More work on API permissions

backend/src/data/AllowedGuilds.ts

@@ -9,6 +9,7 @@ import {
 } from "typeorm";
 import { BaseGuildRepository } from "./BaseGuildRepository";
 import { BaseRepository } from "./BaseRepository";
+import { ApiPermissionTypes } from "./ApiPermissionAssignments";
 
 export class AllowedGuilds extends BaseRepository {
   private allowedGuilds: Repository<AllowedGuild>;
@@ -33,8 +34,8 @@ export class AllowedGuilds extends BaseRepository {
       .innerJoin(
         "api_permissions",
         "api_permissions",
-        "api_permissions.guild_id = allowed_guilds.id AND api_permissions.user_id = :userId",
-        { userId },
+        "api_permissions.guild_id = allowed_guilds.id AND api_permissions.type = :type AND api_permissions.target_id = :userId",
+        { type: ApiPermissionTypes.User, userId },
       )
       .getMany();
   }

backend/src/data/ApiPermissionAssignments.ts

@@ -0,0 +1,36 @@
+import { getRepository, Repository } from "typeorm";
+import { ApiPermissionAssignment } from "./entities/ApiPermissionAssignment";
+import { BaseRepository } from "./BaseRepository";
+
+export enum ApiPermissionTypes {
+  User = "USER",
+  Role = "ROLE",
+}
+
+export class ApiPermissionAssignments extends BaseRepository {
+  private apiPermissions: Repository<ApiPermissionAssignment>;
+
+  constructor() {
+    super();
+    this.apiPermissions = getRepository(ApiPermissionAssignment);
+  }
+
+  getByUserId(userId) {
+    return this.apiPermissions.find({
+      where: {
+        type: ApiPermissionTypes.User,
+        target_id: userId,
+      },
+    });
+  }
+
+  getByGuildAndUserId(guildId, userId) {
+    return this.apiPermissions.findOne({
+      where: {
+        guild_id: guildId,
+        type: ApiPermissionTypes.User,
+        target_id: userId,
+      },
+    });
+  }
+}

backend/src/data/ApiPermissions.ts

@@ -1,29 +0,0 @@
-import { getRepository, Repository } from "typeorm";
-import { ApiPermission } from "./entities/ApiPermission";
-import { BaseRepository } from "./BaseRepository";
-
-export class ApiPermissions extends BaseRepository {
-  private apiPermissions: Repository<ApiPermission>;
-
-  constructor() {
-    super();
-    this.apiPermissions = getRepository(ApiPermission);
-  }
-
-  getByUserId(userId) {
-    return this.apiPermissions.find({
-      where: {
-        user_id: userId,
-      },
-    });
-  }
-
-  getByGuildAndUserId(guildId, userId) {
-    return this.apiPermissions.findOne({
-      where: {
-        guild_id: guildId,
-        user_id: userId,
-      },
-    });
-  }
-}

backend/src/data/ApiRoles.ts

@@ -1,6 +0,0 @@
-export enum ApiRoles {
-  Viewer = 1,
-  Editor,
-  Manager,
-  ServerOwner,
-}

backend/src/data/entities/ApiPermissionAssignment.ts

@@ -2,19 +2,23 @@ import { Entity, Column, PrimaryColumn, ManyToOne, JoinColumn } from "typeorm";
 import { ApiUserInfo } from "./ApiUserInfo";
 
 @Entity("api_permissions")
-export class ApiPermission {
+export class ApiPermissionAssignment {
   @Column()
   @PrimaryColumn()
   guild_id: string;
 
   @Column()
   @PrimaryColumn()
-  user_id: string;
+  type: string;
 
   @Column()
-  role: string;
+  @PrimaryColumn()
+  target_id: string;
 
-  @ManyToOne(type => ApiUserInfo, userInfo => userInfo.permissions)
-  @JoinColumn({ name: "user_id" })
+  @Column("simple-array")
+  permissions: string[];
+
+  @ManyToOne(type => ApiUserInfo, userInfo => userInfo.permissionAssignments)
+  @JoinColumn({ name: "target_id" })
   userInfo: ApiUserInfo;
 }

backend/src/data/entities/ApiUserInfo.ts

@@ -1,6 +1,6 @@
 import { Entity, Column, PrimaryColumn, OneToMany } from "typeorm";
 import { ApiLogin } from "./ApiLogin";
-import { ApiPermission } from "./ApiPermission";
+import { ApiPermissionAssignment } from "./ApiPermissionAssignment";
 
 export interface ApiUserInfoData {
   username: string;
@@ -23,6 +23,6 @@ export class ApiUserInfo {
   @OneToMany(type => ApiLogin, login => login.userInfo)
   logins: ApiLogin[];
 
-  @OneToMany(type => ApiPermission, perm => perm.userInfo)
-  permissions: ApiPermission[];
+  @OneToMany(type => ApiPermissionAssignment, p => p.userInfo)
+  permissionAssignments: ApiPermissionAssignment[];
 }