Skip to content
This repository has been archived by the owner on Sep 12, 2023. It is now read-only.

Commit

Permalink
fix(server): specify the relationships to include
Browse files Browse the repository at this point in the history
  • Loading branch information
KennethTrecy committed Sep 15, 2022
1 parent 198e704 commit b706afa
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion components/resource_management/resource_manager.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe("UI Component: Resource Manager", () => {
"props": {
"resource": sampleUserList
},
"shallow": true,
"shallow": true
})

const filters = wrapper.find(".filters")
Expand Down
2 changes: 1 addition & 1 deletion components/resource_management/resource_manager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function usersResourceEnsurer(resourceItem: any): resourceItem is DeserializedUs
return deserializedResourceItem.type === "user"
}
const isResourceTypeUser = computed(() => (resource.some(usersResourceEnsurer)))
const isResourceTypeUser = computed(() => resource.some(usersResourceEnsurer))
const managerKind = inject("managerKind") as Manager
</script>
2 changes: 1 addition & 1 deletion server/middlewares/common_middleware_list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function makeList() {
UPDATE_ANYONE_ON_OWN_DEPARTMENT,
UPDATE_ANYONE_ON_ALL_DEPARTMENTS
], (request: AuthenticatedRequest) => {
const currentUser = deserialize(request.user) as DeserializedUserDocument
const currentUser = deserialize(request.user) as DeserializedUserDocument<"roles">
const roles = currentUser.data.roles.data
const hasWidePermission = user.hasOneRoleAllowed(
roles,
Expand Down
2 changes: 1 addition & 1 deletion server/policies/belongs_to_current_user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default class <
throw new AuthorizationError("Resource ID should be provided.")
}

const user = deserialize(request.user) as DeserializedUserProfile
const user = deserialize(request.user) as DeserializedUserProfile<"roles">
const manager = new this.Class(request)
if (!await manager.isModelBelongsTo(
Number(request.params.id),
Expand Down
2 changes: 1 addition & 1 deletion server/policies/permission-based.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export default class <
async authorize(request: V): Promise<void> {
await super.authorize(request)

const user = deserialize(request.user) as DeserializedUserDocument
const user = deserialize(request.user) as DeserializedUserDocument<"roles">
const roles = user.data.roles.data as unknown as T[]
const isPermitted = this.permissionGroup.hasOneRoleAllowed(roles, this.permissionCombinations)

Expand Down
2 changes: 1 addition & 1 deletion server/policies/scope-based.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default class <
}

async checkLimitation(request: V): Promise<void> {
const user = deserialize(request.user) as DeserializedUserDocument
const user = deserialize(request.user) as DeserializedUserDocument<"roles">
const roles = user.data.roles.data as unknown as T[]
const hasPublicPermission = this.permissionGroup.hasOneRoleAllowed(
roles,
Expand Down
2 changes: 1 addition & 1 deletion server/validators/manager/does_belong_to_user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default async function(
throw makeDeveloperError(constraints.field)
}

const userProfile = deserialize(constraints.request.user) as DeserializedUserProfile
const userProfile = deserialize(constraints.request.user) as DeserializedUserProfile<"roles">
const manager = new constraints.manager.className(constraints.request)

const userID = Number(userProfile.data.id)
Expand Down

0 comments on commit b706afa

Please sign in to comment.