fix basic auth expiration behavior (#1129)

Soluto · Mar 27, 2019 · e7040aa · e7040aa
1 parent c21a23c
commit e7040aa
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/services/editor/src/services/auth-service.js b/services/editor/src/services/auth-service.js
@@ -37,13 +37,18 @@ const retrieveOidcSettings = () => JSON.parse(storage.getItem('oidc-settings'));
 export const isAuthenticated = async () => {
   const token = retrieveToken();
   if (token) {
-    const expiration = moment.unix(jwt_decode(token).exp);
+    const decoded = jwt_decode(token);
+    const expiration = moment.unix(decoded.exp);
     if (moment().isBefore(expiration)) {
       return true;
     }
+
     if (isAzure()) {
       return false;
     }
+    if (decoded.iss === 'tweek-basic-auth') {
+      return false;
+    }
     const settings = retrieveOidcSettings();
     const oidcClient = getOidcClient(settings);
     try {