yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

throw the error from the server

Browse Source
This commit is contained in:
Jacob Overgaard
2024-05-15 11:45:21 +02:00
parent c6cd4294bb
commit 5997c985a7
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.UI.Client/src/packages/core/auth/auth-flow.ts
View File

@@ -369,7 +369,8 @@ export class UmbAuthFlow {
const result = await fetch(request);
if (!result.ok) {
throw new Error('Failed to unlink login');
const error = await result.json();
throw error;
}
await this.signOut();

22
src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/modals/external-login-modal.element.ts
View File

@@ -8,6 +8,7 @@ import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registr
import { mergeObservables } from '@umbraco-cms/backoffice/observable-api';
import { UMB_AUTH_CONTEXT } from '@umbraco-cms/backoffice/auth';
import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
import { ApiError, ProblemDetails } from '@umbraco-cms/backoffice/external/backend-api';
type UmbExternalLoginProviderOption = UmbCurrentUserExternalLoginProviderModel & {
displayName: string;
@@ -149,7 +150,7 @@ export class UmbCurrentUserExternalLoginModalElement extends UmbLitElement {
color: 'positive',
});
const authContext = await this.getContext(UMB_AUTH_CONTEXT);
authContext.linkLogin(item.providerSchemeName);
await authContext.linkLogin(item.providerSchemeName);
} catch (error) {
if (error instanceof Error) {
this.#notificationContext?.peek('danger', {
@@ -172,16 +173,21 @@ export class UmbCurrentUserExternalLoginModalElement extends UmbLitElement {
color: 'danger',
});
const authContext = await this.getContext(UMB_AUTH_CONTEXT);
authContext.unlinkLogin(item.providerSchemeName, item.providerKey);
await authContext.unlinkLogin(item.providerSchemeName, item.providerKey);
} catch (error) {
let message = this.localize.term('errors_receivedErrorFromServer');
if (error instanceof Error) {
this.#notificationContext?.peek('danger', {
data: {
headline: this.localize.term('defaultdialogs_unLinkYour', providerDisplayName),
message: error.message,
},
});
message = error.message;
} else if (typeof error === 'object' && (error as ProblemDetails).title) {
message = (error as ProblemDetails).title ?? message;
}
console.error('[External Login] Error unlinking provider: ', error);
this.#notificationContext?.peek('danger', {
data: {
headline: this.localize.term('defaultdialogs_unLinkYour', providerDisplayName),
message,
},
});
}
}