Skip to content

Commit bd2212d

Browse files
committed
add missing function and typed authSession
1 parent f146f97 commit bd2212d

1 file changed

Lines changed: 9 additions & 11 deletions

File tree

src/design-system/lib/auth/SolidAuth.ts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ export default class SolidAuth implements AuthContext {
2727
constructor (public signupUrl: string = DEFAULT_SIGNUP_URL) {}
2828

2929
get account (): Account | null {
30-
const sessionAny = authSession as any
31-
const webId: string | undefined = sessionAny.webId ?? sessionAny.info?.webId
32-
const isActive: boolean = sessionAny.isActive ?? sessionAny.info?.isLoggedIn ?? Boolean(webId)
30+
const webId: string | undefined = authSession.webId ?? authSession.info?.webId
31+
const isActive: boolean = authSession.isActive ?? authSession.info?.isLoggedIn ?? Boolean(webId)
3332
if (!isActive || !webId) {
3433
return null
3534
}
@@ -59,7 +58,7 @@ export default class SolidAuth implements AuthContext {
5958

6059
locationUrl.hash = ''
6160

62-
await (authSession as any).login(loginUrl, locationUrl.href)
61+
await authSession.login(loginUrl, locationUrl.href)
6362
}
6463

6564
async signup () {
@@ -72,25 +71,24 @@ export default class SolidAuth implements AuthContext {
7271

7372
onSessionUpdated (callback: () => unknown) {
7473
const sessionEventTarget = authSession as unknown as EventTarget
75-
const sessionAny = authSession as any
7674
const listener = () => {
7775
callback()
7876
}
7977
if (typeof sessionEventTarget.addEventListener === 'function') {
8078
sessionEventTarget.addEventListener('sessionStateChange', listener)
8179
} else {
82-
sessionAny.events.on('login', callback)
83-
sessionAny.events.on('logout', callback)
84-
sessionAny.events.on('sessionRestore', callback)
80+
authSession.events.on('login', callback)
81+
authSession.events.on('logout', callback)
82+
authSession.events.on('sessionRestore', callback)
8583
}
8684

8785
return () => {
8886
if (typeof sessionEventTarget.removeEventListener === 'function') {
8987
sessionEventTarget.removeEventListener('sessionStateChange', listener)
9088
} else {
91-
sessionAny.events.off('login', callback)
92-
sessionAny.events.off('logout', callback)
93-
sessionAny.events.off('sessionRestore', callback)
89+
authSession.events.off('login', callback)
90+
authSession.events.off('logout', callback)
91+
authSession.events.off('sessionRestore', callback)
9492
}
9593
}
9694
}

0 commit comments

Comments
 (0)