From 0a8c089ee0c89867b4187d20cc2fdd8a14593960 Mon Sep 17 00:00:00 2001
From: Andrei Sacuiu <andrei.sacuiu@uni-konstanz.de>
Date: Thu, 23 Mar 2017 17:07:47 +0100
Subject: [PATCH 1/3] create a user and a password for each document that chat
 apps can use to create document group chats

---
 appinfo/routes.php                    |  1 +
 js/viewer/viewer.js                   | 11 ++++++++
 lib/Controller/DocumentController.php | 36 +++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/appinfo/routes.php b/appinfo/routes.php
index 07a5068c..4141094a 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -17,6 +17,7 @@ return [
 		['name' => 'document#index', 'url' => 'index', 'verb' => 'GET'],
 		['name' => 'document#publicPage', 'url' => '/public', 'verb' => 'GET'],
 		['name' => 'document#create', 'url' => 'ajax/documents/create', 'verb' => 'POST'],
+		['name' => 'document#generate', 'url' => 'ajax/generate.php', 'verb' => 'GET'],
 
 		// WOPI access
 		['name' => 'wopi#checkFileInfo', 'url' => 'wopi/files/{fileId}', 'verb' => 'GET'],
diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js
index 88363694..9118bb24 100644
--- a/js/viewer/viewer.js
+++ b/js/viewer/viewer.js
@@ -123,6 +123,16 @@ var odfViewer = {
 
 		$('#app-content #controls').addClass('hidden');
 		$('#app-content').append($iframe);
+
+		$.ajax({type: 'GET', url: OC.filePath('richdocuments', 'ajax', 'generate.php'), data: {id: context.$file.attr('data-id')}, async: false, success: function(result) {
+			if(result.status=="success"){
+				var $chatroom = $('<iframe id="chatroom" data-chatroom-password="'+result.password+'" data-chatroom-title="'+fileName+'" data-chatroom-name="'+result.name+'" hidden />');
+				$('#app-content').append($chatroom);
+			}
+
+		}, error: function(xhr, textStatus, errorThrown){
+			password=errorThrown;
+		}});
 	},
 
 
@@ -132,6 +142,7 @@ var odfViewer = {
 		}
 		$('#app-content #controls').removeClass('hidden');
 		$('#richdocumentsframe').remove();
+		$('#chatroom').remove();
 	},
 
 	registerFilesMenu: function() {
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index 70580962..3b4589a7 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -251,4 +251,40 @@ class DocumentController extends Controller {
 
 		return $response;
 	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function generate($id) {
+		if((!empty($id))) {
+			$view = \OC\Files\Filesystem::getView();
+			try {
+				$path = $view->getPath($id);
+				if ($view->is_file($path) && $view->isReadable($path)) {
+					$secret = \OC::$server->getConfig()->getSystemValue("secret");
+					$instanceID = \OC::$server->getConfig()->getSystemValue("instanceid");
+					$chatRoomPassword = hash('sha512', "chatroom-password".$instanceID.$secret.$id);
+					$chatRoomName = hash('sha512', "chatroom-name".$instanceID.$secret.$id);
+					return  array(
+						'status' => 'success','password' => $chatRoomPassword,'name' => $chatRoomName
+					);
+				} else {
+					return  array(
+						'status' => 'unauthorised'
+					);
+				}
+
+			} catch (\Exception $e) {
+				return  array(
+					'status' => 'unauthorised'
+				);
+			}
+
+		}
+		return  array(
+			'status' => 'no id received'
+		);
+
+	}
+
 }

From 9c4da055a81a140701d4668a9c3fa8c632517c42 Mon Sep 17 00:00:00 2001
From: Andrei Sacuiu <andrei.sacuiu@uni-konstanz.de>
Date: Fri, 24 Mar 2017 16:39:01 +0100
Subject: [PATCH 2/3] cleanup

---
 js/viewer/viewer.js                   | 25 +++++++++-----
 lib/Controller/DocumentController.php | 50 +++++++++++++--------------
 2 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js
index 9118bb24..8a0ae19e 100644
--- a/js/viewer/viewer.js
+++ b/js/viewer/viewer.js
@@ -124,15 +124,24 @@ var odfViewer = {
 		$('#app-content #controls').addClass('hidden');
 		$('#app-content').append($iframe);
 
-		$.ajax({type: 'GET', url: OC.filePath('richdocuments', 'ajax', 'generate.php'), data: {id: context.$file.attr('data-id')}, async: false, success: function(result) {
-			if(result.status=="success"){
-				var $chatroom = $('<iframe id="chatroom" data-chatroom-password="'+result.password+'" data-chatroom-title="'+fileName+'" data-chatroom-name="'+result.name+'" hidden />');
-				$('#app-content').append($chatroom);
+		$.ajax({type: 'GET',
+			url: OC.filePath('richdocuments', 'ajax', 'generate.php'),
+			data: {id: context.$file.attr('data-id')},
+			async: false, success: function(result) {
+				if(result.status=="success"){
+					var $chatroom = $('<div />');
+					$chatroom.attr('id','chatroom');
+					$chatroom.data('chatroom-password',result.password);
+					$chatroom.data('chatroom-name',result.name);
+					$chatroom.data('chatroom-title',fileName);
+					$('#app-content').append($chatroom);
+				} else {
+					console.log(result.message);
+				}
+			}, error: function(xhr, textStatus, errorThrown){
+				console.log(errorThrown);
 			}
-
-		}, error: function(xhr, textStatus, errorThrown){
-			password=errorThrown;
-		}});
+		});
 	},
 
 
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index 3b4589a7..01df7a0d 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -256,35 +256,33 @@ class DocumentController extends Controller {
 	 * @NoAdminRequired
 	 */
 	public function generate($id) {
-		if((!empty($id))) {
-			$view = \OC\Files\Filesystem::getView();
-			try {
-				$path = $view->getPath($id);
-				if ($view->is_file($path) && $view->isReadable($path)) {
-					$secret = \OC::$server->getConfig()->getSystemValue("secret");
-					$instanceID = \OC::$server->getConfig()->getSystemValue("instanceid");
-					$chatRoomPassword = hash('sha512', "chatroom-password".$instanceID.$secret.$id);
-					$chatRoomName = hash('sha512', "chatroom-name".$instanceID.$secret.$id);
-					return  array(
-						'status' => 'success','password' => $chatRoomPassword,'name' => $chatRoomName
-					);
-				} else {
-					return  array(
-						'status' => 'unauthorised'
-					);
-				}
 
-			} catch (\Exception $e) {
+		if (empty($id)) {
+			return  array(
+				'status' => 'error',
+				'message' => 'no id received');
+		}
+		$view = \OC\Files\Filesystem::getView();
+		try {
+			$path = $view->getPath($id);
+			if ($view->is_file($path) && $view->isReadable($path)) {
+				$secret = \OC::$server->getConfig()->getSystemValue('secret');
+				$instanceID = \OC::$server->getConfig()->getSystemValue('instanceid');
+				$chatRoomPassword = hash('sha512', 'chatroom-password'.$instanceID.$secret.$id);
+				$chatRoomName = hash('sha512','chatroom-name'.$instanceID.$secret.$id);
+				return  array(
+					'status' => 'success',
+					'password' => $chatRoomPassword,
+					'name' => $chatRoomName);
+			} else {
 				return  array(
-					'status' => 'unauthorised'
-				);
+					'status' => 'error',
+					'message' => 'user unauthorised to view file');
 			}
-
+		} catch (\Exception $e) {
+			return  array(
+				'status' => 'error',
+				'message' => 'user unauthorised to view file');
 		}
-		return  array(
-			'status' => 'no id received'
-		);
-
 	}
-
 }

From 89f2dd905f738e69db77245f429e3a653a654055 Mon Sep 17 00:00:00 2001
From: Andrei Sacuiu <andrei.sacuiu@uni-konstanz.de>
Date: Fri, 24 Mar 2017 16:52:29 +0100
Subject: [PATCH 3/3] cleanup

---
 js/viewer/viewer.js                   |  5 +++--
 lib/Controller/DocumentController.php | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js
index 8a0ae19e..21169d4f 100644
--- a/js/viewer/viewer.js
+++ b/js/viewer/viewer.js
@@ -127,8 +127,9 @@ var odfViewer = {
 		$.ajax({type: 'GET',
 			url: OC.filePath('richdocuments', 'ajax', 'generate.php'),
 			data: {id: context.$file.attr('data-id')},
-			async: false, success: function(result) {
-				if(result.status=="success"){
+			async: false,
+			success: function(result) {
+				if(result.status==='success'){
 					var $chatroom = $('<div />');
 					$chatroom.attr('id','chatroom');
 					$chatroom.data('chatroom-password',result.password);
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
index 01df7a0d..31b760a8 100644
--- a/lib/Controller/DocumentController.php
+++ b/lib/Controller/DocumentController.php
@@ -260,7 +260,8 @@ class DocumentController extends Controller {
 		if (empty($id)) {
 			return  array(
 				'status' => 'error',
-				'message' => 'no id received');
+				'message' => 'no id received'
+			);
 		}
 		$view = \OC\Files\Filesystem::getView();
 		try {
@@ -273,16 +274,19 @@ class DocumentController extends Controller {
 				return  array(
 					'status' => 'success',
 					'password' => $chatRoomPassword,
-					'name' => $chatRoomName);
+					'name' => $chatRoomName
+				);
 			} else {
 				return  array(
 					'status' => 'error',
-					'message' => 'user unauthorised to view file');
+					'message' => 'user unauthorised to view file'
+				);
 			}
 		} catch (\Exception $e) {
 			return  array(
 				'status' => 'error',
-				'message' => 'user unauthorised to view file');
+				'message' => 'user unauthorised to view file'
+			);
 		}
 	}
 }