feat: Remove group and label and add identity and identityType (#38)

Author: krish221997

apps/event-system/services/event-links/schema/create.schema.ts

@@ -2,12 +2,6 @@ import { createSchema } from '@libs-private/generic-schema/create.schema';
 
 export const createLinkSchema = {
   ...createSchema,
-  label: {
-    type: 'string',
-  },
-  group: {
-    type: 'string',
-  },
   ttl: {
     type: 'number',
     default: 2 * 1000 * 60 * 60, // 2 hours

libs-private/service-logic/generators/embedTokens.ts

@@ -5,8 +5,6 @@ import {
 import { generateId } from '../service-helper';
 
 export const generateEmbedTokensRecord = async ({
-  label,
-  group,
   ttl,
   linkSettings,
   environment,
@@ -15,8 +13,6 @@ export const generateEmbedTokensRecord = async ({
   const sessionId = await generateId('session_id');
 
   return {
-    label,
-    group,
     linkSettings,
     createdAt: Date.now(),
     createdDate: new Date(),

libs-private/service-logic/generators/events/eventLink.ts

@@ -4,8 +4,8 @@ import { generateId } from '@libs-private/utils';
 
 export const generateEventLinkRecord = async ({
   version = '1.0.0_04.44_18-04-2023T10-33-00',
-  label,
-  group,
+  identity,
+  identityType,
   ttl,
   ownership,
   environment,
@@ -19,8 +19,8 @@ export const generateEventLinkRecord = async ({
     _type: 'event-link',
     version,
     ownership,
-    label,
-    group,
+    identity,
+    identityType,
     token: tokenId,
     createdAt: Date.now(),
     createdDate: new Date(),

libs-private/service-logic/services/authkit-demo/client/index.ts

@@ -33,8 +33,6 @@ export class EmbedToken {
 
   async create(payload: {
     version?: string;
-    label?: string;
-    group: string;
     ttl?: number;
   }) {
     const secret = this._clientInfo.secret;

libs-private/service-logic/services/authkit-demo/logic/link.api.ts

@@ -82,8 +82,6 @@ export const createEventLinkTokenApi = async (
       connectedPlatforms: connectedPlatformsFiltered ?? [],
       eventIncToken: linkData?.token,
     },
-    group: linkData?.group,
-    label: linkData?.label,
     environment: isLiveSecret ? 'live' : 'test',
     expiresAt: new Date().getTime() + 5 * 1000 * 60,
     sessionId,

libs-private/service-logic/services/authkit-demo/useAuthkitDemoService.ts

@@ -14,10 +14,6 @@ export const useAuthkitDemoService = () => {
       );
       try {
         const token = await embedToken.create({
-          group: `authkit-demo-group-${uuidv4()
-            .replace(/-/g, '')
-            .substring(0, 10)}`,
-          label: 'Demo connection',
           ttl: 2 * 1000 * 60 * 60,
         });
 

libs-private/service-logic/services/event-links/useEventLinksService.ts

@@ -47,21 +47,21 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
 
   return {
     async create({
-      label,
-      group,
+      identity,
+      identityType,
       ttl = 2 * 1000 * 60 * 60,
       environment = 'live',
       usageSource,
     }: CreateEventLinkPayload): Promise<
       BResult<EventLink, 'service', unknown>
     > {
       const link = await generateEventLinkRecord({
-        label,
-        group,
         ttl,
         ownership,
         environment,
         usageSource,
+        identity,
+        identityType,
       });
 
       return await _create<EventLink>('ln', link);
@@ -122,21 +122,6 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
           identity
         );
 
-        // Get the connection definition by id
-        const connectionDefinitions =
-          await makeHttpNetworkCall<ConnectionDefinitions>({
-            url: `${LIST_CONNECTION_DEFINITIONS_URL}?limit=100&skip=0&active=true`,
-            method: 'GET',
-          });
-        const { data } = matchResultAndHandleHttpError(
-          connectionDefinitions,
-          identity
-        );
-
-        const connectionDefinition = data?.rows?.find(
-          (row) => row?._id === connectionDefinitionId
-        );
-
         const connection = await makeHttpNetworkCall<ConnectionRecord>({
           url: CREATE_CONNECTION_URL,
           method: 'POST',
@@ -148,19 +133,9 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
           data: {
             active: true,
             connectionDefinitionId,
-            name: authFormData['NAME']
-              ? authFormData['NAME']
-              : link?.usageSource === 'user-dashboard'
-              ? `${connectionDefinition?.frontend?.spec?.title} sandbox account`
-              : link?.label,
             authFormData,
-            group: authFormData['NAME']
-              ? `${_.replace(
-                  authFormData['NAME'],
-                  /[^a-zA-Z0-9_]/g,
-                  '-'
-                ).toLowerCase()}-${uuidv4().replace(/-/g, '').substring(0, 10)}`
-              : link?.group,
+            identity: link?.identity,
+            identityType: link?.identityType,
           },
         });
 
@@ -244,21 +219,6 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
           identity
         );
 
-        // Get the connection definition by id
-        const connectionDefinitions =
-          await makeHttpNetworkCall<ConnectionDefinitions>({
-            url: `${LIST_CONNECTION_DEFINITIONS_URL}?limit=100&skip=0&active=true`,
-            method: 'GET',
-          });
-        const { data } = matchResultAndHandleHttpError(
-          connectionDefinitions,
-          identity
-        );
-
-        const connectionDefinition = data?.rows?.find(
-          (row) => row?._id === connectionDefinitionId
-        );
-
         let secret = headers['x-integrationos-secret'];
 
         if (!secret || secret === 'redacted') {
@@ -283,18 +243,8 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
             },
             type,
             connectionDefinitionId,
-            label: formData?.['NAME']
-              ? formData?.['NAME']
-              : link?.usageSource === 'user-dashboard'
-              ? `${connectionDefinition?.frontend?.spec?.title} sandbox account`
-              : link?.label,
-            group: formData?.['NAME']
-              ? `${_.replace(
-                  formData?.['NAME'] as string,
-                  /[^a-zA-Z0-9_]/g,
-                  '-'
-                ).toLowerCase()}-${uuidv4().replace(/-/g, '').substring(0, 10)}`
-              : link?.group,
+            identity: link?.identity,
+            identityType: link?.identityType,
           },
         });
 
@@ -349,8 +299,6 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
 
       // Generate a link record
       const link = await generateEventLinkRecord({
-        label: 'My Connection',
-        group: `connection-${uuidv4().replace(/-/g, '').substring(0, 10)}`,
         ttl: 2 * 1000 * 60 * 60,
         ownership: records?.rows?.[0]?.ownership,
         environment: headers['x-integrationos-secret'].startsWith('sk_test')
@@ -403,8 +351,6 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
           connectedPlatforms: connectedPlatforms ?? [],
           eventIncToken: linkToken?.token,
         },
-        group: linkToken?.group,
-        label: linkToken?.label,
         ttl: 5 * 60 * 1000,
         environment: headers['x-integrationos-secret'].startsWith('sk_test')
           ? 'test'
@@ -470,8 +416,6 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
 
       // Generate a link record
       const link = await generateEventLinkRecord({
-        label: 'My Connection',
-        group: `connection-${uuidv4().replace(/-/g, '').substring(0, 10)}`,
         ttl: 2 * 1000 * 60 * 60,
         ownership: records?.rows?.[0]?.ownership,
         environment: 'test',
@@ -522,8 +466,6 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
           connectedPlatforms: connectedPlatforms ?? [],
           eventIncToken: linkToken?.token,
         },
-        group: linkToken?.group,
-        label: linkToken?.label,
         ttl: 5 * 60 * 1000,
         environment: 'test',
         features: settings?.features,

packages/connections/src/apis/link.api.ts

@@ -86,8 +86,8 @@ export const createEventLinkTokenApi = async (
         connectedPlatforms: connectedPlatformsFiltered ?? [],
         eventIncToken: link?.data?.token,
       },
-      group: link?.data?.group,
-      label: link?.data?.label,
+      identity: link?.data?.identity,
+      identityType: link?.data?.identityType,
       environment: secret.startsWith('sk_test') ? 'test' : 'live',
       expiresAt: new Date().getTime() + 5 * 1000 * 60,
       sessionId,

packages/connections/src/client/index.ts

@@ -33,10 +33,9 @@ export class AuthKitToken {
   }
 
   async create(payload: {
-    version?: string;
-    label?: string;
-    group: string;
     ttl?: number;
+    identity?: string;
+    identityType?: "user" | "team" | "organization";
   }) {
     const secret = this._clientInfo.secret;
     const url = this._url;

packages/connections/src/types/index.d.ts

@@ -17,8 +17,8 @@ export interface EventLink {
   _id?: string;
   version: string;
   ownership: Ownership;
-  label: string;
-  group: string;
+  identity?: string;
+  identityType?: 'user' | 'team' | 'organization';
   token: string;
   createdAt: number;
   createdDate: Date;
@@ -31,11 +31,11 @@ export interface EventLink {
 
 export type CreateEventLinkPayload = {
   version?: string;
-  label?: string;
-  group: string;
   ttl?: number;
   environment?: string;
   usageSource?: string;
+  identity?: string;
+  identityType?: 'user' | 'team' | 'organization';
 };
 
 export interface ConnectionDefinition {
@@ -155,8 +155,6 @@ export interface EmbedTokenRecord {
     connectedPlatforms: Platform[];
     eventIncToken: string;
   };
-  label: string;
-  group: string;
   createdAt: number;
   createdDate: Date;
   updatedAt?: number;

packages/types/embed-tokens.ts

@@ -24,8 +24,8 @@ export interface EmbedTokensPayload {
     connectedPlatforms: Platform[];
     eventIncToken: string;
   };
-  group: string;
-  label: string;
+  identity?: string;
+  identityType?: 'user' | 'team' | 'organization';
   environment: string;
   ttl: number;
   sessionId: string;
@@ -38,8 +38,8 @@ export interface EmbedTokenRecord {
     eventIncToken: string;
   };
   features?: Feature[];
-  label: string;
-  group: string;
+  identity?: string;
+  identityType?: 'user' | 'team' | 'organization';
   createdAt: number;
   createdDate: Date;
   updatedAt?: number;

packages/types/links.ts

@@ -6,19 +6,19 @@ export interface AuthFormData {
 
 export type CreateEventLinkPayload = {
   version?: string;
-  label?: string;
-  group: string;
   ttl?: number;
   environment?: string;
   usageSource?: string;
+  identity?: string;
+  identityType?: 'user' | 'team' | 'organization';
 };
 
 export interface EventLink {
   _id?: string;
   version: string;
   ownership: Ownership;
-  label: string;
-  group: string;
+  identity?: string;
+  identityType?: 'user' | 'team' | 'organization';
   token: string;
   createdAt: number;
   createdDate: Date;