Skip to content

Commit d1ba2ec

Browse files
authored
Merge pull request #2376 from umbraco/v15/feature/login-providers
Extension Manifest Map: Auth Provider
2 parents 71aa60e + ea737d6 commit d1ba2ec

File tree

12 files changed

+29
-16
lines changed

12 files changed

+29
-16
lines changed

src/packages/core/extension-registry/models/auth-provider.model.ts renamed to src/packages/core/auth/auth-provider.extension.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,9 @@ export interface MetaAuthProvider {
8686
allowManualLinking?: boolean;
8787
};
8888
}
89+
90+
declare global {
91+
interface UmbExtensionManifestMap {
92+
umbAuthProvider: ManifestAuthProvider;
93+
}
94+
}

src/packages/core/auth/auth.context.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import type { UmbBackofficeExtensionRegistry, ManifestAuthProvider } from '../extension-registry/index.js';
21
import { UmbAuthFlow } from './auth-flow.js';
32
import { UMB_AUTH_CONTEXT, UMB_STORAGE_TOKEN_RESPONSE_NAME } from './auth.context.token.js';
43
import type { UmbOpenApiConfiguration } from './models/openApiConfiguration.js';
4+
import type { ManifestAuthProvider } from './auth-provider.extension.js';
55
import { OpenAPI } from '@umbraco-cms/backoffice/external/backend-api';
66
import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
77
import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
88
import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
99
import { ReplaySubject, Subject, firstValueFrom, switchMap } from '@umbraco-cms/backoffice/external/rxjs';
10+
import type { UmbBackofficeExtensionRegistry } from '@umbraco-cms/backoffice/extension-registry';
1011

1112
export class UmbAuthContext extends UmbContextBase<UmbAuthContext> {
1213
#isAuthorized = new UmbBooleanState<boolean>(false);

src/packages/core/auth/components/auth-provider-default.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import type { ManifestAuthProvider } from '../../extension-registry/models/index.js';
21
import type { UmbAuthProviderDefaultProps, UmbUserLoginState } from '../types.js';
32
import { UmbLitElement } from '../../lit-element/lit-element.element.js';
43
import { UmbTextStyles } from '../../style/index.js';
4+
import type { ManifestAuthProvider } from '../auth-provider.extension.js';
55
import { css, customElement, html, nothing, property } from '@umbraco-cms/backoffice/external/lit';
66

77
@customElement('umb-auth-provider-default')

src/packages/core/auth/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ export * from './auth.context.token.js';
55
export * from './modals/index.js';
66
export * from './models/openApiConfiguration.js';
77
export * from './components/index.js';
8+
export * from './auth-provider.extension.js';
89

910
export type * from './types.js';

src/packages/core/auth/modals/umb-app-auth-modal.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ManifestAuthProvider } from '../../extension-registry/models/auth-provider.model.js';
1+
import type { ManifestAuthProvider } from '../auth-provider.extension.js';
22
import { UmbModalBaseElement } from '../../modal/index.js';
33
import { UmbTextStyles } from '../../style/text-style.style.js';
44
import { UMB_AUTH_CONTEXT } from '../auth.context.token.js';

src/packages/core/auth/providers/manifests.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ManifestAuthProvider } from '@umbraco-cms/backoffice/extension-registry';
1+
import type { ManifestAuthProvider } from '../auth-provider.extension.js';
22

33
export const manifests: Array<ManifestAuthProvider> = [
44
{

src/packages/core/auth/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ManifestAuthProvider } from '../extension-registry/index.js';
1+
import type { ManifestAuthProvider } from './auth-provider.extension.js';
22

33
/**
44
* User login state that can be used to determine the current state of the user.

src/packages/core/extension-registry/models/external-login-provider.model.ts renamed to src/packages/core/extension-registry/extensions/external-login-provider.extension.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,9 @@ export interface MetaExternalLoginProvider {
1010
label: string;
1111
pathname: string;
1212
}
13+
14+
declare global {
15+
interface UmbExtensionManifestMap {
16+
umbExternalLoginProvider: ManifestExternalLoginProvider;
17+
}
18+
}

src/packages/core/extension-registry/extensions/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ export type * from './backoffice-entry-point.extension.js';
33
export type * from './entity-action.extension.js';
44
export type * from './entity-bulk-action.extension.js';
55
export type * from './entry-point.extension.js';
6+
export type * from './external-login-provider.extension.js';
67
export type * from './global-context.extension.js';
78
export type * from './header-app.extension.js';
89
export type * from './menu-item-element.interface.js';
9-
export type * from './menu-item.extension.js';
1010
export type * from './menu-item-element.interface.js';
11+
export type * from './menu-item.extension.js';
1112
export type * from './menu.extension.js';
13+
export type * from './mfa-login-provider.extension.js';
1214
export type * from './preview-app.extension.js';
1315
export type * from './repository.extension.js';
1416
export type * from './store.extension.js';

src/packages/core/extension-registry/models/mfa-login-provider.model.ts renamed to src/packages/core/extension-registry/extensions/mfa-login-provider.extension.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,9 @@ export interface ManifestMfaLoginProvider extends ManifestElement {
1515
export interface MetaMfaLoginProvider {
1616
label?: string;
1717
}
18+
19+
declare global {
20+
interface UmbExtensionManifestMap {
21+
umbMfaLoginProvider: ManifestMfaLoginProvider;
22+
}
23+
}

0 commit comments

Comments
 (0)