From d8721937c8179e7d3e68fb390bd6d5bd4f6f147f Mon Sep 17 00:00:00 2001
From: Zeeshan Akram <97m.zeeshan@gmail.com>
Date: Tue, 11 Jun 2024 18:18:01 +0500
Subject: [PATCH] rename joystreamAccount to joystreamAccountId in
 'AccountData' graphql type

---
 src/auth-server/handlers/changeAccount.ts               | 2 --
 src/server-extension/resolvers/AccountResolver/index.ts | 8 +++++---
 src/server-extension/resolvers/AccountResolver/types.ts | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/auth-server/handlers/changeAccount.ts b/src/auth-server/handlers/changeAccount.ts
index 6e1d689f4..a13f9f66d 100644
--- a/src/auth-server/handlers/changeAccount.ts
+++ b/src/auth-server/handlers/changeAccount.ts
@@ -54,8 +54,6 @@ export const changeAccount: (
         { joystreamAccountId: payload.joystreamAccountId }
       )
 
-      console.log('after update')
-
       // Remove the old encryption artifacts
       await em.delete(EncryptionArtifacts, { accountId: account.id })
 
diff --git a/src/server-extension/resolvers/AccountResolver/index.ts b/src/server-extension/resolvers/AccountResolver/index.ts
index feef93feb..c286d5442 100644
--- a/src/server-extension/resolvers/AccountResolver/index.ts
+++ b/src/server-extension/resolvers/AccountResolver/index.ts
@@ -31,7 +31,7 @@ export class AccountResolver {
     const account = ctx.account
     const em = await this.em()
     assert(account, 'Unexpected context: account is not set')
-    const { id, email, joystreamAccount, notificationPreferences } = account
+    const { id, email, joystreamAccountId, notificationPreferences } = account
     let followedChannels: FollowedChannel[] = []
     if (
       info.fieldNodes[0].selectionSet?.selections.some(
@@ -44,7 +44,7 @@ export class AccountResolver {
     return {
       id,
       email,
-      joystreamAccount,
+      joystreamAccountId,
       followedChannels,
       preferences: notificationPreferences,
     }
@@ -123,7 +123,9 @@ export class AccountResolver {
         throw new Error(
           `Failed to create membership through faucet for account address: ${
             params.address
-          }, error: ${error.response?.data?.error || error.cause || error.code}`
+          }, error: ${
+            error.response?.data?.error || error.cause || error.code
+          }, faucet address: ${url}`
         )
       }
       throw error
diff --git a/src/server-extension/resolvers/AccountResolver/types.ts b/src/server-extension/resolvers/AccountResolver/types.ts
index 8769a2ec0..ab5c767b7 100644
--- a/src/server-extension/resolvers/AccountResolver/types.ts
+++ b/src/server-extension/resolvers/AccountResolver/types.ts
@@ -1,6 +1,5 @@
 import { IsUrl } from 'class-validator'
 import { ArgsType, Field, ObjectType } from 'type-graphql'
-import { BlockchainAccount } from '../../../model'
 import { AccountNotificationPreferencesOutput } from '../NotificationResolver/types'
 
 @ObjectType()
@@ -21,7 +20,7 @@ export class AccountData {
   email!: string
 
   @Field(() => String, { nullable: false })
-  joystreamAccount!: BlockchainAccount
+  joystreamAccountId!: string
 
   @Field(() => [FollowedChannel], { nullable: false })
   followedChannels: FollowedChannel[]