Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/login/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1047,10 +1047,15 @@ export function newAppInstance (
* and/or a developer
*/
export async function getUserRoles (): Promise<Array<NamedNode>> {
const currentUser = authn.currentUser()
if (!currentUser) {
return []
}

try {
const { me, preferencesFile, preferencesFileError } = await ensureLoadedPreferences({})
const { me, preferencesFile, preferencesFileError } = await ensureLoadedPreferences({ me: currentUser })
if (!preferencesFile || preferencesFileError) {
throw new Error(preferencesFileError)
throw new Error(preferencesFileError || 'Unable to load user preferences file.')
}
return solidLogicSingleton.store.each(
me,
Expand Down
26 changes: 26 additions & 0 deletions test/unit/login/login.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,29 @@ describe('ensureLoggedIn', () => {
expect(testLogin.ensureLoggedIn({})).toBeInstanceOf(Object)
})
})

describe('getUserRoles', () => {
afterEach(() => {
jest.restoreAllMocks()
jest.resetModules()
})

it('returns [] and does not load preferences when current user is missing', async () => {
const solidLogic = require('solid-logic')

const currentUserSpy = jest
.spyOn(solidLogic.authn, 'currentUser')
.mockReturnValue(null)
const loadPreferencesSpy = jest.spyOn(
solidLogic.solidLogicSingleton.profile,
'loadPreferences'
)

const loginModule = require('../../../src/login/login')
const roles = await loginModule.getUserRoles()

expect(currentUserSpy).toHaveBeenCalled()
expect(roles).toEqual([])
expect(loadPreferencesSpy).not.toHaveBeenCalled()
})
})
Loading