fix: regular users are not API users

src/lib/middleware/rbac-middleware.ts

@@ -5,7 +5,6 @@ import {
     DELETE_FEATURE,
     ADMIN,
 } from '../types/permissions';
-import ApiUser from '../types/api-user';
 import { IUnleashConfig } from '../types/option';
 import { IUnleashStores } from '../types/stores';
 import User from '../types/user';

src/lib/routes/admin-api/api-token-controller.ts

@@ -14,7 +14,6 @@ import { AccessService } from '../../services/access-service';
 import { IAuthRequest } from '../unleash-types';
 import User from '../../types/user';
 import { IUnleashConfig } from '../../types/option';
-import ApiUser from '../../types/api-user';
 
 interface IServices {
     apiTokenService: ApiTokenService;
@@ -40,8 +39,8 @@ class ApiTokenController extends Controller {
         this.delete('/:token', this.deleteApiToken, DELETE_API_TOKEN);
     }
 
-    private async isTokenAdmin(user: User | ApiUser) {
+    private async isTokenAdmin(user: User) {
-        if (user instanceof ApiUser) {
+        if (user.isAPI) {
             return user.permissions.includes(ADMIN);
         }
 

src/lib/services/access-service.ts

@@ -148,6 +148,9 @@ export class AccessService {
     }
 
     async getPermissionsForUser(user: User): Promise<IUserPermission[]> {
+        if (user.isAPI) {
+            return [];
+        }
         return this.store.getPermissionsForUser(user.id);
     }
 

src/lib/types/user.ts

@@ -22,6 +22,8 @@ export interface IUser {
 }
 
 export default class User implements IUser {
+    isAPI: boolean = false;
+
     id: number;
 
     name: string;