Update dev login flow for UVDSL

Author: SharonStrats

dev/index.js

@@ -14,14 +14,26 @@ if (loginBanner) {
 }
 
 async function finishLogin () {
-  await logic.authn.checkUser()
+  const me = await logic.authn.checkUser()
   const session = logic.authSession
-  const isLoggedIn = session?.info?.isLoggedIn ?? session?.isActive ?? Boolean(session?.webId)
-  if (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 = ''
+    }
   }
 }
 

jest.config.mjs

@@ -6,14 +6,7 @@ export default {
       customExportConditions: ['node']
   },
   setupFilesAfterEnv: ["./test/helpers/jest.setup.js"],
-<<<<<<< HEAD
-  transform: {
-    '^.+\\.m?js$': 'babel-jest',
-  },
-  transformIgnorePatterns: ['node_modules/(?!.*(?:@uvdsl|uuid|@noble|lit-html|lit-element|lit|@lit|@lit-labs|solid-ui|solid-logic)(?:/|$))'],
-=======
   transformIgnorePatterns: ["/node_modules/(?!(@lit|@lit-labs|lit|lit-html|lit-element)/).+\\.js$"],
->>>>>>> cac3f76 (#171 First pass refactor to match new design)
   roots: ['<rootDir>/src', '<rootDir>/test'],
   moduleNameMapper: {
     '^SolidLogic$': 'solid-logic',