@muze-nl/metro-oidc 0.1.1 → 0.1.3

package/dist/browser-dev.js

@@ -986,7 +986,7 @@
       // note: this allows path components in the options.issuer url
       configURL
     );
-    const openid_config = response2.body;
+    const openid_config = response2.body[Symbol.metroSource];
     assert(openid_config, openid_provider_metadata);
     assert(openid_config.issuer, options.issuer);
     return openid_config;
@@ -1169,8 +1169,8 @@
         has: () => localStorage.getItem("metro/state:" + site) !== null
       };
       localTokens = {
-        get: (name) => localStorage.getItem(site + ":" + name),
-        set: (name, value) => localStorage.setItem(site + ":" + name, value),
+        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
       };
     } else {
@@ -1499,6 +1499,40 @@
       return randomState;
     }
   };
+  function isRedirected() {
+    let url2 = new URL(document.location.href);
+    if (!url2.searchParams.has("code")) {
+      if (url2.hash) {
+        let query = url2.hash.substr(1);
+        params = new URLSearchParams("?" + query);
+        if (params.has("code")) {
+          return true;
+        }
+      }
+      return false;
+    }
+    return true;
+  }
+
+  // src/oidc.store.mjs
+  function oidcStore(site) {
+    let store;
+    if (typeof localStorage !== "undefined") {
+      store = {
+        get: (name) => JSON.parse(localStorage.getItem("metro/oidc:" + site + ":" + name)),
+        set: (name, value) => localStorage.setItem("metro/oidc:" + site + ":" + name, JSON.stringify(value)),
+        has: (name) => localStorage.getItem("metro/oidc:" + site + ":" + name) !== null
+      };
+    } else {
+      let storeMap = /* @__PURE__ */ new Map();
+      store = {
+        get: (name) => JSON.parse(storeMap.get("metro/oidc:" + site + ":" + name) || null),
+        set: (name, value) => storeMap.set("metro/oidc:" + site + ":" + name, JSON.stringify(value)),
+        has: (name) => storeMap.has("metro/oidc:" + site + ":" + name)
+      };
+    }
+    return store;
+  }
 
   // src/oidcmw.mjs
   function oidcmw(options = {}) {
@@ -1507,6 +1541,23 @@
       force_authorization: false
     };
     options = Object.assign({}, defaultOptions, options);
+    assert(options, {
+      client: Required(instanceOf(everything_default.client().constructor)),
+      // required because it is set in defaultOptions
+      client_info: Required(),
+      issuer: Required(validURL),
+      oauth2: Optional({}),
+      openid_configuration: Optional()
+    });
+    if (!options.store) {
+      options.store = oidcStore(options.issuer);
+    }
+    if (!options.openid_configuration && options.store.has("openid_configuration")) {
+      options.openid_configuration = options.store.get("openid_configuration");
+    }
+    if (!options.client_info.client_id && options.store.has("client_info")) {
+      options.client_info = options.store.get("client_info");
+    }
     return async (req, next) => {
       let res;
       if (!options.force_authorization) {
@@ -1525,6 +1576,7 @@
         options.openid_configuration = await oidcDiscovery({
           issuer: options.issuer
         });
+        options.store.set("openid_configuration", options.openid_configuration);
       }
       if (!options.client_info?.client_id) {
         assert(options.client_info?.client_name, Required());
@@ -1535,6 +1587,7 @@
           registration_endpoint: options.openid_configuration.registration_endpoint,
           client_info: options.client_info
         });
+        options.store.set("client_info", options.client_info);
       }
       const oauth2Options = Object.assign(
         {
@@ -1544,10 +1597,14 @@
           oauth2_configuration: {
             client_id: options.client_info.client_id,
             client_secret: options.client_info.client_secret,
+            code_verifier: false,
+            //disable pkce
             grant_type: "authorization_code",
             authorization_endpoint: options.openid_configuration.authorization_endpoint,
             token_endpoint: options.openid_configuration.token_endpoint,
-            scope: options.openid_configuration.scope || "openid"
+            scope: options.openid_configuration.scope || "openid",
+            redirect_uri: options.client_info.redirect_uris[0]
+            //FIXME: find the best match?
           }
         }
         //...
@@ -1557,12 +1614,16 @@
       return res;
     };
   }
+  function isRedirected2() {
+    return isRedirected();
+  }
 
   // src/browser.mjs
   var oidc = {
     discover: oidcDiscovery,
     register,
-    oidcmw
+    oidcmw,
+    isRedirected: isRedirected2
   };
   globalThis.oidc = oidc;
 })();