summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorJoseph Ditton <jditton.atomic@gmail.com>2022-01-07 10:19:34 -0700
committerJoseph Ditton <jditton.atomic@gmail.com>2022-01-07 10:19:34 -0700
commitde84113066c27d88922285bd431b4968cf565a68 (patch)
tree9e093003d73e00b5ab0ddf3519633a6eb5d9d7e8 /server
parent5d9cf51c10f4477a107229f1d4f7fd0b1b89c893 (diff)
downloadlocchat-de84113066c27d88922285bd431b4968cf565a68.tar.gz
locchat-de84113066c27d88922285bd431b4968cf565a68.zip
adds context id to role and role helpers
Diffstat (limited to 'server')
-rw-r--r--server/database/migrations/1641570023672-AddContextIdToUserRole.ts18
-rw-r--r--server/entities/user_role.entity.ts3
-rw-r--r--server/providers/services/users.service.ts38
3 files changed, 59 insertions, 0 deletions
diff --git a/server/database/migrations/1641570023672-AddContextIdToUserRole.ts b/server/database/migrations/1641570023672-AddContextIdToUserRole.ts
new file mode 100644
index 0000000..921c679
--- /dev/null
+++ b/server/database/migrations/1641570023672-AddContextIdToUserRole.ts
@@ -0,0 +1,18 @@
+import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
+
+export class AddContextIdToUserRole1641570023672 implements MigrationInterface {
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.addColumn(
+ 'user_role',
+ new TableColumn({
+ name: 'contextId',
+ type: 'text',
+ default: "'root'", // default values must include single quotes for text
+ }),
+ );
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.dropColumn('user_role', 'contextId');
+ }
+}
diff --git a/server/entities/user_role.entity.ts b/server/entities/user_role.entity.ts
index e680a3a..230a7ec 100644
--- a/server/entities/user_role.entity.ts
+++ b/server/entities/user_role.entity.ts
@@ -13,6 +13,9 @@ export class UserRole {
@Column()
userId: number;
+ @Column()
+ contextId: string;
+
@ManyToOne(() => Role, (role) => role.userRoles)
role: Role;
diff --git a/server/providers/services/users.service.ts b/server/providers/services/users.service.ts
index c3ee086..2bb752a 100644
--- a/server/providers/services/users.service.ts
+++ b/server/providers/services/users.service.ts
@@ -3,12 +3,19 @@ import { InjectRepository } from '@nestjs/typeorm';
import { Repository } from 'typeorm';
import * as bcrypt from 'bcrypt';
import { User } from '../../entities/user.entity';
+import { Role, RoleKey } from 'server/entities/role.entity';
+import { UserRole } from 'server/entities/user_role.entity';
+import { intersection, isEmpty } from 'lodash';
@Injectable()
export class UsersService {
constructor(
@InjectRepository(User)
private usersRespository: Repository<User>,
+ @InjectRepository(UserRole)
+ private userRolesRepository: Repository<UserRole>,
+ @InjectRepository(Role)
+ private rolesRepository: Repository<Role>,
) {}
findAll(relations: string[] = []) {
@@ -33,4 +40,35 @@ export class UsersService {
const verified: boolean = await bcrypt.compare(password, user.passwordHash);
return { verified, user: verified ? user : null };
}
+
+ addUserToRoleInContext(userId: number, contextId: string, ...roleKeys: RoleKey[]) {
+ return Promise.all(
+ roleKeys.map(async (key) => {
+ const role = await this.rolesRepository.findOne({ key });
+ const userRole = new UserRole();
+ userRole.userId = userId;
+ userRole.contextId = contextId;
+ userRole.role = role;
+ await this.userRolesRepository.save(userRole);
+ }),
+ );
+ }
+
+ addUserToRootRole(userId: number, ...roleKeys: RoleKey[]) {
+ return this.addUserToRoleInContext(userId, 'root', ...roleKeys);
+ }
+
+ // if multiple roles are passed then will return true if user has any of the listed roles.
+ async hasRoleInContext(userId: number, contextId: string, ...roleKeys: RoleKey[]) {
+ const userRoles = await this.userRolesRepository.find({
+ where: { userId, contextId },
+ relations: ['role'],
+ });
+ const usersRoleKeys = userRoles.map((userRole) => userRole.role.key);
+ return !isEmpty(intersection(roleKeys, usersRoleKeys));
+ }
+
+ async hasRootRole(userId: number, ...roleKeys: RoleKey[]) {
+ return this.hasRoleInContext(userId, 'root', ...roleKeys);
+ }
}