Merge pull request #872 from solid/fix/safari-login

Make login work on Safari

Author: kjetilk

lib/api/authn/webid-oidc.js

@@ -90,14 +90,12 @@ function middleware (oidc) {
 
   // Static assets related to authentication
   const authAssets = [
+    ['/.well-known/solid/login/', '../static/popup-redirect.html', false],
     ['/common/', 'solid-auth-client/dist-popup/popup.html'],
     ['/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js'],
     ['/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js.map']
   ]
-  authAssets.map(([path, file]) => routeResolvedFile(router, path, file))
-  // Redirect for .well-known login popup location
-  router.get('/.well-known/solid/login',
-    (req, res) => res.redirect('/common/popup.html'))
+  authAssets.map(args => routeResolvedFile(router, ...args))
 
   // Initialize the OIDC Identity Provider routes/api
   // router.get('/.well-known/openid-configuration', discover.bind(provider))

lib/utils.js

@@ -234,8 +234,8 @@ function reqToPath (req) {
 /**
  * Adds a route that serves a static file from another Node module
  */
-function routeResolvedFile (router, path, file) {
-  const fullPath = path + file.match(/[^/]+$/)
+function routeResolvedFile (router, path, file, appendFileName = true) {
+  const fullPath = appendFileName ? path + file.match(/[^/]+$/) : path
   const fullFile = require.resolve(file)
   router.get(fullPath, (req, res) => res.sendFile(fullFile))
 }

package-lock.json

@@ -61,7 +61,7 @@
     "ip-range-check": "0.0.2",
     "is-ip": "^2.0.0",
     "li": "^1.0.1",
-    "mashlib": "^0.7.14",
+    "mashlib": "^0.7.15",
     "mime-types": "^2.1.11",
     "negotiator": "^0.6.0",
     "node-fetch": "^2.1.2",
@@ -72,7 +72,7 @@
     "rdflib": "^0.17.1",
     "recursive-readdir": "^2.1.0",
     "rimraf": "^2.5.0",
-    "solid-auth-client": "^2.2.8",
+    "solid-auth-client": "^2.2.9",
     "solid-namespace": "^0.1.0",
     "solid-permissions": "^0.6.0",
     "solid-ws": "^0.2.3",

package.json

@@ -0,0 +1 @@
+<script>location.replace(`/common/popup.html${location.hash}`)</script>