From abc1a9f32ec997b7e187681ee10e7f3db42cfaf0 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 5 Apr 2024 12:08:42 +0200 Subject: [PATCH] add more to default provider --- .../src/apps/app/app-auth.controller.ts | 9 +++++++-- .../src/packages/core/auth/providers/manifests.ts | 5 ++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/apps/app/app-auth.controller.ts b/src/Umbraco.Web.UI.Client/src/apps/app/app-auth.controller.ts index 290508e72a..0c2eac7678 100644 --- a/src/Umbraco.Web.UI.Client/src/apps/app/app-auth.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/apps/app/app-auth.controller.ts @@ -65,12 +65,17 @@ export class UmbAppAuthController extends UmbControllerBase { this.#authContext.makeAuthorizationRequest(redirectProvider.forProviderName); } else { // Show the provider selection screen - console.log('show modal for', availableProviders); const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT); - await modalManager + const selected = await modalManager .open(this._host, UMB_MODAL_APP_AUTH) .onSubmit() .catch(() => undefined); + + if (!selected?.providerName) { + return false; + } + + this.#authContext.makeAuthorizationRequest(selected.providerName); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/auth/providers/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/auth/providers/manifests.ts index 29f9ca30f6..f1f2f89b41 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/auth/providers/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/auth/providers/manifests.ts @@ -8,7 +8,10 @@ export const manifests: Array = [ forProviderName: 'Umbraco', weight: 1000, meta: { - label: 'Umbraco', + label: 'Sign in with Umbraco', + defaultView: { + look: 'primary', + }, }, }, ];