frontend: Refactored code

OpenVidu · Aug 19, 2024 · dc491dc · dc491dc
1 parent 3d1c862
commit dc491dc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/openvidu-call-front/src/app/components/video-room/video-room.component.ts b/openvidu-call-front/src/app/components/video-room/video-room.component.ts
@@ -69,6 +69,9 @@ export class VideoRoomComponent implements OnInit {
 	async onRecordingStopRequested(event: RecordingStopRequestedEvent) {
 		try {
 			const { recordingId } = event;
+
+			if(!recordingId) throw new Error('Recording ID not found when stopping recording');
+
 			await this.restService.stopRecording(recordingId);
 		} catch (error) {
 			console.error(error);
@@ -78,6 +81,9 @@ export class VideoRoomComponent implements OnInit {
 	async onRecordingDeleteRequested(event: RecordingDeleteRequestedEvent) {
 		try {
 			const { recordingId } = event;
+
+			if(!recordingId) throw new Error('Recording ID not found when deleting recording');
+
 			await this.restService.deleteRecording(recordingId);
 		} catch (error) {
 			console.error(error);

diff --git a/openvidu-call-front/src/app/services/rest.service.ts b/openvidu-call-front/src/app/services/rest.service.ts
@@ -23,8 +23,12 @@ export class RestService {
 			'Content-Type': 'application/json'
 		});
 		const userCredentials = this.storageService.getUserCredentials();
+
 		if (userCredentials?.username && userCredentials?.password) {
-			return headers.append('Authorization', `Basic ${btoa(`${userCredentials.username}:${userCredentials.password}`)}`);
+			return headers.append(
+				'Authorization',
+				`Basic ${btoa(`${userCredentials.username}:${userCredentials.password}`)}`
+			);
 		}
 
 		return headers;
@@ -35,8 +39,16 @@ export class RestService {
 			'Content-Type': 'application/json'
 		});
 		const adminCredentials = this.storageService.getAdminCredentials();
-		if (adminCredentials.username && adminCredentials.password) {
-			return headers.set('Authorization', `Basic ${btoa(`${adminCredentials.username}:${adminCredentials.password}`)}`);
+
+		if (!adminCredentials) {
+			console.error('Admin credentials not found');
+			return headers;
+		}
+
+		const { username, password } = adminCredentials;
+
+		if (username && password) {
+			return headers.set('Authorization', `Basic ${btoa(`${username}:${password}`)}`);
 		}
 
 		return headers;

diff --git a/openvidu-call-front/src/app/services/storage.service.ts b/openvidu-call-front/src/app/services/storage.service.ts
@@ -20,15 +20,15 @@ export class StorageService {
 		this.set(Storage.ADMIN_CREDENTIALS, encodedCredentials);
 	}
 
-	getAdminCredentials(): { username: string; password: string } {
+	getAdminCredentials(): { username: string; password: string } | undefined {
 		const encodedCredentials = this.get(Storage.ADMIN_CREDENTIALS);
 
 		if (encodedCredentials) {
 			const [username, password] = atob(encodedCredentials).split(':');
 			return { username, password };
 		}
 
-		return null;
+		return undefined;
 	}
 
 	clearAdminCredentials() {