Merge pull request #488 from radiantearth/oidc-pathprefix

Bugfix for OIDC: pathPrefix not acknowledged and requests sent without Auth details #479

docs/options.md

@@ -368,7 +368,8 @@ For OpenID Connect some additional options must be provided, which currently fol
 [oidc-client-ts Configuration options](https://github.com/okta/okta-auth-js?tab=readme-ov-file#configuration-options).
 These options (except for `issuer`) must be provided in the property `oidcConfig`.
 The `client_id` option defaults to `stac-browser`.
-The redirect URL for the OIDC client must be set as follows:
+
+The redirect URL for the OIDC client must be the STAC Browser URL, e.g. `https://mycompany.com/browser`, plus an appended `/auth`, so for example `https://mycompany.com/browser/auth`.
 
 #### Example
 

src/auth/oidc.js

@@ -35,12 +35,8 @@ export default class OIDC extends Auth {
   }
 
   getRedirectUri(appPath) {
-    let base = this.router.options.base;
-    let path = this.router.resolve(appPath).href;
-    if (base.endsWith('/') && path.startsWith('/')) {
-      base = base.substring(0, base.length - 1);
-    }
-    return window.location.origin + base + path;
+    const path = this.router.resolve(appPath).href;
+    return window.location.origin + path;
   }
 
   async close() {

src/store/index.js

@@ -627,12 +627,6 @@ function getStore(config, router) {
         for (let key in config) {
           let value = cx.state[key];
           switch (key) {
-            case 'catalogUrl':
-              if (value) {
-                // Load the root catalog data if not available (e.g. after page refresh or external access)
-                await cx.dispatch("load", { url: value, loadApi: true });
-              }
-              break;
             case 'authConfig':
               await cx.dispatch('auth/updateMethod', value);
               break;

src/views/BrowseMixin.js

@@ -16,7 +16,7 @@ export default {
     }
   },
   computed: {
-    ...mapState(["allowExternalAccess", "url", "redirectLegacyUrls"]),
+    ...mapState(["allowExternalAccess", "catalogUrl", "url", "redirectLegacyUrls"]),
     ...mapGetters(["fromBrowserPath", "error", "loading"]),
     errorId() {
       if (this.error instanceof Error && this.error.isAxiosError && Utils.isObject(this.error.response)) {
@@ -30,6 +30,12 @@ export default {
       }
       return null;
     },
+    created() {
+      // Load the root catalog data if not available (e.g. after page refresh or external access)
+      if (this.catalogUrl) {
+        this.$store.dispatch("load", { url: this.catalogUrl, loadApi: true });
+      }
+    },
     errorDescription() {      
       if (this.error instanceof Error && this.error.isAxiosError && Utils.isObject(this.error.response)) {
         let res = this.error.response;