Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove interaction details from IdpRenderHandler

Browse Source
This commit is contained in:
Joachim Van Herwegen 2021-05-26 14:14:52 +02:00
parent 6bfe1bdccc
commit 998d2f49e1
11 changed files with 24 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/identity/interaction/email-password/handler/ForgotPasswordHandler.ts
View File

@ -45,14 +45,13 @@ export class ForgotPasswordHandler extends InteractionHttpHandler {
}
public async handle(input: InteractionHttpHandlerInput): Promise<void> {
const interactionDetails = await input.provider.interactionDetails(input.request, input.response);
try {
// Validate incoming data
const { email } = await getFormDataRequestBody(input.request);
assert(typeof email === 'string' && email.length > 0, 'Email required');
await this.resetPassword(email);
await this.sendResponse(input.response, interactionDetails, email);
await this.sendResponse(input.response, email);
} catch (err: unknown) {
throwIdpInteractionError(err, {});
}
@ -93,15 +92,13 @@ export class ForgotPasswordHandler extends InteractionHttpHandler {
/**
* Sends a response through the messageRenderHandler.
* @param response - HttpResponse to send to.
* @param details - Details of the interaction.
* @param email - Will be inserted in `prefilled` for the template.
*/
private async sendResponse(response: HttpResponse, details: { uid: string }, email: string): Promise<void> {
private async sendResponse(response: HttpResponse, email: string): Promise<void> {
// Send response
await this.messageRenderHandler.handleSafe({
response,
props: {
details,
errorMessage: '',
prefilled: {
email,

10
src/identity/interaction/util/IdpRenderHandler.ts
View File

@ -1,14 +1,12 @@
import { RenderHandler } from '../../../server/util/RenderHandler';
export interface IdpRenderHandlerProps {
details: {
uid: string;
};
errorMessage: string;
prefilled: Record<string, any>;
errorMessage?: string;
prefilled?: Record<string, any>;
}
/**
* A special Render Handler that renders an IDP form
* A special Render Handler that renders an IDP form.
* Contains an error message if something was wrong and prefilled values for forms.
*/
export abstract class IdpRenderHandler extends RenderHandler<IdpRenderHandlerProps> {}

14
src/identity/interaction/util/IdpRouteController.ts
View File

@ -6,8 +6,8 @@ import { IdpInteractionError } from './IdpInteractionError';
import type { IdpRenderHandler } from './IdpRenderHandler';
/**
* Handles an IDP interaction route. All routes need to extract interaction details to render
* the UI and accept a POST request to do some action.
* Handles an IDP interaction route.
* All routes render their UI on a GET and accept POST requests to handle the interaction.
*/
export class IdpRouteController extends RouterHandler {
private readonly renderHandler: IdpRenderHandler;
@ -19,27 +19,25 @@ export class IdpRouteController extends RouterHandler {
/**
* Calls the renderHandler to render using the given response and props.
* `details` typed as any since the `interactionDetails` output typings are not exposed.
*/
private async render(input: InteractionHttpHandlerInput, details: any, errorMessage = '', prefilled = {}):
private async render(input: InteractionHttpHandlerInput, errorMessage = '', prefilled = {}):
Promise<void> {
return this.renderHandler.handleSafe({
response: input.response,
props: { details, errorMessage, prefilled },
props: { errorMessage, prefilled },
});
}
public async handle(input: InteractionHttpHandlerInput): Promise<void> {
const interactionDetails = await input.provider.interactionDetails(input.request, input.response);
if (input.request.method === 'GET') {
await this.render(input, interactionDetails);
await this.render(input);
} else if (input.request.method === 'POST') {
try {
await this.handler.handleSafe(input);
} catch (err: unknown) {
const errorMessage = isNativeError(err) ? err.message : 'An unknown error occurred';
const prefilled = IdpInteractionError.isInstance(err) ? err.prefilled : {};
await this.render(input, interactionDetails, errorMessage, prefilled);
await this.render(input, errorMessage, prefilled);
}
}
}

1
src/identity/interaction/util/InitialInteractionHandler.ts
View File

@ -39,7 +39,6 @@ export class InitialInteractionHandler extends InteractionHttpHandler {
await this.renderHandlerMap[name].handleSafe({
response,
props: {
details: interactionDetails,
errorMessage: '',
prefilled: {},
},

7
templates/idp/email-password-interaction/confirm.ejs
View File

@ -12,13 +12,8 @@
<h1 class="title--white">Authorize</h1>
<div class="login-panel">
<div class="panel-body">
<form autocomplete="off" action="<%= details.pathPrefix %>/idp/confirm" method="post">
<form autocomplete="off" action="/idp/confirm" method="post">
<button autofocus type="submit" name="submit" class="ids-link-filled">Continue</button>
<hr />
<div class="space-between">
<a href="<%= details.returnTo %>" class="link">Cancel</a>
</div>
</form>
</div>
</div>

4
templates/idp/email-password-interaction/forgotPassword.ejs
View File

@ -12,7 +12,7 @@
<h1 class="title--white">Forgot Password</h1>
<div class="login-panel">
<div class="panel-body">
<form autocomplete="off" action="<%= details.pathPrefix %>/idp/forgotpassword" method="post">
<form autocomplete="off" action="/idp/forgotpassword" method="post">
<%if (errorMessage) { %>
<div class="input-wrap">
@ -32,7 +32,7 @@
<hr />
<div class="space-between">
<a href="<%= details.pathPrefix %>/idp/login" class="link">Log In</a>
<a href="/idp/login" class="link">Log In</a>
</div>
</form>
</div>

2
templates/idp/email-password-interaction/login.ejs
View File

@ -12,7 +12,7 @@
<h1 class="title--white">Sign In</h1>
<div class="login-panel">
<div class="panel-body">
<form autocomplete="off" action="<%= details.pathPrefix %>/idp/login" method="post">
<form autocomplete="off" action="/idp/login" method="post">
<%if (errorMessage) { %>
<div class="input-wrap">

4
templates/idp/email-password-interaction/register.ejs
View File

@ -12,7 +12,7 @@
<h1 class="title--white">Register</h1>
<div class="login-panel">
<div class="panel-body">
<form autocomplete="off" action="<%= details.pathPrefix %>/idp/register" method="post">
<form autocomplete="off" action="/idp/register" method="post">
<%if (errorMessage) { %>
<div class="input-wrap">
@ -50,7 +50,7 @@
<hr />
<div class="space-between">
<a href="<%= details.pathPrefix %>/idp/login" class="link">Sign In</a>
<a href="/idp/login" class="link">Sign In</a>
</div>
</form>
</div>

10
test/unit/identity/interaction/email-password/handler/ForgotPasswordHandler.test.ts
View File

@ -16,10 +16,8 @@ describe('A ForgotPasswordHandler', (): void => {
const email = 'test@test.email';
const recordId = '123456';
const html = `<a href="/base/idp/resetpassword?rid=${recordId}">Reset Password</a>`;
// `Interaction` type is not exposed
const details = {} as any;
const renderParams = { response, props: { details, errorMessage: '', prefilled: { email }}};
let provider: Provider;
const renderParams = { response, props: { errorMessage: '', prefilled: { email }}};
const provider: Provider = {} as any;
let messageRenderHandler: IdpRenderHandler;
let accountStore: AccountStore;
const baseUrl = 'http://test.com/base/';
@ -31,10 +29,6 @@ describe('A ForgotPasswordHandler', (): void => {
beforeEach(async(): Promise<void> => {
request = createPostFormRequest({ email });
provider = {
interactionDetails: jest.fn().mockResolvedValue(details),
} as any;
messageRenderHandler = {
handleSafe: jest.fn(),
} as any;

14
test/unit/identity/interaction/util/IdpRouteController.test.ts
View File

@ -11,9 +11,7 @@ import type { HttpResponse } from '../../../../../src/server/HttpResponse';
describe('An IdpRouteController', (): void => {
let request: HttpRequest;
const response: HttpResponse = {} as any;
// `Interaction` type is not exposed
const details = {} as any;
let provider: Provider;
const provider: Provider = {} as any;
let renderHandler: IdpRenderHandler;
let postHandler: HttpHandler;
let controller: IdpRouteController;
@ -24,10 +22,6 @@ describe('An IdpRouteController', (): void => {
method: 'GET',
} as any;
provider = {
interactionDetails: jest.fn().mockResolvedValue(details),
} as any;
renderHandler = {
handleSafe: jest.fn(),
} as any;
@ -44,7 +38,7 @@ describe('An IdpRouteController', (): void => {
expect(renderHandler.handleSafe).toHaveBeenCalledTimes(1);
expect(renderHandler.handleSafe).toHaveBeenLastCalledWith({
response,
props: { details, errorMessage: '', prefilled: {}},
props: { errorMessage: '', prefilled: {}},
});
expect(postHandler.handleSafe).toHaveBeenCalledTimes(0);
});
@ -67,7 +61,7 @@ describe('An IdpRouteController', (): void => {
expect(renderHandler.handleSafe).toHaveBeenCalledTimes(1);
expect(renderHandler.handleSafe).toHaveBeenLastCalledWith({
response,
props: { details, errorMessage: 'bad request!', prefilled: { more: 'data!' }},
props: { errorMessage: 'bad request!', prefilled: { more: 'data!' }},
});
});
@ -80,7 +74,7 @@ describe('An IdpRouteController', (): void => {
expect(renderHandler.handleSafe).toHaveBeenCalledTimes(1);
expect(renderHandler.handleSafe).toHaveBeenLastCalledWith({
response,
props: { details, errorMessage: 'An unknown error occurred', prefilled: {}},
props: { errorMessage: 'An unknown error occurred', prefilled: {}},
});
});

2
test/unit/identity/interaction/util/InitialInteractionHandler.test.ts
View File

@ -36,7 +36,6 @@ describe('An InitialInteractionHandler', (): void => {
expect(map.test.handleSafe).toHaveBeenLastCalledWith({
response,
props: {
details,
errorMessage: '',
prefilled: {},
},
@ -53,7 +52,6 @@ describe('An InitialInteractionHandler', (): void => {
expect(map.default.handleSafe).toHaveBeenLastCalledWith({
response,
props: {
details,
errorMessage: '',
prefilled: {},
},