fix: Fix the request reject params in the repo of verify access

Signed-off-by: harrisonliu5 <harrisonliu_5@163.com>
kubesphere · Aug 13, 2020 · 98aaf31 · 98aaf31
1 parent f041be4
commit 98aaf31
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 47 deletions.
diff --git a/src/stores/devops/scm.js b/src/stores/devops/scm.js
@@ -18,7 +18,7 @@
 
 import { action, observable, toJS } from 'mobx'
 import { isArray, get, isEmpty, set } from 'lodash'
-import { parseUrl, safeParseJSON, getQueryString, generateId } from 'utils'
+import { parseUrl, getQueryString, generateId } from 'utils'
 import { CREDENTIAL_DISPLAY_KEY } from 'utils/constants'
 
 import BaseStore from 'stores/devops/base'
@@ -30,58 +30,43 @@ export default class SCMStore extends BaseStore {
 
     this.verifyAccessErrorHandle = {
       github: (resp, error) => {
-        if (!isEmpty(get(error, 'message'))) {
-          const err = safeParseJSON(error.message)
-          if (err.code === 428) {
-            this.isAccessTokenWrong = true
-            this.orgList.isLoading = false
-            return
-          }
-          if (window.onunhandledrejection) {
-            err.status = error.status
-            err.reason = error.reason
-            window.onunhandledrejection(err)
-          }
-          return Promise.reject(error)
+        if (error.code === 428) {
+          this.isAccessTokenWrong = true
+          this.orgList.isLoading = false
+          return
+        }
+        if (window.onunhandledrejection) {
+          window.onunhandledrejection(error)
         }
+        return Promise.reject(error)
       },
       'bitbucket-server': (resp, error) => {
-        if (!isEmpty(get(error, 'message'))) {
-          const err = safeParseJSON(error.message)
-
-          if (err.code === 428) {
-            this.creatBitBucketServersError = {
-              password: {
-                message: t('Wrong username or password, please try again'),
-              },
-            }
-            return
-          }
-
-          if (isArray(err.errors) && !isEmpty(err.errors)) {
-            this.creatBitBucketServersError = err.errors.reduce(
-              (prev, errorItem) => {
-                prev[errorItem.field] = { message: errorItem.message }
-                return prev
-              },
-              {}
-            )
-            return
+        if (error.code === 428) {
+          this.creatBitBucketServersError = {
+            password: {
+              message: t('Wrong username or password, please try again'),
+            },
           }
+          return
+        }
 
-          this.creatBitBucketServersError = { all: err.message }
-
-          if (window.onunhandledrejection) {
-            err.status = error.status
-            err.reason = error.reason
-            window.onunhandledrejection(err)
-          }
-          return Promise.reject(error)
+        if (isArray(error.errors) && !isEmpty(error.errors)) {
+          this.creatBitBucketServersError = error.errors.reduce(
+            (prev, errorItem) => {
+              prev[errorItem.field] = { message: errorItem.message }
+              return prev
+            },
+            {}
+          )
+          return
         }
 
+        this.creatBitBucketServersError = { all: error.message }
+
         if (window.onunhandledrejection) {
-          window.onunhandledrejection(resp)
+          window.onunhandledrejection(error)
         }
+
         return Promise.reject(error)
       },
     }
@@ -210,7 +195,7 @@ export default class SCMStore extends BaseStore {
     })
 
     if (result && result.credentialId) {
-      this.githubCredentialId = `github-${token.slice(0, 6)}`
+      this.githubCredentialId = `github-${token.slice(0, 6)}-${generateId(5)}`
 
       const data = {
         id: this.githubCredentialId,
@@ -357,6 +342,7 @@ export default class SCMStore extends BaseStore {
     this.githubCredentialId = ''
     this.formData = {}
     this.tokenFormData = {}
+    this.creatBitBucketServersError = {}
   }
 
   @action

diff --git a/src/stores/notification/mailService.js b/src/stores/notification/mailService.js
@@ -118,7 +118,7 @@ export default class AddressStore extends Base {
       `${this.getMailServiceV2URL(cluster)}/validation`,
       params,
       {},
-      error => {
+      (resp, error) => {
         window.onunhandledrejection(error)
         return {
           is_succ: false,

diff --git a/src/utils/request.js b/src/utils/request.js
@@ -199,8 +199,10 @@ function handleResponse(response, reject) {
     // some errors are the string-json in devops
     const errBody = safeParseJSON(text)
     if (isObject(errBody) && !isEmpty(errBody)) {
-      error.status = errBody.code
+      error.status = response.status
+      error.code = errBody.code
       error.message = errBody.message
+      error.errors = errBody.errors
     }
 
     if (typeof reject === 'function') {