Skip to content
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

Update AccountForm.vue so Reconnect button works for Microsoft accounts #8644

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Update AccountForm.vue so Reconnect button works for Microsoft accounts #8644

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
31 changes: 22 additions & 9 deletions src/components/AccountForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,11 @@ export default {
return this.loadingMessage ?? t('mail', 'Connecting')
}
if (this.mode === 'manual' && this.useOauth) {
return this.account ? t('mail', 'Reconnect Google account') : t('mail', 'Sign in with Google')
if (this.isGoogleAccount) {
return this.account ? t('mail', 'Reconnect Google account') : t('mail', 'Sign in with Google')
} else {
return this.account ? t('mail', 'Reconnect Microsoft account') : t('mail', 'Sign in with Microsoft')
}
}
return this.account ? t('mail', 'Save') : t('mail', 'Connect')
},
Expand Down Expand Up @@ -557,16 +561,16 @@ export default {
const account = await this.$store.dispatch('startAccountSetup', data)
if (this.useOauth) {
this.loadingMessage = t('mail', 'Awaiting user consent')
this.feedback = t('mail', 'Account created. Please follow the pop-up instructions to link your Google account')
try {
if (this.isGoogleAccount) {
this.feedback = t('mail', 'Account created. Please follow the pop-up instructions to link your Google account')
await getUserConsent(
this.googleOauthUrl
.replace('_accountId_', account.id)
.replace('_email_', encodeURIComponent(account.emailAddress)),
)
} else {
// Microsoft
this.feedback = t('mail', 'Account created. Please follow the pop-up instructions to link your Microsoft account')
await getUserConsent(
this.microsoftOauthUrl
.replace('_accountId_', account.id)
Expand All @@ -592,13 +596,22 @@ export default {
})
if (this.useOauth) {
this.loadingMessage = t('mail', 'Awaiting user consent')
this.feedback = t('mail', 'Account updated. Please follow the pop-up instructions to reconnect your Google account')
try {
await getUserConsent(
this.googleOauthUrl
.replace('_accountId_', account.id)
.replace('_email_', encodeURIComponent(account.emailAddress)),
)
if (this.isGoogleAccount) {
this.feedback = t('mail', 'Account updated. Please follow the pop-up instructions to reconnect your Google account')
await getUserConsent(
this.googleOauthUrl
.replace('_accountId_', account.id)
.replace('_email_', encodeURIComponent(account.emailAddress)),
)
} else {
this.feedback = t('mail', 'Account updated. Please follow the pop-up instructions to reconnect your Microsoft account')
await getUserConsent(
this.microsoftOauthUrl
.replace('_accountId_', account.id)
.replace('_email_', encodeURIComponent(account.emailAddress)),
)
}
} catch (e) {
// Undo changes
await this.$store.dispatch('updateAccount', {
Expand Down
Loading