update dev to UVDSL

Author: Alain Bourgeois

dev/index.js

@@ -1,22 +1,39 @@
 import * as logic from 'solid-logic'
-import pane from '../src/SourcePane'
+import pane from '../src/sourcePane'
 import './dev-global.css'
 import * as $rdf from 'rdflib'
 import * as UI from 'solid-ui'
 
+console.log('dev/index.js loaded, pane is:', pane)
+
 const loginBanner = document.getElementById('loginBanner')
 const webId = document.getElementById('webId')
 
-loginBanner.appendChild(UI.login.loginStatusBox(document, null, {}))
+if (loginBanner) {
+  loginBanner.appendChild(UI.login.loginStatusBox(document, null, {}))
+}
 
 async function finishLogin () {
-  await logic.authSession.handleIncomingRedirect()
+  const me = await logic.authn.checkUser()
   const session = logic.authSession
-  if (session.info.isLoggedIn) {
-    // Update the page with the status.
-    webId.innerHTML = 'Logged in as: ' + logic.authn.currentUser().uri
+  const sessionWebId = session?.webId ?? session?.info?.webId ?? null
+  const meWebId = me?.uri ?? me?.value ?? null
+  const webIdUri = meWebId ?? sessionWebId
+  const isLoggedIn = Boolean(
+    me ||
+    session?.isActive ||
+    session?.info?.isLoggedIn ||
+    sessionWebId
+  )
+
+  if (isLoggedIn && webIdUri) {
+    if (webId) {
+      webId.innerHTML = 'Logged in as: ' + webIdUri
+    }
   } else {
-    webId.innerHTML = ''
+    if (webId) {
+      webId.innerHTML = ''
+    }
   }
 }