_id <-> id

RocketChat · Aug 4, 2023 · e3b1c5a · e3b1c5a
1 parent b5b96f9
commit e3b1c5a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/definition/accessors/IRoleRead.ts b/src/definition/accessors/IRoleRead.ts
@@ -12,7 +12,7 @@ export interface IRoleRead {
  * @returns null if no role is found.
  * @throws If there is an error while retrieving the role.
  */
- getOneByIdOrName(idOrName: IRole['_id'] | IRole['name'], appId: string): Promise<IRole | null>;
+ getOneByIdOrName(idOrName: IRole['id'] | IRole['name'], appId: string): Promise<IRole | null>;
 
  /**
  * Retrieves all custom roles.

diff --git a/src/definition/roles/IRole.ts b/src/definition/roles/IRole.ts
@@ -4,5 +4,5 @@ export interface IRole {
  name: string;
  protected: boolean;
  scope: 'Users' | 'Subscriptions';
- _id: string;
+ id: string;
 }
diff --git a/src/server/accessors/RoleRead.ts b/src/server/accessors/RoleRead.ts
@@ -5,7 +5,7 @@ import { RoleBridge } from '../bridges';
 export class RoleRead implements IRoleRead {
  constructor(private roleBridge: RoleBridge, private appId: string) {}
 
- public getOneByIdOrName(idOrName: IRole['_id'] | IRole['name']): Promise<IRole | null> {
+ public getOneByIdOrName(idOrName: IRole['id'] | IRole['name']): Promise<IRole | null> {
  return this.roleBridge.doGetOneByIdOrName(idOrName, this.appId);
  }
 

diff --git a/src/server/bridges/RoleBridge.ts b/src/server/bridges/RoleBridge.ts
@@ -5,7 +5,7 @@ import { AppPermissions } from '../permissions/AppPermissions';
 import { BaseBridge } from './BaseBridge';
 
 export abstract class RoleBridge extends BaseBridge {
- public async doGetOneByIdOrName(idOrName: IRole['_id'] | IRole['name'], appId: string): Promise<IRole | null> {
+ public async doGetOneByIdOrName(idOrName: IRole['id'] | IRole['name'], appId: string): Promise<IRole | null> {
  if (this.hasReadPermission(appId)) {
  return this.getOneByIdOrName(idOrName, appId);
  }
@@ -17,7 +17,7 @@ export abstract class RoleBridge extends BaseBridge {
  }
  }
 
- protected abstract getOneByIdOrName(idOrName: IRole['_id'] | IRole['name'], appId: string): Promise<IRole | null>;
+ protected abstract getOneByIdOrName(idOrName: IRole['id'] | IRole['name'], appId: string): Promise<IRole | null>;
  protected abstract getCustomRoles(appId: string): Promise<Array<IRole>>;
 
  private hasReadPermission(appId: string): boolean {

diff --git a/tests/test-data/bridges/roleBridge.ts b/tests/test-data/bridges/roleBridge.ts
@@ -2,7 +2,7 @@ import { IRole } from '../../../src/definition/roles';
 import { RoleBridge } from '../../../src/server/bridges';
 
 export class TestsRoleBridge extends RoleBridge {
- public getOneByIdOrName(idOrName: IRole['_id'] | IRole['name'], appId: string): Promise<IRole | null> {
+ public getOneByIdOrName(idOrName: IRole['id'] | IRole['name'], appId: string): Promise<IRole | null> {
  throw new Error('Method not implemented.');
  }