From 9c0c28e17e174dd5fd22d5910b0f9e3e6f36e00d Mon Sep 17 00:00:00 2001
From: Mohammed S <shoaib@push.org>
Date: Fri, 12 Apr 2024 17:09:44 +0530
Subject: [PATCH] 1223 return id for push api and stream init (#1226)

* fix: added instanceids for push user and stream

* fix: review comments
---
 packages/restapi/src/lib/pushapi/PushAPI.ts       | 6 +++---
 packages/restapi/src/lib/pushstream/PushStream.ts | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/restapi/src/lib/pushapi/PushAPI.ts b/packages/restapi/src/lib/pushapi/PushAPI.ts
index 29675894b..6165b77fb 100644
--- a/packages/restapi/src/lib/pushapi/PushAPI.ts
+++ b/packages/restapi/src/lib/pushapi/PushAPI.ts
@@ -45,7 +45,7 @@ export class PushAPI {
   // Notification
   public channel!: Channel;
   public notification!: Notification;
-  public pushUserInstanceId: string;
+  public uid: string;
   // error object to maintain errors and warnings
   public errors: { type: 'WARN' | 'ERROR'; message: string }[];
 
@@ -71,7 +71,7 @@ export class PushAPI {
     // Instantiate the notification classes
     this.channel = new Channel(this.signer, this.env, this.account);
     this.notification = new Notification(this.signer, this.env, this.account);
-    this.pushUserInstanceId = uuidv4();
+    this.uid = uuidv4();
     this.cache = cache;
 
     // Initialize the instances of the four classes
@@ -315,7 +315,7 @@ export class PushAPI {
     this.pgpPublicKey = newUser.publicKey;
     this.readMode = false;
     this.errors = [];
-
+    this.uid = uuidv4(); 
     // Initialize the instances of the four classes
     this.chat = new Chat(
       this.account,
diff --git a/packages/restapi/src/lib/pushstream/PushStream.ts b/packages/restapi/src/lib/pushstream/PushStream.ts
index 988ecab80..7f2863d2d 100644
--- a/packages/restapi/src/lib/pushstream/PushStream.ts
+++ b/packages/restapi/src/lib/pushstream/PushStream.ts
@@ -28,7 +28,7 @@ export class PushStream extends EventEmitter {
   private chatInstance: Chat;
   private listen: STREAM[];
   private disconnected: boolean;
-  public streamInstanceId: string;
+  public uid: string;
   constructor(
     account: string,
     private _listen: STREAM[],
@@ -45,7 +45,7 @@ export class PushStream extends EventEmitter {
     this.options = options;
     this.listen = _listen;
     this.disconnected = false;
-    this.streamInstanceId = uuidv4(); 
+    this.uid = uuidv4(); 
     this.chatInstance = new Chat(
       this.account,
       this.options.env as ENV,
@@ -102,6 +102,7 @@ export class PushStream extends EventEmitter {
     listen: STREAM[],
     newOptions: PushStreamInitializeProps
   ): Promise<void> {
+    this.uid = uuidv4(); 
     this.listen = listen;
     this.options = { ...this.options, ...newOptions };
     await this.disconnect();