Skip to content

Commit 8acc371

Browse files
authored
Merge pull request #222 from SolidOS/fixDev
fix dev login to match new authn
2 parents c3f247a + 5af6ee3 commit 8acc371

4 files changed

Lines changed: 1426 additions & 1219 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ on:
77
push:
88
branches:
99
- main
10+
- staging
1011
pull_request:
1112
branches:
1213
- main
14+
- staging
1315
workflow_dispatch:
1416

1517
jobs:

dev/index.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ const webId = document.getElementById('webId')
1111
loginBanner.appendChild(UI.login.loginStatusBox(document, null, {}))
1212

1313
async function finishLogin () {
14-
await authSession.handleIncomingRedirect()
14+
await authn.checkUser()
1515
const session = authSession
16-
if (session.info.isLoggedIn) {
16+
const isLoggedIn = session?.info?.isLoggedIn ?? session?.isActive ?? Boolean(session?.webId)
17+
if (isLoggedIn) {
1718
// Update the page with the status.
1819
webId.textContent = 'Logged in as: ' + authn.currentUser().uri
1920
} else {

0 commit comments

Comments
 (0)