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: Accept client WebIDs with a context array

Browse Source
This commit is contained in:
Joachim Van Herwegen 2022-05-17 09:58:50 +02:00
parent 74c2a9d909
commit d290848096
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/identity/storage/WebIdAdapterFactory.ts
View File

@ -51,9 +51,10 @@ export class WebIdAdapter extends PassthroughAdapter {
let json: any | undefined;
try {
json = JSON.parse(data);
const contexts = Array.isArray(json['@context']) ? json['@context'] : [ json['@context'] ];
// We can only parse as simple JSON if the @context is correct
if (json['@context'] !== 'https://www.w3.org/ns/solid/oidc-context.jsonld') {
throw new Error('Invalid context');
if (!contexts.includes('https://www.w3.org/ns/solid/oidc-context.jsonld')) {
throw new Error('Missing context https://www.w3.org/ns/solid/oidc-context.jsonld');
}
} catch (error: unknown) {
json = undefined;

9
test/unit/identity/storage/WebIdAdapterFactory.test.ts
View File

@ -85,6 +85,15 @@ describe('A WebIdAdapterFactory', (): void => {
});
});
it('can handle a context array.', async(): Promise<void> => {
json['@context'] = [ json['@context'] ];
fetchMock.mockResolvedValueOnce({ url: id, status: 200, text: (): string => JSON.stringify(json) });
await expect(adapter.find(id)).resolves.toEqual({
...json,
token_endpoint_auth_method: 'none',
});
});
it('errors if there is a client_id mismatch.', async(): Promise<void> => {
json.client_id = 'someone else';
fetchMock.mockResolvedValueOnce({ url: id, status: 200, text: (): string => JSON.stringify(json) });