From d8e5a524d4cb83cf0b736469dde88ab33761abec Mon Sep 17 00:00:00 2001 From: rr-bw <102181210+rr-bw@users.noreply.github.com> Date: Thu, 30 Oct 2025 07:41:17 -0700 Subject: [PATCH] style(sso-login): (Auth) [PM-26535] Make SSO Button Primary if `ssoRequired` (#16757) When SSO is required: - Make the SSO button primary - Add a tooltip to the disabled buttons When SSO is not required: - SSO button remains secondary - No tooltip on the buttons Feature Flags enabled: pm-22110-disable-alternate-login-methods --- apps/browser/src/_locales/en/messages.json | 3 +++ apps/desktop/src/locales/en/messages.json | 3 +++ apps/web/src/locales/en/messages.json | 3 +++ libs/auth/src/angular/login/login.component.html | 12 +++++++++++- libs/auth/src/angular/login/login.component.ts | 2 ++ libs/components/src/index.ts | 1 + 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index 4f230dd9883..a7cee53e08b 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -31,6 +31,9 @@ "useSingleSignOn": { "message": "Use single sign-on" }, + "yourOrganizationRequiresSingleSignOn": { + "message": "Your organization requires single sign-on." + }, "welcomeBack": { "message": "Welcome back" }, diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json index 32545a0c1cd..605fefb03f8 100644 --- a/apps/desktop/src/locales/en/messages.json +++ b/apps/desktop/src/locales/en/messages.json @@ -771,6 +771,9 @@ "useSingleSignOn": { "message": "Use single sign-on" }, + "yourOrganizationRequiresSingleSignOn": { + "message": "Your organization requires single sign-on." + }, "submit": { "message": "Submit" }, diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index c1026af4b6e..df67973ee5a 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -1314,6 +1314,9 @@ "useSingleSignOn": { "message": "Use single sign-on" }, + "yourOrganizationRequiresSingleSignOn": { + "message": "Your organization requires single sign-on." + }, "welcomeBack": { "message": "Welcome back" }, diff --git a/libs/auth/src/angular/login/login.component.html b/libs/auth/src/angular/login/login.component.html index 26e19f11147..4e1689b1054 100644 --- a/libs/auth/src/angular/login/login.component.html +++ b/libs/auth/src/angular/login/login.component.html @@ -44,6 +44,8 @@ block buttonType="primary" (click)="continuePressed()" + [bitTooltip]="ssoRequired ? ('yourOrganizationRequiresSingleSignOn' | i18n) : ''" + [addTooltipToDescribedby]="ssoRequired" [disabled]="ssoRequired" > {{ "continue" | i18n }} @@ -59,6 +61,8 @@ block buttonType="secondary" (click)="handleLoginWithPasskeyClick()" + [bitTooltip]="ssoRequired ? ('yourOrganizationRequiresSingleSignOn' | i18n) : ''" + [addTooltipToDescribedby]="ssoRequired" [disabled]="ssoRequired" > @@ -67,7 +71,13 @@ - diff --git a/libs/auth/src/angular/login/login.component.ts b/libs/auth/src/angular/login/login.component.ts index 537a42700c8..54a2a3b732b 100644 --- a/libs/auth/src/angular/login/login.component.ts +++ b/libs/auth/src/angular/login/login.component.ts @@ -54,6 +54,7 @@ import { IconButtonModule, LinkModule, ToastService, + TooltipDirective, } from "@bitwarden/components"; import { LoginComponentService, PasswordPolicies } from "./login-component.service"; @@ -82,6 +83,7 @@ export enum LoginUiState { JslibModule, ReactiveFormsModule, RouterModule, + TooltipDirective, ], }) export class LoginComponent implements OnInit, OnDestroy { diff --git a/libs/components/src/index.ts b/libs/components/src/index.ts index f36a3fdddf5..643b5d69da7 100644 --- a/libs/components/src/index.ts +++ b/libs/components/src/index.ts @@ -42,6 +42,7 @@ export * from "./table"; export * from "./tabs"; export * from "./toast"; export * from "./toggle-group"; +export * from "./tooltip"; export * from "./typography"; export * from "./utils"; export * from "./stepper";