Skip to content

Commit 0026beb

Browse files
authored
Merge pull request #771 from actiontech/feature/issue-3179
[feature](Login): Preferred third-party login when oauth is enable
2 parents 713cd8f + 9a0921f commit 0026beb

File tree

14 files changed

+1935
-1068
lines changed

14 files changed

+1935
-1068
lines changed

packages/base/src/__snapshots__/App.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2266,7 +2266,7 @@ exports[`App render App when token is not existed 1`] = `
22662266
</div>
22672267
</div>
22682268
<div
2269-
class="css-zhd3kf"
2269+
class="css-1gefj4"
22702270
>
22712271
<div
22722272
class="login-page-right-content"

packages/base/src/locale/zh-CN/dmsLogin.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
export default {
33
login: '登录',
44
otherMethod: '其他登录方式',
5+
thirdPartyLogin: '第三方登录',
6+
localLogin: '本地登录',
7+
oauth2Tips: '点击下方按钮跳转到授权页面进行登录:',
8+
useOAuth2Login: '使用第三方账户登录',
59
loginButtonDisabledTips: '当前已禁用账密登录',
610
userAgreementTips: '已阅读并同意',
711
userAgreement: '用户协议',

packages/base/src/page/BindUser/__snapshots__/index.ce.test.tsx.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exports[`page/BindUser-ce render bind user form item render form item error when
2020
</div>
2121
</div>
2222
<div
23-
class="css-zhd3kf"
23+
class="css-1gefj4"
2424
>
2525
<div
2626
class="login-page-right-content"
@@ -250,7 +250,7 @@ exports[`page/BindUser-ce render bind user form item render oauth2_token params
250250
</div>
251251
</div>
252252
<div
253-
class="css-zhd3kf"
253+
class="css-1gefj4"
254254
>
255255
<div
256256
class="login-page-right-content"
@@ -455,7 +455,7 @@ exports[`page/BindUser-ce render bind user ui snap 1`] = `
455455
</div>
456456
</div>
457457
<div
458-
class="css-zhd3kf"
458+
class="css-1gefj4"
459459
>
460460
<div
461461
class="login-page-right-content"

packages/base/src/page/BindUser/__snapshots__/index.test.tsx.snap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exports[`page/BindUser-ee render bind user form item render form item error when
2020
</div>
2121
</div>
2222
<div
23-
class="css-zhd3kf"
23+
class="css-1gefj4"
2424
>
2525
<div
2626
class="login-page-right-content"
@@ -250,7 +250,7 @@ exports[`page/BindUser-ee render bind user form item render oauth2_token params
250250
</div>
251251
</div>
252252
<div
253-
class="css-zhd3kf"
253+
class="css-1gefj4"
254254
>
255255
<div
256256
class="login-page-right-content"
@@ -455,7 +455,7 @@ exports[`page/BindUser-ee render bind user ui snap 1`] = `
455455
</div>
456456
</div>
457457
<div
458-
class="css-zhd3kf"
458+
class="css-1gefj4"
459459
>
460460
<div
461461
class="login-page-right-content"

packages/base/src/page/Login/__snapshots__/index.ce.test.tsx.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ exports[`page/Login-ce render login page snap 1`] = `
2020
</div>
2121
</div>
2222
<div
23-
class="css-zhd3kf"
23+
class="css-1gefj4"
2424
>
2525
<div
2626
class="login-page-right-content"
@@ -220,7 +220,7 @@ exports[`page/Login-ce render login when api return fail 1`] = `
220220
</div>
221221
</div>
222222
<div
223-
class="css-zhd3kf"
223+
class="css-1gefj4"
224224
>
225225
<div
226226
class="login-page-right-content"
@@ -443,7 +443,7 @@ exports[`page/Login-ce render login when api return success 1`] = `
443443
</div>
444444
</div>
445445
<div
446-
class="css-zhd3kf"
446+
class="css-1gefj4"
447447
>
448448
<div
449449
class="login-page-right-content"
@@ -666,7 +666,7 @@ exports[`page/Login-ce render login when api return success 2`] = `
666666
</div>
667667
</div>
668668
<div
669-
class="css-zhd3kf"
669+
class="css-1gefj4"
670670
>
671671
<div
672672
class="login-page-right-content"

0 commit comments

Comments
 (0)