Merge sharing_no_groups into master, fix conflicts

nextcloud · Oct 7, 2016 · c52984f · c52984f
2 parents f5755f8 + 538a996
commit c52984f
Show file tree

Hide file tree

Showing 57 changed files with 3,505 additions and 502 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -42,6 +42,13 @@ module.exports = function (grunt) {
 						src: ["**/bookmarklet.scss"],
 						dest: "css",
 						ext: ".css"
+					},
+					{
+						expand: true,
+						cwd: "sass",
+						src: ["**/public-page.scss"],
+						dest: "css",
+						ext: ".css"
 					}
 				]
 			}

diff --git a/appinfo/database.xml b/appinfo/database.xml
@@ -234,12 +234,8 @@
 				<default>false</default>
 			</field>
 			<field>
-				<name>is_shared</name>
-				<type>integer</type>
-				<default>0</default>
-				<length>1</length>
-				<notnull>false</notnull>
-				<unsigned>true</unsigned>
+				<name>shared_key</name>
+				<type>clob</type>
 			</field>
 			<index>
 				<name>passman_credential_id_index</name>
@@ -370,6 +366,12 @@
 				<type>clob</type>
 				<notnull>true</notnull>
 			</field>
+			<field>
+				<name>edited_by</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
 			<index>
 				<name>passman_revision_id_index</name>
 				<field>
@@ -417,14 +419,14 @@
 			<field>
 				<name>vault_id</name>
 				<type>integer</type>
-				<notnull>true</notnull>
+				<notnull>false</notnull>
 				<unsigned>true</unsigned>
 				<length>8</length>
 			</field>
 			<field>
 				<name>vault_guid</name>
 				<type>text</type>
-				<notnull>true</notnull>
+				<notnull>false</notnull>
 				<length>64</length>
 			</field>
 			<field>
@@ -434,21 +436,23 @@
 				<length>64</length>
 			</field>
 			<field>
-				<name>group_id</name>
-				<type>text</type>
-				<notnull>false</notnull>
+				<name>created</name>
+				<type>integer</type>
 				<length>64</length>
+				<default>0</default>
+				<notnull>false</notnull>
+				<unsigned>true</unsigned>
 			</field>
 			<field>
-				<name>created</name>
+				<name>expire</name>
 				<type>integer</type>
 				<length>64</length>
 				<default>0</default>
 				<notnull>false</notnull>
 				<unsigned>true</unsigned>
 			</field>
 			<field>
-				<name>expire</name>
+				<name>expire_views</name>
 				<type>integer</type>
 				<length>64</length>
 				<default>0</default>
@@ -466,7 +470,7 @@
 			<field>
 				<name>shared_key</name>
 				<type>clob</type>
-				<notnull>true</notnull>
+				<notnull>false</notnull>
 			</field>
 		</declaration>
 	</table>
@@ -485,7 +489,7 @@
 			<field>
 				<name>item_id</name>
 				<type>integer</type>
-				<notnull>true</notnull><name>shared_key</name>
+				<notnull>true</notnull>
 				<type>clob</type>
 				<notnull>true</notnull>
 				<length>8</length>
@@ -496,6 +500,18 @@
 				<notnull>true</notnull>
 				<length>64</length>
 			</field>
+			<field>
+				<name>target_user_id</name>
+				<type>text</type>
+				<notnull>false</notnull>
+				<length>64</length>
+			</field>
+			<field>
+				<name>from_user_id</name>
+				<type>text</type>
+				<notnull>false</notnull>
+				<length>64</length>
+			</field>
 			<field>
 				<name>target_vault_id</name>
 				<type>integer</type>
@@ -514,6 +530,22 @@
 				<type>clob</type>
 				<notnull>true</notnull>
 			</field>
+			<field>
+				<name>permissions</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>3</length>
+				<default>0</default>
+			</field>
+			<field>
+				<name>created</name>
+				<type>integer</type>
+				<length>64</length>
+				<default>0</default>
+				<notnull>false</notnull>
+				<unsigned>true</unsigned>
+			</field>
 		</declaration>
 	</table>
 </database>
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -5,7 +5,7 @@
     <description>A password manager for Nextcloud</description>
     <licence>AGPL</licence>
     <author>Sander Brand</author>
-    <version>1.0.2.11</version>
+    <version>1.0.2.24</version>
     <namespace>Passman</namespace>
     <category>other</category>
     <website>https://github.com/nextcloud/passman/</website>

diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -39,18 +39,31 @@
 		['name' => 'credential#deleteCredential', 'url' => '/api/v2/credentials/{credential_id}', 'verb' => 'DELETE'],
 
 		//Revisions
-		['name' => 'credential#getRevision', 'url' => '/api/v2/credentials/{credential_id}/revision', 'verb' => 'GET'],
+		['name' => 'credential#getRevision', 'url' => '/api/v2/credentials/{credential_guid}/revision', 'verb' => 'GET'],
 		['name' => 'credential#deleteRevision', 'url' => '/api/v2/credentials/{credential_id}/revision/{revision_id}', 'verb' => 'DELETE'],
+		['name' => 'credential#updateRevision', 'url' => '/api/v2/credentials/{credential_id}/revision/{revision_id}', 'verb' => 'PATCH'],
 
 		//File stuff
 		['name' => 'file#uploadFile', 'url' => '/api/v2/file', 'verb' => 'POST'],
 		['name' => 'file#getFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'GET'],
 		['name' => 'file#deleteFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'DELETE'],
+		['name' => 'file#updateFile', 'url' => '/api/v2/file/{file_id}', 'verb' => 'PATCH'],
 
 		//Sharing stuff
 		['name' => 'share#search', 'url' => '/api/v2/sharing/search', 'verb' => 'POST'],
 		['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'],
-
+        ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
+        ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
+        ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
+        ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
+        ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],
+        ['name' => 'share#createPublicShare', 'url' => '/api/v2/sharing/public', 'verb' => 'POST'],
+        ['name' => 'share#getPublicCredentialData', 'url' => '/api/v2/sharing/credential/{credential_guid}/public', 'verb' => 'GET'],
+        ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/credential/{item_guid}', 'verb' => 'DELETE'],
+        ['name' => 'share#getRevisions', 'url' => '/api/v2/sharing/credential/{item_guid}/revisions', 'verb' => 'GET'],
+        ['name' => 'share#getItemAcl', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'GET'],
+        ['name' => 'share#getFile', 'url' => '/api/v2/sharing/credential/{item_guid}/file/{file_guid}', 'verb' => 'GET'],
+        ['name' => 'share#updateSharedCredentialACL', 'url' => '/api/v2/sharing/credential/{item_guid}/acl', 'verb' => 'PATCH'],
 
 		//Internal API
 		['name' => 'internal#remind', 'url' => '/api/internal/notifications/remind/{credential_id}', 'verb' => 'POST'],