Skip to content

fix(web): surface SSO login errors to the user #38335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SquabbyZ wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −0
Open

fix(web): surface SSO login errors to the user #38335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions web/app/signin/components/sso-auth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ const SSOAuth: FC<SSOAuthProps> = ({
if (protocol === SSOProtocol.SAML) {
getUserSAMLSSOUrl(invite_token).then((res) => {
router.push(res.url)
}).catch(() => {
toast.error(t('error.ssoFailed', { ns: 'login' }))
}).finally(() => {
setIsLoading(false)
})
Expand All @@ -36,6 +38,8 @@ const SSOAuth: FC<SSOAuthProps> = ({
getUserOIDCSSOUrl(invite_token).then((res) => {
document.cookie = `user-oidc-state=${res.state};Path=/`
router.push(res.url)
}).catch(() => {
toast.error(t('error.ssoFailed', { ns: 'login' }))
}).finally(() => {
setIsLoading(false)
})
Expand All @@ -44,6 +48,8 @@ const SSOAuth: FC<SSOAuthProps> = ({
getUserOAuth2SSOUrl(invite_token).then((res) => {
document.cookie = `user-oauth2-state=${res.state};Path=/`
router.push(res.url)
}).catch(() => {
toast.error(t('error.ssoFailed', { ns: 'login' }))
}).finally(() => {
setIsLoading(false)
})
Expand Down
2 changes: 2 additions & 0 deletions web/i18n/en-US/login.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"error.invalidEmailOrPassword": "Invalid email or password.",
"error.invalidRedirectUrlOrAppCode": "Invalid redirect URL or app code",
"error.invalidSSOProtocol": "Invalid SSO protocol",
"error.ssoFailed": "SSO login failed. Please try again or contact your administrator.",
"error.unknown": "Something went wrong. Please try again.",
"error.nameEmpty": "Name is required",
"error.passwordEmpty": "Password is required",
"error.passwordInvalid": "Password must contain letters and numbers, and the length must be greater than 8",
Expand Down