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

feat: Remove useless fields from IDP JSON response

Browse Source
This commit is contained in:
Joachim Van Herwegen
2021-08-25 15:42:50 +02:00
parent 32a182dde8
commit 3542fe29da
7 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/identity/IdentityProviderHttpHandler.ts
View File

@@ -213,11 +213,7 @@ export class IdentityProviderHttpHandler extends BaseHttpHandler {
private async resolveRoute(operation: Operation, route: InteractionRoute, oidcInteraction?: Interaction):
Promise<{ result: InteractionHandlerResult; templateFiles: Record<string, string> }> {
if (operation.method === 'GET') {
// .ejs templates errors on undefined variables
return {
result: { type: 'response', details: { errorMessage: '', prefilled: {}}},
templateFiles: route.viewTemplates,
};
return { result: { type: 'response' }, templateFiles: route.viewTemplates };
}
if (operation.method === 'POST') {
@@ -226,12 +222,12 @@ export class IdentityProviderHttpHandler extends BaseHttpHandler {
return { result, templateFiles: route.responseTemplates };
} catch (error: unknown) {
// Render error in the view
const prefilled = IdpInteractionError.isInstance(error) ? error.prefilled : {};
const errorMessage = createErrorMessage(error);
return {
result: { type: 'response', details: { errorMessage, prefilled }},
templateFiles: route.viewTemplates,
};
const result: InteractionResponseResult = { type: 'response', details: { errorMessage }};
if (IdpInteractionError.isInstance(error)) {
result.details!.prefilled = error.prefilled;
}
return { result, templateFiles: route.viewTemplates };
}
}

2
templates/identity/email-password/confirm.html.ejs
View File

@@ -1,7 +1,7 @@
<h1>Authorize</h1>
<p>You are authorizing an application to access your Pod.</p>
<form method="post">
<% if (errorMessage) { %>
<% if (locals.errorMessage) { %>
<p class="error"><%= errorMessage %></p>
<% } %>

2
templates/identity/email-password/forgot-password.html.ejs
View File

@@ -1,6 +1,6 @@
<h1>Forgot password</h1>
<form method="post">
<% if (errorMessage) { %>
<% if (locals.errorMessage) { %>
<p class="error"><%= errorMessage %></p>
<% } %>

6
templates/identity/email-password/login.html.ejs
View File

@@ -1,6 +1,8 @@
<h1>Log in</h1>
<form method="post">
<% if (errorMessage) { %>
<% const safePrefilled = locals.prefilled || {}; %>
<% if (locals.errorMessage) { %>
<p class="error"><%= errorMessage %></p>
<% } %>
@@ -9,7 +11,7 @@
<ol>
<li>
<label for="email">Email</label>
<input id="email" type="email" name="email" autofocus <% if (prefilled.email) { %> value="<%= prefilled.email %>" <% } %>>
<input id="email" type="email" name="email" autofocus value="<%= safePrefilled.email || '' %>">
</li>
<li>
<label for="password">Password</label>

15
templates/identity/email-password/register.html.ejs
View File

@@ -1,8 +1,9 @@
<h1>Sign up</h1>
<form method="post" id="mainForm">
<% const isBlankForm = !('email' in prefilled); %>
<% const isBlankForm = !('prefilled' in locals); %>
<% const safePrefilled = locals.prefilled || {}; %>
<% if (errorMessage) { %>
<% if (locals.errorMessage) { %>
<p class="error">Error: <%= errorMessage %></p>
<% } %>
@@ -19,7 +20,7 @@
<li class="radio">
<label>
<input type="radio" id="createWebIdOn" name="createWebId" value="on"<%
if (isBlankForm || prefilled.createWebId) { %> checked<% } %>>
if (isBlankForm || safePrefilled.createWebId) { %> checked<% } %>>
Create a new WebID for my Pod.
</label>
<p id="createWebIdForm">
@@ -35,7 +36,7 @@
<ol id="existingWebIdForm">
<li>
<label for="webId">Existing WebID:</label>
<input id="webId" type="text" name="webId" value="<%= prefilled.webId || '' %>">
<input id="webId" type="text" name="webId" value="<%= safePrefilled.webId || '' %>">
</li>
<li class="checkbox">
<label>
@@ -66,8 +67,7 @@
<ol id="createPodForm">
<li>
<label for="podName">Pod name:</label>
<input id="podName" type="text" name="podName" <%
if (prefilled.podName) { %> value="<%= prefilled.podName %>" <% } %>>
<input id="podName" type="text" name="podName" value="<%= safePrefilled.podName || '' %>">
</li>
</ol>
</li>
@@ -83,8 +83,7 @@
<ol>
<li>
<label for="email">Email:</label>
<input id="email" type="text" name="email" <%
if (prefilled.email) { %> value="<%= prefilled.email %>" <% } %>>
<input id="email" type="text" name="email" value="<%= safePrefilled.email || '' %>" >
</li>
</ol>
<ol id="passwordForm">

2
templates/identity/email-password/reset-password.html.ejs
View File

@@ -1,6 +1,6 @@
<h1>Reset password</h1>
<form method="post">
<% if (errorMessage) { %>
<% if (locals.errorMessage) { %>
<p class="error"><%= errorMessage %></p>
<% } %>

4
test/unit/identity/IdentityProviderHttpHandler.test.ts
View File

@@ -132,7 +132,7 @@ describe('An IdentityProviderHttpHandler', (): void => {
const { response: mockResponse, result } = responseWriter.handleSafe.mock.calls[0][0];
expect(mockResponse).toBe(response);
expect(JSON.parse(await readableToString(result.data!)))
.toEqual({ apiVersion, errorMessage: '', prefilled: {}, authenticating: false, controls });
.toEqual({ apiVersion, authenticating: false, controls });
expect(result.statusCode).toBe(200);
expect(result.metadata?.contentType).toBe('text/html');
expect(result.metadata?.get(SOLID_META.template)?.value).toBe(routes.response.viewTemplates['text/html']);
@@ -253,7 +253,7 @@ describe('An IdentityProviderHttpHandler', (): void => {
const { response: mockResponse, result } = responseWriter.handleSafe.mock.calls[0][0];
expect(mockResponse).toBe(response);
expect(JSON.parse(await readableToString(result.data!)))
.toEqual({ apiVersion, errorMessage: 'handle error', prefilled: {}, authenticating: false, controls });
.toEqual({ apiVersion, errorMessage: 'handle error', authenticating: false, controls });
});
it('calls the errorHandler if there is a problem resolving the request.', async(): Promise<void> => {