Merge branch 'release-6.2.0' into chore/patch-deps

RocketChat · Apr 25, 2023 · 7600795 · 7600795
2 parents 4de7b05 + b504b0a
commit 7600795
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/apps/meteor/app/apple/lib/handleIdentityToken.ts b/apps/meteor/app/apple/lib/handleIdentityToken.ts
@@ -5,7 +5,7 @@ import { fetch } from '../../../server/lib/http/fetch';
 
 async function isValidAppleJWT(identityToken: string, header: any): Promise<boolean> {
 	const request = await fetch('https://appleid.apple.com/auth/keys', { method: 'GET' });
-	const applePublicKeys = (await request.json()).data.keys;
+	const applePublicKeys = (await request.json()).keys;
 	const { kid } = header;
 
 	const key = applePublicKeys.find((k: any) => k.kid === kid);

diff --git a/apps/meteor/app/autotranslate/server/googleTranslate.ts b/apps/meteor/app/autotranslate/server/googleTranslate.ts
@@ -115,7 +115,7 @@ class GoogleAutoTranslate extends AutoTranslate {
 		if (this.supportedLanguages[target]) {
 			return this.supportedLanguages[target];
 		}
-		this.supportedLanguages[target || 'en'] = result?.data?.data?.languages;
+		this.supportedLanguages[target || 'en'] = result?.data?.languages;
 		return this.supportedLanguages[target || 'en'];
 	}
 

diff --git a/apps/meteor/server/lib/rooms/roomTypes/livechat.ts b/apps/meteor/server/lib/rooms/roomTypes/livechat.ts
@@ -31,7 +31,8 @@ roomCoordinator.add(LivechatRoomType, {
 	},
 
 	async getNotificationDetails(room, _sender, notificationMessage, userId) {
-		const title = `[Omnichannel] ${this.roomName(room, userId)}`;
+		const roomName = await this.roomName(room, userId);
+		const title = `[Omnichannel] ${roomName}`;
 		const text = notificationMessage;
 
 		return { title, text };