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: Use URLs for channel identifiers

Browse Source 
In the future these can potentially be used to dereference them
This commit is contained in:
Joachim Van Herwegen
2023-02-03 15:32:34 +01:00
parent 67d1ff4ac0
commit cbbb10afa1
13 changed files with 58 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/unit/server/notifications/BaseChannelType.test.ts
View File

@@ -29,7 +29,7 @@ class DummyChannelType extends BaseChannelType {
}
describe('A BaseChannelType', (): void => {
const id = '4c9b88c1-7502-4107-bb79-2a3a590c7aa3:https://storage.example/resource';
const id = 'http://example.com/DummyType/4c9b88c1-7502-4107-bb79-2a3a590c7aa3';
const credentials: Credentials = {};
const channelType = new DummyChannelType();

18
test/unit/server/notifications/WebHookSubscription2021/WebHook2021Util.test.ts
View File

@@ -1,18 +0,0 @@
import {
generateWebHookUnsubscribeUrl, parseWebHookUnsubscribeUrl,
} from '../../../../../src/server/notifications/WebHookSubscription2021/WebHook2021Util';
describe('WebHook2021Util', (): void => {
describe('#generateWebHookUnsubscribeUrl', (): void => {
it('generates the URL with the identifier.', async(): Promise<void> => {
expect(generateWebHookUnsubscribeUrl('http://example.com/unsubscribe', '123$456'))
.toBe('http://example.com/unsubscribe/123%24456');
});
});
describe('#parseWebHookUnsubscribeUrl', (): void => {
it('returns the parsed identifier from the URL.', async(): Promise<void> => {
expect(parseWebHookUnsubscribeUrl('http://example.com/unsubscribe/123%24456')).toBe('123$456');
});
});
});

8
test/unit/server/notifications/WebHookSubscription2021/WebHookSubscription2021.test.ts
View File

@@ -18,7 +18,6 @@ import {
isWebHook2021Channel,
WebHookSubscription2021,
} from '../../../../../src/server/notifications/WebHookSubscription2021/WebHookSubscription2021';
import { joinUrl } from '../../../../../src/util/PathUtil';
import { NOTIFY, RDF } from '../../../../../src/util/Vocabularies';
import quad = DataFactory.quad;
import blankNode = DataFactory.blankNode;
@@ -41,7 +40,6 @@ describe('A WebHookSubscription2021', (): void => {
let channel: WebHookSubscription2021Channel;
const route = new AbsolutePathInteractionRoute('http://example.com/webhooks/');
const webIdRoute = new RelativePathInteractionRoute(route, '/webid');
const unsubscribeRoute = new RelativePathInteractionRoute(route, '/unsubscribe');
let stateHandler: jest.Mocked<StateHandler>;
let channelType: WebHookSubscription2021;
@@ -51,7 +49,7 @@ describe('A WebHookSubscription2021', (): void => {
data.addQuad(quad(subject, NOTIFY.terms.topic, namedNode(topic)));
data.addQuad(quad(subject, NOTIFY.terms.target, namedNode(target)));
const id = '4c9b88c1-7502-4107-bb79-2a3a590c7aa3:https://storage.example/resource';
const id = 'http://example.com/webhooks/4c9b88c1-7502-4107-bb79-2a3a590c7aa3';
channel = {
id,
type: NOTIFY.WebHookSubscription2021,
@@ -59,14 +57,14 @@ describe('A WebHookSubscription2021', (): void => {
target,
webId: 'http://example.org/alice',
// eslint-disable-next-line @typescript-eslint/naming-convention
unsubscribe_endpoint: joinUrl(unsubscribeRoute.getPath(), encodeURIComponent(id)),
unsubscribe_endpoint: id,
};
stateHandler = {
handleSafe: jest.fn(),
} as any;
channelType = new WebHookSubscription2021(route, webIdRoute, unsubscribeRoute, stateHandler);
channelType = new WebHookSubscription2021(route, webIdRoute, stateHandler);
});
it('exposes a utility function to verify if a channel is a webhook channel.', async(): Promise<void> => {

4
test/unit/server/notifications/WebHookSubscription2021/WebHookUnsubscriber.test.ts
View File

@@ -25,7 +25,7 @@ describe('A WebHookUnsubscriber', (): void => {
beforeEach(async(): Promise<void> => {
operation = {
method: 'DELETE',
target: { path: 'http://example.com/.notifications/webhooks/unsubscribe/134' },
target: { path: 'http://example.com/.notifications/webhooks/134' },
preferences: {},
body: new BasicRepresentation(),
};
@@ -58,6 +58,6 @@ describe('A WebHookUnsubscriber', (): void => {
await expect(unsubscriber.handle({ operation, request, response }))
.resolves.toEqual(new ResetResponseDescription());
expect(storage.delete).toHaveBeenCalledTimes(1);
expect(storage.delete).toHaveBeenLastCalledWith('134');
expect(storage.delete).toHaveBeenLastCalledWith('http://example.com/.notifications/webhooks/134');
});
});

2
test/unit/server/notifications/WebSocketSubscription2021/WebSocketSubscription2021.test.ts
View File

@@ -34,7 +34,7 @@ describe('A WebSocketSubscription2021', (): void => {
data.addQuad(quad(subject, RDF.terms.type, NOTIFY.terms.WebSocketSubscription2021));
data.addQuad(quad(subject, NOTIFY.terms.topic, namedNode(topic)));
const id = '4c9b88c1-7502-4107-bb79-2a3a590c7aa3:https://storage.example/resource';
const id = 'http://example.com/foo/4c9b88c1-7502-4107-bb79-2a3a590c7aa3';
channel = {
id,
type: NOTIFY.WebSocketSubscription2021,