Merge remote-tracking branch 'upstream/develop' into OB-Sync

src/api/apiGetUserData.ts

@@ -2,12 +2,15 @@ import { endpoints } from '../resources/scripts/endpoints';
 import { UserDataInterface } from '../globalState';
 import { fetchData, FETCH_METHODS } from './fetchData';
 
-export const apiGetUserData = async (): Promise<UserDataInterface> => {
+export const apiGetUserData = async (
+	responseHandling?: string[]
+): Promise<UserDataInterface> => {
 	const url = endpoints.userData;
 
 	return fetchData({
 		url: url,
 		rcValidation: true,
+		responseHandling,
 		method: FETCH_METHODS.GET
 	});
 };

src/api/apiJoinGroupChat.ts

@@ -0,0 +1,18 @@
+import { endpoints } from '../resources/scripts/endpoints';
+import {
+	fetchData,
+	FETCH_METHODS,
+	FETCH_ERRORS,
+	FETCH_SUCCESS
+} from './fetchData';
+
+export const apiJoinGroupChat = async (roomId: string): Promise<any> =>
+	fetchData({
+		url: endpoints.videocallServiceBase + '/join/' + roomId,
+		method: FETCH_METHODS.POST,
+		responseHandling: [
+			FETCH_ERRORS.CONFLICT,
+			FETCH_ERRORS.CATCH_ALL,
+			FETCH_SUCCESS.CONTENT
+		]
+	});

src/api/apiLogoutKeycloak.ts

@@ -1,37 +1,20 @@
 import { endpoints } from '../resources/scripts/endpoints';
 import { getValueFromCookie } from '../components/sessionCookie/accessSessionCookie';
-import {
-	getErrorCaseForStatus,
-	redirectToErrorPage
-} from '../components/error/errorHandling';
 
-export const apiKeycloakLogout = (): Promise<any> =>
-	new Promise((resolve, reject) => {
-		const url = endpoints.keycloakLogout;
-		const refreshToken = getValueFromCookie('refreshToken');
-		const data = `client_id=app&grant_type=refresh_token&refresh_token=${refreshToken}`;
+export const apiKeycloakLogout = async (): Promise<any> => {
+	const url = endpoints.keycloakLogout;
+	const refreshToken = getValueFromCookie('refreshToken');
+	const data = `client_id=app&grant_type=refresh_token&refresh_token=${refreshToken}`;
 
-		const req = new Request(url, {
+	return fetch(
+		new Request(url, {
 			method: 'POST',
 			headers: {
 				'Content-Type': 'application/x-www-form-urlencoded',
 				'cache-control': 'no-cache'
 			},
 			credentials: 'include',
 			body: data
-		});
-
-		fetch(req)
-			.then((response) => {
-				if (response.status === 204) {
-					resolve(response);
-				} else {
-					const error = getErrorCaseForStatus(response.status);
-					redirectToErrorPage(error);
-					reject(new Error('keycloakLogout'));
-				}
-			})
-			.catch((error) => {
-				reject(error);
-			});
-	});
+		})
+	);
+};

src/api/apiStartVideoCall.ts

@@ -1,21 +1,28 @@
 import { endpoints } from '../resources/scripts/endpoints';
-import { fetchData, FETCH_METHODS, FETCH_SUCCESS } from './fetchData';
+import {
+	fetchData,
+	FETCH_METHODS,
+	FETCH_SUCCESS,
+	FETCH_ERRORS
+} from './fetchData';
 
 export const apiStartVideoCall = async (
 	sessionId: number,
-	initiatorDisplayName: string
+	initiatorDisplayName: string,
+	groupId?: number
 ): Promise<{ moderatorVideoCallUrl: string }> => {
 	const url = endpoints.startVideoCall;
 	const videoCallData = JSON.stringify({
 		sessionId: sessionId,
+		groupChatId: groupId,
 		initiatorDisplayName: initiatorDisplayName
 	});
 
 	return fetchData({
 		url: url,
 		method: FETCH_METHODS.POST,
 		bodyData: videoCallData,
-		responseHandling: [FETCH_SUCCESS.CONTENT],
+		responseHandling: [FETCH_SUCCESS.CONTENT, FETCH_ERRORS.CATCH_ALL],
 		rcValidation: true
 	});
 };

src/api/appointments/getAppointment.ts

@@ -3,13 +3,15 @@ import { endpoints } from '../../resources/scripts/endpoints';
 import { FETCH_ERRORS, FETCH_METHODS, fetchData } from '../fetchData';
 
 export const getAppointment = async (
-	appointmentId: string
+	appointmentId: string,
+	skipAuth: boolean = false
 ): Promise<AppointmentsDataInterface> => {
 	const url = endpoints.appointmentsServiceBase + '/' + appointmentId;
 
 	return fetchData({
 		url: url,
 		method: FETCH_METHODS.GET,
-		responseHandling: [FETCH_ERRORS.CATCH_ALL_WITH_RESPONSE]
+		responseHandling: [FETCH_ERRORS.CATCH_ALL_WITH_RESPONSE],
+		skipAuth: skipAuth
 	});
 };

src/api/index.ts

@@ -26,6 +26,7 @@ export * from './apiPostAnonymousRegistration';
 export * from './apiPostRegistration';
 export * from './apiPutArchive';
 export * from './apiPutDearchive';
+export * from './apiJoinGroupChat';
 export * from './apiPutGroupChat';
 export * from './apiPatchConsultantData';
 export * from './apiPutConsultantData';

src/api/videocalls/getJwt.ts

@@ -3,13 +3,15 @@ import { endpoints } from '../../resources/scripts/endpoints';
 import { FETCH_ERRORS, FETCH_METHODS, fetchData } from '../fetchData';
 
 export const getJwt = async (
-	appointmentId: string
+	appointmentId: string,
+	skipAuth: boolean = false
 ): Promise<VideoCallJwtDataInterface> => {
 	const url = endpoints.videocallServiceBase + '/' + appointmentId + '/jwt';
 
 	return fetchData({
 		url: url,
 		method: FETCH_METHODS.GET,
-		responseHandling: [FETCH_ERRORS.CATCH_ALL_WITH_RESPONSE]
+		responseHandling: [FETCH_ERRORS.CATCH_ALL_WITH_RESPONSE],
+		skipAuth: skipAuth
 	});
 };

src/components/E2EEncryptionSupportBanner/E2EEncryptionSupportBanner.styles.scss

@@ -1,7 +1,6 @@
 .encryption-banner {
 	background-color: #f7d9d9;
 	display: flex;
-	position: fixed;
 	justify-content: center;
 	padding: $grid-base-two $grid-base-three;
 

src/components/E2EEncryptionSupportBanner/E2EEncryptionSupportBanner.tsx

@@ -42,6 +42,11 @@ export const E2EEncryptionSupportBanner = () => {
 		}
 	}, [userData, consultingTypes, sessions]);
 
+	useEffect(() => {
+		const fn = showBanner ? 'add' : 'remove';
+		document.body.classList[fn]('banner-open');
+	}, [showBanner]);
+
 	if (!showBanner) {
 		return null;
 	}

src/components/app/AuthenticatedApp.tsx

@@ -4,7 +4,6 @@ import { useCallback, useContext, useEffect, useState } from 'react';
 import { Routing } from './Routing';
 import {
 	UserDataContext,
-	NotificationsContext,
 	hasUserAuthority,
 	AUTHORITIES,
 	ConsultingTypesContext,
@@ -16,7 +15,6 @@ import { apiGetConsultingTypes } from '../../api';
 import { Loading } from './Loading';
 import { handleTokenRefresh } from '../auth/auth';
 import { logout } from '../logout/logout';
-import { Notifications } from '../notifications/Notifications';
 import './authenticatedApp.styles';
 import './navigation.styles';
 import { requestPermissions } from '../../utils/notificationHelpers';
@@ -48,7 +46,6 @@ export const AuthenticatedApp = ({
 	const [appReady, setAppReady] = useState<boolean>(false);
 	const [loading, setLoading] = useState<boolean>(true);
 	const [userDataRequested, setUserDataRequested] = useState<boolean>(false);
-	const { notifications } = useContext(NotificationsContext);
 
 	useEffect(() => {
 		// When the user has a group chat id that means that we need to join the user in the group chat
@@ -124,11 +121,6 @@ export const AuthenticatedApp = ({
 									<RocketChatUserStatusProvider>
 										<E2EEncryptionSupportBanner />
 										<Routing logout={handleLogout} />
-										{notifications && (
-											<Notifications
-												notifications={notifications}
-											/>
-										)}
 									</RocketChatUserStatusProvider>
 								</RocketChatUnreadProvider>
 							</RocketChatSubscriptionsProvider>