fix: add cluster param to getCrumb

kubesphere · Jul 6, 2020 · 8217691 · 8217691
1 parent 5d99c4e
commit 8217691
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/stores/devops/base.js b/src/stores/devops/base.js
@@ -27,10 +27,10 @@ export default class Base extends BaseStore {
     })
   }
 
-  getCrumb = async () =>
+  getCrumb = async ({ cluster } = { cluster: '' }) =>
     await this.catchRequestError(
       'get',
-      `${this.getBaseUrlV2()}crumbissuer`,
+      `${this.getBaseUrlV2({ cluster })}crumbissuer`,
       null,
       null,
       () => true
@@ -53,7 +53,13 @@ export default class Base extends BaseStore {
       options = {}
     }
     if (globals.user.crumb === undefined) {
-      await this.getCrumb()
+      const match = url.match(/(clusters|klusters)\/([^/]*)\//)
+      if (match && match.length === 3) {
+        const cluster = match[2]
+        await this.getCrumb({ cluster })
+      } else {
+        await this.getCrumb()
+      }
     }
     if (globals.user.crumb) {
       set(options, 'headers.Jenkins-Crumb', globals.user.crumb)

diff --git a/src/stores/devops/pipelines.js b/src/stores/devops/pipelines.js
@@ -485,7 +485,7 @@ export default class PipelineStore extends BaseStore {
   @action
   async scanRepository({ project_id, name, cluster }) {
     if (globals.user.crumb === undefined) {
-      await this.getCrumb()
+      await this.getCrumb({ cluster })
     }
     const options = {}
     if (globals.user.crumb) {