wip

sequentech · Jun 19, 2024 · c04988d · c04988d
1 parent f5fef1f
commit c04988d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 53 deletions.
diff --git a/avRegistration/auth-method-service.js b/avRegistration/auth-method-service.js
@@ -83,42 +83,41 @@ angular.module('avRegistration')
         }
 
         authmethod.setAuth = function(auth, isAdmin, autheventid) {
+            console.log("setAuth");
             authmethod.admin = isAdmin;
             $http.defaults.headers.common.Authorization = auth;
             authmethod.lastAuthDate = new Date();
 
-            if (!authmethod.pingTimeout) {
-                $interval.cancel(authmethod.pingTimeout);
-                authmethod.refreshAuthToken(autheventid);
-
-                // callback only every 1 second, for efficiency
-                authmethod.pingTimeout = $interval(
-                  function() {
-                    console.log("authmethod.pingTimeout..");
-                    // only call the callback if the last interaction was within
-                    // last 5 seconds
-                    wasInteractionWithinLastXSeconds(
-                      5 /* seconds */,
-                      function () {
-                        console.log("wasInteractionWithinLastXSeconds..");
-                        // Only try to renew token when it's older than 50% of
-                        // the expiration time
-                        var secsDiff = getSecondsDifference(
-                          authmethod.lastAuthDate, new Date()
-                        );
-                        var halfLife = ConfigService.authTokenExpirationSeconds * 0.5;
-                        if (secsDiff <= halfLife) {
-                          console.log("secsDiff <= halfLife, stopping..");
-                          return;
-                        }
-                        console.log("secsDiff > halfLife, refreshing token..");
-                        authmethod.refreshAuthToken(autheventid);
-                      }
+            $interval.cancel(authmethod.pingTimeout);
+            authmethod.refreshAuthToken(autheventid);
+
+            // callback only every 1 second, for efficiency
+            authmethod.pingTimeout = $interval(
+              function() {
+                console.log("authmethod.pingTimeout..");
+                // only call the callback if the last interaction was within
+                // last 5 seconds
+                wasInteractionWithinLastXSeconds(
+                  5 /* seconds */,
+                  function () {
+                    console.log("wasInteractionWithinLastXSeconds..");
+                    // Only try to renew token when it's older than 50% of
+                    // the expiration time
+                    var secsDiff = getSecondsDifference(
+                      authmethod.lastAuthDate, new Date()
                     );
-                  },
-                  1000
+                    var halfLife = ConfigService.authTokenExpirationSeconds * 0.5;
+                    if (secsDiff <= halfLife) {
+                      console.log("secsDiff <= halfLife, stopping..");
+                      return;
+                    }
+                    console.log("secsDiff > halfLife, refreshing token..");
+                    authmethod.refreshAuthToken(autheventid);
+                  }
                 );
-            }
+              },
+              1000
+            );
             return false;
         };
 
@@ -631,20 +630,6 @@ angular.module('avRegistration')
             return $http.get(backendUrl);
         };
 
-        authmethod.setAuth = function(auth, isAdmin, autheventid) {
-            authmethod.admin = isAdmin;
-            $http.defaults.headers.common.Authorization = auth;
-            if (!authmethod.pingTimeout) {
-                $interval.cancel(authmethod.pingTimeout);
-                authmethod.refreshAuthToken(autheventid);
-                authmethod.pingTimeout = $interval(
-                        function() { authmethod.refreshAuthToken(autheventid); },
-                        ConfigService.authTokenExpirationSeconds*500 // renew token when 50% of the expiration time has passed
-                );
-            }
-            return false;
-        };
-
         authmethod.electionsIds = function(page, listType, ids, page_size) {
             if (!page) {
                 page = 1;

diff --git a/dist/appCommon-v10.4.2.js b/dist/appCommon-v10.4.2.js
@@ -19,16 +19,16 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
         (isPerformanceApiAvailable() ? performance.now() - lastInteractionTime : 1 / 0) <= 1e3 * seconds && callback();
     }
     return authmethod.setAuth = function(auth, isAdmin, autheventid) {
-        return authmethod.admin = isAdmin, $http.defaults.headers.common.Authorization = auth, 
-        authmethod.lastAuthDate = new Date(), authmethod.pingTimeout || ($interval.cancel(authmethod.pingTimeout), 
+        return console.log("setAuth"), authmethod.admin = isAdmin, $http.defaults.headers.common.Authorization = auth, 
+        authmethod.lastAuthDate = new Date(), $interval.cancel(authmethod.pingTimeout), 
         authmethod.refreshAuthToken(autheventid), authmethod.pingTimeout = $interval(function() {
             console.log("authmethod.pingTimeout.."), wasInteractionWithinLastXSeconds(5, function() {
                 var date1, date2;
                 console.log("wasInteractionWithinLastXSeconds.."), (date1 = authmethod.lastAuthDate, 
                 date2 = new Date(), Math.abs(date2 - date1) / 1e3) <= .5 * ConfigService.authTokenExpirationSeconds ? console.log("secsDiff <= halfLife, stopping..") : (console.log("secsDiff > halfLife, refreshing token.."), 
                 authmethod.refreshAuthToken(autheventid));
             });
-        }, 1e3)), !1;
+        }, 1e3), !1;
     }, authmethod.isAdmin = function() {
         return authmethod.isLoggedIn() && authmethod.admin;
     }, authmethod.isLoggedIn = function() {
@@ -261,12 +261,6 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
         });
     }, authmethod.test = function() {
         return $http.get(backendUrl);
-    }, authmethod.setAuth = function(auth, isAdmin, autheventid) {
-        return authmethod.admin = isAdmin, $http.defaults.headers.common.Authorization = auth, 
-        authmethod.pingTimeout || ($interval.cancel(authmethod.pingTimeout), authmethod.refreshAuthToken(autheventid), 
-        authmethod.pingTimeout = $interval(function() {
-            authmethod.refreshAuthToken(autheventid);
-        }, 500 * ConfigService.authTokenExpirationSeconds)), !1;
     }, authmethod.electionsIds = function(page, queryIds, ids, page_size) {
         page = page || 1;
         var perms = "edit|view";