From fdab5f3e329a765d3325507332c8419650dec6d4 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 24 Jan 2023 10:32:40 +0100 Subject: [PATCH] move auth components to auth app --- src/Umbraco.Web.UI.Client/apps/auth/index.html | 15 +++++++++++++++ src/Umbraco.Web.UI.Client/apps/auth/package.json | 16 ++++++++++++++++ .../auth/src}/auth-layout.element.ts | 0 .../{src/auth => apps/auth/src}/auth.ts | 0 .../external-login-provider-test.element.ts | 0 .../external-login-provider-test2.element.ts | 0 .../src}/external-login-providers/manifests.ts | 0 .../{src/auth => apps/auth/src}/index.ts | 7 +++---- .../login => apps/auth/src}/login.element.ts | 12 +++--------- .../auth/login => apps/auth/src}/login.test.ts | 2 +- .../apps/auth/vite.config.ts | 15 +++++++++++++++ 11 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/apps/auth/index.html create mode 100644 src/Umbraco.Web.UI.Client/apps/auth/package.json rename src/Umbraco.Web.UI.Client/{src/auth => apps/auth/src}/auth-layout.element.ts (100%) rename src/Umbraco.Web.UI.Client/{src/auth => apps/auth/src}/auth.ts (100%) rename src/Umbraco.Web.UI.Client/{src/auth => apps/auth/src}/external-login-providers/external-login-provider-test.element.ts (100%) rename src/Umbraco.Web.UI.Client/{src/auth => apps/auth/src}/external-login-providers/external-login-provider-test2.element.ts (100%) rename src/Umbraco.Web.UI.Client/{src/auth => apps/auth/src}/external-login-providers/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/{src/auth => apps/auth/src}/index.ts (84%) rename src/Umbraco.Web.UI.Client/{src/auth/login => apps/auth/src}/login.element.ts (92%) rename src/Umbraco.Web.UI.Client/{src/auth/login => apps/auth/src}/login.test.ts (100%) create mode 100644 src/Umbraco.Web.UI.Client/apps/auth/vite.config.ts diff --git a/src/Umbraco.Web.UI.Client/apps/auth/index.html b/src/Umbraco.Web.UI.Client/apps/auth/index.html new file mode 100644 index 0000000000..0e8af67e3e --- /dev/null +++ b/src/Umbraco.Web.UI.Client/apps/auth/index.html @@ -0,0 +1,15 @@ + + + + + + + Umbraco Auth + + + + + + + + diff --git a/src/Umbraco.Web.UI.Client/apps/auth/package.json b/src/Umbraco.Web.UI.Client/apps/auth/package.json new file mode 100644 index 0000000000..55a0fb987a --- /dev/null +++ b/src/Umbraco.Web.UI.Client/apps/auth/package.json @@ -0,0 +1,16 @@ +{ + "name": "umbraco-backoffice-auth", + "version": "0.0.0", + "license": "MIT", + "author": { + "name": "Umbraco HQ", + "email": "backoffice@umbraco.com" + }, + "scripts": { + "dev": "vite", + "build": "vite build", + "build:production": "vite build --mode production", + "preview": "vite preview", + "test": "web-test-runner \"test/**/*.test.ts\" --node-resolve" + } +} diff --git a/src/Umbraco.Web.UI.Client/src/auth/auth-layout.element.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/auth-layout.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/auth/auth-layout.element.ts rename to src/Umbraco.Web.UI.Client/apps/auth/src/auth-layout.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/auth/auth.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/auth.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/auth/auth.ts rename to src/Umbraco.Web.UI.Client/apps/auth/src/auth.ts diff --git a/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test.element.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/external-login-provider-test.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test.element.ts rename to src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/external-login-provider-test.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test2.element.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/external-login-provider-test2.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/auth/external-login-providers/external-login-provider-test2.element.ts rename to src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/external-login-provider-test2.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/auth/external-login-providers/manifests.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/auth/external-login-providers/manifests.ts rename to src/Umbraco.Web.UI.Client/apps/auth/src/external-login-providers/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/auth/index.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/index.ts similarity index 84% rename from src/Umbraco.Web.UI.Client/src/auth/index.ts rename to src/Umbraco.Web.UI.Client/apps/auth/src/index.ts index 05973f455a..ab2e185e31 100644 --- a/src/Umbraco.Web.UI.Client/src/auth/index.ts +++ b/src/Umbraco.Web.UI.Client/apps/auth/src/index.ts @@ -1,6 +1,7 @@ +import { ManifestTypes, umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; import { manifests as externalLoginProviders } from './external-login-providers/manifests'; -import { ManifestTypes, umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; +import './login.element'; const registerExtensions = (manifests: Array) => { manifests.forEach((manifest) => { @@ -9,6 +10,4 @@ const registerExtensions = (manifests: Array) => { }); }; -registerExtensions([ - ...externalLoginProviders, -]); +registerExtensions([...externalLoginProviders]); diff --git a/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/login.element.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts rename to src/Umbraco.Web.UI.Client/apps/auth/src/login.element.ts index c2549c83c3..e80411c49f 100644 --- a/src/Umbraco.Web.UI.Client/src/auth/login/login.element.ts +++ b/src/Umbraco.Web.UI.Client/apps/auth/src/login.element.ts @@ -1,10 +1,9 @@ -import '../auth-layout.element'; - import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; -import { query } from 'router-slot'; + +import './auth-layout.element'; @customElement('umb-login') export default class UmbLogin extends LitElement { @@ -45,12 +44,7 @@ export default class UmbLogin extends LitElement { try { this._loggingIn = false; - let { redirectTo } = query(); - if (!redirectTo) { - redirectTo = 'section'; - } - sessionStorage.setItem('is-authenticated', 'true'); - history.pushState(null, '', redirectTo); + alert('go back to the backoffice'); } catch (error) { console.log(error); this._loggingIn = false; diff --git a/src/Umbraco.Web.UI.Client/src/auth/login/login.test.ts b/src/Umbraco.Web.UI.Client/apps/auth/src/login.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/auth/login/login.test.ts rename to src/Umbraco.Web.UI.Client/apps/auth/src/login.test.ts index d937ffba1e..4908a6342e 100644 --- a/src/Umbraco.Web.UI.Client/src/auth/login/login.test.ts +++ b/src/Umbraco.Web.UI.Client/apps/auth/src/login.test.ts @@ -1,6 +1,6 @@ import { expect, fixture, html } from '@open-wc/testing'; -import UmbLogin from './login.element'; import { defaultA11yConfig } from '@umbraco-cms/test-utils'; +import UmbLogin from './login.element'; describe('UmbLogin', () => { let element: UmbLogin; diff --git a/src/Umbraco.Web.UI.Client/apps/auth/vite.config.ts b/src/Umbraco.Web.UI.Client/apps/auth/vite.config.ts new file mode 100644 index 0000000000..7b374f6da4 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/apps/auth/vite.config.ts @@ -0,0 +1,15 @@ +import { defineConfig } from 'vite'; +import viteTSConfigPaths from 'vite-tsconfig-paths'; + +// https://vitejs.dev/config/ +export default defineConfig({ + build: { + lib: { + entry: 'src/index.ts', + formats: ['es'], + fileName: 'main', + }, + sourcemap: true, + }, + plugins: [viteTSConfigPaths()], +});