From 774c423125cc85935a3accadfd0b9571104b494c Mon Sep 17 00:00:00 2001
From: Jakob <haruhunab1320@gmail.com>
Date: Thu, 18 Jul 2024 11:31:29 -0700
Subject: [PATCH] refactor: Update CredentialManager constructor to accept
 worldId and agentId as parameters

---
 .../credentialsManager/credentialsManager.ts  | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/server/agents-v2/src/lib/services/credentialsManager/credentialsManager.ts b/packages/server/agents-v2/src/lib/services/credentialsManager/credentialsManager.ts
index c1252bf4ed..5f63f7d4f6 100644
--- a/packages/server/agents-v2/src/lib/services/credentialsManager/credentialsManager.ts
+++ b/packages/server/agents-v2/src/lib/services/credentialsManager/credentialsManager.ts
@@ -8,12 +8,12 @@ import { decrypt, encrypt } from '@magickml/credentials'
 import { CREDENTIALS_ENCRYPTION_KEY } from '@magickml/server-config'
 
 export class CredentialManager implements ICredentialManager {
-  protected projectId: string
+  protected worldId: string
   protected agentId: string
   protected cachedCredentials: CredentialKeyValuePair[] = []
 
-  constructor(agentId: string, projectId: string) {
-    this.projectId = projectId
+  constructor({ worldId, agentId }: { worldId: string; agentId: string }) {
+    this.worldId = worldId
     this.agentId = agentId
   }
 
@@ -39,7 +39,7 @@ export class CredentialManager implements ICredentialManager {
         where: {
           agentId: this.agentId,
           credentials: {
-            projectId: this.projectId,
+            worldId: this.worldId,
           },
         },
         include: {
@@ -82,7 +82,7 @@ export class CredentialManager implements ICredentialManager {
         agentId: this.agentId,
         credentials: {
           credentialType: 'custom',
-          projectId: this.projectId,
+          worldId: this.worldId,
           name,
         },
       },
@@ -108,7 +108,7 @@ export class CredentialManager implements ICredentialManager {
       where: {
         name: credential.name,
         serviceType: credential?.serviceType,
-        projectId: this.projectId,
+        worldId: this.worldId,
       },
     })
 
@@ -121,7 +121,8 @@ export class CredentialManager implements ICredentialManager {
         name: credential.name,
         value: encrypt(credential.value, CREDENTIALS_ENCRYPTION_KEY),
         serviceType: credential.serviceType,
-        projectId: this.projectId,
+        worldId: this.worldId,
+        projectId: '',
         credentialType: credential.credentialType,
         description: credential.description,
       },
@@ -143,7 +144,7 @@ export class CredentialManager implements ICredentialManager {
       where: {
         name: credential.name,
         serviceType: credential?.serviceType,
-        projectId: this.projectId,
+        worldId: this.worldId,
       },
     })
 
@@ -172,7 +173,7 @@ export class CredentialManager implements ICredentialManager {
           agentId: this.agentId,
           credentials: {
             name: name as string,
-            projectId: this.projectId,
+            worldId: this.worldId,
           },
         },
       })
@@ -181,7 +182,7 @@ export class CredentialManager implements ICredentialManager {
       await prismaCore.credentials.deleteMany({
         where: {
           name: name as string,
-          projectId: this.projectId,
+          worldId: this.worldId,
         },
       })