From 3d2a0d48dc2f0ee9bb261d554c332658ac14b4c9 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 30 May 2022 13:17:59 +0200 Subject: [PATCH] split up handlers --- .../src/mocks/domains/install.handlers.ts | 82 +++++++++ .../src/mocks/domains/manifests.handlers.ts | 25 +++ .../src/mocks/domains/user.handlers.ts | 53 ++++++ .../src/mocks/domains/version.handlers.ts | 15 ++ .../src/mocks/handlers.ts | 166 +----------------- 5 files changed, 183 insertions(+), 158 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/mocks/domains/install.handlers.ts create mode 100644 src/Umbraco.Web.UI.Client/src/mocks/domains/manifests.handlers.ts create mode 100644 src/Umbraco.Web.UI.Client/src/mocks/domains/user.handlers.ts create mode 100644 src/Umbraco.Web.UI.Client/src/mocks/domains/version.handlers.ts diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/install.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/domains/install.handlers.ts new file mode 100644 index 0000000000..2afacf9c41 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/mocks/domains/install.handlers.ts @@ -0,0 +1,82 @@ +import { rest } from 'msw'; +import { components } from '../../../schemas/generated-schema'; + +export const handlers = [ + rest.get('/umbraco/backoffice/install', (_req, res, ctx) => { + return res( + // Respond with a 200 status code + ctx.status(200), + ctx.json({ + user: { + minCharLength: 2, + minNonAlphaNumericLength: 0, + consentLevels: [ + { + level: 'Minimal', + description: 'We will only send an anonymized site ID to let us know that the site exists.', + }, + { + level: 'Basic', + description: 'We will send an anonymized site ID, umbraco version, and packages installed', + }, + { + level: 'Detailed', + description: + 'We will send:\n
- Anonymized site ID, umbraco version, and packages installed.\n
- Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, and Property Editors in use.\n
- System information: Webserver, server OS, server framework, server OS language, and database provider.\n
- Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, and if you are in debug mode.\n
\n
We might change what we send on the Detailed level in the future. If so, it will be listed above.\n
By choosing "Detailed" you agree to current and future anonymized information being collected.', + }, + ], + }, + databases: [ + { + id: '1', + sortOrder: -1, + displayName: 'SQLite', + defaultDatabaseName: 'Umbraco', + providerName: 'Microsoft.Data.SQLite', + supportsQuickInstall: true, + isAvailable: true, + requiresServer: false, + serverPlaceholder: null, + requiresCredentials: false, + supportsIntegratedAuthentication: false, + requiresConnectionTest: false, + }, + { + id: '2', + sortOrder: 2, + displayName: 'SQL Server', + defaultDatabaseName: '', + providerName: 'Microsoft.Data.SqlClient', + supportsQuickInstall: false, + isAvailable: true, + requiresServer: true, + serverPlaceholder: '(local)\\SQLEXPRESS', + requiresCredentials: true, + supportsIntegratedAuthentication: true, + requiresConnectionTest: true, + }, + { + id: '42c0eafd-1650-4bdb-8cf6-d226e8941698', + sortOrder: 2147483647, + displayName: 'Custom', + defaultDatabaseName: '', + providerName: null, + isAvailable: true, + requiresServer: false, + serverPlaceholder: null, + requiresCredentials: false, + supportsIntegratedAuthentication: false, + requiresConnectionTest: true, + }, + ], + } as components['schemas']['UmbracoInstaller']) + ); + }), + + rest.post('/umbraco/backoffice/install', (_req, res, ctx) => { + return res( + // Respond with a 200 status code + ctx.status(201) + ); + }) +]; \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/manifests.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/domains/manifests.handlers.ts new file mode 100644 index 0000000000..5765b8b93f --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/mocks/domains/manifests.handlers.ts @@ -0,0 +1,25 @@ +import { rest } from 'msw'; +import { components } from '../../../schemas/generated-schema'; + +// TODO: set up schema +export const handlers = [ + rest.get('/umbraco/backoffice/manifests', (_req, res, ctx) => { + return res( + // Respond with a 200 status code + ctx.status(200), + ctx.json({ + manifests: [ + { + type: 'section', + alias: 'My.Section.Custom', + name: 'Custom', + elementName: 'umb-custom-section', + meta: { + weight: 30 + } + }, + ], + }) + ); + }), +]; \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/user.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/domains/user.handlers.ts new file mode 100644 index 0000000000..3fda4f3a39 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/mocks/domains/user.handlers.ts @@ -0,0 +1,53 @@ +import { rest } from 'msw'; +import { components } from '../../../schemas/generated-schema'; + +export const handlers = [ + rest.post('/umbraco/backoffice/user/login', (_req, res, ctx) => { + // Persist user's authentication in the session + sessionStorage.setItem('is-authenticated', 'true'); + return res( + // Respond with a 200 status code + ctx.status(201) + ); + }), + + rest.post('/umbraco/backoffice/user/logout', (_req, res, ctx) => { + // Persist user's authentication in the session + sessionStorage.removeItem('is-authenticated'); + return res( + // Respond with a 200 status code + ctx.status(201) + ); + }), + + rest.get('/umbraco/backoffice/user', (_req, res, ctx) => { + // Check if the user is authenticated in this session + const isAuthenticated = sessionStorage.getItem('is-authenticated'); + if (!isAuthenticated) { + // If not authenticated, respond with a 403 error + return res( + ctx.status(403), + ctx.json({ + errorMessage: 'Not authorized', + }) + ); + } + // If authenticated, return a mocked user details + return res( + ctx.status(200), + ctx.json({ + username: 'admin', + role: 'administrator', + } as components['schemas']['UserResponse']) + ); + }), + + rest.get('/umbraco/backoffice/user/sections', (_req, res, ctx) => { + return res( + ctx.status(200), + ctx.json({ + sections: ['Umb.Section.Content', 'Umb.Section.Media', 'Umb.Section.Settings', 'My.Section.Custom'], + } as components['schemas']['AllowedSectionsResponse']) + ); + }) +]; \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/mocks/domains/version.handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/domains/version.handlers.ts new file mode 100644 index 0000000000..572c089d3d --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/mocks/domains/version.handlers.ts @@ -0,0 +1,15 @@ +import { rest } from 'msw'; +import { components } from '../../../schemas/generated-schema'; + +// TODO: set up schema +export const handlers = [ + rest.get('/umbraco/backoffice/version', (_req, res, ctx) => { + return res( + // Respond with a 200 status code + ctx.status(200), + ctx.json({ + version: '13.0.0', + } as components['schemas']['VersionResponse']) + ); + }), +]; \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/mocks/handlers.ts b/src/Umbraco.Web.UI.Client/src/mocks/handlers.ts index 5a74754723..4723f6de18 100644 --- a/src/Umbraco.Web.UI.Client/src/mocks/handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/mocks/handlers.ts @@ -1,28 +1,11 @@ import { rest } from 'msw'; - import { components } from '../../schemas/generated-schema'; +import { handlers as installHandlers } from './domains/install.handlers'; +import { handlers as manifestsHandlers } from './domains/manifests.handlers'; +import { handlers as userHandlers } from './domains/user.handlers'; +import { handlers as versionHandlers } from './domains/version.handlers'; export const handlers = [ - rest.get('/umbraco/backoffice/manifests', (_req, res, ctx) => { - return res( - // Respond with a 200 status code - ctx.status(200), - ctx.json({ - manifests: [ - { - type: 'section', - alias: 'My.Section.Custom', - name: 'Custom', - elementName: 'umb-custom-section', - meta: { - weight: 30 - } - }, - ], - }) - ); - }), - rest.get('/umbraco/backoffice/init', (_req, res, ctx) => { return res( // Respond with a 200 status code @@ -32,141 +15,8 @@ export const handlers = [ } as components['schemas']['InitResponse']) ); }), - - rest.get('/umbraco/backoffice/version', (_req, res, ctx) => { - return res( - // Respond with a 200 status code - ctx.status(200), - ctx.json({ - version: '13.0.0', - } as components['schemas']['VersionResponse']) - ); - }), - - rest.post('/umbraco/backoffice/user/login', (_req, res, ctx) => { - // Persist user's authentication in the session - sessionStorage.setItem('is-authenticated', 'true'); - return res( - // Respond with a 200 status code - ctx.status(201) - ); - }), - - rest.post('/umbraco/backoffice/user/logout', (_req, res, ctx) => { - // Persist user's authentication in the session - sessionStorage.removeItem('is-authenticated'); - return res( - // Respond with a 200 status code - ctx.status(201) - ); - }), - - rest.get('/umbraco/backoffice/user', (_req, res, ctx) => { - // Check if the user is authenticated in this session - const isAuthenticated = sessionStorage.getItem('is-authenticated'); - if (!isAuthenticated) { - // If not authenticated, respond with a 403 error - return res( - ctx.status(403), - ctx.json({ - errorMessage: 'Not authorized', - }) - ); - } - // If authenticated, return a mocked user details - return res( - ctx.status(200), - ctx.json({ - username: 'admin', - role: 'administrator', - } as components['schemas']['UserResponse']) - ); - }), - - rest.get('/umbraco/backoffice/user/sections', (_req, res, ctx) => { - return res( - ctx.status(200), - ctx.json({ - sections: ['Umb.Section.Content', 'Umb.Section.Media', 'Umb.Section.Settings', 'My.Section.Custom'], - } as components['schemas']['AllowedSectionsResponse']) - ); - }), - - rest.get('/umbraco/backoffice/install', (_req, res, ctx) => { - return res( - // Respond with a 200 status code - ctx.status(200), - ctx.json({ - user: { - minCharLength: 2, - minNonAlphaNumericLength: 0, - consentLevels: [ - { - level: 'Minimal', - description: 'We will only send an anonymized site ID to let us know that the site exists.', - }, - { - level: 'Basic', - description: 'We will send an anonymized site ID, umbraco version, and packages installed', - }, - { - level: 'Detailed', - description: - 'We will send:\n
- Anonymized site ID, umbraco version, and packages installed.\n
- Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, and Property Editors in use.\n
- System information: Webserver, server OS, server framework, server OS language, and database provider.\n
- Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, and if you are in debug mode.\n
\n
We might change what we send on the Detailed level in the future. If so, it will be listed above.\n
By choosing "Detailed" you agree to current and future anonymized information being collected.', - }, - ], - }, - databases: [ - { - id: '1', - sortOrder: -1, - displayName: 'SQLite', - defaultDatabaseName: 'Umbraco', - providerName: 'Microsoft.Data.SQLite', - supportsQuickInstall: true, - isAvailable: true, - requiresServer: false, - serverPlaceholder: null, - requiresCredentials: false, - supportsIntegratedAuthentication: false, - requiresConnectionTest: false, - }, - { - id: '2', - sortOrder: 2, - displayName: 'SQL Server', - defaultDatabaseName: '', - providerName: 'Microsoft.Data.SqlClient', - supportsQuickInstall: false, - isAvailable: true, - requiresServer: true, - serverPlaceholder: '(local)\\SQLEXPRESS', - requiresCredentials: true, - supportsIntegratedAuthentication: true, - requiresConnectionTest: true, - }, - { - id: '42c0eafd-1650-4bdb-8cf6-d226e8941698', - sortOrder: 2147483647, - displayName: 'Custom', - defaultDatabaseName: '', - providerName: null, - isAvailable: true, - requiresServer: false, - serverPlaceholder: null, - requiresCredentials: false, - supportsIntegratedAuthentication: false, - requiresConnectionTest: true, - }, - ], - } as components['schemas']['UmbracoInstaller']) - ); - }), - - rest.post('/umbraco/backoffice/install', (_req, res, ctx) => { - return res( - // Respond with a 200 status code - ctx.status(201) - ); - }), + ...installHandlers, + ...manifestsHandlers, + ...userHandlers, + ...versionHandlers ];