@muze-nl/metro-oidc 0.4.1 → 0.5.1

package/dist/browser.js

@@ -877,19 +877,22 @@
       localState = {
         get: () => localStorage.getItem("metro/state:" + site),
         set: (value) => localStorage.setItem("metro/state:" + site, value),
-        has: () => localStorage.getItem("metro/state:" + site) !== null
+        has: () => localStorage.getItem("metro/state:" + site) !== null,
+        delete: () => localStorage.remoteItem("metro/state:" + site)
       };
       localTokens = {
         get: (name) => JSON.parse(localStorage.getItem(site + ":" + name)),
         set: (name, value) => localStorage.setItem(site + ":" + name, JSON.stringify(value)),
-        has: (name) => localStorage.getItem(site + ":" + name) !== null
+        has: (name) => localStorage.getItem(site + ":" + name) !== null,
+        delete: (name) => localStorage.removeItem(site + ":" + name)
       };
     } else {
       let stateMap = /* @__PURE__ */ new Map();
       localState = {
         get: () => stateMap.get("metro/state:" + site),
         set: (value) => stateMap.set("metro/state:" + site, value),
-        has: () => stateMap.has("metro/state:" + site)
+        has: () => stateMap.has("metro/state:" + site),
+        delete: () => stateMap.delete("metro/state:" + site)
       };
       localTokens = /* @__PURE__ */ new Map();
     }
@@ -981,8 +984,10 @@
     };
     async function oauth2authorized(req, next) {
       getTokensFromLocation();
-      let accessToken = options.tokens.get("access_token");
-      if (!accessToken) {
+      const accessToken = options.tokens.get("access_token");
+      const refreshToken = options.tokens.get("refresh_token");
+      const tokenIsExpired = isExpired(accessToken);
+      if (!accessToken || tokenIsExpired && !refreshToken) {
         try {
           let token = await fetchAccessToken();
           if (!token) {
@@ -992,9 +997,9 @@
           throw e;
         }
         return oauth2authorized(req, next);
-      } else if (isExpired(accessToken)) {
+      } else if (tokenIsExpired && refreshToken) {
         try {
-          let token = await fetchRefreshToken();
+          let token = await refreshAccessToken();
           if (!token) {
             return response("false");
           }
@@ -1070,9 +1075,10 @@
         };
         options.tokens.set("refresh_token", token);
       }
+      options.tokens.delete("authorization_code");
       return data;
     }
-    async function fetchRefreshToken() {
+    async function refreshAccessToken() {
       let refreshTokenReq = getAccessTokenRequest("refresh_token");
       let response2 = await options.client.post(refreshTokenReq);
       if (!response2.ok) {
@@ -1124,6 +1130,7 @@
         search.client_secret = oauth2.client_secret;
       }
       if (oauth2.code_verifier) {
+        options.tokens.set("code_verifier", oauth2.code_verifier);
         search.code_challenge = await generateCodeChallenge(oauth2.code_verifier);
         search.code_challenge_method = "S256";
       }
@@ -1148,19 +1155,20 @@
         grant_type: grant_type || oauth2.grant_type,
         client_id: oauth2.client_id
       };
-      if (oauth2.code_verifier) {
-        params2.code_verifier = oauth2.code_verifier;
-      }
       if (oauth2.client_secret) {
         params2.client_secret = oauth2.client_secret;
       }
       if (oauth2.scope) {
         params2.scope = oauth2.scope;
       }
-      switch (oauth2.grant_type) {
+      switch (params2.grant_type) {
         case "authorization_code":
           params2.redirect_uri = oauth2.redirect_uri;
           params2.code = options.tokens.get("authorization_code");
+          const code_verifier = options.tokens.get("code_verifier");
+          if (code_verifier) {
+            params2.code_verifier = code_verifier;
+          }
           break;
         case "client_credentials":
           break;