Skip to content

Commit 30368e7

Browse files
Merge pull request JavaScriptSolidServer#147 from JavaScriptSolidServer/issue-143-handleunauthorized-mashlib-module
Fix handleUnauthorized serving old mashlib when mashlibModule configured
2 parents 4d6498f + 9e5f535 commit 30368e7

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

src/auth/middleware.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { checkAccess, getRequiredMode } from '../wac/checker.js';
99
import { AccessMode } from '../wac/parser.js';
1010
import * as storage from '../storage/filesystem.js';
1111
import { getEffectiveUrlPath } from '../utils/url.js';
12-
import { generateDatabrowserHtml, generateSolidosUiHtml } from '../mashlib/index.js';
12+
import { generateDatabrowserHtml, generateModuleDatabrowserHtml, generateSolidosUiHtml } from '../mashlib/index.js';
1313

1414
/**
1515
* Build a resource URL for WAC checking, normalizing path-based pod access
@@ -148,10 +148,12 @@ export function handleUnauthorized(request, reply, isAuthenticated, wacAllow, au
148148
// If mashlib is enabled, serve mashlib instead of static error page
149149
// Mashlib has built-in login functionality via panes.runDataBrowser()
150150
if (request.mashlibEnabled) {
151-
// Use SolidOS UI if enabled, otherwise fallback to classic mashlib
151+
// Use SolidOS UI if enabled, ES module if configured, otherwise classic mashlib
152152
const html = request.solidosUiEnabled
153153
? generateSolidosUiHtml()
154-
: generateDatabrowserHtml(request.url, request.mashlibCdn ? request.mashlibVersion : null);
154+
: request.mashlibModule
155+
? generateModuleDatabrowserHtml(request.mashlibModule)
156+
: generateDatabrowserHtml(request.url, request.mashlibCdn ? request.mashlibVersion : null);
155157
return reply.code(statusCode).type('text/html').send(html);
156158
}
157159
return reply.code(statusCode).type('text/html').send(getErrorPage(statusCode, isAuthenticated, request));

0 commit comments

Comments
 (0)