feat: consume the get redirect url function from osd core

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
opensearch-project · Aug 13, 2024 · c8e849c · c8e849c
1 parent 4cb813f
commit c8e849c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/server/auth/types/openid/openid_auth.ts b/server/auth/types/openid/openid_auth.ts
@@ -131,7 +131,7 @@ export class OpenIdAuthentication extends AuthenticationType {
     const path = getRedirectUrl({
       request,
       basePath: this.coreSetup.http.basePath.serverBasePath,
-      nextUrl: request.url.pathname || '/app/opensearch-dashboards'
+      nextUrl: request.url.pathname || '/app/opensearch-dashboards',
     });
     return escape(path);
   }

diff --git a/server/auth/types/saml/saml_auth.ts b/server/auth/types/saml/saml_auth.ts
@@ -63,7 +63,7 @@ export class SamlAuthentication extends AuthenticationType {
     let path = getRedirectUrl({
       request,
       basePath: this.coreSetup.http.basePath.serverBasePath,
-      nextUrl: request.url.pathname || '/app/opensearch-dashboards'
+      nextUrl: request.url.pathname || '/app/opensearch-dashboards',
     });
     if (request.url.search) {
       path += request.url.search;

diff --git a/server/utils/next_url.ts b/server/utils/next_url.ts
@@ -29,11 +29,13 @@ export function composeNextUrlQueryParam(
     const nextUrl = parsedUrl?.path;
 
     if (!!nextUrl && nextUrl !== '/') {
-      return `nextUrl=${encodeUriQuery(getRedirectUrl({
-        request,
-        basePath,
-        nextUrl,
-      }))}`;
+      return `nextUrl=${encodeUriQuery(
+        getRedirectUrl({
+          request,
+          basePath,
+          nextUrl,
+        })
+      )}`;
     }
   } catch (error) {
     /* Ignore errors from parsing */