✨ Separation of voting session time and bearer token lifetime (#455)

Parent issue: sequentech/meta#762
sequentech · Jul 19, 2024 · 76b39da · 76b39da
1 parent 8b81d74
commit 76b39da
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/avBooth/booth-directive/booth-directive.js b/avBooth/booth-directive/booth-directive.js
@@ -695,10 +695,13 @@ angular.module('avBooth')
       function isStateCompatibleWithCountdown() {
         return scope.state !== stateEnum.errorScreen && scope.state !== stateEnum.successScreen;
       }
+      var demoStartTime = Date.now();
 
       // Try to read and process voting credentials
       function readVoteCredentials() {
         if (scope.isDemo || scope.isPreview) {
+          scope.startTimeMs = demoStartTime;
+          scope.sessionEndsAtMs = scope.startTimeMs + ConfigService.authTokenExpirationSeconds * 1000;
           return;
         }
         var credentialsStr = $window.sessionStorage.getItem("vote_permission_tokens");
@@ -792,7 +795,6 @@ angular.module('avBooth')
         var objectType = splitMessage[1];
         var objectId = splitMessage[2];
         var action = splitMessage[3];
-        var startTimeSecsStr = splitMessage[4];
         // timestamp has already been validated so we don't validate it again
         if (
           isNaN(parseInt(objectId, 10)) ||
@@ -814,7 +816,7 @@ angular.module('avBooth')
         scope.authorizationHeader = currentElectionCredentials.token;
         scope.currentElectionCredentials = currentElectionCredentials;
         scope.isDemo = false;
-        scope.startTimeMs = Number(startTimeSecsStr) * 1000;
+        scope.startTimeMs = decodedToken.create_timestamp * 1000;
         scope.sessionEndsAtMs = decodedToken.expiry_timestamp * 1000;
       }
 
@@ -823,8 +825,8 @@ angular.module('avBooth')
         return scope.sessionEndsAtMs || scope.currentElectionCredentials && scope.currentElectionCredentials.sessionEndsAtMs || (scope.startTimeMs + ConfigService.authTokenExpirationSeconds * 1000);
       }
 
-      function getSessionStartTime() {
-        if (!scope.startTimeMs) {
+      function getSessionStartTime(readCredentials) {
+        if (readCredentials) {
           readVoteCredentials();
         }
         return scope.startTimeMs || (scope.currentElectionCredentials && scope.currentElectionCredentials.sessionStartedAtMs);