Bug 1310035: display 'sign in' when credentials are expired at page l…

…oad (#167)
TheLayman · Oct 27, 2016 · 607caa0 · 607caa0
1 parent 268b487
commit 607caa0
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/lib/auth.js b/src/lib/auth.js
@@ -45,13 +45,14 @@ export const loadCredentials = () => {
 
     if (creds.certificate && creds.certificate.expiry < Date.now()) {
       saveCredentials(null); // clear credentials
-    } else if (creds.certificate) {
-      clearTimeout(credentialsExpiredTimeout);
+      return null;
+    }
 
+    clearTimeout(credentialsExpiredTimeout);
+    if (creds.certificate) {
       credentialsExpiredTimeout = setTimeout(() => saveCredentials(null),
         creds.certificate.expiry - Date.now());
     } else {
-      clearTimeout(credentialsExpiredTimeout);
       credentialsExpiredTimeout = null;
     }