Add wrapper around "OC.getCurrentUser()" to be able to override the user

"OC.getCurrentUser()" gets its returned value from the "data-user" and
"data-user-displayname" attributes of the "head" element of the page,
which in some cases may not be the correct ones for Talk (for example,
in the public share page, as it uses the incognito mode which hides the
current user).

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

js/app.js

@@ -337,7 +337,7 @@
 		 * @param {string} token
 		 */
 		_setRoomActive: function(token) {
-			if (OC.getCurrentUser().uid) {
+			if (OCA.Talk.getCurrentUser().uid) {
 				this._rooms.forEach(function(room) {
 					room.set('active', room.get('token') === token);
 				});
@@ -363,7 +363,7 @@
 					self.stopListening(self.activeRoom, 'change:participantFlags');
 					self.stopListening(self.activeRoom, 'change:lobbyState');
 
-					if (OC.getCurrentUser().uid) {
+					if (OCA.Talk.getCurrentUser().uid) {
 						roomChannel.trigger('active', token);
 
 						self._rooms.forEach(function(room) {
@@ -501,7 +501,7 @@
 			this._sidebarView = new OCA.SpreedMe.Views.SidebarView();
 			$('#content').append(this._sidebarView.$el);
 
-			if (OC.getCurrentUser().uid) {
+			if (OCA.Talk.getCurrentUser().uid) {
 				this._rooms = new OCA.SpreedMe.Models.RoomCollection();
 				this.listenTo(roomChannel, 'active', this._setRoomActive);
 			} else {
@@ -722,7 +722,7 @@
 				this.signaling.disconnect();
 			}.bind(this));
 
-			if (OC.getCurrentUser().uid) {
+			if (OCA.Talk.getCurrentUser().uid) {
 				this._showRoomList();
 				this.signaling.setRoomCollection(this._rooms)
 					.then(function(data) {

js/currentuser.js

@@ -0,0 +1,65 @@
+/* global OC, OCA */
+
+/**
+ *
+ * @copyright Copyright (c) 2019, Daniel Calviño Sánchez ([email protected])
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+(function(OC, OCA) {
+
+	'use strict';
+
+	OCA.Talk = OCA.Talk || {};
+
+	/**
+	 * Current user as seen by Talk.
+	 *
+	 * This may differ from the current user returned by OC.getCurrentUser().
+	 */
+	var currentUser = undefined;
+
+	/**
+	 * Returns the current user set in Talk or, if none, the current user as
+	 * returned by OC.getCurrentUser().
+	 */
+	function getCurrentUser() {
+		if (currentUser) {
+			return currentUser;
+		}
+
+		return OC.getCurrentUser();
+	}
+
+	/**
+	 * Sets the current user returned by getCurrentUser().
+	 *
+	 * @param string uid
+	 * @param string displayName
+	 */
+	function setCurrentUser(uid, displayName) {
+		currentUser = {
+			uid: uid,
+			displayName: displayName
+		};
+	}
+
+	OCA.Talk.getCurrentUser = getCurrentUser;
+	OCA.Talk.setCurrentUser = setCurrentUser;
+
+})(OC, OCA);

js/embedded.js

@@ -65,7 +65,7 @@
 		},
 
 		initialize: function() {
-			if (!OC.getCurrentUser().uid) {
+			if (!OCA.Talk.getCurrentUser().uid) {
 				this.initGuestName();
 			}
 

js/merged-files.json

@@ -25,6 +25,7 @@
   "webrtc.js",
   "signaling.js",
   "connection.js",
+  "currentuser.js",
   "embedded.js",
   "filesplugin.js"
 ]

js/merged-guest.json

@@ -32,6 +32,7 @@
   "webrtc.js",
   "signaling.js",
   "connection.js",
+  "currentuser.js",
   "app.js",
   "init.js"
 ]

js/merged-public-share.json

@@ -26,6 +26,7 @@
   "webrtc.js",
   "signaling.js",
   "connection.js",
+  "currentuser.js",
   "embedded.js",
   "publicshare.js"
 ]

js/merged-share-auth.json

@@ -26,6 +26,7 @@
   "webrtc.js",
   "signaling.js",
   "connection.js",
+  "currentuser.js",
   "embedded.js",
   "publicshareauth.js"
 ]

js/merged.json

@@ -35,6 +35,7 @@
   "webrtc.js",
   "signaling.js",
   "connection.js",
+  "currentuser.js",
   "app.js",
   "init.js"
 ]

js/signaling.js

@@ -205,7 +205,7 @@
 
 	OCA.Talk.Signaling.Base.prototype.syncRooms = function() {
 		var defer = $.Deferred();
-		if (this.roomCollection && OC.getCurrentUser().uid) {
+		if (this.roomCollection && OCA.Talk.getCurrentUser().uid) {
 			this.roomCollection.fetch({
 				success: function(roomCollection) {
 					defer.resolve(roomCollection);
@@ -956,7 +956,7 @@
 		} else {
 			// Already reconnected with a new session.
 			this._forceReconnect = false;
-			var user = OC.getCurrentUser();
+			var user = OCA.Talk.getCurrentUser();
 			var url = OC.linkToOCS('apps/spreed/api/v1/signaling', 2) + 'backend';
 			msg = {
 				"type": "hello",

js/views/chatview.js

@@ -206,14 +206,14 @@
 			}
 
 			return this._addCommentTemplate(_.extend({
-				isGuest: !OC.getCurrentUser().uid,
-				actorId: OC.getCurrentUser().uid || 'guest/' + this.model.get('hashedSessionId'),
-				actorDisplayName: OC.getCurrentUser().displayName || '',
+				isGuest: !OCA.Talk.getCurrentUser().uid,
+				actorId: OCA.Talk.getCurrentUser().uid || 'guest/' + this.model.get('hashedSessionId'),
+				actorDisplayName: OCA.Talk.getCurrentUser().displayName || '',
 				newMessagePlaceholder: newMessagePlaceholder,
 				submitText: submitText,
 				shareText: t('spreed', 'Share'),
 				isReadOnly: isReadOnly,
-				canShare: !isReadOnly && OC.getCurrentUser().uid,
+				canShare: !isReadOnly && OCA.Talk.getCurrentUser().uid,
 			}, params));
 		},
 
@@ -224,7 +224,7 @@
 
 			params = _.extend({
 				// TODO isUserAuthor is not properly set for guests
-				isUserAuthor: OC.getCurrentUser().uid === params.actorId,
+				isUserAuthor: OCA.Talk.getCurrentUser().uid === params.actorId,
 				isGuest: params.actorType === 'guests',
 			}, params);
 
@@ -256,8 +256,8 @@
 			this._virtualList = new OCA.SpreedMe.Views.VirtualList(this.$container);
 
 			var avatarSize = 32;
-			if (OC.getCurrentUser().uid) {
-				this.$el.find('.avatar').avatar(OC.getCurrentUser().uid, avatarSize, undefined, false, undefined, OC.getCurrentUser().displayName);
+			if (OCA.Talk.getCurrentUser().uid) {
+				this.$el.find('.avatar').avatar(OCA.Talk.getCurrentUser().uid, avatarSize, undefined, false, undefined, OCA.Talk.getCurrentUser().displayName);
 			} else {
 				var displayName = this.getOption('guestNameModel').get('nick');
 				var customName = displayName !== t('spreed', 'Guest') ? displayName : '';
@@ -500,7 +500,7 @@
 			formattedMessage = formattedMessage.replace(/\n/g, '<br/>');
 			formattedMessage = OCA.SpreedMe.Views.RichObjectStringParser.parseMessage(
 				formattedMessage, commentModel.get('messageParameters'), {
-					userId: OC.getCurrentUser().uid,
+					userId: OCA.Talk.getCurrentUser().uid,
 					sessionHash: this.model.get('hashedSessionId'),
 				});
 
@@ -807,10 +807,10 @@
 				setAvatar($(this), inlineAvatarSize);
 			});
 
-			if (OC.getCurrentUser().uid &&
+			if (OCA.Talk.getCurrentUser().uid &&
 				model &&
 				model.get('actorType') === 'users' &&
-				model.get('actorId') !== OC.getCurrentUser().uid) {
+				model.get('actorId') !== OCA.Talk.getCurrentUser().uid) {
 				$el.find('.authorRow .avatar, .authorRow .author').contactsMenu(
 					model.get('actorId'), 0, $el.find('.authorRow'));
 			}
@@ -827,7 +827,7 @@
 			});
 
 			// Contacts menu is not shown in public view.
-			if (!OC.getCurrentUser().uid) {
+			if (!OCA.Talk.getCurrentUser().uid) {
 				return;
 			}
 
@@ -836,7 +836,7 @@
 				var $avatar = $this.find('.avatar');
 
 				var user = $avatar.data('user-id');
-				if (user !== OC.getCurrentUser().uid) {
+				if (user !== OCA.Talk.getCurrentUser().uid) {
 					$this.contactsMenu(user, 0, $this);
 				}
 			});
@@ -884,7 +884,7 @@
 			img.width = previewSize;
 			img.height = previewSize;
 
-			if (OC.getCurrentUser().uid) {
+			if (OCA.Talk.getCurrentUser().uid) {
 				img.onerror = handlePreviewLoadError;
 				img.src = previewUrl;
 			} else {
@@ -1018,7 +1018,7 @@
 				message: message
 			};
 
-			if (!OC.getCurrentUser().uid) {
+			if (!OCA.Talk.getCurrentUser().uid) {
 				var guestNick = OCA.SpreedMe.app._localStorageModel.get('nick');
 				if (guestNick) {
 					data.actorDisplayName = guestNick;

js/views/emptycontentview.js

@@ -211,7 +211,7 @@
 			var messageAdditional = '';
 			var url = '';
 
-			var isGuest = (OC.getCurrentUser().uid === null);
+			var isGuest = (OCA.Talk.getCurrentUser().uid === null);
 
 			var participants = this._activeRoom.get('participants');
 			var numberOfParticipants = Object.keys(participants).length;
@@ -230,7 +230,7 @@
 					participantName = '';
 
 				_.each(participants, function(data, userId) {
-					if (OC.getCurrentUser().uid !== userId) {
+					if (OCA.Talk.getCurrentUser().uid !== userId) {
 						participantId = userId;
 						participantName = data.name;
 					}

js/views/localvideoview.js

@@ -103,7 +103,7 @@
 				return;
 			}
 
-			var userId = OC.getCurrentUser().uid;
+			var userId = OCA.Talk.getCurrentUser().uid;
 			var guestName = localStorage.getItem("nick");
 			this.setAvatar(userId, guestName);
 

js/views/participantlistview.js

@@ -81,8 +81,8 @@
 			templateContext: function() {
 				var isSelf = false,
 					isModerator = false;
-				if (OC.getCurrentUser().uid) {
-					isSelf = this.model.get('userId') === OC.getCurrentUser().uid;
+				if (OCA.Talk.getCurrentUser().uid) {
+					isSelf = this.model.get('userId') === OCA.Talk.getCurrentUser().uid;
 					isModerator = this.room.get('participantType') === OCA.SpreedMe.app.OWNER ||
 						this.room.get('participantType') === OCA.SpreedMe.app.MODERATOR;
 				} else {
@@ -102,7 +102,7 @@
 				}
 
 				var isGuestOrGuestModerator = this.model.get('participantType') === OCA.SpreedMe.app.GUEST || this.model.get('participantType') === OCA.SpreedMe.app.GUEST_MODERATOR;
-				var hasContactsMenu = OC.getCurrentUser().uid && !isSelf && !isGuestOrGuestModerator;
+				var hasContactsMenu = OCA.Talk.getCurrentUser().uid && !isSelf && !isGuestOrGuestModerator;
 
 				return {
 					canModerate: canModerate,
@@ -139,8 +139,8 @@
 					}
 				});
 
-				if (OC.getCurrentUser().uid && model.get('userId') &&
-					model.get('userId') !== OC.getCurrentUser().uid) {
+				if (OCA.Talk.getCurrentUser().uid && model.get('userId') &&
+					model.get('userId') !== OCA.Talk.getCurrentUser().uid) {
 					this.$el.find('.participant-entry .avatar').contactsMenu(
 						model.get('userId'), 0, this.$el.find('.participant-entry'));
 

js/webrtc.js

@@ -381,7 +381,7 @@ var spreedPeerConnectionTable = [];
 			detectSpeakingEvents: true,
 			connection: signaling,
 			enableDataChannels: true,
-			nick: OC.getCurrentUser().displayName
+			nick: OCA.Talk.getCurrentUser().displayName
 		});
 		if (signaling.hasFeature('mcu')) {
 			// Force "Plan-B" semantics if the MCU is used, which doesn't support
@@ -536,7 +536,7 @@ var spreedPeerConnectionTable = [];
 							} else {
 								OCA.SpreedMe.webrtc.emit('audioOn');
 							}
-							if (!OC.getCurrentUser()['uid']) {
+							if (!OCA.Talk.getCurrentUser()['uid']) {
 								var currentGuestNick = localStorage.getItem("nick");
 								sendDataChannelToAll('status', 'nickChanged', currentGuestNick);
 							}
@@ -624,7 +624,7 @@ var spreedPeerConnectionTable = [];
 				OCA.SpreedMe.videos.stopSendingNick(peer);
 				peer.nickInterval = setInterval(function() {
 					var payload;
-					var user = OC.getCurrentUser();
+					var user = OCA.Talk.getCurrentUser();
 					if (!user.uid) {
 						payload = localStorage.getItem("nick");
 					} else {