javascript-solid-server 0.0.138 → 0.0.139
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/ap/index.js +9 -9
- package/src/ap/keys.js +2 -2
- package/src/ap/routes/actor.js +1 -1
- package/src/ap/routes/collections.js +1 -1
- package/src/ap/routes/inbox.js +1 -1
- package/src/ap/routes/mastodon.js +2 -2
- package/src/ap/routes/outbox.js +2 -2
- package/src/db/index.js +2 -2
- package/src/handlers/container.js +22 -23
- package/src/idp/interactions.js +5 -5
- package/src/server.js +18 -14
- package/src/webid/profile.js +21 -80
- package/test/auth.test.js +1 -1
- package/test/pod.test.js +5 -5
- package/test/webid.test.js +18 -26
package/package.json
CHANGED
package/src/ap/index.js
CHANGED
|
@@ -68,7 +68,7 @@ export async function activityPubPlugin(fastify, options = {}) {
|
|
|
68
68
|
const getActorId = (request) => {
|
|
69
69
|
const protocol = getProtocol(request)
|
|
70
70
|
const host = request.headers['x-forwarded-host'] || request.hostname
|
|
71
|
-
return `${protocol}://${host}/profile/card#me`
|
|
71
|
+
return `${protocol}://${host}/profile/card.jsonld#me`
|
|
72
72
|
}
|
|
73
73
|
|
|
74
74
|
// Helper to get base URL
|
|
@@ -96,11 +96,11 @@ export async function activityPubPlugin(fastify, options = {}) {
|
|
|
96
96
|
return reply.code(404).send({ error: 'Not found' })
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
// For now, accept any username and map to /profile/card#me
|
|
99
|
+
// For now, accept any username and map to /profile/card.jsonld#me
|
|
100
100
|
// In multi-user mode, we'd look up the user
|
|
101
101
|
const baseUrl = getBaseUrl(request)
|
|
102
|
-
const actorUrl = `${baseUrl}/profile/card#me`
|
|
103
|
-
const profileUrl = `${baseUrl}/profile/card`
|
|
102
|
+
const actorUrl = `${baseUrl}/profile/card.jsonld#me`
|
|
103
|
+
const profileUrl = `${baseUrl}/profile/card.jsonld`
|
|
104
104
|
|
|
105
105
|
const response = webfinger.createResponse(
|
|
106
106
|
`${parsed.username}@${parsed.domain}`,
|
|
@@ -174,18 +174,18 @@ export async function activityPubPlugin(fastify, options = {}) {
|
|
|
174
174
|
// Inbox endpoint
|
|
175
175
|
const inboxHandler = createInboxHandler(config, keypair)
|
|
176
176
|
fastify.post('/inbox', inboxHandler)
|
|
177
|
-
fastify.post('/profile/card/inbox', inboxHandler)
|
|
177
|
+
fastify.post('/profile/card.jsonld/inbox', inboxHandler)
|
|
178
178
|
|
|
179
179
|
// Outbox endpoint
|
|
180
180
|
const outboxHandler = createOutboxHandler(config, keypair)
|
|
181
181
|
const outboxPostHandler = createOutboxPostHandler(config, keypair)
|
|
182
|
-
fastify.get('/profile/card/outbox', outboxHandler)
|
|
183
|
-
fastify.post('/profile/card/outbox', outboxPostHandler)
|
|
182
|
+
fastify.get('/profile/card.jsonld/outbox', outboxHandler)
|
|
183
|
+
fastify.post('/profile/card.jsonld/outbox', outboxPostHandler)
|
|
184
184
|
|
|
185
185
|
// Followers/Following collections
|
|
186
186
|
const collectionsHandler = createCollectionsHandler(config)
|
|
187
|
-
fastify.get('/profile/card/followers', (req, reply) => collectionsHandler(req, reply, 'followers'))
|
|
188
|
-
fastify.get('/profile/card/following', (req, reply) => collectionsHandler(req, reply, 'following'))
|
|
187
|
+
fastify.get('/profile/card.jsonld/followers', (req, reply) => collectionsHandler(req, reply, 'followers'))
|
|
188
|
+
fastify.get('/profile/card.jsonld/following', (req, reply) => collectionsHandler(req, reply, 'following'))
|
|
189
189
|
|
|
190
190
|
// Mastodon-compatible API endpoints
|
|
191
191
|
fastify.post('/api/v1/apps', createAppsHandler())
|
package/src/ap/keys.js
CHANGED
|
@@ -52,8 +52,8 @@ export function loadOrCreateKeypair(path = DEFAULT_KEY_PATH) {
|
|
|
52
52
|
|
|
53
53
|
/**
|
|
54
54
|
* Get key ID for HTTP Signatures
|
|
55
|
-
* @param {string} actorId - Actor URL (e.g., https://example.com/profile/card#me)
|
|
56
|
-
* @returns {string} Key ID (e.g., https://example.com/profile/card#main-key)
|
|
55
|
+
* @param {string} actorId - Actor URL (e.g., https://example.com/profile/card.jsonld#me)
|
|
56
|
+
* @returns {string} Key ID (e.g., https://example.com/profile/card.jsonld#main-key)
|
|
57
57
|
*/
|
|
58
58
|
export function getKeyId(actorId) {
|
|
59
59
|
// Strip fragment and add #main-key
|
package/src/ap/routes/actor.js
CHANGED
|
@@ -30,7 +30,7 @@ export function createActorHandler(config, keypair) {
|
|
|
30
30
|
}
|
|
31
31
|
protocol = protocol || request.protocol
|
|
32
32
|
const baseUrl = `${protocol}://${host}`
|
|
33
|
-
const profileUrl = `${baseUrl}/profile/card`
|
|
33
|
+
const profileUrl = `${baseUrl}/profile/card.jsonld`
|
|
34
34
|
const actorId = `${profileUrl}#me`
|
|
35
35
|
|
|
36
36
|
const actor = {
|
|
@@ -15,7 +15,7 @@ export function createCollectionsHandler(config) {
|
|
|
15
15
|
const protocol = request.headers['x-forwarded-proto'] || request.protocol
|
|
16
16
|
const host = request.headers['x-forwarded-host'] || request.hostname
|
|
17
17
|
const baseUrl = `${protocol}://${host}`
|
|
18
|
-
const profileUrl = `${baseUrl}/profile/card`
|
|
18
|
+
const profileUrl = `${baseUrl}/profile/card.jsonld`
|
|
19
19
|
|
|
20
20
|
let items, totalItems
|
|
21
21
|
|
package/src/ap/routes/inbox.js
CHANGED
|
@@ -150,7 +150,7 @@ export function createInboxHandler(config, keypair) {
|
|
|
150
150
|
const protocol = request.headers['x-forwarded-proto'] || request.protocol
|
|
151
151
|
const host = request.headers['x-forwarded-host'] || request.hostname
|
|
152
152
|
const baseUrl = `${protocol}://${host}`
|
|
153
|
-
const profileUrl = `${baseUrl}/profile/card`
|
|
153
|
+
const profileUrl = `${baseUrl}/profile/card.jsonld`
|
|
154
154
|
const actorId = `${profileUrl}#me`
|
|
155
155
|
|
|
156
156
|
request.log.info(`Received ${activity.type} from ${activity.actor}`)
|
|
@@ -78,8 +78,8 @@ export function createVerifyCredentialsHandler (config) {
|
|
|
78
78
|
acct: config.username,
|
|
79
79
|
display_name: config.displayName,
|
|
80
80
|
note: config.summary ? `<p>${escapeHtml(config.summary)}</p>` : '',
|
|
81
|
-
url: `${baseUrl}/profile/card`,
|
|
82
|
-
uri: `${baseUrl}/profile/card#me`,
|
|
81
|
+
url: `${baseUrl}/profile/card.jsonld`,
|
|
82
|
+
uri: `${baseUrl}/profile/card.jsonld#me`,
|
|
83
83
|
avatar: `${baseUrl}/profile/avatar.png`,
|
|
84
84
|
header: '',
|
|
85
85
|
locked: false,
|
package/src/ap/routes/outbox.js
CHANGED
|
@@ -19,7 +19,7 @@ export function createOutboxHandler(config, keypair) {
|
|
|
19
19
|
const protocol = request.headers['x-forwarded-proto'] || request.protocol
|
|
20
20
|
const host = request.headers['x-forwarded-host'] || request.hostname
|
|
21
21
|
const baseUrl = `${protocol}://${host}`
|
|
22
|
-
const profileUrl = `${baseUrl}/profile/card`
|
|
22
|
+
const profileUrl = `${baseUrl}/profile/card.jsonld`
|
|
23
23
|
const actorId = `${profileUrl}#me`
|
|
24
24
|
|
|
25
25
|
const posts = getPosts(20)
|
|
@@ -63,7 +63,7 @@ export function createOutboxPostHandler(config, keypair) {
|
|
|
63
63
|
const protocol = request.headers['x-forwarded-proto'] || request.protocol
|
|
64
64
|
const host = request.headers['x-forwarded-host'] || request.hostname
|
|
65
65
|
const baseUrl = `${protocol}://${host}`
|
|
66
|
-
const profileUrl = `${baseUrl}/profile/card`
|
|
66
|
+
const profileUrl = `${baseUrl}/profile/card.jsonld`
|
|
67
67
|
const actorId = `${profileUrl}#me`
|
|
68
68
|
|
|
69
69
|
// Parse body
|
package/src/db/index.js
CHANGED
|
@@ -59,8 +59,8 @@ export async function dbPlugin(fastify, options) {
|
|
|
59
59
|
if (podName) {
|
|
60
60
|
// Build expected WebID for both path and subdomain modes
|
|
61
61
|
const expectedWebId = request.subdomainsEnabled && request.baseDomain
|
|
62
|
-
? `${request.protocol}://${podName}.${request.baseDomain}/profile/card#me`
|
|
63
|
-
: `${request.protocol}://${request.hostname}/${podName}/profile/card#me`;
|
|
62
|
+
? `${request.protocol}://${podName}.${request.baseDomain}/profile/card.jsonld#me`
|
|
63
|
+
: `${request.protocol}://${request.hostname}/${podName}/profile/card.jsonld#me`;
|
|
64
64
|
if (webId !== expectedWebId) {
|
|
65
65
|
return reply.code(403).send({ error: 'Forbidden', message: 'You can only write to your own /db/ space' });
|
|
66
66
|
}
|
|
@@ -173,20 +173,20 @@ export async function createPodStructure(name, webId, podUri, issuer, defaultQuo
|
|
|
173
173
|
await storage.createContainer(`${podPath}settings/`);
|
|
174
174
|
await storage.createContainer(`${podPath}profile/`);
|
|
175
175
|
|
|
176
|
-
// Generate and write WebID profile at /profile/card
|
|
177
|
-
const
|
|
178
|
-
await storage.write(`${podPath}profile/card`,
|
|
176
|
+
// Generate and write WebID profile at /profile/card.jsonld
|
|
177
|
+
const profile = generateProfile({ webId, name, podUri, issuer });
|
|
178
|
+
await storage.write(`${podPath}profile/card.jsonld`, serialize(profile));
|
|
179
179
|
|
|
180
|
-
// Generate and write preferences
|
|
180
|
+
// Generate and write preferences
|
|
181
181
|
const prefs = generatePreferences({ webId, podUri });
|
|
182
|
-
await storage.write(`${podPath}settings/
|
|
182
|
+
await storage.write(`${podPath}settings/prefs.jsonld`, serialize(prefs));
|
|
183
183
|
|
|
184
|
-
// Generate and write type indexes
|
|
185
|
-
const publicTypeIndex = generateTypeIndex(`${podUri}settings/publicTypeIndex.
|
|
186
|
-
await storage.write(`${podPath}settings/publicTypeIndex.
|
|
184
|
+
// Generate and write type indexes
|
|
185
|
+
const publicTypeIndex = generateTypeIndex(`${podUri}settings/publicTypeIndex.jsonld`);
|
|
186
|
+
await storage.write(`${podPath}settings/publicTypeIndex.jsonld`, serialize(publicTypeIndex));
|
|
187
187
|
|
|
188
|
-
const privateTypeIndex = generateTypeIndex(`${podUri}settings/privateTypeIndex.
|
|
189
|
-
await storage.write(`${podPath}settings/privateTypeIndex.
|
|
188
|
+
const privateTypeIndex = generateTypeIndex(`${podUri}settings/privateTypeIndex.jsonld`);
|
|
189
|
+
await storage.write(`${podPath}settings/privateTypeIndex.jsonld`, serialize(privateTypeIndex));
|
|
190
190
|
|
|
191
191
|
// Create default ACL files
|
|
192
192
|
// Pod root: owner full control, public read
|
|
@@ -229,13 +229,13 @@ export async function createPodStructure(name, webId, podUri, issuer, defaultQuo
|
|
|
229
229
|
*
|
|
230
230
|
* Creates the following structure:
|
|
231
231
|
* /{name}/
|
|
232
|
-
* /{name}/profile/card
|
|
233
|
-
* /{name}/inbox/
|
|
234
|
-
* /{name}/public/
|
|
235
|
-
* /{name}/private/
|
|
236
|
-
* /{name}/settings/prefs
|
|
237
|
-
* /{name}/settings/publicTypeIndex
|
|
238
|
-
* /{name}/settings/privateTypeIndex
|
|
232
|
+
* /{name}/profile/card.jsonld - WebID profile
|
|
233
|
+
* /{name}/inbox/ - Notifications
|
|
234
|
+
* /{name}/public/ - Public files
|
|
235
|
+
* /{name}/private/ - Private files
|
|
236
|
+
* /{name}/settings/prefs.jsonld - Preferences
|
|
237
|
+
* /{name}/settings/publicTypeIndex.jsonld
|
|
238
|
+
* /{name}/settings/privateTypeIndex.jsonld
|
|
239
239
|
*/
|
|
240
240
|
export async function handleCreatePod(request, reply) {
|
|
241
241
|
// Read-only mode - block pod creation
|
|
@@ -272,23 +272,22 @@ export async function handleCreatePod(request, reply) {
|
|
|
272
272
|
return reply.code(409).send({ error: 'Pod already exists' });
|
|
273
273
|
}
|
|
274
274
|
|
|
275
|
-
// Build URIs
|
|
276
|
-
// WebID follows standard Solid convention: /alice/profile/card#me
|
|
275
|
+
// Build URIs. WebID is the JSON-LD profile with an #me fragment.
|
|
277
276
|
const subdomainsEnabled = request.subdomainsEnabled;
|
|
278
277
|
const baseDomain = request.baseDomain;
|
|
279
278
|
|
|
280
279
|
let baseUri, podUri, webId;
|
|
281
280
|
if (subdomainsEnabled && baseDomain) {
|
|
282
|
-
// Subdomain mode: alice.example.com/profile/card#me
|
|
281
|
+
// Subdomain mode: alice.example.com/profile/card.jsonld#me
|
|
283
282
|
const podHost = `${name}.${baseDomain}`;
|
|
284
283
|
baseUri = `${request.protocol}://${baseDomain}`;
|
|
285
284
|
podUri = `${request.protocol}://${podHost}/`;
|
|
286
|
-
webId = `${podUri}profile/card#me`;
|
|
285
|
+
webId = `${podUri}profile/card.jsonld#me`;
|
|
287
286
|
} else {
|
|
288
|
-
// Path mode: example.com/alice/profile/card#me
|
|
287
|
+
// Path mode: example.com/alice/profile/card.jsonld#me
|
|
289
288
|
baseUri = `${request.protocol}://${request.hostname}`;
|
|
290
289
|
podUri = `${baseUri}${podPath}`;
|
|
291
|
-
webId = `${podUri}profile/card#me`;
|
|
290
|
+
webId = `${podUri}profile/card.jsonld#me`;
|
|
292
291
|
}
|
|
293
292
|
|
|
294
293
|
// Issuer needs trailing slash for CTH compatibility
|
package/src/idp/interactions.js
CHANGED
|
@@ -405,20 +405,20 @@ export async function handleRegisterPost(request, reply, issuer, inviteOnly = fa
|
|
|
405
405
|
}
|
|
406
406
|
|
|
407
407
|
try {
|
|
408
|
-
// Build URLs
|
|
408
|
+
// Build URLs. WebID is the JSON-LD profile with an #me fragment.
|
|
409
409
|
const subdomainsEnabled = request.subdomainsEnabled;
|
|
410
410
|
const baseDomain = request.baseDomain;
|
|
411
411
|
const baseUrl = issuer.endsWith('/') ? issuer.slice(0, -1) : issuer;
|
|
412
412
|
|
|
413
413
|
let podUri, webId;
|
|
414
414
|
if (subdomainsEnabled && baseDomain) {
|
|
415
|
-
// Subdomain mode: alice.example.com/profile/card#me
|
|
415
|
+
// Subdomain mode: alice.example.com/profile/card.jsonld#me
|
|
416
416
|
podUri = `${request.protocol}://${username}.${baseDomain}/`;
|
|
417
|
-
webId = `${podUri}profile/card#me`;
|
|
417
|
+
webId = `${podUri}profile/card.jsonld#me`;
|
|
418
418
|
} else {
|
|
419
|
-
// Path mode: example.com/alice/profile/card#me
|
|
419
|
+
// Path mode: example.com/alice/profile/card.jsonld#me
|
|
420
420
|
podUri = `${baseUrl}/${username}/`;
|
|
421
|
-
webId = `${podUri}profile/card#me`;
|
|
421
|
+
webId = `${podUri}profile/card.jsonld#me`;
|
|
422
422
|
}
|
|
423
423
|
|
|
424
424
|
// Check if pod already exists
|
package/src/server.js
CHANGED
|
@@ -314,12 +314,12 @@ export function createServer(options = {}) {
|
|
|
314
314
|
// Note: OPTIONS requests are handled by handleOptions to include Accept-* headers
|
|
315
315
|
});
|
|
316
316
|
|
|
317
|
-
// ActivityPub actor endpoint - dedicated route for /profile/card with AP Accept header
|
|
317
|
+
// ActivityPub actor endpoint - dedicated route for /profile/card.jsonld with AP Accept header
|
|
318
318
|
// Registered before wildcard routes to take priority
|
|
319
319
|
if (activitypubEnabled) {
|
|
320
320
|
fastify.route({
|
|
321
321
|
method: 'GET',
|
|
322
|
-
url: '/profile/card',
|
|
322
|
+
url: '/profile/card.jsonld',
|
|
323
323
|
handler: async (request, reply) => {
|
|
324
324
|
const accept = request.headers.accept || '';
|
|
325
325
|
const wantsAP = accept.includes('activity+json') ||
|
|
@@ -426,13 +426,13 @@ export function createServer(options = {}) {
|
|
|
426
426
|
fastify.addHook('preHandler', async (request, reply) => {
|
|
427
427
|
// Skip auth for pod creation, OPTIONS, IdP routes, mashlib, well-known, notifications, nostr, git, and AP
|
|
428
428
|
const mashlibPaths = ['/mashlib.min.js', '/mash.css', '/841.mashlib.min.js'];
|
|
429
|
-
const apPaths = ['/inbox', '/profile/card/inbox', '/profile/card/outbox', '/profile/card/followers', '/profile/card/following',
|
|
429
|
+
const apPaths = ['/inbox', '/profile/card.jsonld/inbox', '/profile/card.jsonld/outbox', '/profile/card.jsonld/followers', '/profile/card.jsonld/following',
|
|
430
430
|
'/api/v1/apps', '/api/v1/instance', '/api/v1/accounts/verify_credentials',
|
|
431
431
|
'/oauth/authorize', '/oauth/token'];
|
|
432
432
|
// Check if request wants ActivityPub content for profile
|
|
433
433
|
const accept = request.headers.accept || '';
|
|
434
434
|
const wantsAP = accept.includes('activity+json') || accept.includes('ld+json; profile="https://www.w3.org/ns/activitystreams"');
|
|
435
|
-
const isProfileAP = activitypubEnabled && wantsAP && (request.url === '/profile/card' || request.url.startsWith('/profile/card?'));
|
|
435
|
+
const isProfileAP = activitypubEnabled && wantsAP && (request.url === '/profile/card.jsonld' || request.url.startsWith('/profile/card.jsonld?'));
|
|
436
436
|
if (request.url === '/.pods' ||
|
|
437
437
|
request.url === '/.notifications' ||
|
|
438
438
|
request.method === 'OPTIONS' ||
|
|
@@ -557,11 +557,15 @@ export function createServer(options = {}) {
|
|
|
557
557
|
const isRootPod = !singleUserName || singleUserName === '/';
|
|
558
558
|
const podPath = isRootPod ? '/' : `/${singleUserName}/`;
|
|
559
559
|
const podUri = isRootPod ? `${baseUrl}/` : `${baseUrl}/${singleUserName}/`;
|
|
560
|
-
const webId = `${podUri}profile/card#me`;
|
|
560
|
+
const webId = `${podUri}profile/card.jsonld#me`;
|
|
561
561
|
const displayName = isRootPod ? 'me' : singleUserName;
|
|
562
562
|
|
|
563
|
-
// Check if pod already exists
|
|
564
|
-
|
|
563
|
+
// Check if pod already exists. Accept either the new `card.jsonld`
|
|
564
|
+
// or legacy extensionless `card` layout so we don't re-seed a pod
|
|
565
|
+
// that was created by an older JSS version.
|
|
566
|
+
const profileExists =
|
|
567
|
+
await storage.exists(`${podPath}profile/card.jsonld`) ||
|
|
568
|
+
await storage.exists(`${podPath}profile/card`);
|
|
565
569
|
|
|
566
570
|
if (!profileExists) {
|
|
567
571
|
fastify.log.info(`Creating single-user pod at ${podUri}...`);
|
|
@@ -593,18 +597,18 @@ export function createServer(options = {}) {
|
|
|
593
597
|
await storage.createContainer('/profile/');
|
|
594
598
|
|
|
595
599
|
// Generate profile
|
|
596
|
-
const
|
|
597
|
-
await storage.write('/profile/card',
|
|
600
|
+
const profile = generateProfile({ webId, name: displayName, podUri, issuer });
|
|
601
|
+
await storage.write('/profile/card.jsonld', serialize(profile));
|
|
598
602
|
|
|
599
603
|
// Preferences and type indexes
|
|
600
604
|
const prefs = generatePreferences({ webId, podUri });
|
|
601
|
-
await storage.write('/settings/
|
|
605
|
+
await storage.write('/settings/prefs.jsonld', serialize(prefs));
|
|
602
606
|
|
|
603
|
-
const publicTypeIndex = generateTypeIndex(`${podUri}settings/publicTypeIndex.
|
|
604
|
-
await storage.write('/settings/publicTypeIndex.
|
|
607
|
+
const publicTypeIndex = generateTypeIndex(`${podUri}settings/publicTypeIndex.jsonld`);
|
|
608
|
+
await storage.write('/settings/publicTypeIndex.jsonld', serialize(publicTypeIndex));
|
|
605
609
|
|
|
606
|
-
const privateTypeIndex = generateTypeIndex(`${podUri}settings/privateTypeIndex.
|
|
607
|
-
await storage.write('/settings/privateTypeIndex.
|
|
610
|
+
const privateTypeIndex = generateTypeIndex(`${podUri}settings/privateTypeIndex.jsonld`);
|
|
611
|
+
await storage.write('/settings/privateTypeIndex.jsonld', serialize(privateTypeIndex));
|
|
608
612
|
|
|
609
613
|
// ACL files
|
|
610
614
|
const rootAcl = generateOwnerAcl(podUri, webId, true);
|
package/src/webid/profile.js
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* WebID Profile generation
|
|
3
|
-
*
|
|
4
|
-
*
|
|
3
|
+
*
|
|
4
|
+
* Creates profile documents following Solid conventions. Default profile
|
|
5
|
+
* shape is now plain JSON-LD at `profile/card.jsonld` — operators who
|
|
6
|
+
* want a human-readable HTML shell can serve their own `index.html` with
|
|
7
|
+
* an embedded `<script type="application/ld+json">` data island.
|
|
5
8
|
*/
|
|
6
9
|
|
|
7
10
|
const FOAF = 'http://xmlns.com/foaf/0.1/';
|
|
@@ -45,95 +48,33 @@ export function generateProfileJsonLd({ webId, name, podUri, issuer }) {
|
|
|
45
48
|
'inbox': `${pod}inbox/`,
|
|
46
49
|
'storage': pod,
|
|
47
50
|
'oidcIssuer': issuer,
|
|
48
|
-
'preferencesFile': `${pod}settings/
|
|
49
|
-
'publicTypeIndex': `${pod}settings/publicTypeIndex.
|
|
50
|
-
'privateTypeIndex': `${pod}settings/privateTypeIndex.
|
|
51
|
+
'preferencesFile': `${pod}settings/prefs.jsonld`,
|
|
52
|
+
'publicTypeIndex': `${pod}settings/publicTypeIndex.jsonld`,
|
|
53
|
+
'privateTypeIndex': `${pod}settings/privateTypeIndex.jsonld`
|
|
51
54
|
};
|
|
52
55
|
}
|
|
53
56
|
|
|
54
57
|
/**
|
|
55
|
-
* Generate
|
|
56
|
-
*
|
|
58
|
+
* Generate the profile document as a plain JSON-LD object.
|
|
59
|
+
*
|
|
60
|
+
* Previously returned an HTML shell with an embedded data island; that
|
|
61
|
+
* shell still exists for hand-curated personal sites, but server-default
|
|
62
|
+
* profiles are now plain JSON-LD for predictability and easier
|
|
63
|
+
* post-processing by clients.
|
|
64
|
+
*
|
|
57
65
|
* @param {object} options
|
|
58
66
|
* @param {string} options.webId - Full WebID URI
|
|
59
67
|
* @param {string} options.name - Display name
|
|
60
68
|
* @param {string} options.podUri - Pod root URI
|
|
61
69
|
* @param {string} options.issuer - OIDC issuer URI
|
|
62
|
-
* @returns {
|
|
70
|
+
* @returns {object} JSON-LD profile document
|
|
63
71
|
*/
|
|
64
72
|
export function generateProfile({ webId, name, podUri, issuer }) {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
return `<!DOCTYPE html>
|
|
68
|
-
<html lang="en">
|
|
69
|
-
<head>
|
|
70
|
-
<meta charset="utf-8">
|
|
71
|
-
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
72
|
-
<title>${escapeHtml(name)}'s Profile</title>
|
|
73
|
-
<link rel="stylesheet" href="https://javascriptsolidserver.github.io/mashlib-jss/dist/mash.css">
|
|
74
|
-
<script type="application/ld+json">
|
|
75
|
-
${JSON.stringify(jsonLd, null, 2)}
|
|
76
|
-
</script>
|
|
77
|
-
<style>
|
|
78
|
-
body { margin: 0; font-family: system-ui, sans-serif; }
|
|
79
|
-
.loading { padding: 2rem; text-align: center; color: #666; }
|
|
80
|
-
</style>
|
|
81
|
-
</head>
|
|
82
|
-
<body>
|
|
83
|
-
<div class="TabulatorOutline" id="DummyUUID" role="main">
|
|
84
|
-
<table id="outline"></table>
|
|
85
|
-
<div id="GlobalDashboard"></div>
|
|
86
|
-
</div>
|
|
87
|
-
<div class="loading" id="loading">Loading profile...</div>
|
|
88
|
-
|
|
89
|
-
<script src="https://javascriptsolidserver.github.io/mashlib-jss/dist/mashlib.min.js"></script>
|
|
90
|
-
<script src="https://cdn.jsdelivr.net/npm/solidos-lite/solidos-lite.js"></script>
|
|
91
|
-
<script>
|
|
92
|
-
document.addEventListener('DOMContentLoaded', function() {
|
|
93
|
-
const loadingEl = document.getElementById('loading');
|
|
94
|
-
|
|
95
|
-
// Initialize solidos-lite to handle data islands
|
|
96
|
-
const success = SolidOSLite.init({ verbose: false });
|
|
97
|
-
if (!success) {
|
|
98
|
-
loadingEl.textContent = 'Failed to initialize. Please try refreshing.';
|
|
99
|
-
return;
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
// Parse data islands into the RDF store
|
|
103
|
-
SolidOSLite.parseAllIslands();
|
|
104
|
-
|
|
105
|
-
// Mark this document as already fetched
|
|
106
|
-
const pageBase = window.location.href.split('?')[0].split('#')[0];
|
|
107
|
-
const fetcher = SolidLogic.store.fetcher;
|
|
108
|
-
fetcher.requested[pageBase] = 'done';
|
|
109
|
-
fetcher.requested[pageBase.replace(/\\/$/, '')] = 'done';
|
|
110
|
-
|
|
111
|
-
// Navigate to #me
|
|
112
|
-
const subject = $rdf.sym(pageBase + '#me');
|
|
113
|
-
const outliner = panes.getOutliner(document);
|
|
114
|
-
outliner.GotoSubject(subject, true, undefined, true, undefined);
|
|
115
|
-
|
|
116
|
-
loadingEl.style.display = 'none';
|
|
117
|
-
});
|
|
118
|
-
</script>
|
|
119
|
-
</body>
|
|
120
|
-
</html>`;
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
/**
|
|
124
|
-
* Escape HTML entities
|
|
125
|
-
*/
|
|
126
|
-
function escapeHtml(str) {
|
|
127
|
-
return str
|
|
128
|
-
.replace(/&/g, '&')
|
|
129
|
-
.replace(/</g, '<')
|
|
130
|
-
.replace(/>/g, '>')
|
|
131
|
-
.replace(/"/g, '"');
|
|
73
|
+
return generateProfileJsonLd({ webId, name, podUri, issuer });
|
|
132
74
|
}
|
|
133
75
|
|
|
134
76
|
/**
|
|
135
|
-
* Generate preferences file as JSON-LD
|
|
136
|
-
* Uses mashlib-compatible paths (settings/Preferences.ttl)
|
|
77
|
+
* Generate preferences file as JSON-LD.
|
|
137
78
|
* @param {object} options
|
|
138
79
|
* @param {string} options.webId - Full WebID URI
|
|
139
80
|
* @param {string} options.podUri - Pod root URI
|
|
@@ -149,9 +90,9 @@ export function generatePreferences({ webId, podUri }) {
|
|
|
149
90
|
'publicTypeIndex': { '@id': 'solid:publicTypeIndex', '@type': '@id' },
|
|
150
91
|
'privateTypeIndex': { '@id': 'solid:privateTypeIndex', '@type': '@id' }
|
|
151
92
|
},
|
|
152
|
-
'@id': `${pod}settings/
|
|
153
|
-
'publicTypeIndex': `${pod}settings/publicTypeIndex.
|
|
154
|
-
'privateTypeIndex': `${pod}settings/privateTypeIndex.
|
|
93
|
+
'@id': `${pod}settings/prefs.jsonld`,
|
|
94
|
+
'publicTypeIndex': `${pod}settings/publicTypeIndex.jsonld`,
|
|
95
|
+
'privateTypeIndex': `${pod}settings/privateTypeIndex.jsonld`
|
|
155
96
|
};
|
|
156
97
|
}
|
|
157
98
|
|
package/test/auth.test.js
CHANGED
|
@@ -173,7 +173,7 @@ describe('Authentication', () => {
|
|
|
173
173
|
{
|
|
174
174
|
'@id': '#owner',
|
|
175
175
|
'@type': 'acl:Authorization',
|
|
176
|
-
'acl:agent': { '@id': `${baseUrl}/authuser1/profile/card#me` },
|
|
176
|
+
'acl:agent': { '@id': `${baseUrl}/authuser1/profile/card.jsonld#me` },
|
|
177
177
|
'acl:accessTo': { '@id': `${baseUrl}/authuser1/authenticated-only/` },
|
|
178
178
|
'acl:default': { '@id': `${baseUrl}/authuser1/authenticated-only/` },
|
|
179
179
|
'acl:mode': [
|
package/test/pod.test.js
CHANGED
|
@@ -36,7 +36,7 @@ describe('Pod Lifecycle', () => {
|
|
|
36
36
|
|
|
37
37
|
const data = await res.json();
|
|
38
38
|
assert.strictEqual(data.name, 'alice');
|
|
39
|
-
assert.ok(data.webId.endsWith('/alice/profile/card#me'));
|
|
39
|
+
assert.ok(data.webId.endsWith('/alice/profile/card.jsonld#me'));
|
|
40
40
|
assert.ok(data.podUri.endsWith('/alice/'));
|
|
41
41
|
});
|
|
42
42
|
|
|
@@ -103,16 +103,16 @@ describe('Pod Lifecycle', () => {
|
|
|
103
103
|
it('should create settings files', async () => {
|
|
104
104
|
await createTestPod('dan');
|
|
105
105
|
|
|
106
|
-
// Check
|
|
107
|
-
const prefs = await request('/dan/settings/
|
|
106
|
+
// Check prefs.jsonld (needs auth - settings is private)
|
|
107
|
+
const prefs = await request('/dan/settings/prefs.jsonld', { auth: 'dan' });
|
|
108
108
|
assertStatus(prefs, 200);
|
|
109
109
|
|
|
110
110
|
// Check public type index (needs auth)
|
|
111
|
-
const pubIndex = await request('/dan/settings/publicTypeIndex.
|
|
111
|
+
const pubIndex = await request('/dan/settings/publicTypeIndex.jsonld', { auth: 'dan' });
|
|
112
112
|
assertStatus(pubIndex, 200);
|
|
113
113
|
|
|
114
114
|
// Check private type index (needs auth)
|
|
115
|
-
const privIndex = await request('/dan/settings/privateTypeIndex.
|
|
115
|
+
const privIndex = await request('/dan/settings/privateTypeIndex.jsonld', { auth: 'dan' });
|
|
116
116
|
assertStatus(privIndex, 200);
|
|
117
117
|
});
|
|
118
118
|
});
|
package/test/webid.test.js
CHANGED
|
@@ -12,7 +12,6 @@ import {
|
|
|
12
12
|
assertStatus,
|
|
13
13
|
assertHeader,
|
|
14
14
|
assertHeaderContains,
|
|
15
|
-
extractJsonLdFromHtml
|
|
16
15
|
} from './helpers.js';
|
|
17
16
|
|
|
18
17
|
describe('WebID Profile', () => {
|
|
@@ -30,87 +29,80 @@ describe('WebID Profile', () => {
|
|
|
30
29
|
});
|
|
31
30
|
|
|
32
31
|
describe('Profile Document', () => {
|
|
33
|
-
// Profile is at /pod/profile/card
|
|
34
|
-
const profilePath = '/webidtest/profile/card';
|
|
32
|
+
// Profile is now a plain JSON-LD doc at /pod/profile/card.jsonld.
|
|
33
|
+
const profilePath = '/webidtest/profile/card.jsonld';
|
|
35
34
|
|
|
36
|
-
it('should serve profile as
|
|
35
|
+
it('should serve profile as JSON-LD', async () => {
|
|
37
36
|
const res = await request(profilePath);
|
|
38
37
|
|
|
39
38
|
assertStatus(res, 200);
|
|
40
|
-
assertHeaderContains(res, 'Content-Type', '
|
|
39
|
+
assertHeaderContains(res, 'Content-Type', 'application/ld+json');
|
|
41
40
|
});
|
|
42
41
|
|
|
43
|
-
it('should
|
|
42
|
+
it('should be valid JSON-LD with @context and @id', async () => {
|
|
44
43
|
const res = await request(profilePath);
|
|
45
|
-
const
|
|
44
|
+
const jsonLd = await res.json();
|
|
46
45
|
|
|
47
|
-
const jsonLd = extractJsonLdFromHtml(html);
|
|
48
46
|
assert.ok(jsonLd['@context'], 'Should have @context');
|
|
49
|
-
// Profile uses flat structure, not @graph
|
|
50
47
|
assert.ok(jsonLd['@id'], 'Should have @id');
|
|
51
48
|
});
|
|
52
49
|
|
|
53
50
|
it('should have correct WebID URI', async () => {
|
|
54
51
|
const res = await request(profilePath);
|
|
55
|
-
const
|
|
56
|
-
const jsonLd = extractJsonLdFromHtml(html);
|
|
52
|
+
const jsonLd = await res.json();
|
|
57
53
|
|
|
58
|
-
|
|
59
|
-
|
|
54
|
+
assert.ok(jsonLd['@id'].endsWith('/webidtest/profile/card.jsonld#me'),
|
|
55
|
+
`WebID should end with /profile/card.jsonld#me, got ${jsonLd['@id']}`);
|
|
60
56
|
});
|
|
61
57
|
|
|
62
58
|
it('should have foaf:name', async () => {
|
|
63
59
|
const res = await request(profilePath);
|
|
64
|
-
const
|
|
65
|
-
const jsonLd = extractJsonLdFromHtml(html);
|
|
60
|
+
const jsonLd = await res.json();
|
|
66
61
|
|
|
67
62
|
assert.strictEqual(jsonLd['foaf:name'], 'webidtest');
|
|
68
63
|
});
|
|
69
64
|
|
|
70
65
|
it('should have solid:oidcIssuer', async () => {
|
|
71
66
|
const res = await request(profilePath);
|
|
72
|
-
const
|
|
73
|
-
const jsonLd = extractJsonLdFromHtml(html);
|
|
67
|
+
const jsonLd = await res.json();
|
|
74
68
|
|
|
75
69
|
assert.ok(jsonLd['oidcIssuer'], 'Should have oidcIssuer');
|
|
76
70
|
});
|
|
77
71
|
|
|
78
72
|
it('should have pim:storage pointing to pod', async () => {
|
|
79
73
|
const res = await request(profilePath);
|
|
80
|
-
const
|
|
81
|
-
const jsonLd = extractJsonLdFromHtml(html);
|
|
74
|
+
const jsonLd = await res.json();
|
|
82
75
|
|
|
83
76
|
assert.ok(jsonLd['storage'].endsWith('/webidtest/'), 'Storage should point to pod');
|
|
84
77
|
});
|
|
85
78
|
|
|
86
79
|
it('should have ldp:inbox', async () => {
|
|
87
80
|
const res = await request(profilePath);
|
|
88
|
-
const
|
|
89
|
-
const jsonLd = extractJsonLdFromHtml(html);
|
|
81
|
+
const jsonLd = await res.json();
|
|
90
82
|
|
|
91
83
|
assert.ok(jsonLd['inbox'].endsWith('/webidtest/inbox/'), 'Should have inbox');
|
|
92
84
|
});
|
|
93
85
|
|
|
94
86
|
it('should have mainEntityOfPage', async () => {
|
|
95
87
|
const res = await request(profilePath);
|
|
96
|
-
const
|
|
97
|
-
const jsonLd = extractJsonLdFromHtml(html);
|
|
88
|
+
const jsonLd = await res.json();
|
|
98
89
|
|
|
99
|
-
// Check for mainEntityOfPage which links to the profile document
|
|
100
90
|
assert.ok(jsonLd['mainEntityOfPage'], 'Should have mainEntityOfPage');
|
|
101
91
|
});
|
|
102
92
|
});
|
|
103
93
|
|
|
104
94
|
describe('WebID Resolution', () => {
|
|
95
|
+
const profilePath = '/webidtest/profile/card.jsonld';
|
|
96
|
+
|
|
105
97
|
it('should return LDP headers', async () => {
|
|
106
|
-
const res = await request(
|
|
98
|
+
const res = await request(profilePath);
|
|
107
99
|
|
|
108
100
|
assertHeaderContains(res, 'Link', 'ldp#Resource');
|
|
109
101
|
assertHeader(res, 'WAC-Allow');
|
|
110
102
|
});
|
|
111
103
|
|
|
112
104
|
it('should return CORS headers', async () => {
|
|
113
|
-
const res = await request(
|
|
105
|
+
const res = await request(profilePath, {
|
|
114
106
|
headers: { 'Origin': 'https://example.com' }
|
|
115
107
|
});
|
|
116
108
|
|