fix: type definition of user object for ws auth (#1003)

Update user type def for WS auth, based on https://getstream.slack.com/archives/C022N8JNQGZ/p1693212159363949?thread_ts=1693160079.067939&cid=C022N8JNQGZ
GetStream · Aug 29, 2023 · e0ed3d1 · e0ed3d1
1 parent c9624cd
commit e0ed3d1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/packages/client/src/coordinator/connection/types.ts b/packages/client/src/coordinator/connection/types.ts
@@ -5,9 +5,9 @@ import { ConnectedEvent, UserRequest, VideoEvent } from '../../gen/coordinator';
 export type UR = Record<string, unknown>;
 
 export type User =
-  | (UserRequest & { type?: 'authenticated' })
-  | (UserRequest & { type: 'guest' })
-  | (Omit<UserRequest, 'id'> & {
+  | (Omit<UserRequest, 'role'> & { type?: 'authenticated' })
+  | (Omit<UserRequest, 'role'> & { type: 'guest' })
+  | (Omit<UserRequest, 'id' | 'role'> & {
       id?: '!anon';
       type: 'anonymous';
     });

diff --git a/sample-apps/react/livestream-app/src/hooks/useInitVideoClient.ts b/sample-apps/react/livestream-app/src/hooks/useInitVideoClient.ts
@@ -10,12 +10,10 @@ const tokenProviderUrl = import.meta.env.VITE_TOKEN_PROVIDER_URL as string;
 
 type VideoClientProviderProps = {
   isAnon?: boolean;
-  role?: string;
 };
 
 export const useInitVideoClient = ({
   isAnon,
-  role,
 }: PropsWithChildren<VideoClientProviderProps>) => {
   const { callId } = useParams<{ callId: string }>();
   const { api_key, token, type } = getURLCredentials();
@@ -48,7 +46,7 @@ export const useInitVideoClient = ({
       apiKey,
       ...((isAnon || !token) && { tokenProvider }),
       ...(!isAnon && { token }),
-      user: isAnon ? { type: 'anonymous' } : role ? { ...user, role } : user,
+      user: isAnon ? { type: 'anonymous' } : user,
     });
     setClient(_client);
 

diff --git a/sample-apps/react/livestream-app/src/hosts/Hosts.tsx b/sample-apps/react/livestream-app/src/hosts/Hosts.tsx
@@ -3,7 +3,7 @@ import { Outlet } from 'react-router-dom';
 import { useInitVideoClient } from '../hooks/useInitVideoClient';
 
 export const Hosts = () => {
-  const client = useInitVideoClient({ role: 'host' });
+  const client = useInitVideoClient({});
 
   if (!client) {
     return null;

diff --git a/sample-apps/react/livestream-app/src/viewers/Viewers.tsx b/sample-apps/react/livestream-app/src/viewers/Viewers.tsx
@@ -12,7 +12,7 @@ import { ErrorPanel, LoadingPanel } from '../LoadingState';
 
 export const Viewers = () => {
   const { callId } = useParams<{ callId?: string }>();
-  const client = useInitVideoClient({ role: 'user' });
+  const client = useInitVideoClient({});
 
   if (!client) {
     return null;

diff --git a/sample-apps/react/react-video-demo/src/components/LobbyPanel/LobbyPanel.data.ts b/sample-apps/react/react-video-demo/src/components/LobbyPanel/LobbyPanel.data.ts
@@ -5,7 +5,6 @@ export const KichinSink: Props = {
   user: {
     id: '123213',
     name: 'Kichin Sink',
-    role: 'role',
     teams: ['team'],
     image: '',
   },

diff --git a/sample-apps/react/react-video-demo/src/components/Views/LobbyView/LobbyView.data.ts b/sample-apps/react/react-video-demo/src/components/Views/LobbyView/LobbyView.data.ts
@@ -4,7 +4,6 @@ export const KichinSink: Props = {
   user: {
     id: '123213',
     name: 'Kichin Sink',
-    role: 'role',
     teams: ['team'],
     image: '',
   },