Skip to content

Avoid throwing error when user school is undefined #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtreinik merged 2 commits into from
Aug 21, 2026
Merged

Avoid throwing error when user school is undefined #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
793e5bd
Avoid throwing error when user school is undefined
mtreinik Aug 21, 2026
22344d8
Avoid throwing error when user schools is undefined
mtreinik Aug 21, 2026
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
16 changes: 16 additions & 0 deletions packages/user-management/__tests__/permissions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,22 @@ describe('Permissions', () => {
assert.equal(isPrincipal(testCaseUser, { schoolId: user.schools[1].schoolId }), false)
})

test('check if principal with undefined school', () => {
const invalidTestCaseUser1 = { ...modifyUser(user, 0, [], true), schools: [...user.schools, undefined] }
// @ts-expect-error testing with invalid data in user schools
assert.equal(isPrincipal(invalidTestCaseUser1, { schoolId: user.schools[0].schoolId }), false)

const invalidTestCaseUser2 = { ...modifyUser(user, 0, [], true), schools: [...user.schools, undefined] }
// @ts-expect-error testing with invalid data in user schools
assert.equal(isPrincipal(invalidTestCaseUser2, { schoolId: undefined }), false)
})

test.only('check if principal with undefined schools', () => {
const invalidTestCaseUser1 = { ...modifyUser(user, 0, [], true), schools: undefined }
// @ts-expect-error testing with invalid data in user schools
assert.equal(isPrincipal(invalidTestCaseUser1, { schoolId: user.schools[0].schoolId }), false)
})

test('check if a user has a permission in given school', () => {
const testCaseUser = modifyUser(user, 0, ['observations'])
assert.equal(hasPermission(testCaseUser, 'observations', { schoolId: testCaseUser.schools[0].schoolId }), true)
Expand Down
10 changes: 7 additions & 3 deletions packages/user-management/src/user-checks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
import { applicationPermissions, AppPerm, Perm, PermissionGrant, PermissionOptions, User, UserSchool } from './index'

function userSchools(user: User, options?: PermissionOptions): UserSchool[] {
return options?.schoolId ? user.schools.filter(school => school.schoolId === options.schoolId) : user.schools
return user.schools
? options?.schoolId
? user.schools.filter(school => school?.schoolId === options.schoolId)
: user.schools
: []
}

export function userPermissionGrants(user: User, options?: PermissionOptions): PermissionGrant[] {
return userSchools(user, options).flatMap(school => school.permissions)
return userSchools(user, options).flatMap(school => school?.permissions ?? [])
}

export function userPermissions(user: User, options?: PermissionOptions): Perm[] {
return userPermissionGrants(user, options).map(grant => grant.permission)
}

export function isPrincipal(user: User, options?: PermissionOptions): boolean {
return userSchools(user, options).find(school => school.principal) !== undefined
return userSchools(user, options).find(school => school?.principal) !== undefined
}

export function hasPermission(user: User, requiredPermission: Perm | '*', options?: PermissionOptions): boolean {
Expand Down