From dee5ecda55636d889a7db6bf2dfee6b64ba1ca2a Mon Sep 17 00:00:00 2001 From: brantje Date: Wed, 14 Sep 2016 21:12:10 +0200 Subject: [PATCH] Start with showing Credentials --- appinfo/database.xml | 4 +- appinfo/info.xml | 2 +- controller/credentialcontroller.php | 32 +- css/app.css | 257 +++++++++------- css/app.css.map | 4 +- js/app/controllers/credential.js | 12 + js/app/controllers/edit_credential.js | 25 +- js/app/filters/decrypt.js | 18 ++ js/app/services/credentialservice.js | 30 +- js/app/services/fileservice.js | 1 + js/templates.js | 6 +- lib/Db/Credential.php | 2 + lib/Db/CredentialMapper.php | 22 ++ lib/Service/CredentialService.php | 4 + sass/app.scss | 1 - sass/container.scss | 26 -- sass/credentials.scss | 291 +++++++++++------- templates/main.php | 1 + templates/views/edit_credential.html | 2 + .../forms/edit_credential/basics.html | 2 +- templates/views/show_vault.html | 70 ++++- 21 files changed, 517 insertions(+), 295 deletions(-) create mode 100644 js/app/filters/decrypt.js delete mode 100644 sass/container.scss diff --git a/appinfo/database.xml b/appinfo/database.xml index 2b2d6eb0..b720f3f0 100644 --- a/appinfo/database.xml +++ b/appinfo/database.xml @@ -110,9 +110,9 @@ vault_id - text + integer true - 64 + 8 diff --git a/appinfo/info.xml b/appinfo/info.xml index 525f3f48..732b27cc 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -5,7 +5,7 @@ A password manager for Nextcloud AGPL Sander Brand - 1.0.2.3 + 1.0.2.4 Passman other https://github.com/nextcloud/passman/ diff --git a/controller/credentialcontroller.php b/controller/credentialcontroller.php index eb57fed8..c5293749 100644 --- a/controller/credentialcontroller.php +++ b/controller/credentialcontroller.php @@ -20,10 +20,11 @@ use OCA\Passman\Service\CredentialService; class CredentialController extends ApiController { private $userId; private $credentialService; + public function __construct($AppName, IRequest $request, $UserId, - CredentialService $credentialService){ + CredentialService $credentialService) { parent::__construct($AppName, $request); $this->userId = $UserId; $this->credentialService = $credentialService; @@ -75,8 +76,33 @@ class CredentialController extends ApiController { /** * @NoAdminRequired */ - public function updateCredential($credential_id) { - return; + public function updateCredential($changed, $created, + $credential_id, $custom_fields, $delete_time, + $description, $email, $expire_time, $favicon, $files, $guid, + $hidden, $label, $otp, $password, $renew_interval, + $tags, $url, $username, $vault_id) { + $credential = array( + 'credential_id' => $credential_id, + 'guid' => $guid, + 'user_id' => $this->userId, + 'label' => $label, + 'description' => $description, + 'created' => $created, + 'changed' => $changed, + 'tags' => $tags, + 'email' => $email, + 'username' => $username, + 'password' => $password, + 'url' => $url, + 'favicon' => $favicon, + 'renew_interval' => $renew_interval, + 'expire_time' => $expire_time, + 'files' => $files, + 'custom_fields' => $custom_fields, + 'otp' => $otp, + ); + $credential = $this->credentialService->updateCredential($credential); + return new JSONResponse($credential); } /** diff --git a/css/app.css b/css/app.css index d01c051e..18c75977 100644 --- a/css/app.css +++ b/css/app.css @@ -1,26 +1,3 @@ -.actions.creatable { - padding-left: 10px; } - .actions.creatable .bubble { - position: relative; - width: 185px; - -webkit-border-radius: 5px; - border-radius: 5px; - background-clip: padding-box; - /* stops bg color from leaking outside the border: */ - box-shadow: 0 1px 10px rgba(50, 50, 50, 0.7); } - .actions.creatable .bubble ul li { - padding-left: 10px; } - .actions.creatable .bubble ul .menuitem { - font-size: 12px; - display: inline; } - .actions.creatable .bubble:after { - right: inherit; - left: 10px; - top: -19px; } - -#app-content-wrapper { - min-height: 95%; } - .button-geen { background: #37ce02; color: #fff; } @@ -156,105 +133,147 @@ @media screen and (max-width: 768px) { .vault_wrapper { width: 90%; } } -.credential-table { - width: 100%; - margin-top: 44px; } - .credential-table tr:hover { - background-color: whitesmoke; } - .credential-table tr td { - cursor: pointer; - padding: 5px; - border-bottom: 1px solid #eeeeee; } - .credential-table tr td .label { - float: left; } - .credential-table tr td .tags { - float: right; } - .credential-table tr td .tags .tag { - background-color: rgba(240, 240, 240, 0.9); - padding: 4px; - font-size: 11px; } - .credential-table tr td .icon-more { - display: inline-block; - float: right; - margin-left: 5px; - margin-top: 1px; - opacity: 0.4; - height: 20px; - width: 32px; - cursor: pointer; } - .credential-table tr td .icon-more:hover { - opacity: 1; } - .credential-table tr td .popovermenu { - margin-top: 7px; - height: 100px; - width: 100px; - right: -2px !important; - box-shadow: 0 1px 10px rgba(50, 50, 50, 0.7); } - .credential-table tr td .popovermenu ul { - display: block; - width: 100px; - height: 75px; } - .credential-table tr td .popovermenu ul li { - padding: 0px; } - .credential-table tr td .popovermenu ul .menuitem { +#app-content { + overflow-x: hidden; } + #app-content #app-content-wrapper { + min-height: 95%; } + #app-content #app-content-wrapper .actions.creatable { + padding-left: 10px; } + #app-content #app-content-wrapper .actions.creatable .bubble { + position: relative; + width: 185px; + -webkit-border-radius: 5px; + border-radius: 5px; + background-clip: padding-box; + /* stops bg color from leaking outside the border: */ + box-shadow: 0 1px 10px rgba(50, 50, 50, 0.7); } + #app-content #app-content-wrapper .actions.creatable .bubble ul li { + padding-left: 10px; } + #app-content #app-content-wrapper .actions.creatable .bubble ul .menuitem { font-size: 12px; display: inline; } - .credential-table tr td .popovermenu .action { - padding: 10px; - margin: -10px; } - -.edit_credential { - padding-top: 10px; } - .edit_credential label { - display: block; } - .edit_credential input[type="text"], .edit_credential input[type="password"] { - width: 100%; } - .edit_credential .tags { - float: left; } - .edit_credential .tags .tag { - background-color: rgba(240, 240, 240, 0.9); - padding: 4px; - font-size: 11px; } - .edit_credential .credential_textarea { - width: 100%; - height: 100px; } - .edit_credential .password_settings label { - overflow: hidden; } - .edit_credential .password_settings label input[type="checkbox"] { - width: auto !important; - float: left; } - .edit_credential .password_settings label .label { - float: left; } - .edit_credential .password_settings label .label.sm { - font-size: 12px; } - .edit_credential .custom_fields, .edit_credential .files { - margin-top: 10px; } - .edit_credential .custom_fields table, .edit_credential .files table { - width: 100%; } - .edit_credential .custom_fields table thead th, .edit_credential .files table thead th { - color: #fff; } - .edit_credential .custom_fields table thead th.field_actions, .edit_credential .files table thead th.field_actions { - width: 15%; } - .edit_credential .custom_fields table tr td.field_actions, .edit_credential .files table tr td.field_actions { - font-size: 13px; - width: 15%; } - .edit_credential .custom_fields table tr td.field_actions i, .edit_credential .files table tr td.field_actions i { + #app-content #app-content-wrapper .actions.creatable .bubble:after { + right: inherit; + left: 10px; + top: -19px; } + #app-content #app-content-wrapper .credential-table { + width: 100%; + margin-top: 44px; } + #app-content #app-content-wrapper .credential-table tr:hover { + background-color: whitesmoke; } + #app-content #app-content-wrapper .credential-table tr.selected { + background-color: #f8f8f8; } + #app-content #app-content-wrapper .credential-table tr td { + cursor: pointer; + padding: 5px; + border-bottom: 1px solid #eeeeee; } + #app-content #app-content-wrapper .credential-table tr td .label { + float: left; } + #app-content #app-content-wrapper .credential-table tr td .tags { + float: right; } + #app-content #app-content-wrapper .credential-table tr td .tags .tag { + background-color: rgba(240, 240, 240, 0.9); + padding: 4px; + font-size: 11px; } + #app-content #app-content-wrapper .credential-table tr td .icon-more { + display: inline-block; + float: right; + margin-left: 5px; + margin-top: 1px; + opacity: 0.4; + height: 20px; + width: 32px; cursor: pointer; } - .edit_credential .custom_fields table tr td, .edit_credential .custom_fields table tr th, .edit_credential .files table tr td, .edit_credential .files table tr th { - width: 20%; - padding: 5px; } - .edit_credential .custom_fields table tr td .editable-has-buttons.editable-input, .edit_credential .custom_fields table tr th .editable-has-buttons.editable-input, .edit_credential .files table tr td .editable-has-buttons.editable-input, .edit_credential .files table tr th .editable-has-buttons.editable-input { - width: 55%; } - .edit_credential .custom_fields table tr td, .edit_credential .files table tr td { - height: 50px; - vertical-align: middle; } - .edit_credential .file_tab .progress { - margin-top: 10px; - height: 10px; } - .edit_credential .file_tab .progress .progress-bar { - height: 10px; - background-image: none; - background-color: #0082c9; } + #app-content #app-content-wrapper .credential-table tr td .icon-more:hover { + opacity: 1; } + #app-content #app-content-wrapper .credential-table tr td .popovermenu { + margin-top: 25px; + height: 100px; + width: 100px; + right: -2px !important; + box-shadow: 0 1px 10px rgba(50, 50, 50, 0.7); } + #app-content #app-content-wrapper .credential-table tr td .popovermenu ul { + display: block; + width: 100px; + height: 75px; } + #app-content #app-content-wrapper .credential-table tr td .popovermenu ul li { + padding: 0px; } + #app-content #app-content-wrapper .credential-table tr td .popovermenu ul .menuitem { + font-size: 12px; + display: inline; } + #app-content #app-content-wrapper .credential-table tr td .popovermenu .action { + padding: 10px; + margin: -10px; } + #app-content #app-content-wrapper .edit_credential { + padding-top: 10px; } + #app-content #app-content-wrapper .edit_credential label { + display: block; } + #app-content #app-content-wrapper .edit_credential input[type="text"], #app-content #app-content-wrapper .edit_credential input[type="password"] { + width: 100%; } + #app-content #app-content-wrapper .edit_credential .tags { + float: left; } + #app-content #app-content-wrapper .edit_credential .tags .tag { + background-color: rgba(240, 240, 240, 0.9); + padding: 4px; + font-size: 11px; } + #app-content #app-content-wrapper .edit_credential .credential_textarea { + width: 100%; + height: 100px; } + #app-content #app-content-wrapper .edit_credential .password_settings label { + overflow: hidden; } + #app-content #app-content-wrapper .edit_credential .password_settings label input[type="checkbox"] { + width: auto !important; + float: left; } + #app-content #app-content-wrapper .edit_credential .password_settings label .label { + float: left; } + #app-content #app-content-wrapper .edit_credential .password_settings label .label.sm { + font-size: 12px; } + #app-content #app-content-wrapper .edit_credential .custom_fields, #app-content #app-content-wrapper .edit_credential .files { + margin-top: 10px; } + #app-content #app-content-wrapper .edit_credential .custom_fields table, #app-content #app-content-wrapper .edit_credential .files table { + width: 100%; } + #app-content #app-content-wrapper .edit_credential .custom_fields table thead th, #app-content #app-content-wrapper .edit_credential .files table thead th { + color: #fff; } + #app-content #app-content-wrapper .edit_credential .custom_fields table thead th.field_actions, #app-content #app-content-wrapper .edit_credential .files table thead th.field_actions { + width: 15%; } + #app-content #app-content-wrapper .edit_credential .custom_fields table tr td.field_actions, #app-content #app-content-wrapper .edit_credential .files table tr td.field_actions { + font-size: 13px; + width: 15%; } + #app-content #app-content-wrapper .edit_credential .custom_fields table tr td.field_actions i, #app-content #app-content-wrapper .edit_credential .files table tr td.field_actions i { + cursor: pointer; } + #app-content #app-content-wrapper .edit_credential .custom_fields table tr td, #app-content #app-content-wrapper .edit_credential .custom_fields table tr th, #app-content #app-content-wrapper .edit_credential .files table tr td, #app-content #app-content-wrapper .edit_credential .files table tr th { + width: 20%; + padding: 5px; } + #app-content #app-content-wrapper .edit_credential .custom_fields table tr td .editable-has-buttons.editable-input, #app-content #app-content-wrapper .edit_credential .custom_fields table tr th .editable-has-buttons.editable-input, #app-content #app-content-wrapper .edit_credential .files table tr td .editable-has-buttons.editable-input, #app-content #app-content-wrapper .edit_credential .files table tr th .editable-has-buttons.editable-input { + width: 55%; } + #app-content #app-content-wrapper .edit_credential .custom_fields table tr td, #app-content #app-content-wrapper .edit_credential .files table tr td { + height: 50px; + vertical-align: middle; } + #app-content #app-content-wrapper .edit_credential .file_tab .progress { + margin-top: 10px; + height: 10px; } + #app-content #app-content-wrapper .edit_credential .file_tab .progress .progress-bar { + height: 10px; + background-image: none; + background-color: #0082c9; } + #app-content #app-content-wrapper .view_pane { + -webkit-box-shadow: 0px -4px 3px rgba(150, 150, 150, 0.75); + -moz-box-shadow: 0px -4px 3px rgba(150, 150, 150, 0.75); + box-shadow: 0px -4px 3px rgba(150, 150, 150, 0.75); + padding-top: 10px; + position: absolute; + bottom: 0; + background-color: #eee; + left: 0; + right: 0; + display: none; + overflow-y: auto; } + #app-content #app-content-wrapper .view_pane .row { + margin-left: 0; + margin-right: 0; } + #app-content #app-content-wrapper .view_pane.item_selected { + height: 20%; + display: inline-block; } .settings-container div { padding-left: 15px; } diff --git a/css/app.css.map b/css/app.css.map index 0a05f6b9..320ad7c3 100644 --- a/css/app.css.map +++ b/css/app.css.map @@ -1,7 +1,7 @@ { "version": 3, -"mappings": "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", -"sources": ["../sass/container.scss","../sass/mixins.scss","../sass/partials/button.scss","../sass/partials/tabs.scss","../sass/partials/pwgen.scss","../sass/vaults.scss","../sass/credentials.scss","../sass/menu.scss","../sass/app.scss"], +"mappings": "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", +"sources": ["../sass/partials/button.scss","../sass/partials/tabs.scss","../sass/partials/pwgen.scss","../sass/mixins.scss","../sass/vaults.scss","../sass/credentials.scss","../sass/menu.scss","../sass/app.scss"], "names": [], "file": "app.css" } diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js index 471a5d97..bd4b93f9 100644 --- a/js/app/controllers/credential.js +++ b/js/app/controllers/credential.js @@ -31,6 +31,18 @@ angular.module('passmanApp') $location.path('/vault/'+ $scope.active_vault.vault_id +'/new') }; + $scope.editCredential = function(credential){ + var credential = angular.copy(credential); + SettingsService.setSetting('edit_credential',credential); + $location.path('/vault/'+ $scope.active_vault.vault_id +'/edit/'+ credential.credential_id) + }; + + $scope.selectedCredential = false; + $scope.selectCredential = function (credential) { + console.log(credential); + $scope.selectedCredential = credential + } + $rootScope.$on('logout', function () { console.log('Logout received, clean up'); $scope.credentials = []; diff --git a/js/app/controllers/edit_credential.js b/js/app/controllers/edit_credential.js index 767bafed..e5847d5f 100644 --- a/js/app/controllers/edit_credential.js +++ b/js/app/controllers/edit_credential.js @@ -8,7 +8,7 @@ * Controller of the passmanApp */ angular.module('passmanApp') - .controller('CredentialEditCtrl', ['$scope', 'VaultService', 'CredentialService', 'SettingsService', '$location', '$routeParams', 'FileService', function ($scope, VaultService, CredentialService, SettingsService, $location, $routeParams, FileService) { + .controller('CredentialEditCtrl', ['$scope', 'VaultService', 'CredentialService', 'SettingsService', '$location', '$routeParams', 'FileService', 'EncryptService', function ($scope, VaultService, CredentialService, SettingsService, $location, $routeParams, FileService, EncryptService) { $scope.active_vault = VaultService.getActiveVault(); @@ -143,6 +143,7 @@ angular.module('passmanApp') }; FileService.uploadFile(_file).then(function (result) { delete result.file_data; + result.filename = EncryptService.decryptString(result.filename); $scope.storedCredential.files.push(result); }); @@ -177,5 +178,27 @@ angular.module('passmanApp') qrInfo[parsedQR[5]] = parsedQR[6]; $scope.storedCredential.otp = qrInfo; $scope.$apply() + }; + + $scope.saveCredential = function () { + + delete $scope.storedCredential.password_repeat; + if(!$scope.storedCredential.credential_id){ + $scope.storedCredential.vault_id = $scope.active_vault.vault_id; + CredentialService.createCredential($scope.storedCredential).then(function (result) { + $location.path('/vault/' + $routeParams.vault_id); + //@TODO Show notification + }) + } else { + CredentialService.updateCredential($scope.storedCredential).then(function (result) { + SettingsService.setSetting('edit_credential', null); + $location.path('/vault/' + $routeParams.vault_id); + //@TODO Show notification + }) + } + }; + + $scope.cancel = function(){ + $location.path('/vault/' + $routeParams.vault_id); } }]); diff --git a/js/app/filters/decrypt.js b/js/app/filters/decrypt.js new file mode 100644 index 00000000..97ae1792 --- /dev/null +++ b/js/app/filters/decrypt.js @@ -0,0 +1,18 @@ +'use strict'; + +/** + * @ngdoc filter + * @name passmanApp.filter:decrypt + * @function + * @description + * # decrypt + * Filter in the passmanApp. + */ +angular.module('passmanApp') + .filter('decrypt',['EncryptService', function (EncryptService) { + return function (input) { + if(input) { + return EncryptService.decryptString(input); + } + }; + }]); diff --git a/js/app/services/credentialservice.js b/js/app/services/credentialservice.js index 96892493..fa7e73bc 100644 --- a/js/app/services/credentialservice.js +++ b/js/app/services/credentialservice.js @@ -24,28 +24,31 @@ angular.module('passmanApp') 'url': null, 'favicon': null, 'renew_interval': null, - 'expire_time': null, + 'expire_time': 0, 'delete_time': 0, 'files': [], 'custom_fields': [], 'otp': {}, 'hidden': false }; - var _encryptedFields = ['description','username','password','files','custom_fields','otp']; + var _encryptedFields = ['description', 'username', 'password', 'files', 'custom_fields', 'otp', 'email', 'tags', 'url']; + + return { newCredential: function () { return angular.copy(credential); }, createCredential: function (credential) { - for(var i = 0; i < _encryptedFields.length; i++){ + var _credential = angular.copy(credential); + for (var i = 0; i < _encryptedFields.length; i++) { var field = _encryptedFields[i]; var fieldValue = angular.copy(credential[field]); - credential[field] = EncryptService.encryptString(JSON.stringify(fieldValue)); + _credential[field] = EncryptService.encryptString(JSON.stringify(fieldValue)); } var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials'); - return $http.post(queryUrl, credential).then(function (response) { - if(response.data){ + return $http.post(queryUrl, _credential).then(function (response) { + if (response.data) { return response.data; } else { return response; @@ -53,15 +56,16 @@ angular.module('passmanApp') }); }, updateCredential: function (credential) { - for(var i = 0; i < _encryptedFields.length; i++){ + var _credential = angular.copy(credential); + for (var i = 0; i < _encryptedFields.length; i++) { var field = _encryptedFields[i]; var fieldValue = angular.copy(credential[field]); - credential[field] = EncryptService.encryptString(JSON.stringify(fieldValue)); + _credential[field] = EncryptService.encryptString(JSON.stringify(fieldValue)); } - var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/'+ credential.credential_id); - return $http.post(queryUrl, credential).then(function (response) { - if(response.data){ + var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/' + credential.credential_id); + return $http.patch(queryUrl, _credential).then(function (response) { + if (response.data) { return response.data; } else { return response; @@ -69,7 +73,7 @@ angular.module('passmanApp') }); }, encryptCredential: function (credential) { - for(var i = 0; i < _encryptedFields.length; i++){ + for (var i = 0; i < _encryptedFields.length; i++) { var field = _encryptedFields[i]; var fieldValue = angular.copy(credential[field]); credential[field] = EncryptService.encryptString(JSON.stringify(fieldValue)); @@ -77,7 +81,7 @@ angular.module('passmanApp') return credential; }, decryptCredential: function (credential) { - for(var i = 0; i < _encryptedFields.length; i++){ + for (var i = 0; i < _encryptedFields.length; i++) { var field = _encryptedFields[i]; var fieldValue = angular.copy(credential[field]); credential[field] = JSON.parse(EncryptService.decryptString(fieldValue)); diff --git a/js/app/services/fileservice.js b/js/app/services/fileservice.js index 89bddb2a..4aa716a8 100644 --- a/js/app/services/fileservice.js +++ b/js/app/services/fileservice.js @@ -13,6 +13,7 @@ angular.module('passmanApp') uploadFile: function (file) { var queryUrl = OC.generateUrl('apps/passman/api/v2/file'); var _file = angular.copy(file); + _file.filename = EncryptService.encryptString(_file.filename); var data = EncryptService.encryptString(angular.copy(file.data)); _file.data = data; return $http.post(queryUrl, _file).then(function (response) { diff --git a/js/templates.js b/js/templates.js index a0c1c49c..2b0b2283 100644 --- a/js/templates.js +++ b/js/templates.js @@ -3,7 +3,7 @@ angular.module('templates-main', ['views/edit_credential.html', 'views/partials/ angular.module('views/edit_credential.html', []).run(['$templateCache', function($templateCache) { 'use strict'; $templateCache.put('views/edit_credential.html', - '
'); }]); @@ -11,7 +11,7 @@ angular.module('views/edit_credential.html', []).run(['$templateCache', function angular.module('views/partials/forms/edit_credential/basics.html', []).run(['$templateCache', function($templateCache) { 'use strict'; $templateCache.put('views/partials/forms/edit_credential/basics.html', - '
test
'); + '
test
'); }]); angular.module('views/partials/forms/edit_credential/custom_fields.html', []).run(['$templateCache', function($templateCache) { @@ -47,7 +47,7 @@ angular.module('views/partials/password-meter.html', []).run(['$templateCache', angular.module('views/show_vault.html', []).run(['$templateCache', function($templateCache) { 'use strict'; $templateCache.put('views/show_vault.html', - '
New
  • New credential
  • New shared credential
{{credential.label}} Tag 1 Tag 2 Tag 4 Tag 4 Long tag xD
  • Edit
  • Share
  • Delete
'); + '
New
  • New credential
  • New shared credential
{{credential.label}} Tag 1 Tag 2 Tag 4 Tag 4 Long tag xD
  • Edit
  • Share
  • Delete
Label
{{selectedCredential.label}}
Account
{{selectedCredential.label}}
Password
{{selectedCredential.label}}
Files
{{selectedCredential.label}}
Custom fields
{{selectedCredential.label}}
Changed
{{selectedCredential.label}}
Created
{{selectedCredential.label}}
'); }]); angular.module('views/vaults.html', []).run(['$templateCache', function($templateCache) { diff --git a/lib/Db/Credential.php b/lib/Db/Credential.php index b7d6de9a..9fa76941 100644 --- a/lib/Db/Credential.php +++ b/lib/Db/Credential.php @@ -93,6 +93,8 @@ class Credential extends Entity implements \JsonSerializable{ $this->addType('renewInterval', 'integer'); $this->addType('expireTime', 'integer'); $this->addType('deleteTime', 'integer'); + $this->addType('vault_id', 'integer'); + $this->addType('credential_id', 'integer'); } diff --git a/lib/Db/CredentialMapper.php b/lib/Db/CredentialMapper.php index 293b20f0..d52569c2 100644 --- a/lib/Db/CredentialMapper.php +++ b/lib/Db/CredentialMapper.php @@ -58,4 +58,26 @@ class CredentialMapper extends Mapper { return parent::insert($credential); } + public function update($raw_credential){ + $credential = new Credential(); + $credential->setId($raw_credential['credential_id']); + $credential->setUserId($raw_credential['user_id']); + $credential->setLabel($raw_credential['label']); + $credential->setDescription($raw_credential['description']); + $credential->setChanged($this->utils->getTime()); + $credential->setTags($raw_credential['tags']); + $credential->setEmail($raw_credential['email']); + $credential->setUsername($raw_credential['username']); + $credential->setPassword($raw_credential['password']); + $credential->setUrl($raw_credential['url']); + $credential->setFavicon($raw_credential['favicon']); + $credential->setRenewInterval($raw_credential['renew_interval']); + $credential->setExpireTime($raw_credential['expire_time']); + $credential->setFiles($raw_credential['files']); + $credential->setCustomFields($raw_credential['custom_fields']); + $credential->setOtp($raw_credential['otp']); + $credential->setHidden($raw_credential['hidden']); + return parent::update($credential); + } + } \ No newline at end of file diff --git a/lib/Service/CredentialService.php b/lib/Service/CredentialService.php index d279c7c8..d358ebf9 100644 --- a/lib/Service/CredentialService.php +++ b/lib/Service/CredentialService.php @@ -29,6 +29,10 @@ class CredentialService { return $this->credentialMapper->create($credential); } + public function updateCredential($credential) { + return $this->credentialMapper->update($credential); + } + public function getCredentialsByVaultId($vault_id, $user_id){ return $this->credentialMapper->getCredentialsByVaultId($vault_id, $user_id); } diff --git a/sass/app.scss b/sass/app.scss index a28c438b..b85bdbbd 100644 --- a/sass/app.scss +++ b/sass/app.scss @@ -1,7 +1,6 @@ @import 'variables'; @import 'mixins'; -@import 'container'; @import 'partials/button'; @import 'partials/popovermenu'; @import 'partials/tabs'; diff --git a/sass/container.scss b/sass/container.scss deleted file mode 100644 index e1c90213..00000000 --- a/sass/container.scss +++ /dev/null @@ -1,26 +0,0 @@ -.actions.creatable{ - padding-left: 10px; - .bubble{ - position: relative; - width: 185px; - @include border-radius(5px); - box-shadow: 0 1px 10px rgba(50, 50, 50, .7); - ul{ - li{ - padding-left: 10px; - } - .menuitem{ - font-size: 12px; - display: inline; - } - } - } - .bubble:after{ - right: inherit; - left: 10px; - top: -19px; - } -} -#app-content-wrapper{ - min-height: 95%; -} \ No newline at end of file diff --git a/sass/credentials.scss b/sass/credentials.scss index a8ff9ec9..e2445202 100644 --- a/sass/credentials.scss +++ b/sass/credentials.scss @@ -1,143 +1,196 @@ -.credential-table { - width: 100%; - margin-top: 44px; - tr:hover { - background-color: darken(#fff, 4%); - } - tr { - td { - cursor: pointer; - padding: 5px; - border-bottom: 1px solid #eeeeee; - .label { - float: left; - } - .tags { - float: right; - .tag { - background-color: rgba(240, 240, 240, .9); - padding: 4px; - font-size: 11px; - } - } - .icon-more { - display: inline-block; - float: right; - margin-left: 5px; - margin-top: 1px; - opacity: 0.4; - height: 20px; - width: 32px; - cursor: pointer; - } - .icon-more:hover { - opacity: 1; - } - .popovermenu { - margin-top: 7px; - height: 100px; - width: 100px; - right: -2px !important; +#app-content { + overflow-x: hidden; + #app-content-wrapper { + min-height: 95%; + .actions.creatable { + padding-left: 10px; + .bubble { + position: relative; + width: 185px; + @include border-radius(5px); box-shadow: 0 1px 10px rgba(50, 50, 50, .7); ul { - display: block; - width: 100px; - height: 75px; li { - padding: 0px; + padding-left: 10px; } .menuitem { font-size: 12px; display: inline; } } - .action { - padding: 10px; - margin: -10px; - } + } + .bubble:after { + right: inherit; + left: 10px; + top: -19px; } } - } -} - -.edit_credential { - padding-top: 10px; - label { - display: block; - } - input[type="text"], input[type="password"] { - width: 100%; - } - .tags { - float: left; - .tag { - background-color: rgba(240, 240, 240, .9); - padding: 4px; - font-size: 11px; - } - } - .credential_textarea { - width: 100%; - height: 100px; - } - .password_settings { - label { - overflow: hidden; - input[type="checkbox"] { - width: auto !important; - float: left; - } - .label { - &.sm{ - font-size: 12px; - } - float: left; - } - } - } - .custom_fields, .files { - margin-top: 10px; - table { + .credential-table { width: 100%; - thead { - th { - color: #fff; - } - th.field_actions { - width: 15%; - } + margin-top: 44px; + tr:hover { + background-color: darken(#fff, 4%); } tr { - td.field_actions { - font-size: 13px; - width: 15%; - i{ + &.selected { + background-color: #f8f8f8; + } + td { + cursor: pointer; + padding: 5px; + border-bottom: 1px solid #eeeeee; + .label { + float: left; + } + .tags { + float: right; + .tag { + background-color: rgba(240, 240, 240, .9); + padding: 4px; + font-size: 11px; + } + } + .icon-more { + display: inline-block; + float: right; + margin-left: 5px; + margin-top: 1px; + opacity: 0.4; + height: 20px; + width: 32px; cursor: pointer; } - } - td, th { - width: 20%; - padding: 5px; - .editable-has-buttons.editable-input { - width: 55%; + .icon-more:hover { + opacity: 1; + } + .popovermenu { + margin-top: 25px; + height: 100px; + width: 100px; + right: -2px !important; + box-shadow: 0 1px 10px rgba(50, 50, 50, .7); + ul { + display: block; + width: 100px; + height: 75px; + li { + padding: 0px; + } + .menuitem { + font-size: 12px; + display: inline; + } + } + .action { + padding: 10px; + margin: -10px; + } } - } - td{ - height: 50px; - vertical-align: middle; } } } - } - .file_tab{ - .progress{ - margin-top: 10px; - height: 10px; - .progress-bar{ - height: 10px; - background-image: none; - background-color: #0082c9; + + .edit_credential { + padding-top: 10px; + label { + display: block; } + input[type="text"], input[type="password"] { + width: 100%; + } + .tags { + float: left; + .tag { + background-color: rgba(240, 240, 240, .9); + padding: 4px; + font-size: 11px; + } + } + .credential_textarea { + width: 100%; + height: 100px; + } + .password_settings { + label { + overflow: hidden; + input[type="checkbox"] { + width: auto !important; + float: left; + } + .label { + &.sm { + font-size: 12px; + } + float: left; + } + } + } + .custom_fields, .files { + margin-top: 10px; + table { + width: 100%; + thead { + th { + color: #fff; + } + th.field_actions { + width: 15%; + } + } + tr { + td.field_actions { + font-size: 13px; + width: 15%; + i { + cursor: pointer; + } + } + td, th { + width: 20%; + padding: 5px; + .editable-has-buttons.editable-input { + width: 55%; + } + } + td { + height: 50px; + vertical-align: middle; + } + } + } + } + .file_tab { + .progress { + margin-top: 10px; + height: 10px; + .progress-bar { + height: 10px; + background-image: none; + background-color: #0082c9; + } + } + } + } + .view_pane { + -webkit-box-shadow: 0px -4px 3px rgba(150, 150, 150, 0.75); + -moz-box-shadow: 0px -4px 3px rgba(150, 150, 150, 0.75); + box-shadow: 0px -4px 3px rgba(150, 150, 150, 0.75); + padding-top: 10px; + .row { + margin-left: 0; + margin-right: 0; + } + &.item_selected { + height: 20%; + display: inline-block; + } + position: absolute; + bottom: 0; + background-color: #eee; + left: 0; + right: 0; + display: none; + overflow-y: auto; } } } \ No newline at end of file diff --git a/templates/main.php b/templates/main.php index 4cf45317..5d6a3bd8 100644 --- a/templates/main.php +++ b/templates/main.php @@ -30,6 +30,7 @@ script('passman', 'app/controllers/credential'); script('passman', 'app/controllers/edit_credential'); script('passman', 'app/filters/range'); script('passman', 'app/filters/propsfilter'); +script('passman', 'app/filters/decrypt'); script('passman', 'app/services/cacheservice'); script('passman', 'app/services/vaultservice'); script('passman', 'app/services/credentialservice'); diff --git a/templates/views/edit_credential.html b/templates/views/edit_credential.html index 54637ca7..c642750b 100644 --- a/templates/views/edit_credential.html +++ b/templates/views/edit_credential.html @@ -7,6 +7,8 @@
+ + diff --git a/templates/views/partials/forms/edit_credential/basics.html b/templates/views/partials/forms/edit_credential/basics.html index d1a3dc8e..0f56b4a6 100644 --- a/templates/views/partials/forms/edit_credential/basics.html +++ b/templates/views/partials/forms/edit_credential/basics.html @@ -30,7 +30,7 @@
- +
diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html index eabb9e72..95eb3047 100644 --- a/templates/views/show_vault.html +++ b/templates/views/show_vault.html @@ -29,8 +29,8 @@
- - +
+ -
{{credential.label}}
    -
  • Edit @@ -63,4 +63,66 @@
\ No newline at end of file + + +
+
+
+ Label +
+
+ {{selectedCredential.label}} +
+
+
+
+ Account +
+
+ {{selectedCredential.label}} +
+
+
+
+ Password +
+
+ {{selectedCredential.label}} +
+
+ +
+
+ Files +
+
+ {{selectedCredential.label}} +
+
+
+
+ Custom fields +
+
+ {{selectedCredential.label}} +
+
+
+
+ Changed +
+
+ {{selectedCredential.label}} +
+
+
+
+ Created +
+
+ {{selectedCredential.label}} +
+
+ + +
\ No newline at end of file