unifying M2M types

Author: LuizFNJ

server/chat-bot/chat-bot.machine.ts

@@ -1,7 +1,6 @@
 import { createMachine, interpret } from "xstate";
 import * as actions from "./chat-bot-actions";
 import { VerificationRequestStateMachineService } from "../verification-request/state-machine/verification-request.state-machine.service";
-import { M2M } from "../entities/m2m.entity";
 
 export interface ChatBotContext {
     verificationRequest: string;
@@ -15,7 +14,7 @@ export const createChatBotMachine = (
     verificationRequestStateMachineService: VerificationRequestStateMachineService,
     value?,
     context?,
-    M2MUser?: M2M,
+    M2MUser?,
 ) => {
     const chatBotMachine = createMachine<ChatBotContext>(
         {

server/chat-bot/chat-bot.service.ts

@@ -8,6 +8,7 @@ import { ConfigService } from "@nestjs/config";
 import { ChatBotStateService } from "../chat-bot-state/chat-bot-state.service";
 import { VerificationRequestStateMachineService } from "../verification-request/state-machine/verification-request.state-machine.service";
 import { Roles } from "../auth/ability/ability.factory";
+import { M2M } from "../entities/m2m.entity";
 
 const diacriticsRegex = /[\u0300-\u036f]/g;
 const MESSAGE_MAP = {
@@ -23,7 +24,7 @@ interface ChatBotContext {
     sourceChannel?: string;
 }
 
-function M2MUser(clientId) {
+function M2MUser(clientId): M2M {
   return {
     isM2M: true,
     clientId,

server/entities/m2m.entity.ts

@@ -1,7 +1,11 @@
+import { Roles } from "../auth/ability/ability.factory";
 export class M2M {
-    isM2M: boolean;
-    role: {
-        main: string;
-    };
-    scopes: string[];
+  isM2M: boolean;
+  clientId: string;
+  subject: string;
+  scopes: string[];
+  role: {
+    main: Roles.Integration;
+  };
+  namespace: string;
 }

server/history/types/history.interfaces.ts

@@ -1,4 +1,4 @@
-import { Roles } from "../../auth/ability/ability.factory";
+import { M2M } from "../../entities/m2m.entity";
 import { HistoryType, TargetModel } from "../schema/history.schema";
 import { Types } from "mongoose";
 
@@ -33,16 +33,6 @@ interface HistoryItem {
 }
 
 type PerformedBy = Types.ObjectId[] | M2M | string | null;
-interface M2M {
-  isM2M: boolean;
-  clientId: string;
-  subject: string;
-  scopes: string[];
-  role: {
-    main: Roles.Integration;
-  };
-  namespace: string;
-}
 interface HistoryDetails {
   after: AfterAndBeforeType;
   before?: AfterAndBeforeType | null;

src/types/User.ts

@@ -12,10 +12,12 @@ export type User = {
 };
 
 export class M2M {
-    isM2M: boolean;
-    subject: string;
-    role: {
-        main: string;
-    };
-    scopes: string[];
+  isM2M: boolean;
+  clientId: string;
+  subject: string;
+  scopes: string[];
+  role: {
+    main: Roles.Integration;
+  };
+  namespace: string;
 }

src/types/enums.ts

@@ -16,6 +16,7 @@ enum Roles {
     Reviewer = "reviewer",
     Admin = "admin",
     SuperAdmin = "super-admin",
+    Integration = "integration",
 }
 
 enum Status {