Merge pull request #118 from havfo/lti1

LTI 1.1 integration

app/package.json

@@ -13,6 +13,7 @@
 		"bowser": "^2.7.0",
 		"dompurify": "^2.0.7",
 		"domready": "^1.0.8",
+		"end-of-stream": "1.4.0",
 		"file-saver": "^2.0.2",
 		"hark": "^1.2.3",
 		"is-electron": "^2.2.0",
@@ -27,7 +28,7 @@
 		"react-intl": "^3.4.0",
 		"react-redux": "^7.1.1",
 		"react-router-dom": "^5.1.2",
-		"react-scripts": "3.2.0",
+		"react-scripts": "^3.3.0",
 		"redux": "^4.0.4",
 		"redux-logger": "^3.0.6",
 		"redux-persist": "^6.0.0",
@@ -36,7 +37,6 @@
 		"riek": "^1.1.0",
 		"socket.io-client": "^2.3.0",
 		"source-map-explorer": "^2.1.0",
-		"end-of-stream": "1.4.0",
 		"webtorrent": "^0.107.16"
 	},
 	"scripts": {

app/src/RoomClient.js

@@ -106,7 +106,7 @@ export default class RoomClient
 	}
 
 	constructor(
-		{ peerId, accessCode, device, useSimulcast, produce, forceTcp } = {})
+		{ peerId, accessCode, device, useSimulcast, produce, forceTcp, displayName } = {})
 	{
 		if (!peerId)
 			throw new Error('Missing peerId');
@@ -114,8 +114,8 @@ export default class RoomClient
 			throw new Error('Missing device');
 
 		logger.debug(
-			'constructor() [peerId: "%s", device: "%s", useSimulcast: "%s", produce: "%s", forceTcp: "%s"]',
-			peerId, device.flag, useSimulcast, produce, forceTcp);
+			'constructor() [peerId: "%s", device: "%s", useSimulcast: "%s", produce: "%s", forceTcp: "%s", displayName ""]',
+			peerId, device.flag, useSimulcast, produce, forceTcp, displayName);
 
 		this._signalingUrl = null;
 
@@ -128,6 +128,9 @@ export default class RoomClient
 		// Wheter we force TCP
 		this._forceTcp = forceTcp;
 
+		// Use displayName
+		store.dispatch(settingsActions.setDisplayName(displayName));
+
 		// Torrent support
 		this._torrentSupport = null;
 
@@ -493,7 +496,7 @@ export default class RoomClient
 
 		store.dispatch(
 			meActions.setDisplayNameInProgress(true));
-		
+
 		try
 		{
 			await this.sendRequest('changeDisplayName', { displayName });
@@ -811,7 +814,7 @@ export default class RoomClient
 			catch (error)
 			{
 				logger.error('unmuteMic() | failed: %o', error);
-	
+
 				store.dispatch(requestActions.notify(
 					{
 						type : 'error',
@@ -1533,7 +1536,7 @@ export default class RoomClient
 					case 'enteredLobby':
 					{
 						store.dispatch(roomActions.setInLobby(true));
-	
+
 						const { displayName } = store.getState().settings;
 						const { picture } = store.getState().me;
 	
@@ -1702,7 +1705,7 @@ export default class RoomClient
 						store.dispatch(
 							roomActions.setJoinByAccessCode(joinByAccessCode));
 						
-						if (joinByAccessCode) 
+						if (joinByAccessCode)
 						{
 							store.dispatch(requestActions.notify(
 								{
@@ -1742,10 +1745,10 @@ export default class RoomClient
 					case 'changeDisplayName':
 					{
 						const { peerId, displayName, oldDisplayName } = notification.data;
-	
+
 						store.dispatch(
 							peerActions.setPeerDisplayName(displayName, peerId));
-	
+
 						store.dispatch(requestActions.notify(
 							{
 								text : intl.formatMessage({
@@ -1756,26 +1759,26 @@ export default class RoomClient
 									displayName
 								})
 							}));
-	
+
 						break;
 					}
-	
+
 					case 'changePicture':
 					{
 						const { peerId, picture } = notification.data;
-	
+
 						store.dispatch(peerActions.setPeerPicture(peerId, picture));
-	
+
 						break;
 					}
-	
+
 					case 'chatMessage':
 					{
 						const { peerId, chatMessage } = notification.data;
-	
+
 						store.dispatch(
 							chatActions.addResponseMessage({ ...chatMessage, peerId }));
-	
+
 						if (
 							!store.getState().toolarea.toolAreaOpen ||
 							(store.getState().toolarea.toolAreaOpen &&
@@ -1786,16 +1789,16 @@ export default class RoomClient
 								roomActions.setToolbarsVisible(true));
 							this._soundNotification();
 						}
-	
+
 						break;
 					}
-	
+
 					case 'sendFile':
 					{
 						const { peerId, magnetUri } = notification.data;
-	
+
 						store.dispatch(fileActions.addFile(peerId, magnetUri));
-	
+
 						store.dispatch(requestActions.notify(
 							{
 								text : intl.formatMessage({
@@ -1803,7 +1806,7 @@ export default class RoomClient
 									defaultMessage : 'New file available'
 								})
 							}));
-	
+
 						if (
 							!store.getState().toolarea.toolAreaOpen ||
 							(store.getState().toolarea.toolAreaOpen &&
@@ -1814,27 +1817,27 @@ export default class RoomClient
 								roomActions.setToolbarsVisible(true));
 							this._soundNotification();
 						}
-	
+
 						break;
 					}
-	
+
 					case 'producerScore':
 					{
 						const { producerId, score } = notification.data;
-	
+
 						store.dispatch(
 							producerActions.setProducerScore(producerId, score));
-	
+
 						break;
 					}
-	
+
 					case 'newPeer':
 					{
 						const { id, displayName, picture, device } = notification.data;
-	
+
 						store.dispatch(
 							peerActions.addPeer({ id, displayName, picture, device, consumers: [] }));
-	
+
 						store.dispatch(requestActions.notify(
 							{
 								text : intl.formatMessage({
@@ -1844,20 +1847,20 @@ export default class RoomClient
 									displayName
 								})
 							}));
-	
+
 						break;
 					}
-	
+
 					case 'peerClosed':
 					{
 						const { peerId } = notification.data;
-	
+
 						store.dispatch(
 							peerActions.removePeer(peerId));
-	
+
 						break;
 					}
-	
+
 					case 'consumerClosed':
 					{
 						const { consumerId } = notification.data;
@@ -1891,7 +1894,7 @@ export default class RoomClient
 	
 						store.dispatch(
 							consumerActions.setConsumerPaused(consumerId, 'remote'));
-	
+
 						break;
 					}
 	

app/src/index.js

@@ -102,7 +102,8 @@ function run()
 	const produce = parameters.get('produce') !== 'false';
 	const useSimulcast = parameters.get('simulcast') === 'true';
 	const forceTcp = parameters.get('forceTcp') === 'true';
-
+	const displayName = parameters.get('displayName');
+	
 	// Get current device.
 	const device = deviceInfo();
 
@@ -114,7 +115,7 @@ function run()
 	);
 
 	roomClient = new RoomClient(
-		{ peerId, accessCode, device, useSimulcast, produce, forceTcp });
+		{ peerId, accessCode, device, useSimulcast, produce, forceTcp, displayName });
 
 	global.CLIENT = roomClient;