Merge branch 'master' into theming-v2

Author: szuperaz

projects/stream-chat-angular/package.json

@@ -9,8 +9,8 @@
     "url": "https://github.com/GetStream/stream-chat-angular.git"
   },
   "peerDependencies": {
-    "@angular/common": "^12.2.0 || ^13.0.0",
-    "@angular/core": "^12.2.0 || ^13.0.0",
+    "@angular/common": "^12.2.0 || ^13.0.0 || ^14.0.0",
+    "@angular/core": "^12.2.0 || ^13.0.0 || ^14.0.0",
     "@ngx-translate/core": "^13.0.0 || ^14.0.0",
     "stream-chat": "^6.4.0"
   },

projects/stream-chat-angular/src/lib/chat-client.service.spec.ts

@@ -2,7 +2,11 @@ import { TestBed } from '@angular/core/testing';
 import { Event, OwnUserResponse, StreamChat } from 'stream-chat';
 import { version } from '../assets/version';
 import { ChatClientService } from './chat-client.service';
-import { mockStreamChatClient, MockStreamChatClient } from './mocks';
+import {
+  mockCurrentUser,
+  mockStreamChatClient,
+  MockStreamChatClient,
+} from './mocks';
 import { NotificationService } from './notification.service';
 import { DefaultStreamChatGenerics } from './types';
 
@@ -29,8 +33,11 @@ describe('ChatClientService', () => {
     expect(StreamChat.getInstance).toHaveBeenCalledWith(apiKey);
     const spy = jasmine.createSpy();
     service.appSettings$.subscribe(spy);
+    const userSpy = jasmine.createSpy();
+    service.user$.subscribe(userSpy);
 
     expect(spy).toHaveBeenCalledWith(undefined);
+    expect(userSpy).toHaveBeenCalledWith(mockCurrentUser());
   });
 
   it(`should notify if connection wasn't successful`, async () => {
@@ -67,6 +74,9 @@ describe('ChatClientService', () => {
     service.pendingInvites$.subscribe(pendingInvitesSpy);
     pendingInvitesSpy.calls.reset();
     eventsSpy.calls.reset();
+    const userSpy = jasmine.createSpy();
+    service.user$.subscribe(userSpy);
+    userSpy.calls.reset();
     await service.disconnectUser();
     const event = {
       id: 'mockevent',
@@ -77,6 +87,7 @@ describe('ChatClientService', () => {
     expect(mockChatClient.disconnectUser).toHaveBeenCalledWith();
     expect(pendingInvitesSpy).toHaveBeenCalledWith([]);
     expect(eventsSpy).not.toHaveBeenCalled();
+    expect(userSpy).toHaveBeenCalledWith(undefined);
   });
 
   it('should init with user meta data', async () => {

projects/stream-chat-angular/src/lib/chat-client.service.ts

@@ -53,6 +53,10 @@ export class ChatClientService<
    * Emits the list of pending invites of the user. It emits every pending invitation during initialization and then extends the list when a new invite is received. More information can be found in the [channel invitations](../code-examples/channel-invites.mdx) guide.
    */
   pendingInvites$: Observable<(ChannelResponse<T> | Channel<T>)[]>;
+  /**
+   * Emits the current chat user
+   */
+  user$: Observable<UserResponse<T> | undefined>;
   private notificationSubject = new ReplaySubject<ClientEvent<T>>(1);
   private connectionStateSubject = new ReplaySubject<'offline' | 'online'>(1);
   private appSettingsSubject = new BehaviorSubject<AppSettings | undefined>(
@@ -61,6 +65,7 @@ export class ChatClientService<
   private pendingInvitesSubject = new BehaviorSubject<
     (ChannelResponse<T> | Channel<T>)[]
   >([]);
+  private userSubject = new ReplaySubject<UserResponse<T> | undefined>(1);
   private subscriptions: { unsubscribe: () => void }[] = [];
 
   constructor(
@@ -71,6 +76,7 @@ export class ChatClientService<
     this.connectionState$ = this.connectionStateSubject.asObservable();
     this.appSettings$ = this.appSettingsSubject.asObservable();
     this.pendingInvites$ = this.pendingInvitesSubject.asObservable();
+    this.user$ = this.userSubject.asObservable();
   }
 
   /**
@@ -101,6 +107,7 @@ export class ChatClientService<
       this.chatClient.setUserAgent(
         `stream-chat-angular-${version}-${this.chatClient.getUserAgent()}`
       );
+      this.userSubject.next(this.chatClient.user);
     });
     const channels = await this.chatClient.queryChannels(
       { invite: 'pending' } as any as ChannelFilters<T>, // TODO: find out why we need this typecast
@@ -146,6 +153,7 @@ export class ChatClientService<
   async disconnectUser() {
     this.pendingInvitesSubject.next([]);
     await this.chatClient.disconnectUser();
+    this.userSubject.next(undefined);
     this.subscriptions.forEach((s) => s.unsubscribe());
   }