From 5fd2bb01b9e5935bf36bddb5c7714e8ffe55133a Mon Sep 17 00:00:00 2001
From: csantosm <4a.santos@gmail.com>
Date: Tue, 16 Aug 2022 16:27:39 +0200
Subject: [PATCH] openvidu-call: Improved backends

---
 .../call/java/services/OpenViduService.java   | 17 ++++++++------
 .../src/services/OpenViduService.ts           | 22 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/openvidu-call/openvidu-call-back-java/src/main/java/io/openvidu/call/java/services/OpenViduService.java b/openvidu-call/openvidu-call-back-java/src/main/java/io/openvidu/call/java/services/OpenViduService.java
index e018d5b3..5559f571 100644
--- a/openvidu-call/openvidu-call-back-java/src/main/java/io/openvidu/call/java/services/OpenViduService.java
+++ b/openvidu-call/openvidu-call-back-java/src/main/java/io/openvidu/call/java/services/OpenViduService.java
@@ -52,13 +52,16 @@ public class OpenViduService {
 	}
 
 	public long getDateFromCookie(String recordingToken) {
-
-		if (!recordingToken.isEmpty()) {
-			MultiValueMap<String, String> cookieTokenParams = UriComponentsBuilder.fromUriString(recordingToken).build()
-					.getQueryParams();
-			String date = cookieTokenParams.get("createdAt").get(0);
-			return Long.parseLong(date);
-		} else {
+		try {
+			if (!recordingToken.isEmpty()) {
+				MultiValueMap<String, String> cookieTokenParams = UriComponentsBuilder.fromUriString(recordingToken).build()
+						.getQueryParams();
+				String date = cookieTokenParams.get("createdAt").get(0);
+				return Long.parseLong(date);
+			} else {
+				return System.currentTimeMillis();
+			}
+		} catch(Exception e) {
 			return System.currentTimeMillis();
 		}
 	}
diff --git a/openvidu-call/openvidu-call-back/src/services/OpenViduService.ts b/openvidu-call/openvidu-call-back/src/services/OpenViduService.ts
index bbb2ee01..74065d6c 100644
--- a/openvidu-call/openvidu-call-back/src/services/OpenViduService.ts
+++ b/openvidu-call/openvidu-call-back/src/services/OpenViduService.ts
@@ -25,12 +25,16 @@ export class OpenViduService {
 	}
 
 	getDateFromCookie(cookies: any): number {
-		const cookieToken = cookies[this.RECORDING_TOKEN_NAME];
-		if (!!cookieToken) {
-			const cookieTokenUrl = new URL(cookieToken);
-			const date = cookieTokenUrl?.searchParams.get('createdAt');
-			return Number(date);
-		} else {
+		try {
+			const cookieToken = cookies[this.RECORDING_TOKEN_NAME];
+			if (!!cookieToken) {
+				const cookieTokenUrl = new URL(cookieToken);
+				const date = cookieTokenUrl?.searchParams.get('createdAt');
+				return Number(date);
+			} else {
+				return Date.now();
+			}
+		} catch (error) {
 			return Date.now();
 		}
 	}
@@ -62,7 +66,7 @@ export class OpenViduService {
 			}
 			return false;
 		} catch (error) {
-			console.log(error)
+			console.log(error);
 			return false;
 		}
 	}
@@ -79,7 +83,9 @@ export class OpenViduService {
 		console.log(`Requesting token for session ${session.sessionId}`);
 		let connectionProperties: ConnectionProperties = { role };
 		if (!!nickname) {
-			connectionProperties.data = JSON.stringify({ openviduCustomConnectionId: nickname });
+			connectionProperties.data = JSON.stringify({
+				openviduCustomConnectionId: nickname
+			});
 		}
 		console.log('Connection Properties:', connectionProperties);
 		return session.createConnection(connectionProperties);