Merge branch 'develop' into master

kjetilk · web-flow · commit 3390a7dfab97 · 2018-09-04T12:01:06.000+02:00
diff --git a/default-templates/new-account/index.html b/default-templates/new-account/index.html
@@ -58,76 +58,25 @@ <h1>Data</h1>
     <div class="col-md-12">
       <h1>Apps</h1>
       <div class="list-group">
-        <a href="https://databox.me/apps/friends/" target="_blank" class="list-group-item">
-          <span class="lead">Friends</span>
-        </a>
-        <a href="https://github.com/solid/solid-apps" target="_blank" class="list-group-item">
-          <span class="lead">More Apps</span>
+        <a href="https://github.com/solid/userguide" target="_blank" class="list-group-item">
+          <span class="lead">Getting started with Solid and Data Browser</span>
         </a>
       </div>
     </div>
   </section>
-  <footer>| <a target="_blank" href="https://github.com/solid/userguide">Getting started with solid and data browser</a> |</footer>
 </div>
-</body>
 <script src="/common/js/solid-auth-client.bundle.js"></script>
 <script type="text/javascript">
-  const popupUri = window.location.origin + '/common/popup.html'
-  const stateData = {
-    session: null
-  }
-  const state = new Proxy(stateData, {
-    set: (obj, prop, value) => {
-      obj[prop] = value
-      render()
-    }
-  })
-
-  function main() {
-    // Render the session state
-    SolidAuthClient
-      .currentSession()
-      .then(saveSession)
-      .then(render)
-
-    // Add event listeners
-    const actionButton = sessionActionButton()
-    actionButton.addEventListener('click', takeSessionAction)
-  }
-
-  function saveSession(session) {
-    state.session = session
-    return session
-  }
+  const button = document.getElementById('session-action')
+  let loggedIn = false
 
-  function takeSessionAction() {
-    const { session } = state
-    const loggedIn = !!session
-    if (loggedIn) {
-      SolidAuthClient
-        .logout()
-        .then(saveSession)
-    } else {
-      SolidAuthClient
-        .popupLogin({ popupUri })
-        .then(saveSession)
-    }
-  }
-
-  function render() {
-    const { session } = state
-    const actionButton = sessionActionButton()
-    if (!session) {
-      actionButton.innerText = 'Log in'
-    } else {
-      actionButton.innerText = 'Log out'
-    }
-  }
-
-  function sessionActionButton() {
-    return document.getElementById('session-action')
-  }
+  solid.auth.trackSession(session => {
+    loggedIn = !!session
+    button.innerText = loggedIn ? 'Log out' : 'Log in'
+  })
 
-  document.addEventListener('DOMContentLoaded', main)
+  button.addEventListener('click', () =>
+    loggedIn ? solid.auth.logout() : solid.auth.popupLogin())
 </script>
+</body>
 </html>
diff --git a/default-views/auth/login-required.hbs b/default-views/auth/login-required.hbs
@@ -5,7 +5,6 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Log in</title>
   <link rel="stylesheet" href="/common/css/bootstrap.min.css">
-  <script src="/common/js/solid-auth-client.bundle.js"></script>
 </head>
 <body>
 <div class="container">
@@ -20,17 +19,16 @@
     <button class="btn btn-primary" onclick="register()">Register</button>
   </div>
 </div>
+<script src="/common/js/solid-auth-client.bundle.js"></script>
 <script>
   async function login() {
-    // Log in through the popup
-    const popupUri = '/common/popup.html'
-    const session = await SolidAuthClient.popupLogin({ popupUri })
+    const session = await solid.auth.popupLogin()
     if (session) {
       // Make authenticated request to the server to establish a session cookie
-      const { status } = await SolidAuthClient.fetch(location)
+      const { status } = await solid.auth.fetch(location)
       if (status === 401) {
         alert(`Invalid login.\n\nDid you set ${session.idp} as your OIDC provider in your profile ${session.webId}?`);
-        await SolidAuthClient.logout();
+        await solid.auth.logout()
       }
       // Now that we have a cookie, reload to display the authenticated page
       location.reload()
diff --git a/lib/api/authn/webid-oidc.js b/lib/api/authn/webid-oidc.js
@@ -94,6 +94,9 @@ function middleware (oidc) {
     ['/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'))
 
   // Initialize the OIDC Identity Provider routes/api
   // router.get('/.well-known/openid-configuration', discover.bind(provider))
diff --git a/package-lock.json b/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,9 @@ function middleware (oidc) {`
`94`	`94`	`['/common/js/', 'solid-auth-client/dist-lib/solid-auth-client.bundle.js.map']`
`95`	`95`	`]`
`96`	`96`	`authAssets.map(([path, file]) => routeResolvedFile(router, path, file))`
	`97`	`+ // Redirect for .well-known login popup location`
	`98`	`+ router.get('/.well-known/solid/login',`
	`99`	`+ (req, res) => res.redirect('/common/popup.html'))`
`97`	`100`
`98`	`101`	`// Initialize the OIDC Identity Provider routes/api`
`99`	`102`	`// router.get('/.well-known/openid-configuration', discover.bind(provider))`