naturalprogrammer / lemon-demo-angular1 Goto Github PK

 git diff
diff --git a/app/scripts/app.js b/app/scripts/app.js
index 91ed384..653aaf7 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -42,7 +42,7 @@ var serverUrl;
     var $http = initInjector.get("$http");
     $http.defaults.withCredentials = true;

-    $http.get(serverUrl + '/api/core/context').
+    /*$http.get(serverUrl + '/api/core/context').
       success(function (data, status, headers, config) {

         data.context.user = data.user;
@@ -58,7 +58,25 @@ var serverUrl;

         alert("Could not connect to server. Please try refreshing after sometime");

+      });*/
+
+    $http.get(serverUrl + '/api/core/context').
+      then(function (response) {
+
+        response.data.context.user = response.data.user;
+        angular.module('appBoot').constant("context", response.data.context);
+        $http.get(serverUrl + '/api/core/ping'); // otherwise gives CSRF exception if remember-me is activated
+
+        angular.element(document).ready(function() {
+          angular.bootstrap(document, [appName]);
+        });
+
+      }, function (response) {
+
+        alert("Could not connect to server. Please try refreshing after sometime");
+
       });
+
   };

   angular.module('appBoot', ['ngMessages', 'ui.bootstrap', 'vcRecaptcha'])
diff --git a/app/scripts/services/ping.js b/app/scripts/services/ping.js
index c570f09..325e68b 100644
--- a/app/scripts/services/ping.js
+++ b/app/scripts/services/ping.js
@@ -13,10 +13,9 @@ angular.module('appBoot')
     return function() {

       $http.get(serverUrl + '/api/core/ping')
-        .success(function(){
+        .then(function(response){
           $log.info("Ping completed");
-        })
-        .error(function (data, status, headers, config) {
+        }, function (response) {
           alerts.addAlert("Could not ping server. Please try refreshing after sometime");
         });
     };