javascript-solid-server 0.0.33 → 0.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "javascript-solid-server",
-  "version": "0.0.33",
+  "version": "0.0.34",
   "description": "A minimal, fast Solid server",
   "main": "src/index.js",
   "type": "module",

package/src/auth/middleware.js

@@ -28,6 +28,11 @@ export async function authorize(request, reply) {
   // Get WebID from token (supports both simple and Solid-OIDC tokens)
   const { webId, error: authError } = await getWebIdFromRequestAsync(request);
 
+  // Log auth failures for debugging
+  if (authError) {
+    request.log.warn({ authError, method, urlPath, hasAuth: !!request.headers.authorization }, 'Auth error');
+  }
+
   // Get effective storage path (includes pod name in subdomain mode)
   const storagePath = getEffectiveUrlPath(request);
 

package/src/auth/solid-oidc.js

@@ -89,16 +89,19 @@ export async function verifySolidOidc(request) {
   } catch (err) {
     // Handle specific JWT errors
     if (err.code === 'ERR_JWT_EXPIRED') {
+      console.error('Solid-OIDC: Access token expired');
       return { webId: null, error: 'Access token expired' };
     }
     if (err.code === 'ERR_JWS_SIGNATURE_VERIFICATION_FAILED') {
+      console.error('Solid-OIDC: Invalid token signature');
       return { webId: null, error: 'Invalid token signature' };
     }
     if (err.code === 'ERR_JWKS_NO_MATCHING_KEY') {
+      console.error('Solid-OIDC: No matching key found in JWKS');
       return { webId: null, error: 'No matching key found in JWKS' };
     }
 
-    console.error('Solid-OIDC verification error:', err.message);
+    console.error('Solid-OIDC verification error:', err.code, err.message);
     return { webId: null, error: 'Token verification failed' };
   }
 }
@@ -177,8 +180,8 @@ async function verifyDpopProof(dpopProof, request, accessToken) {
     return { thumbprint, error: null };
 
   } catch (err) {
-    console.error('DPoP verification error:', err.message);
-    return { thumbprint: null, error: 'Invalid DPoP proof' };
+    console.error('DPoP verification error:', err.code, err.message);
+    return { thumbprint: null, error: 'Invalid DPoP proof: ' + err.message };
   }
 }
 

package/src/handlers/container.js

@@ -132,27 +132,28 @@ export async function createPodStructure(name, webId, podUri, issuer) {
   const podPath = `/${name}/`;
 
   // Create pod directory structure
+  // Uses 'Settings' (capital S) for mashlib compatibility
   await storage.createContainer(podPath);
   await storage.createContainer(`${podPath}inbox/`);
   await storage.createContainer(`${podPath}public/`);
   await storage.createContainer(`${podPath}private/`);
-  await storage.createContainer(`${podPath}settings/`);
+  await storage.createContainer(`${podPath}Settings/`);
   await storage.createContainer(`${podPath}profile/`);
 
   // Generate and write WebID profile at /profile/card (standard Solid location)
   const profileHtml = generateProfile({ webId, name, podUri, issuer });
   await storage.write(`${podPath}profile/card`, profileHtml);
 
-  // Generate and write preferences
+  // Generate and write preferences (mashlib-compatible paths)
   const prefs = generatePreferences({ webId, podUri });
-  await storage.write(`${podPath}settings/prefs`, serialize(prefs));
+  await storage.write(`${podPath}Settings/Preferences.ttl`, serialize(prefs));
 
-  // Generate and write type indexes
-  const publicTypeIndex = generateTypeIndex(`${podUri}settings/publicTypeIndex`);
-  await storage.write(`${podPath}settings/publicTypeIndex`, serialize(publicTypeIndex));
+  // Generate and write type indexes with .ttl extension for mashlib
+  const publicTypeIndex = generateTypeIndex(`${podUri}Settings/publicTypeIndex.ttl`);
+  await storage.write(`${podPath}Settings/publicTypeIndex.ttl`, serialize(publicTypeIndex));
 
-  const privateTypeIndex = generateTypeIndex(`${podUri}settings/privateTypeIndex`);
-  await storage.write(`${podPath}settings/privateTypeIndex`, serialize(privateTypeIndex));
+  const privateTypeIndex = generateTypeIndex(`${podUri}Settings/privateTypeIndex.ttl`);
+  await storage.write(`${podPath}Settings/privateTypeIndex.ttl`, serialize(privateTypeIndex));
 
   // Create default ACL files
   // Pod root: owner full control, public read
@@ -164,8 +165,8 @@ export async function createPodStructure(name, webId, podUri, issuer) {
   await storage.write(`${podPath}private/.acl`, serializeAcl(privateAcl));
 
   // Settings folder: owner only
-  const settingsAcl = generatePrivateAcl(`${podUri}settings/`, webId);
-  await storage.write(`${podPath}settings/.acl`, serializeAcl(settingsAcl));
+  const settingsAcl = generatePrivateAcl(`${podUri}Settings/`, webId);
+  await storage.write(`${podPath}Settings/.acl`, serializeAcl(settingsAcl));
 
   // Inbox: owner full, public append
   const inboxAcl = generateInboxAcl(`${podUri}inbox/`, webId);

package/src/webid/profile.js

@@ -34,6 +34,8 @@ export function generateProfileJsonLd({ webId, name, podUri, issuer }) {
       'storage': { '@id': 'pim:storage', '@type': '@id' },
       'oidcIssuer': { '@id': 'solid:oidcIssuer', '@type': '@id' },
       'preferencesFile': { '@id': 'pim:preferencesFile', '@type': '@id' },
+      'publicTypeIndex': { '@id': 'solid:publicTypeIndex', '@type': '@id' },
+      'privateTypeIndex': { '@id': 'solid:privateTypeIndex', '@type': '@id' },
       'mainEntityOfPage': { '@id': 'schema:mainEntityOfPage', '@type': '@id' }
     },
     '@id': webId,
@@ -43,7 +45,9 @@ export function generateProfileJsonLd({ webId, name, podUri, issuer }) {
     'inbox': `${pod}inbox/`,
     'storage': pod,
     'oidcIssuer': issuer,
-    'preferencesFile': `${pod}settings/prefs`
+    'preferencesFile': `${pod}Settings/Preferences.ttl`,
+    'publicTypeIndex': `${pod}Settings/publicTypeIndex.ttl`,
+    'privateTypeIndex': `${pod}Settings/privateTypeIndex.ttl`
   };
 }
 
@@ -129,6 +133,7 @@ function escapeHtml(str) {
 
 /**
  * Generate preferences file as JSON-LD
+ * Uses mashlib-compatible paths (Settings/Preferences.ttl)
  * @param {object} options
  * @param {string} options.webId - Full WebID URI
  * @param {string} options.podUri - Pod root URI
@@ -144,9 +149,9 @@ export function generatePreferences({ webId, podUri }) {
       'publicTypeIndex': { '@id': 'solid:publicTypeIndex', '@type': '@id' },
       'privateTypeIndex': { '@id': 'solid:privateTypeIndex', '@type': '@id' }
     },
-    '@id': `${pod}settings/prefs`,
-    'publicTypeIndex': `${pod}settings/publicTypeIndex`,
-    'privateTypeIndex': `${pod}settings/privateTypeIndex`
+    '@id': `${pod}Settings/Preferences.ttl`,
+    'publicTypeIndex': `${pod}Settings/publicTypeIndex.ttl`,
+    'privateTypeIndex': `${pod}Settings/privateTypeIndex.ttl`
   };
 }