cronapp-framework-js 2.9.6-SP.38 → 2.9.6-SP.39

package/dist/js/upload.service.js

@@ -1 +1 @@
-(function(){function a(a){var b=[].slice.call(arguments,1),c=0;return a.replace(/%s/g,function(){return b[c++]})}angular.module("upload.services",[]).service("UploadService",["$http","$compile","$modal","Upload",function(a,b,c){var d=$("body"),e=angular.element(d.get(0)).scope();this.ensureProps=a=>(a.filter&&(a.filter=a.filter.replace(/\s/g,"")),a),this.upload=function(a){let b=this.ensureProps(a);c.open({templateUrl:"node_modules/cronapp-framework-js/components/upload/upload.html",controller:"UploadController",resolve:{data:function(){return b}}})}.bind(this)}]),angular.module("custom.controllers").controller("UploadController",["$scope","$http","$translate","$stateParams","$location","$http","$modalInstance","data",function(b,c,d,e,f,c,g,h){app.registerEventsCronapi(b,d),b.params=e,b.$http=c;var i=f.search();for(var j in i)i.hasOwnProperty(j)&&(b.params[j]=i[j]);b.files=[],b.uploading=!1,b.uploaded=!0,b.progress=0,b.data=h,b.message=d.instant("Upload.oneFile"),"true"==h.multiple&&(b.message=d.instant("Upload.multipleFile")),h.description&&(b.message=h.description),b.safeApply=safeApply,b.uploadFile=function(e){var f=b.data.scope,g="api/cronapi/upload/"+h.id,j=new FormData;if(0==e.length)this.Notification.error(a(d.instant("Upload.errorValidation"),h.maxSize,h.filter));else{for(var k=0;k<e.length;k++)j.append("file",e[k]),console.log(e[k].$valid);var l=JSON.parse(localStorage.getItem("_u"));this.$promise=c({method:"POST",url:(window.hostApp||"")+g,data:j,headers:{"Content-Type":void 0,"X-AUTH-TOKEN":l?l.token:""},onProgress:function(a){this.safeApply(function(){if(a.lengthComputable){var c=0|100*(a.loaded/a.total);b.progress=c}b.uploading=!0,console.log(c)})}.bind(this)}).then(function(a){f.cronapi.evalInContext(JSON.stringify(a)).then(()=>{b.uploaded=!0,b.uploading=!1,b.close()})}.bind(this)).catch(function(a){let c=a.error;a&&a.data&&(c=a.data.error),this.Notification.error(c),b.uploading=!1,b.close()}.bind(this))}}.bind(b),b.close=function(){g.dismiss("cancel")}}])})(app);
+(function(){function a(a){var b=[].slice.call(arguments,1),c=0;return a.replace(/%s/g,function(){return b[c++]})}angular.module("upload.services",[]).service("UploadService",["$http","$compile","$modal","Upload",function(a,b,c){var d=$("body"),e=angular.element(d.get(0)).scope();this.ensureProps=a=>(a.filter&&(a.filter=a.filter.replace(/\s/g,"")),a),this.upload=function(a){let b=this.ensureProps(a);c.open({templateUrl:"node_modules/cronapp-framework-js/components/upload/upload.html",controller:"UploadController",resolve:{data:function(){return b}}})}.bind(this)}]),angular.module("custom.controllers").controller("UploadController",["$scope","$http","$translate","$stateParams","$location","$http","$modalInstance","data",function(b,c,d,e,f,c,g,h){app.registerEventsCronapi(b,d),b.params=e,b.$http=c;var i=f.search();for(var j in i)i.hasOwnProperty(j)&&(b.params[j]=i[j]);b.files=[],b.uploading=!1,b.uploaded=!0,b.progress=0,b.data=h,b.message=d.instant("Upload.oneFile"),"true"==h.multiple&&(b.message=d.instant("Upload.multipleFile")),h.description&&(b.message=h.description),b.safeApply=safeApply,b.uploadFile=function(e){var f=b.data.scope,g="api/cronapi/upload/"+h.id,j=new FormData;if(0==e.length)this.Notification.error(a(d.instant("Upload.errorValidation"),h.maxSize,h.filter));else{for(var k=0;k<e.length;k++)j.append("file",e[k]),console.log(e[k].$valid);var l=JSON.parse(localStorage.getItem("_u"));let a=navigator.cookieEnabled?{"Content-Type":void 0}:{"Content-Type":void 0,"X-AUTH-TOKEN":l?l.token:""};this.$promise=c({method:"POST",url:(window.hostApp||"")+g,data:j,headers:a,onProgress:function(a){this.safeApply(function(){if(a.lengthComputable){var c=0|100*(a.loaded/a.total);b.progress=c}b.uploading=!0,console.log(c)})}.bind(this)}).then(function(a){f.cronapi.evalInContext(JSON.stringify(a)).then(()=>{b.uploaded=!0,b.uploading=!1,b.close()})}.bind(this)).catch(function(a){let c=a.error;a&&a.data&&(c=a.data.error),this.Notification.error(c),b.uploading=!1,b.close()}.bind(this))}}.bind(b),b.close=function(){g.dismiss("cancel")}}])})(app);

package/js/app.js

@@ -71,10 +71,11 @@ var app = (function() {
             function($q, $rootScope) {
               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 (!navigator.cookieEnabled) {
+                    var _u = JSON.parse(localStorage.getItem('_u'));
+                    if (_u && _u.token) {
+                      config.headers['X-AUTH-TOKEN'] = _u.token;
+                    }
                   }
                   return config;
                 }

package/js/controllers.js

@@ -8,6 +8,9 @@
       url: 'auth/refresh'
     }).then(function (data, status, headers, config) {
       data = getRequestData(data);
+      if (navigator.cookieEnabled) {
+        delete data.token;
+      }
       //Keeping the user information, the auth/refresh only has name and username info
       if (localStorage.getItem("_u")) {
         let currentSession = JSON.parse(localStorage.getItem("_u"));
@@ -44,14 +47,17 @@
         return;
       }
 
+      let headerValues = navigator.cookieEnabled ? {
+        'Content-Type': 'application/x-www-form-urlencoded'
+      } : {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'X-AUTH-TOKEN' : $location.search().token
+      };
       $http({
         method: 'POST',
         url: 'auth/confirm-reset-password',
         data: $.param({password: passwordNew.value}),
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          'X-AUTH-TOKEN': $location.search().token
-        }
+        headers: headerValues
       }).then(() => {
         Notification.info($translate.instant('ResetPasswordSuccess'));
         passwordNew.value = "";
@@ -131,6 +137,9 @@
     if ($cookies.get('_u')) {
       if (!localStorage.getItem('_u')) {
         var decodedUser = decodeURIComponent($cookies.get('_u'));
+        if (navigator.cookieEnabled) {
+          delete decodedUser.token;
+        }
         localStorage.setItem("_u", decodedUser);
       }
       $scope.goHome();
@@ -166,7 +175,7 @@
         'Content-Type' : 'application/x-www-form-urlencoded'
       };
 
-      if (token) {
+      if (!navigator.cookieEnabled && token) {
         headerValues["X-AUTH-TOKEN"] = token;
       }
 
@@ -209,6 +218,9 @@
       // The local storage will be cleaned when the browser window is closed
       if(typeof (Storage) !== "undefined") {
         // save the user data on localStorage
+        if (navigator.cookieEnabled) {
+          delete data.token;
+        }
         localStorage.setItem("_u", JSON.stringify(data));
         $rootScope.session = JSON.parse(localStorage._u);
       }
@@ -352,15 +364,15 @@
           $('#themeSytleSheet').attr('href', "node_modules/cronapp-framework-js/css/themes/" + value + ".min.css");
         }
       });
-      if(localStorage.getItem('_u') && JSON.parse(localStorage.getItem('_u')).token){
-        refreshToken($http,function(){},function(){
+      if (localStorage.getItem('_u') && (JSON.parse(localStorage.getItem('_u')).token || navigator.cookieEnabled)){
+        refreshToken($http, function() {},function() {
           localStorage.removeItem('_u');
           if (window.location.hash) {
             $state.go('loginReturnUrl', { "returnUrl" : window.location.hash });
           } else {
             $state.go('login');
           }
-        })
+        });
       }
     }
     else {
@@ -517,6 +529,9 @@
         function changeSuccess(data, status, headers, config) {
           $rootScope.session.theme = theme;
           $rootScope.session.user.theme = theme;
+          if (navigator.cookieEnabled) {
+            delete $rootScope.session.token;
+          }
           localStorage.setItem("_u", JSON.stringify($rootScope.session));
         }
 

package/js/directives.js

@@ -3531,8 +3531,8 @@
                     getAllParent(cronappDatasource, itemResult.d.results[0], ids, resolve, reject);
                   },
                   beforeSend: (xhr) => {
-                    if (window.uToken) {
-                      xhr.setRequestHeader ("X-AUTH-TOKEN", window.uToken);
+                    if (!navigator.cookieEnabled) {
+                      xhr.setRequestHeader ("X-AUTH-TOKEN", cronapi.util.getUserToken());
                     }
                   },
                   error: () => reject(),
@@ -3673,8 +3673,8 @@
                               resolve();
                             },
                             beforeSend: (xhr) => {
-                              if (window.uToken) {
-                                xhr.setRequestHeader ("X-AUTH-TOKEN", window.uToken);
+                              if (!navigator.cookieEnabled) {
+                                xhr.setRequestHeader ("X-AUTH-TOKEN", cronapi.util.getUserToken());
                               }
                             },
                             error: () => reject(),

package/js/upload.service.js

@@ -80,14 +80,17 @@
               console.log(files[i].$valid);
             }
             var _u = JSON.parse(localStorage.getItem('_u'));
+            let headerValues = navigator.cookieEnabled ? {
+              '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-js",
-  "version": "2.9.6-SP.38",
+  "version": "2.9.6-SP.39",
   "description": "Javascript library for CronApp's projects",
   "main": "cronapp.framework.js",
   "scripts": {