Initial hook-point to setup oauth.

Author: MikeNeilson

cda-gui/package-lock.json

@@ -19,7 +19,7 @@
     "react-dom": "^18.2.0",
     "react-icons": "^5.0.1",
     "react-router-dom": "^7.1.2",
-    "swagger-ui-dist": "^5.17.7",
+    "swagger-ui-dist": "^5.29.5",
     "use-debounce": "^10.0.5"
   },
   "devDependencies": {

cda-gui/package.json

@@ -12,8 +12,10 @@ export default function SwaggerUI() {
         document.title = "CWMS Data API for Data Retrieval - Swagger UI";
         // Begin Swagger UI call region
         // TODO: add endpoint that dynamic returns swagger generated doc
+
         const ui = SwaggerUIBundle({
             url: getBasePath() + "/swagger-docs",
+            
             dom_id: "#swagger-ui",
             deepLinking: false,
             presets: [SwaggerUIBundle.presets.apis],
@@ -34,13 +36,17 @@ export default function SwaggerUI() {
                 }
                 return req;
             },
+            onComplete: () => {
+                const spec = JSON.parse(ui.spec().get("spec"));
+                console.log(JSON.stringify(spec.components.securitySchemes));
+                
+                ui.initOAuth({
+                    clientId:"cwms",
+                    additionalQueryStringParams: {kc_idp_hint: "federation-eams"},
+                    usePkceWithAuthorizationCodeGrant: true
+                });
+            },
         });
-        // The client id may, in the future, need to be changed. When that happens deal with it then.
-        ui.initOAuth({
-            clientId:"cwms",
-            additionalQueryStringParams: {kc_idp_hint: "federation-eams"},
-            usePkceWithAuthorizationCodeGrant: true
-        })
     }, []);
 
     return <div id="swagger-ui"></div>;

cda-gui/src/pages/swagger-ui/index.jsx

@@ -3,7 +3,7 @@ import react from "@vitejs/plugin-react";
 
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
-  // const env = loadEnv(mode, process.cwd(), "");
+  const env = loadEnv(mode, process.cwd(), "");
   // const BASE_PATH = env?.BASE_PATH ?? "/cwms-data";
   return {
     base: "/cwms-data",
@@ -14,12 +14,17 @@ export default defineConfig(({ mode }) => {
     server: {
       proxy: {
         "^/cwms-data/timeseries/.*": {
-          target: "https://cwms-data.usace.army.mil",
+          target: env.CDA_API_ROOT,
           changeOrigin: true,
           secure: false,
         },
         "^/cwms-data/catalog/.*": {
-          target: "https://cwms-data.usace.army.mil",
+          target: env.CDA_API_ROOT,
+          changeOrigin: true,
+          secure: false,
+        },
+        "^/cwms-data/swagger-docs$": {
+          target: env.CDA_API_ROOT,
           changeOrigin: true,
           secure: false,
         },