fix sonar sso (#39)

* fix sonar sso

* update

Author: Tongcaiyun

testing/steps/sso.go

@@ -132,6 +132,24 @@ func loginACP(ctx context.Context, page playwright.Page, params ssoParams) error
 	}
 
 	log.Info("等待登录表单出现...")
+	// 检查是否在第三方登录页面
+	buttonLocator := page.Locator(".connectors")
+	isVisible, err := buttonLocator.IsVisible()
+	if err != nil {
+		return fmt.Errorf("检查第三方登录页面失败: %v", err)
+	}
+
+	if isVisible {
+		log.Info("当前在第三方登录页面，切换到本地登录...")
+		if err := page.GetByRole("button", playwright.PageGetByRoleOptions{
+			Name: "切换本地用户登录",
+		}).Click(); err != nil {
+			return fmt.Errorf("点击切换本地用户登录按钮失败: %v", err)
+		}
+	} else {
+		log.Info("已是本地用户登录页")
+	}
+
 	if _, err := page.WaitForSelector(".login-form", playwright.PageWaitForSelectorOptions{
 		State:   playwright.WaitForSelectorStateVisible,
 		Timeout: playwright.Float(60000),
@@ -149,8 +167,18 @@ func loginACP(ctx context.Context, page playwright.Page, params ssoParams) error
 	}
 
 	// 点击登录按钮
-	if err := page.GetByRole("button", playwright.PageGetByRoleOptions{}).Click(); err != nil {
-		return fmt.Errorf("点击登录按钮失败: %v", err)
+	if err := page.GetByRole("button", playwright.PageGetByRoleOptions{
+		Name:  "登录",
+		Exact: playwright.Bool(true),
+	}).Click(); err != nil {
+		log.Info("点击 登录 按钮失败，错误信息: %v", zap.Error(err))
+		log.Info("尝试点击 Login 按钮...")
+		if err := page.GetByRole("button", playwright.PageGetByRoleOptions{
+			Name:  "Login",
+			Exact: playwright.Bool(true),
+		}).Click(); err != nil {
+			return fmt.Errorf("点击Login按钮失败: %v", err)
+		}
 	}
 
 	// 等待 Devops 文本出现

testing/testdata/sonar-oidc.yaml

@@ -14,7 +14,7 @@ spec:
       sonar.auth.oidc.issuerUri: <config.{{.acp.baseUrl}}>/dex
       sonar.auth.oidc.clientId.secured: test-dex
       sonar.auth.oidc.clientSecret.secured: Z2l0bGFiLW9mZmljaWFsLTAK
-      sonar.auth.oidc.loginStrategy: Email
+      sonar.auth.oidc.loginStrategy: Preferred username
       sonar.auth.oidc.providerConfiguration: '{"issuer":"<config.{{.acp.baseUrl}}>/dex","authorization_endpoint":"<config.{{.acp.baseUrl}}>/dex/auth","token_endpoint":"<config.{{.acp.baseUrl}}>/dex/token","jwks_uri":"<config.{{.acp.baseUrl}}>/dex/keys","response_types_supported":["code","id_token","token"],"subject_types_supported":["public"],"id_token_signing_alg_values_supported":["RS256"],"scopes_supported":["openid","email","groups","profile","offline_access"],"token_endpoint_auth_methods_supported":["client_secret_basic"],"claims_supported":["aud","email","email_verified","exp","iat","iss","locale","name","sub"]}'
     postgresql:
       enabled: false