Merge alpha 0.0.5 to master #54

Merged
niggl merged 292 commits from dev into main 2020-12-23 17:05:35 +00:00
2 changed files with 7 additions and 2 deletions
Showing only changes of commit d742ccd581 - Show all commits

View File

@ -104,6 +104,11 @@ export class JwtUser {
for (let permission of user.permissions) {
returnPermissions.push(permission.toString());
}
return returnPermissions;
for (let group of user.groups) {
for (let permission of group.permissions) {
returnPermissions.push(permission.toString());
}
}
return Array.from(new Set(returnPermissions));
}
}

View File

@ -12,7 +12,7 @@ import { PermissionTarget } from '../models/enums/PermissionTargets';
export default class SeedUsers implements Seeder {
public async run(factory: Factory, connection: Connection): Promise<any> {
let adminGroup: UserGroup = await this.createAdminGroup(connection);
let demouser = await this.createUser(connection, adminGroup.id);
await this.createUser(connection, adminGroup.id);
await this.createPermissions(connection, adminGroup.id);
}