cronapp-framework-js 1.0.5 → 1.0.6

package/js/controllers.js

@@ -5,28 +5,68 @@ if (!window.hostApp) {
   angular.module('custom.controllers', []);
 
   // refresh token
-  var refreshToken = function ($http, success, error) {
-    $http({
-      method: 'GET',
-      url: window.hostApp + 'auth/refresh'
-    }).then(function (data, status, headers, config) {
-      data = getRequestData(data);
-      //Keeping the user information, the auth/refresh only has name and username info
-      if (localStorage.getItem("_u")) {
-        let currentSession = JSON.parse(localStorage.getItem("_u"));
-        if (currentSession.user.username === data.user.username)
-          data.user = currentSession.user;
+  var refreshToken = function ($http, success, error, FrontBoostAuthenticationService) {
+    FrontBoostAuthenticationService.isAvailable().then(available => {
+      if (!available) {
+        $http({
+          method: 'GET',
+          url: window.hostApp + 'auth/refresh'
+        }).then(function (data, status, headers, config) {
+          data = getRequestData(data);
+          //Keeping the user information, the auth/refresh only has name and username info
+          if (localStorage.getItem("_u")) {
+            let currentSession = JSON.parse(localStorage.getItem("_u"));
+            if (currentSession.user.username === data.user.username)
+              data.user = currentSession.user;
+          }
+          // Store data response on local storage
+          localStorage.setItem("_u", JSON.stringify(data));
+          // Recussive
+          setTimeout(function () {
+            refreshToken($http, success, error);
+            // refresh time
+          }, (1800 * 1000));
+          success();
+        }).catch(function () {
+          error();
+        });
+      } else {
+        // For FrontBoost authentication
+        FrontBoostAuthenticationService.getSessionInfo().then(info => {
+          if (info.isLoggedIn) {
+            // Check if token will expire in the next 5 minutes (300000ms)
+            const expiresAt = (info.expires_at || 0) * 1000;
+            const expiresInMs = expiresAt - Date.now();
+            const needsRefresh = expiresInMs < 300000;
+
+            if (needsRefresh) {
+              // Token needs to be refreshed
+              FrontBoostAuthenticationService.refreshToken()
+                .then(() => {
+                  // Schedule the next refresh
+                  setTimeout(() => {
+                    refreshToken($http, success, error, FrontBoostAuthenticationService);
+                  }, (1800 * 1000)); // Same refresh interval as cronapp auth
+                  success();
+                })
+                .catch(() => {
+                  error();
+                });
+            } else {
+              // Token is still valid, schedule next check
+              setTimeout(() => {
+                refreshToken($http, success, error, FrontBoostAuthenticationService);
+              }, (1800 * 1000));
+              success();
+            }
+          } else {
+            // Not logged in, call error handler
+            error();
+          }
+        }).catch(() => {
+          error();
+        });
       }
-      // Store data response on local storage
-      localStorage.setItem("_u", JSON.stringify(data));
-      // Recussive
-      setTimeout(function () {
-        refreshToken($http, success, error);
-        // refresh time
-      }, (1800 * 1000));
-      success();
-    }).catch(function () {
-      error();
     });
   };
 
@@ -74,9 +114,11 @@ if (!window.hostApp) {
     }
   });
 
-  app.controller('SignupController' , function($controller, $scope, $stateParams, $location, $http, $rootScope, $translate, Notification, UploadService, $timeout, $state, ReportService) {
+  app.controller('SignupController' , function($controller, $scope, $stateParams, $location, $http, $rootScope, $translate, Notification, UploadService, $timeout, $state, ReportService, FrontBoostCommandService, $log) {
 
     app.registerEventsCronapi($scope, $translate);
+    app.registerFrontBoostFunctions($scope, FrontBoostCommandService, $log);
+
 
     $rootScope.Notification = Notification; // Não remover, usado pelo cronapi.js para notificar erros de auto-cadastro.
 
@@ -87,26 +129,16 @@ if (!window.hostApp) {
 
   });
 
-  app.controller('LoginController', function($controller, $scope, $http, $rootScope, $window, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, $cookies, $templateCache, DashboardService, SyncService) {
+  app.controller('LoginController', function($controller, $scope, $http, $rootScope, $window, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, $cookies, $templateCache, DashboardService, SyncService, FrontBoostAuthenticationService, SessionService, FrontBoostCommandService, $log) {
 
     $http.get(window.NotificationProviderOptions.templateUrl, {cache: true})
-        .then((response) => $templateCache.put(window.NotificationProviderOptions.templateUrl, response.data));
-
-    $scope.goHome = () => {
-      let returnUrl = cronapi.screen.getParam('returnUrl');
-      if (returnUrl) {
-        window.location.hash = returnUrl;
-      }
-      else {
-        $state.go('home');
-      }
-      $scope.cronapi.forceCloseAllModal();
-    };
+      .then((response) => $templateCache.put(window.NotificationProviderOptions.templateUrl, response.data));
 
     $scope.$http = $http;
     $scope.params = $stateParams;
     $scope.$state = $state;
     app.registerEventsCronapi($scope, $translate, $location);
+    app.registerFrontBoostFunctions($scope, FrontBoostCommandService, $log);
 
     $rootScope.http = $http;
     $rootScope.Notification = Notification;
@@ -121,7 +153,13 @@ if (!window.hostApp) {
     };
 
     $scope.redirectToLogin = function() {
-      $scope.cronapi.social.ssoLogin();
+      FrontBoostAuthenticationService.isAvailable().then(available => {
+        if (!available) {
+          $scope.cronapi.social.ssoLogin();
+        } else {
+          FrontBoostAuthenticationService.signIn();
+        }
+      });
     };
 
     if (localStorage.getItem('redir_mob')) {
@@ -135,48 +173,46 @@ if (!window.hostApp) {
       window.grecaptcha.reset();
     };
 
-    function checkSession() {
-      $http({
-        method : 'GET',
-        url : window.hostApp + 'me'
-      }).then(handleSuccess);
-    }
-
     $scope.login = function(username, password) {
-      $scope.message.error = undefined;
-      if($('form').find('*[class=g-recaptcha]').length){
-        if(!$scope.captcha_token && $('form').find('*[class=g-recaptcha]').attr("data-sitekey")=== ""){
-          Notification.error($translate.instant('Login.view.EmptySiteKeyCaptcha'));
-          return;
-        }
-        $scope.captcha_token = window.grecaptcha.getResponse();
-        if(!$scope.captcha_token && $('form').find('*[class=g-recaptcha]').attr("data-size") !== "invisible"){
-          Notification.error($translate.instant('Login.view.InvalidCaptcha'));
-          return;
-        }
-        else if($('form').find('*[class=g-recaptcha]').attr("data-size") === "invisible"){
-          window.grecaptcha.execute();
+      FrontBoostAuthenticationService.isAvailable().then(available => {
+        if (!available) {
+          $scope.message.error = undefined;
+          if ($('form').find('*[class=g-recaptcha]').length) {
+            if (!$scope.captcha_token && $('form').find('*[class=g-recaptcha]').attr("data-sitekey") === "") {
+              Notification.error($translate.instant('Login.view.EmptySiteKeyCaptcha'));
+              return;
+            }
+            $scope.captcha_token = window.grecaptcha.getResponse();
+            if (!$scope.captcha_token && $('form').find('*[class=g-recaptcha]').attr("data-size") !== "invisible") {
+              Notification.error($translate.instant('Login.view.InvalidCaptcha'));
+              return;
+            } else if ($('form').find('*[class=g-recaptcha]').attr("data-size") === "invisible") {
+              window.grecaptcha.execute();
+            }
+          }
+          var user = {
+            username: username ? username : $scope.username.value,
+            password: password ? password : $scope.password.value,
+            recaptchaToken: $scope.captcha_token ? $scope.captcha_token : undefined
+          };
+
+          var headerValues = {
+            'Content-Type': 'application/x-www-form-urlencoded'
+          };
+
+          $http({
+            method: 'POST',
+            url: window.hostApp + 'login',
+            data: $.param(user),
+            headers: headerValues
+          }).then(() => SessionService.checkSession($scope)).catch(handleError);
+        } else {
+          FrontBoostAuthenticationService.signIn();
         }
-      }
-      var user = {
-        username : username?username:$scope.username.value,
-        password : password?password:$scope.password.value,
-        recaptchaToken : $scope.captcha_token ? $scope.captcha_token : undefined
-      };
-
-      var headerValues = {
-        'Content-Type' : 'application/x-www-form-urlencoded'
-      };
-
-      $http({
-        method : 'POST',
-        url : window.hostApp + 'login',
-        data : $.param(user),
-        headers : headerValues
-      }).then(checkSession).catch(handleError);
-    };
+      });
+    }
 
-    checkSession();
+    SessionService.checkSession($scope);
 
     $scope.forgotPassword = function () {
       if (forgotPasswordEmail.value === '') {
@@ -203,31 +239,6 @@ if (!window.hostApp) {
       }).catch(data => Notification.error(data));
     };
 
-    function handleSuccess(data, status, headers, config) {
-      if (data.status == 200) {
-        data = getRequestData(data);
-        // Store data response on session storage
-        // The local storage will be cleaned when the browser window is closed
-        if (typeof (Storage) !== "undefined") {
-          // save the user data on localStorage
-          localStorage.setItem("_u", JSON.stringify(data));
-          $rootScope.session = JSON.parse(localStorage._u);
-        } else {
-          // Sorry! No Web Storage support.
-          // The home page may not work if it depends
-          // on the logged user data
-        }
-
-        // Redirect to home page
-        $scope.goHome();
-
-        // Verify if the 'onLogin' event is defined and it is a function (it can be a string pointing to a non project blockly) and run it.
-        if ($scope.blockly && $scope.blockly.events && $scope.blockly.events.onLogin && $scope.blockly.events.onLogin instanceof Function) {
-          $scope.blockly.events.onLogin();
-        }
-      }
-    }
-
     function handleError(data, status, headers, config) {
       status = status || data.status;
       data = getRequestData(data);
@@ -264,12 +275,13 @@ if (!window.hostApp) {
 
   });
 
-  app.controller('HomeController', function($controller, $scope, $http, $rootScope, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, DashboardService, SyncService) {
+  app.controller('HomeController', function($controller, $scope, $http, $rootScope, $state, $translate, Notification, ReportService, UploadService, $location, $stateParams, $timeout, DashboardService, SyncService, FrontBoostAuthenticationService, SessionService, FrontBoostCommandService, $log) {
 
     $scope.$http = $http;
     $scope.params = $stateParams;
     $scope.$state = $state;
     app.registerEventsCronapi($scope, $translate, $location);
+    app.registerFrontBoostFunctions($scope, FrontBoostCommandService, $log);
 
     $rootScope.http = $http;
     $rootScope.Notification = Notification;
@@ -284,49 +296,49 @@ if (!window.hostApp) {
     };
 
     var idleMonitor = function(timer){
-        let userIsIdle = false;
-        let userIdleTime = new Date().getTime();
-
-        var notifyIdle = function() {
-           if (!userIsIdle) {
-             userIsIdle = true;
-             console.log("User is Idle");
-             try {
-               $scope.logout();
-             } catch (e) {
-               console.log(e)
-             }
-           }
-         }
-
-         var resetIdleTimer = function() {
-           userIdleTime = new Date().getTime();
-           if (userIsIdle) {
-             console.log("User is Back");
-           }
-           userIsIdle = false;
-         }
-
-         var monitorIdleWindow = function(win) {
-           win.onload = resetIdleTimer;
-           win.onmousemove = resetIdleTimer;
-           win.onmousedown = resetIdleTimer;
-           win.ontouchstart = resetIdleTimer;
-           win.onclick = resetIdleTimer;
-           win.onkeypress = resetIdleTimer;
-           win.addEventListener('scroll', resetIdleTimer, true);
-           resetIdleTimer();
-         }
-
-         if(timer && timer > 0){
-           monitorIdleWindow(window);
-           setInterval(() => {
-             if (new Date().getTime() - userIdleTime > (60000 * timer)) {
-               notifyIdle();
-             }
-           }, 1000);
-         }
-     }
+      let userIsIdle = false;
+      let userIdleTime = new Date().getTime();
+
+      var notifyIdle = function() {
+        if (!userIsIdle) {
+          userIsIdle = true;
+          console.log("User is Idle");
+          try {
+            $scope.logout();
+          } catch (e) {
+            console.log(e)
+          }
+        }
+      }
+
+      var resetIdleTimer = function() {
+        userIdleTime = new Date().getTime();
+        if (userIsIdle) {
+          console.log("User is Back");
+        }
+        userIsIdle = false;
+      }
+
+      var monitorIdleWindow = function(win) {
+        win.onload = resetIdleTimer;
+        win.onmousemove = resetIdleTimer;
+        win.onmousedown = resetIdleTimer;
+        win.ontouchstart = resetIdleTimer;
+        win.onclick = resetIdleTimer;
+        win.onkeypress = resetIdleTimer;
+        win.addEventListener('scroll', resetIdleTimer, true);
+        resetIdleTimer();
+      }
+
+      if(timer && timer > 0){
+        monitorIdleWindow(window);
+        setInterval(() => {
+          if (new Date().getTime() - userIdleTime > (60000 * timer)) {
+            notifyIdle();
+          }
+        }, 1000);
+      }
+    }
 
     cronapp.ioc.getInstance(cronapp.configuration.IConfigurationService).getValue("cronapp.framework.auth.idletime").then(idleMonitor);
 
@@ -343,60 +355,68 @@ if (!window.hostApp) {
       $scope.ignoreAuth = true;
     }
 
-    $rootScope.session = (localStorage.getItem('_u') !== undefined) ? JSON.parse(localStorage.getItem('_u')) : null;
-
-    if($rootScope.session) {
-      // When access home page we have to check
-      // if the user is authenticated and the userData
-      // was saved on the browser's localStorage
-      $rootScope.myTheme = '';
-      if ($rootScope.session.user)
-        $rootScope.myTheme = $rootScope.session.user.theme;
-      $scope.$watch('myTheme', function(value) {
-        if(value !== undefined && value !== "") {
-          $('#themeSytleSheet').attr('href', "node_modules/cronapp-framework-js/css/themes/" + value + ".min.css");
+    SessionService.checkSession($scope).then(() => {
+      $rootScope.session = (localStorage.getItem('_u') !== undefined) ? JSON.parse(localStorage.getItem('_u')) : null;
+
+      if ($rootScope.session) {
+        // When access home page we have to check
+        // if the user is authenticated and the userData
+        // was saved on the browser's localStorage
+        $rootScope.myTheme = '';
+        if ($rootScope.session.user)
+          $rootScope.myTheme = $rootScope.session.user.theme;
+        $scope.$watch('myTheme', function (value) {
+          if (value !== undefined && value !== "") {
+            $('#themeSytleSheet').attr('href', "node_modules/cronapp-framework-js/css/themes/" + value + ".min.css");
+          }
+        });
+        if (localStorage.getItem('_u')) {
+          refreshToken($http, function () {
+          }, function () {
+            localStorage.removeItem('_u');
+            if (window.location.hash) {
+              $state.go('loginReturnUrl', {"returnUrl": window.location.hash});
+            } else {
+              $state.go('login');
+            }
+          }, FrontBoostAuthenticationService);
         }
-      });
-      if (localStorage.getItem('_u')){
-        refreshToken($http, function() {},function() {
-          localStorage.removeItem('_u');
+      } else {
+        if (!$scope.ignoreAuth) {
+          localStorage.removeItem("_u");
           if (window.location.hash) {
-            $state.go('loginReturnUrl', { "returnUrl" : window.location.hash });
+            $state.go('loginReturnUrl', {"returnUrl": window.location.hash});
           } else {
-            $state.go('login');
+            window.location.href = "";
           }
-        });
-      }
-    }
-    else {
-      if (!$scope.ignoreAuth) {
-        localStorage.removeItem("_u");
-        if (window.location.hash) {
-          $state.go('loginReturnUrl', { "returnUrl" : window.location.hash });
-        } else {
-          window.location.href = "";
         }
       }
-    }
+    });
 
     $rootScope.logout = function logout() {
-      $http({
-        method : 'POST',
-        url : window.hostApp + 'logout',
-        headers : {
-          'Content-Type' : 'application/json'
+      FrontBoostAuthenticationService.isAvailable().then(available => {
+        if (available) {
+          FrontBoostAuthenticationService.signOut().then(clean).catch(clean);
+        } else {
+          $http({
+            method: 'POST',
+            url: window.hostApp + 'logout',
+            headers: {
+              'Content-Type': 'application/json'
+            }
+          }).then(clean).catch(clean);
         }
-      }).then(clean).catch(clean);
 
-      function clean(result) {
-        result = getRequestData(result);
-        $rootScope.session = {};
-        if(typeof (Storage) !== "undefined") {
-          localStorage.removeItem("_u");
-        }
+        function clean(result) {
+          result = getRequestData(result);
+          $rootScope.session = {};
+          if (typeof (Storage) !== "undefined") {
+            localStorage.removeItem("_u");
+          }
 
-        $scope.cronapi.util.changeViewLogout();
-      }
+          $scope.cronapi.util.changeViewLogout();
+        }
+      });
     };
 
     $scope.changePassword = function() {
@@ -575,7 +595,7 @@ if (!window.hostApp) {
 }(app));
 
 window.safeApply = function(fn) {
-  var phase = this.$root.$$phase;
+  const phase = this.$root?.$$phase;
   if(phase === '$apply' || phase === '$digest') {
     if(fn && (typeof (fn) === 'function')) {
       fn();
@@ -585,4 +605,3 @@ window.safeApply = function(fn) {
     this.$apply(fn);
   }
 };
-