Merge 66071d7 into 606ac27

caicloud · Sep 17, 2020 · ee4eedf · ee4eedf
2 parents 606ac27 + 66071d7
commit ee4eedf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/pkg/server/biz/scm/scm.go b/pkg/server/biz/scm/scm.go
@@ -130,16 +130,21 @@ func GenerateSCMToken(config *v1alpha1.SCMSource) error {
 
 	if generatedToken != "" && config.AuthType == v1alpha1.AuthTypePassword {
 		config.Token = generatedToken
-	} else {
-		err := provider.CheckToken()
-		if err != nil {
-			return err
-		}
 	}
 
 	// Cleanup the password for security.
 	config.Password = ""
 
+	// recreate the scm provider and check auth
+	provider, err = GetSCMProvider(config)
+	if err != nil {
+		return err
+	}
+	err = provider.CheckToken()
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 

diff --git a/pkg/util/cerr/error.go b/pkg/util/cerr/error.go
@@ -118,7 +118,7 @@ var (
 
 	// ErrorExternalAuthorizationFailed defines error that authorization failed for external system, Unauthorized 401.
 	ErrorExternalAuthorizationFailed = nerror.InternalServerError.Build(ReasonAuthorizationFailed,
-		"authentication failed: ${error}")
+		"authorization failed: ${error}")
 
 	// ErrorExternalAuthenticationFailed defines error that authentication failed for external system, Forbidden 403.
 	ErrorExternalAuthenticationFailed = nerror.InternalServerError.Build(ReasonAuthenticationFailed,