mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-15 15:37:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

support linking OAuth 2.0 user to logged-in users

Browse Source
This commit is contained in:
MaysWind
2025-10-31 01:22:47 +08:00
parent 8a0777be4c
commit b690316aa7
24 changed files with 172 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/desktop/OAuth2CallbackPage.vue
+2 -2
View File
@@ -212,7 +212,7 @@ function verifyAndLogin(): void {
rootStore.authorizeOAuth2({
password: password.value,
passcode: passcode.value,
token: props.token || ''
callbackToken: props.token || ''
}).then(authResponse => {
loggingInByOAuth2.value = false;
doAfterLogin(authResponse);
@@ -238,7 +238,7 @@ if (!error.value && props.platform && props.token && !props.userName) {
loggingInByOAuth2.value = true;
rootStore.authorizeOAuth2({
token: props.token
callbackToken: props.token
}).then(authResponse => {
loggingInByOAuth2.value = false;
doAfterLogin(authResponse);
src/views/desktop/user/settings/tabs/UserSecuritySettingTab.vue
+14 -1
View File
@@ -105,6 +105,14 @@
<td class="text-sm">{{ thirdPartyLogin.externalUsername }}</td>
<td class="text-sm">{{ thirdPartyLogin.createdAt }}</td>
<td class="text-sm text-right">
<v-btn density="comfortable" variant="tonal"
:disabled="loggingInByOAuth2"
:href="oauth2LinkUrl"
@click="loggingInByOAuth2 = true"
v-if="!thirdPartyLogin.linked && isOAuth2Enabled() && getOAuth2Provider() === thirdPartyLogin.externalAuthType">
{{ tt('Link') }}
<v-progress-circular indeterminate size="22" class="ms-2" v-if="loggingInByOAuth2"></v-progress-circular>
</v-btn>
<v-btn density="comfortable" color="error" variant="tonal"
:disabled="loadingExternalAuth"
@click="unlinkExternalAuth(thirdPartyLogin)"
@@ -209,7 +217,8 @@ import { type TokenInfoResponse, SessionInfo } from '@/models/token.ts';
import { isEquals } from '@/lib/common.ts';
import { parseSessionInfo } from '@/lib/session.ts';
import { isOAuth2Enabled, getOIDCCustomDisplayNames, isMCPServerEnabled } from '@/lib/server_settings.ts';
import { isOAuth2Enabled, getOAuth2Provider, getOIDCCustomDisplayNames, isMCPServerEnabled } from '@/lib/server_settings.ts';
import { generateRandomUUID } from '@/lib/misc.ts';
import {
mdiRefresh,
@@ -314,6 +323,10 @@ const confirmPassword = ref<string>('');
const updatingPassword = ref<boolean>(false);
const loadingExternalAuth = ref<boolean>(true);
const loadingSession = ref<boolean>(true);
const loggingInByOAuth2 = ref<boolean>(false);
const oauth2ClientSessionId = ref<string>(generateRandomUUID());
const oauth2LinkUrl = computed<string>(() => rootStore.generateOAuth2LinkUrl('desktop', oauth2ClientSessionId.value));
const thirdPartyLogins = computed<DesktopPageLinkedThirdPartyLogin[]>(() => {
const logins: DesktopPageLinkedThirdPartyLogin[] = [];