From 3e9db53ff8e199fb7de0bf91e178155d4348d112 Mon Sep 17 00:00:00 2001
From: Miroslav Pejic <miroslav.pejic.85@gmail.com>
Date: Fri, 8 Nov 2024 23:42:10 +0100
Subject: [PATCH] [mirotalksfu] - #160 fetch peer_name from OIDC profile

---
 app/src/Server.js          | 19 ++++++++++++++++---
 app/src/config.template.js |  5 +++++
 package.json               |  2 +-
 public/js/Room.js          | 38 ++++++++++++++++++++++++++++++++++++--
 4 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/app/src/Server.js b/app/src/Server.js
index 19706be6..1c28c867 100644
--- a/app/src/Server.js
+++ b/app/src/Server.js
@@ -55,7 +55,7 @@ dev dependencies: {
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.6.27
+ * @version 1.6.28
  *
  */
 
@@ -395,9 +395,22 @@ function startServer() {
     // Route to display user information
     app.get('/profile', OIDCAuth, (req, res) => {
         if (OIDC.enabled) {
-            return res.json(req.oidc.user); // Send user information as JSON
+            const user = { ...req.oidc.user };
+            user.peer_name = {
+                force: OIDC.peer_name?.force || false,
+                email: OIDC.peer_name?.email || false,
+                name: OIDC.peer_name?.name || false,
+            };
+            log.debug('OIDC get Profile', user);
+            return res.json(user);
         }
-        res.sendFile(views.notFound);
+        // OIDC disabled
+        res.status(201).json({
+            email: false,
+            name: false,
+            peer_name: false,
+            message: 'Profile not found because OIDC is disabled',
+        });
     });
 
     // Authentication Callback Route
diff --git a/app/src/config.template.js b/app/src/config.template.js
index 465ddc07..7c8485dd 100644
--- a/app/src/config.template.js
+++ b/app/src/config.template.js
@@ -144,6 +144,11 @@ module.exports = {
             For those seeking an open-source solution, check out: https://github.com/panva/node-oidc-provider
         */
         enabled: false,
+        peer_name: {
+            force: true, // Enforce using profile data for peer_name
+            email: true, // Use email as peer_name
+            name: false, // Don't use full name (family_name + given_name)
+        },
         config: {
             issuerBaseURL: 'https://server.example.com',
             baseURL: `http://localhost:${process.env.PORT ? process.env.PORT : 3010}`, // https://sfu.mirotalk.com
diff --git a/package.json b/package.json
index d3e6761f..9ad4e884 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mirotalksfu",
-    "version": "1.6.27",
+    "version": "1.6.28",
     "description": "WebRTC SFU browser-based video calls",
     "main": "Server.js",
     "scripts": {
diff --git a/public/js/Room.js b/public/js/Room.js
index d4efd278..f05fd783 100644
--- a/public/js/Room.js
+++ b/public/js/Room.js
@@ -11,7 +11,7 @@ if (location.href.substr(0, 5) !== 'https') location.href = 'https' + location.h
  * @license For commercial or closed source, contact us at license.mirotalk@gmail.com or purchase directly via CodeCanyon
  * @license CodeCanyon: https://codecanyon.net/item/mirotalk-sfu-webrtc-realtime-video-conferences/40769970
  * @author  Miroslav Pejic - miroslav.pejic.85@gmail.com
- * @version 1.6.27
+ * @version 1.6.28
  *
  */
 
@@ -996,6 +996,34 @@ async function whoAreYou() {
 
     initUser.classList.toggle('hidden');
 
+    // Fetch the OIDC profile and manage peer_name
+    let force_peer_name = false;
+
+    try {
+        const { data: profile } = await axios.get('/profile', { timeout: 5000 });
+
+        if (profile) {
+            console.log('AXIOS GET OIDC Profile retrieved successfully', profile);
+
+            // Define peer_name based on the profile properties and preferences
+            const peerNamePreference = profile.peer_name || {};
+            default_name =
+                (peerNamePreference.email && profile.email) || (peerNamePreference.name && profile.name) || null;
+
+            // Set localStorage and force_peer_name if applicable
+            if (default_name && peerNamePreference.force) {
+                window.localStorage.peer_name = default_name;
+                force_peer_name = true;
+            } else {
+                console.warn('AXIOS GET Profile retrieved but missing required peer name fields');
+            }
+        } else {
+            console.warn('AXIOS GET Profile data is empty or undefined');
+        }
+    } catch (error) {
+        console.error('AXIOS OIDC Error fetching profile', error.message || error);
+    }
+
     Swal.fire({
         allowOutsideClick: false,
         allowEscapeKey: false,
@@ -1034,6 +1062,11 @@ async function whoAreYou() {
         joinRoom(peer_name, room_id);
     });
 
+    if (force_peer_name) {
+        getId('usernameInput').disabled = true;
+        getId('initUsernameEmojiButton').disabled = true;
+    }
+
     if (!isVideoAllowed) {
         elemDisplay('initVideo', false);
         initVideoContainerShow(false);
@@ -4503,6 +4536,7 @@ function adaptAspectRatio(participantsCount) {
     // desktop aspect ratio
     switch (participantsCount) {
         case 1:
+        //case 2:
         case 3:
         case 4:
         case 7:
@@ -4564,7 +4598,7 @@ function showAbout() {
         imageUrl: image.about,
         customClass: { image: 'img-about' },
         position: 'center',
-        title: 'WebRTC SFU v1.6.27',
+        title: 'WebRTC SFU v1.6.28',
         html: `
         <br />
         <div id="about">