Commit Graph

101 Commits

Author SHA1 Message Date
Daniel García
4f7cc5e190
Merge pull request #32 from mprasil/collection_users
Support listing and deleting users from collection
2018-05-30 17:32:08 +02:00
Miroslav Prasil
46f3b229ee Removed unnecessary checks, simplified the code a bit 2018-05-30 16:01:56 +01:00
Miroslav Prasil
62be23b1c0 Support listing and deleting users from collection 2018-05-30 15:40:37 +01:00
Daniel García
4de0bf3722
Merge pull request #34 from mprasil/organization_guards
Implement request guards for organization
2018-05-30 15:16:52 +02:00
Miroslav Prasil
4d50014e35 Implement request guards for organization 2018-05-30 13:35:10 +01:00
Daniel García
ed97725c8b
Merge pull request #31 from mprasil/invite_fix
Fix user invitation
2018-05-29 00:17:26 +02:00
Miroslav Prasil
85ecd001a5 Fix user invitation 2018-05-28 17:26:02 +01:00
Daniel García
d69d4d0d30
Merge pull request #29 from mprasil/attachments_fix
Fix reference in attachments table
2018-05-26 23:05:55 +02:00
Daniel García
2cf46e1a5f Make sure TOTP codes can be both Numbers or Strings, fixes #30 2018-05-26 23:04:23 +02:00
Miroslav Prasil
9b017bbbb9 Fix reference in attachments table 2018-05-26 00:39:19 +01:00
Daniel García
ca01fa1419
Merge pull request #28 from mprasil/indirect_collection
Let find_by_uuid_and_user return indirect collection (#26)
2018-05-21 21:28:25 +02:00
Miroslav Prasil
a6105f7029 Let find_by_uuid_and_user return indirect collection (#26) 2018-05-21 17:31:46 +01:00
Daniel García
6a5b2648c4
Merge pull request #27 from mprasil/rocket_update
Update rocket to 0.3.11
2018-05-21 15:04:56 +02:00
Miroslav Prasil
571ef6823d Update rocket to 0.3.11 2018-05-21 13:20:34 +01:00
Daniel García
e55993f2fb
Merge pull request #25 from mprasil/org_delete
Implement deleting Organization
2018-05-19 23:32:40 +02:00
Miroslav Prasil
941747f9e8 Implement deleting Organization 2018-05-19 22:09:32 +01:00
Daniel García
726ba36e5b
Merge pull request #24 from mprasil/myvault_collections
Support editing collections from user vault
2018-05-19 22:56:35 +02:00
Daniel García
e301e69ff5 Change update_cipher method to save cipher before creating folder mapping, otherwise there is an error when creating a cipher with a folder value 2018-05-19 22:33:15 +02:00
Miroslav Prasil
2215bdf018 Support editing collections from user vault 2018-05-19 21:30:19 +01:00
Daniel García
9273c38b69
Merge pull request #22 from mprasil/delete_collection
Implement deleting collections
2018-05-19 21:58:10 +02:00
Miroslav Prasil
a0d2ca3f24 Implement deleting collections 2018-05-16 23:05:50 +01:00
Daniel García
e2a065cb09
Merge pull request #20 from mprasil/folder_delete
Improve Folder::delete() to handle FolderCipher
2018-05-16 22:50:47 +02:00
Miroslav Prasil
e54b52f109 Improve Folder::delete() to handle FolderCipher 2018-05-16 17:19:52 +01:00
Daniel García
795d98afa6
Merge pull request #19 from mprasil/cipher_deleting
Remove dependent items when removing cipher
2018-05-15 20:24:17 +02:00
Miroslav Prasil
21c1ab7fda Remove dependent items when removing cipher 2018-05-15 17:28:24 +01:00
Daniel García
1e812c0a23
Merge pull request #18 from mprasil/share_ownership
Remove user_uuid when sharing to organization
2018-05-15 17:53:03 +02:00
Miroslav Prasil
180a02030c Remove user_uuid when sharing to organization 2018-05-15 16:08:19 +01:00
Daniel García
ac4a40be04
Merge pull request #17 from mprasil/share_cipher
Implement cipher sharing
2018-05-15 16:02:52 +02:00
Miroslav Prasil
3b537f70ac Remove unnecessary test and rewrite match 2018-05-15 13:57:00 +01:00
Miroslav Prasil
f43d329e22 Don't clone() unused value 2018-05-15 11:10:10 +01:00
Miroslav Prasil
8b18c4c633 Implement cipher sharing 2018-05-14 16:19:24 +01:00
Daniel García
a00ecf228d
Merge pull request #16 from mprasil/max_storage
set max storage to non-null value
2018-05-14 16:17:17 +02:00
Miroslav Prasil
c054d0094a set max storage to non-null value 2018-05-14 15:04:13 +01:00
Daniel García
c29d342c21
Merge pull request #14 from mprasil/shared_cipher
Also list shared ciphers in find_by_user
2018-05-13 15:09:45 +02:00
Miroslav Prasil
b0472d7aab Delete owned ciphers on account deletion 2018-05-13 13:21:51 +01:00
Miroslav Prasil
89e544009f Fix duplicate ciphers returned from find_by_user 2018-05-13 13:21:51 +01:00
Miroslav Prasil
8bed867798 Also list shared ciphers in find_by_user 2018-05-13 13:21:51 +01:00
Daniel García
fcef2fa1f1 Check that the database folder exists before connecting
If the parent folder ('data' by default) doesn't exist, the database won't be able to connect.
2018-05-12 22:55:18 +02:00
Daniel García
ba8a1c27f7
Merge pull request #13 from mprasil/cipher_collection
Implement Collection-Cipher mapping
2018-05-11 22:55:05 +02:00
Miroslav Prasil
dfb1232081 Filter collection lists based on user 2018-05-11 21:08:14 +01:00
Miroslav Prasil
9cf449e1c5 Error on invalid collection ID in post_collections_admin 2018-05-11 21:08:14 +01:00
Miroslav Prasil
e5c9d19e25 Remove outdated comment 2018-05-11 21:08:14 +01:00
Miroslav Prasil
34f2aa68f4 Implement Collection-Cipher mapping 2018-05-11 21:08:14 +01:00
Daniel García
032134aabc Fixed some errors asigning collections to users 2018-05-11 20:08:02 +02:00
Daniel García
8298795087 Update dependencies and bundle SQLite with the program, so we have one less dependency to install separately 2018-05-07 21:33:54 +02:00
Daniel García
7e7c3681da Implemented public key method correctly, which fixes decryption errors in collections and organizations 2018-05-04 22:54:23 +02:00
Daniel García
79b4ddcae8 Added read_only bit to users_collections 2018-05-04 20:10:35 +02:00
Daniel García
0cb58add54 Implemented some admin methods, inserted CollectionsUsers only when Org accessAll == false, and implemented find_collection when user has access_all in Org 2018-05-04 19:47:31 +02:00
Daniel García
92236394e6 Delete folder mappings when deleting folders and make sure that we can't change a ciphers owner when created 2018-05-04 19:02:19 +02:00
Daniel García
85bc5514f8
Merge pull request #12 from mprasil/user_decoupling
Decoupling user from cipher
2018-05-04 16:27:28 +02:00