added date time and network status in sidebar (#536)

added date time and network status in sidebar

Author: ann-aot

forms-flow-nav/src/sidenav/Sidebar.scss

@@ -270,9 +270,9 @@
 }
 
 .date-time-network-container .date {
-  font-size: 15px;
+  font-size: 13px;
   color: #cbd5e0;
-  margin-left: 10px;
+  margin-left: 8px;
   margin-top: 4px;
 }
 

forms-flow-rsbcservice/src/services/offlineSubmissions.ts

@@ -56,7 +56,7 @@ class OfflineSubmissions {
   /**
    * Initializes Keycloak if it's not already initialized and retry token.
    */
-  private static async retryToken(): Promise<void> {
+  public static async retryToken(): Promise<void> {
     const instance = KeycloakService.getInstance(
       KEYCLOAK_URL_AUTH,
       KEYCLOAK_URL_REALM,

forms-flow-service/src/keycloak/KeycloakService.ts

@@ -67,41 +67,57 @@ import {
         return 60000;
       }
     }
-    
+
+    private keycloackUpdateToken(timeEnabled = false): void {
+      this.kc
+        ?.updateToken(-1)
+        .then((refreshed) => {
+          if (refreshed) {
+            console.log("Token refreshed!");
+            this.token = this.kc.token;
+            StorageService.save(StorageService.User.AUTH_TOKEN, this.token!);
+            if (this.kc.refreshToken && APPLICATION_NAME === "roadsafety") {
+              StorageService.save(
+                StorageService.User.REFRESH_TOKEN,
+                HelperServices.encrypt(this.kc.refreshToken)
+              );
+            } else {
+              console.info(
+                "Refreshing Tokens - Not storing the refresh token."
+              );
+            }
+            this.refreshToken();
+          } else {
+            console.log("Token is still valid!");
+          }
+        })
+        .catch((err) => {
+          console.error("Keycloak token update failed!", err);
+          this.handleTokenRefreshFailure();
+        })
+        .finally(() => {
+          if (timeEnabled) {
+            clearInterval(this.timerId);
+          }
+        });
+    }
+
     /**
      * Refresh the keycloak token before expiring
      */
     private refreshToken(skipTimer: boolean = false): void {
-      this.timerId = setInterval(() => {
-        if (!navigator.onLine) {
-          console.debug("Offline: Skipping token refresh.");
-          return;
-        }
-    
-        this.kc
-          ?.updateToken(-1)
-          .then((refreshed) => {
-            if (refreshed) {
-              console.log("Token refreshed!");
-              clearInterval(this.timerId);
-              this.token = this.kc.token;
-              StorageService.save(StorageService.User.AUTH_TOKEN, this.token!);
-              if (this.kc.refreshToken && APPLICATION_NAME === "roadsafety") {
-                StorageService.save(StorageService.User.REFRESH_TOKEN, HelperServices.encrypt(this.kc.refreshToken));
-              } else {
-                console.info("Refreshing Tokens - Not storing the refresh token.");
-              }
-              this.refreshToken();
-            } else {
-              console.log("Token is still valid!");
-            }
-          })
-          .catch((err) => {
-            console.error("Keycloak token update failed!", err);
-            clearInterval(this.timerId);
-            this.handleTokenRefreshFailure();
-          });
-      }, (!skipTimer && APPLICATION_NAME === "roadsafety") ? this.getTokenExpireTime() : 0);
+      this.timerId = setInterval(
+        () => {
+          if (!navigator.onLine) {
+            console.debug("Offline: Skipping token refresh.");
+            return;
+          }
+          this.keycloackUpdateToken(true);
+        },
+        !skipTimer && APPLICATION_NAME === "roadsafety"
+          ? this.getTokenExpireTime()
+          : 0
+      );
     }
 
     /**
@@ -146,7 +162,7 @@ import {
         }
       }
       this.isWaitingForOnline = false;
-      this.refreshToken(skipTimer);
+    this.keycloackUpdateToken();
     };