Skip to content

[feature](Login): Preferred third-party login when oauth is enable #771

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

Merged
LZS911 merged 2 commits into from
Dec 2, 2025
Merged

[feature](Login): Preferred third-party login when oauth is enable #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63c20b8
[feature](Login): Preferred third-party login when oauth is enable
zzyangh Dec 2, 2025
9a0921f
[test]: Update unit tests snap file
zzyangh Dec 2, 2025
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
2 changes: 1 addition & 1 deletion packages/base/src/__snapshots__/App.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2266,7 +2266,7 @@ exports[`App render App when token is not existed 1`] = `
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down
4 changes: 4 additions & 0 deletions packages/base/src/locale/zh-CN/dmsLogin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
export default {
login: '登录',
otherMethod: '其他登录方式',
thirdPartyLogin: '第三方登录',
localLogin: '本地登录',
oauth2Tips: '点击下方按钮跳转到授权页面进行登录：',
useOAuth2Login: '使用第三方账户登录',
loginButtonDisabledTips: '当前已禁用账密登录',
userAgreementTips: '已阅读并同意',
userAgreement: '用户协议',
Expand Down
6 changes: 3 additions & 3 deletions packages/base/src/page/BindUser/__snapshots__/index.ce.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exports[`page/BindUser-ce render bind user form item render form item error when
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down Expand Up @@ -250,7 +250,7 @@ exports[`page/BindUser-ce render bind user form item render oauth2_token params
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down Expand Up @@ -455,7 +455,7 @@ exports[`page/BindUser-ce render bind user ui snap 1`] = `
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down
6 changes: 3 additions & 3 deletions packages/base/src/page/BindUser/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exports[`page/BindUser-ee render bind user form item render form item error when
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down Expand Up @@ -250,7 +250,7 @@ exports[`page/BindUser-ee render bind user form item render oauth2_token params
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down Expand Up @@ -455,7 +455,7 @@ exports[`page/BindUser-ee render bind user ui snap 1`] = `
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down
8 changes: 4 additions & 4 deletions packages/base/src/page/Login/__snapshots__/index.ce.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exports[`page/Login-ce render login page snap 1`] = `
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down Expand Up @@ -220,7 +220,7 @@ exports[`page/Login-ce render login when api return fail 1`] = `
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down Expand Up @@ -443,7 +443,7 @@ exports[`page/Login-ce render login when api return success 1`] = `
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down Expand Up @@ -666,7 +666,7 @@ exports[`page/Login-ce render login when api return success 2`] = `
</div>
</div>
<div
class="css-zhd3kf"
class="css-1gefj4"
>
<div
class="login-page-right-content"
Expand Down
Loading