fix: Fix app manage page logout redirect

kubesphere · Feb 21, 2020 · 1c7dc61 · 1c7dc61
1 parent b78985a
commit 1c7dc61
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/server/libs/utils.js b/server/libs/utils.js
@@ -127,8 +127,8 @@ const isValidReferer = path =>
  * @param path  koa ctx.path
  */
 const isAppsRoute = path => {
-  const regex = pathToRegex('/apps(/?.*)')
-  return regex.exec(path)
+  const regex = pathToRegex('/apps/app-(.*)')
+  return path === '/apps' || regex.exec(path)
 }
 
 /**

diff --git a/src/components/Layout/LoginInfo/index.jsx b/src/components/Layout/LoginInfo/index.jsx
@@ -135,7 +135,10 @@ export default class LoginInfo extends Component {
                 secondary: '#8d663e',
               }}
             />
-            <a className={styles.loginLabel} href="/login?referer=/apps">
+            <a
+              className={styles.loginLabel}
+              href={`/login?referer=${location.pathname}`}
+            >
               {t('Login KubeSphere')}
             </a>
           </div>

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -456,4 +456,4 @@ export const withDryRun = async requests => {
  * @param {String} path
  */
 export const isAppsPage = (path = location.pathname) =>
-  path === '/apps' || path.startsWith('/apps/')
+  path === '/apps' || path.startsWith('/apps/app-')