cronapp-framework-mobile-js 3.0.0-SP.4 → 3.0.0-SP.40

package/js/app.authentication.js

@@ -87,10 +87,11 @@ var app = (function() {
             function ($q, $rootScope, $injector) {
               var service = {
                 request: function (config) {
-                  var _u = JSON.parse(localStorage.getItem('_u'));
-                  if (_u && _u.token) {
-                    config.headers['X-AUTH-TOKEN'] = _u.token;
-                    window.uToken = _u.token;
+                  if (!window.isUsingCookie()) {
+                    var _u = JSON.parse(localStorage.getItem('_u'));
+                    if (_u && _u.token) {
+                      config.headers['X-AUTH-TOKEN'] = _u.token;
+                    }
                   }
                   return config;
                 },
@@ -591,6 +592,9 @@ window.refreshToken = function(Notification, $http, success, err) {
     }).success(function (data, status, headers, config) {
       // Store data response on local storage
       console.log('revive :', new Date(data.expires));
+      if (window.isUsingCookie()) {
+        delete data.token;
+      }
       localStorage.setItem("_u", JSON.stringify(data));
       // Recussive
       setTimeout(function () {

package/js/app.js

@@ -60,8 +60,10 @@ var app = (function() {
           function($q, $rootScope) {
             var service = {
               'request': function(config) {
-                var _u = JSON.parse(sessionStorage.getItem('_u'));
-                if (_u && _u.token) config.headers['X-AUTH-TOKEN'] = _u.token;
+                if (!window.isUsingCookie()) {
+                  var _u = JSON.parse(sessionStorage.getItem('_u'));
+                  if (_u && _u.token) config.headers['X-AUTH-TOKEN'] = _u.token;
+                }
                 return config;
               }
             };

package/js/controllers.authentication.js

@@ -92,6 +92,9 @@
             if ($cookies.get('_u')) {
                 if (!localStorage.getItem('_u')) {
                     var decodedUser = decodeURIComponent($cookies.get('_u'));
+                    if (window.isUsingCookie()) {
+                      delete decodedUser.token;
+                    }
                     localStorage.setItem("_u", decodedUser);
                 }
                 // Redirect to home page
@@ -113,7 +116,7 @@
                   'Content-Type' : 'application/x-www-form-urlencoded'
                 };
 
-                if (token) {
+                if (!window.isUsingCookie() && token) {
                   headerValues["X-AUTH-TOKEN"] = token;
                 }
 
@@ -140,6 +143,9 @@
                 // The session storage will be cleaned when the browser window is closed
                 if(typeof (Storage) !== "undefined") {
                     // save the user data on localStorage
+                    if (window.isUsingCookie()) {
+                      delete data.token;
+                    }
                     localStorage.setItem('_u', JSON.stringify(data));
                 }
                 else {

package/js/upload.service.js

@@ -126,14 +126,17 @@
               formData.append("file", files[i]);
             }
             let _u = JSON.parse(localStorage.getItem('_u'));
+            let headerValues = window.isUsingCookie() ? {
+              'Content-Type' : undefined
+            } : {
+              'Content-Type' : undefined,
+              'X-AUTH-TOKEN' : (_u ?_u.token : '')
+            };
             this.$promise = $http({
               method: 'POST',
               url: (window.hostApp || "") + uploadUrl,
               data: formData,
-              headers: {
-                'Content-Type': undefined,
-                'X-AUTH-TOKEN': (_u ? _u.token : '')
-              },
+              headers: headerValues,
               onProgress: function (event) {
                 this.safeApply(function () {
                   if (event.lengthComputable) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronapp-framework-mobile-js",
-  "version": "3.0.0-SP.4",
+  "version": "3.0.0-SP.40",
   "description": "Javascript library for CronApp's projects",
   "main": "cronapp.framework.mobile.js",
   "scripts": {