Skip to content

Commit c59efc0

Browse files
authored
v3.1.2 Merge pull request #786 from SolidOS/fix/login
#785 fix login redirect
2 parents f5627c6 + 80f5a10 commit c59efc0

3 files changed

Lines changed: 7 additions & 17 deletions

File tree

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "solid-ui",
3-
"version": "3.1.1",
3+
"version": "3.1.2",
44
"description": "UI library for Solid applications",
55
"main": "dist/solid-ui.js",
66
"types": "dist/index.d.ts",

src/login/login.ts

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ export async function ensureLoadedPreferences (
162162
} else {
163163
throw new Error(`(via loadPrefs) ${err}`)
164164
}
165+
166+
context.preferencesFileError = m2
165167
}
166168
return context
167169
}
@@ -1047,22 +1049,10 @@ export function newAppInstance (
10471049
* and/or a developer
10481050
*/
10491051
export async function getUserRoles (): Promise<Array<NamedNode>> {
1050-
const sessionInfo = authSession.info
1051-
if (!sessionInfo?.isLoggedIn || !sessionInfo?.webId) {
1052-
return []
1053-
}
1054-
1055-
const currentUser = authn.currentUser()
1056-
if (!currentUser) {
1057-
return []
1058-
}
1059-
10601052
try {
1061-
const { me, preferencesFile, preferencesFileError } = await ensureLoadedPreferences({
1062-
me: currentUser
1063-
})
1053+
const { me, preferencesFile, preferencesFileError } = await ensureLoadedPreferences({})
10641054
if (!preferencesFile || preferencesFileError) {
1065-
throw new Error(preferencesFileError || 'Unable to load user preferences file.')
1055+
throw new Error(preferencesFileError)
10661056
}
10671057
return solidLogicSingleton.store.each(
10681058
me,

0 commit comments

Comments
 (0)