Add swagger doc api path for oauth redirect (#567)

* Add swagger doc api path for oauth redirect
microsoft · Aug 8, 2023 · ed4f5d4 · ed4f5d4
1 parent e0a79ad
commit ed4f5d4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/center/src/main/java/com/microsoft/hydralab/center/controller/AuthController.java b/center/src/main/java/com/microsoft/hydralab/center/controller/AuthController.java
@@ -63,9 +63,13 @@ public void getAccessToken(@RequestParam("code") String code, HttpServletRequest
         String state = request.getParameter("state");
         String prefix = Const.FrontEndPath.INDEX_PATH + "?" + Const.FrontEndPath.REDIRECT_PARAM + "=";
 
-        if (StringUtils.isNotEmpty(state) && state.startsWith(prefix)) {
-            String newUrl = state.replace(prefix, "");
-            if (LogUtils.isLegalStr(newUrl, Const.RegexString.URL, false)) {
+        if (StringUtils.isNotEmpty(state)) {
+            if (state.startsWith(prefix)) {
+                String newUrl = state.replace(prefix, "");
+                if (LogUtils.isLegalStr(newUrl, Const.RegexString.URL, false)) {
+                    redirectUrl = state;
+                }
+            } else if (state.equals(Const.FrontEndPath.SWAGGER_DOC_PATH)) {
                 redirectUrl = state;
             }
         }

diff --git a/center/src/main/java/com/microsoft/hydralab/center/interceptor/BaseInterceptor.java b/center/src/main/java/com/microsoft/hydralab/center/interceptor/BaseInterceptor.java
@@ -96,6 +96,8 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
                     } else {
                         response.sendRedirect(authUtil.getLoginUrl());
                     }
+                } else if (requestURI.equals(Const.FrontEndPath.SWAGGER_DOC_PATH)) {
+                    response.sendRedirect(authUtil.getLoginUrl(requestURI, null));
                 } else {
                     response.setStatus(HttpStatus.UNAUTHORIZED.value());
                     response.setHeader("Location", authUtil.getLoginUrl());

diff --git a/common/src/main/java/com/microsoft/hydralab/common/util/Const.java b/common/src/main/java/com/microsoft/hydralab/common/util/Const.java
@@ -109,6 +109,7 @@ interface FrontEndPath {
         String INDEX_PATH = "/portal/index.html";
         String ANCHOR = "#";
         String REDIRECT_PARAM = "redirectUrl";
+        String SWAGGER_DOC_PATH = "/v3/api-docs";
     }
 
     interface RegexString {