Bump to v0.0.18 - Fix mashlib browser login and RDF content types

melvincarvalho · melvincarvalho · commit 50ea82dbfa57 · 2025-12-27T14:44:50.000+01:00
- Add RDF file extensions to content type detection (.ttl, .n3, .nt, .rdf, .nq, .trig)
- Update isRdfContentType() to recognize all RDF MIME types
- Fix IdP login to do proper HTTP redirects for browsers while keeping JSON response for CTH
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "javascript-solid-server",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "description": "A minimal, fast Solid server",
   "main": "src/index.js",
   "type": "module",
diff --git a/src/idp/interactions.js b/src/idp/interactions.js
@@ -118,20 +118,22 @@ export async function handleLogin(request, reply, provider) {
 
     request.log.info({ accountId: account.id, uid }, 'Login successful');
 
-    // For CTH compatibility, we need to return a response that CTH can handle.
-    // CTH expects either:
-    // 1. A redirect it can follow (but Java HttpClient follows to final destination which fails)
-    // 2. A 200 response with "location" in body (CSS v3+ style)
-    //
-    // We use interactionResult to get the redirect URL, then save it and return JSON
-
-    // Save the login result to the interaction for programmatic clients
-    // This allows the auth endpoint to continue the flow when resumed
+    // Detect if this is a browser (wants HTML/redirect) or programmatic client (wants JSON)
+    const acceptHeader = request.headers.accept || '';
+    const wantsBrowserRedirect = acceptHeader.includes('text/html') && !acceptHeader.includes('application/json');
+
+    // Save the login result to the interaction
     interaction.result = result;
     await interaction.save(interaction.exp - Math.floor(Date.now() / 1000));
 
-    // For CTH and programmatic clients: use interactionFinished with hijacked response
-    // to properly complete the interaction while returning JSON
+    // For browsers (mashlib, etc): do a proper HTTP redirect
+    if (wantsBrowserRedirect) {
+      reply.hijack();
+      return provider.interactionFinished(request.raw, reply.raw, result, { mergeWithLastSubmission: false });
+    }
+
+    // For CTH and programmatic clients: return JSON with location
+    // CTH expects a 200 response with "location" in body (CSS v3+ style)
     try {
       reply.hijack();
 
@@ -188,7 +190,6 @@ export async function handleLogin(request, reply, provider) {
       request.log.warn({ err: err.message, errName: err.name, uid }, 'interactionFinished failed, using fallback');
 
       // Fallback: return the redirect URL for manual following
-      // The interaction result is already saved above
       const redirectTo = `/idp/auth/${uid}`;
       return reply
         .code(200)
diff --git a/src/utils/url.js b/src/utils/url.js
@@ -120,7 +120,13 @@ export function getContentType(filePath) {
     '.jpeg': 'image/jpeg',
     '.gif': 'image/gif',
     '.svg': 'image/svg+xml',
-    '.pdf': 'application/pdf'
+    '.pdf': 'application/pdf',
+    '.ttl': 'text/turtle',
+    '.n3': 'text/n3',
+    '.nt': 'application/n-triples',
+    '.rdf': 'application/rdf+xml',
+    '.nq': 'application/n-quads',
+    '.trig': 'application/trig'
   };
   return types[ext] || 'application/octet-stream';
 }
@@ -131,5 +137,15 @@ export function getContentType(filePath) {
  * @returns {boolean}
  */
 export function isRdfContentType(contentType) {
-  return contentType === 'application/ld+json' || contentType === 'application/json';
+  const rdfTypes = [
+    'application/ld+json',
+    'application/json',
+    'text/turtle',
+    'text/n3',
+    'application/n-triples',
+    'application/rdf+xml',
+    'application/n-quads',
+    'application/trig'
+  ];
+  return rdfTypes.includes(contentType);
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "javascript-solid-server",`
`3`		`- "version": "0.0.17",`
	`3`	`+ "version": "0.0.18",`
`4`	`4`	`"description": "A minimal, fast Solid server",`
`5`	`5`	`"main": "src/index.js",`
`6`	`6`	`"type": "module",`