mirror of
https://github.com/nextcloud/passman.git
synced 2024-09-20 23:06:24 +08:00
Stared to work on revisions
This commit is contained in:
brantje
parent
292fdef6ab
commit
a77ae301f5
|
|
@ -262,6 +262,12 @@ class CredentialController extends ApiController {
|
|||
*/
|
||||
public function updateRevision($credential_id, $revision_id, $credential_data){
|
||||
$revision = null;
|
||||
try {
|
||||
$credential = $this->credentialService->getCredentialById($credential_id, $this->userId);
|
||||
} catch (DoesNotExistException $e) {
|
||||
return new NotFoundResponse();
|
||||
}
|
||||
|
||||
try{
|
||||
$revision = $this->credentialRevisionService->getRevision($revision_id);
|
||||
} catch(DoesNotExistException $exception){
|
||||
|
|
@ -269,6 +275,8 @@ class CredentialController extends ApiController {
|
|||
}
|
||||
|
||||
$revision->setCredentialData($credential_data);
|
||||
|
||||
$this->credentialRevisionService->updateRevision($revision);
|
||||
return new JSONResponse(array());
|
||||
}
|
||||
}
|
||||
|
|
@ -419,12 +419,14 @@ class ShareController extends ApiController {
|
|||
* @param $credential_guid
|
||||
* @param $file_guid
|
||||
* @NoAdminRequired
|
||||
* @return JSONResponse
|
||||
* @return NotFoundResponse
|
||||
*/
|
||||
public function getFile($item_guid, $file_guid){
|
||||
try {
|
||||
$credential = $this->credentialService->getCredentialByGUID($item_guid);
|
||||
} catch (DoesNotExistException $e){
|
||||
return new JSONResponse(array());
|
||||
return new NotFoundResponse();
|
||||
}
|
||||
|
||||
$acl = $this->shareService->getACL($this->userId->getUID(), $credential->getGuid());
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
* Controller of the passmanApp
|
||||
*/
|
||||
angular.module('passmanApp')
|
||||
.controller('RevisionCtrl', ['$scope', 'SettingsService', 'VaultService', 'CredentialService', '$location', '$routeParams', '$rootScope', 'NotificationService', '$filter',
|
||||
function ($scope, SettingsService, VaultService, CredentialService, $location, $routeParams, $rootScope, NotificationService, $filter) {
|
||||
.controller('RevisionCtrl', ['$scope', 'SettingsService', 'VaultService', 'CredentialService', '$location', '$routeParams', '$rootScope', 'NotificationService', '$filter', 'ShareService','EncryptService',
|
||||
function ($scope, SettingsService, VaultService, CredentialService, $location, $routeParams, $rootScope, NotificationService, $filter, ShareService, EncryptService) {
|
||||
|
||||
if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) {
|
||||
if (!$scope.active_vault) {
|
||||
|
|
@ -52,8 +52,24 @@ angular.module('passmanApp')
|
|||
}
|
||||
|
||||
$scope.selectRevision = function (revision) {
|
||||
console.log(revision, $scope.storedCredential);
|
||||
var key;
|
||||
|
||||
return;
|
||||
$scope.selectedRevision = angular.copy(revision);
|
||||
|
||||
if(!$scope.storedCredential.hasOwnProperty('acl') && $scope.storedCredential.hasOwnProperty('shared_key')){
|
||||
key = EncryptService.decryptString(angular.copy($scope.storedCredential.shared_key));
|
||||
}
|
||||
if($scope.storedCredential.hasOwnProperty('acl')){
|
||||
key = EncryptService.decryptString(angular.copy($scope.storedCredential.acl.shared_key));
|
||||
}
|
||||
if(key){
|
||||
$scope.selectedRevision.credential_data = CredentialService.decryptCredential(angular.copy(revision.credential_data));
|
||||
} else {
|
||||
$scope.selectedRevision.credential_data = ShareService.decryptSharedCredential(angular.copy(revision.credential_data), key);
|
||||
}
|
||||
|
||||
$rootScope.$emit('app_menu', true);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -299,6 +299,16 @@ angular.module('passmanApp')
|
|||
})
|
||||
}
|
||||
|
||||
CredentialService.getRevisions($scope.storedCredential.credential_id).then(function (revisions) {
|
||||
console.log(revisions);
|
||||
for (var r = 0; r < revisions.length; r++) {
|
||||
var _revision = revisions[r];
|
||||
//Decrypt!
|
||||
_revision.credential_data = CredentialService.decryptCredential(_revision.credential_data);
|
||||
_revision.credential_data = ShareService.encryptSharedCredential(_revision.credential_data, key);
|
||||
CredentialService.updateRevision(_revision);
|
||||
}
|
||||
});
|
||||
|
||||
//@TODO Update revisions with new key (async)
|
||||
// With CredentialService.getRevisions we can get the revisions.
|
||||
|
|
|
|||
|
|
@ -141,9 +141,9 @@ angular.module('passmanApp')
|
|||
},
|
||||
updateRevision: function(revision){
|
||||
var _revision = angular.copy(revision);
|
||||
_revision.revision_data = window.btoa(_revision.revision_data);
|
||||
var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/' + id + '/revision/' + revision.id);
|
||||
return $http.patch(queryUrl, revision).then(function (response) {
|
||||
_revision.credential_data = window.btoa(JSON.stringify(_revision.credential_data));
|
||||
var queryUrl = OC.generateUrl('apps/passman/api/v2/credentials/' + revision.credential_data.credential_id + '/revision/' + revision.revision_id);
|
||||
return $http.patch(queryUrl, _revision).then(function (response) {
|
||||
if (response.data) {
|
||||
return response.data;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ angular.module('templates-main', ['views/credential_revisions.html', 'views/edit
|
|||
angular.module('views/credential_revisions.html', []).run(['$templateCache', function($templateCache) {
|
||||
'use strict';
|
||||
$templateCache.put('views/credential_revisions.html',
|
||||
'<div id="controls"><div class="actions creatable"><div class="breadcrumb"><div class="crumb svg ui-droppable" data-dir="/"><a ng-click="logout()"><i class="fa fa-home"></i></a></div><div class="crumb svg" data-dir="/Test"><a ng-click="cancel()">{{active_vault.name}}</a></div><div class="crumb svg last" data-dir="/Test"><a ng-if="storedCredential.credential_id">Showing revisions of "{{storedCredential.label}}"</a></div></div></div></div><div off-click="closeSelected()"><table class="credential-table" ng-init="menuOpen = false;"><tr ng-repeat="revision in revisions | orderBy:\'-created\'" ng-click="selectRevision(revision)" ng-class="{\'selected\': selectedRevision.revision_id == revision.revision_id}"><td><span class="icon"><i class="fa fa-lock"></i></span> <span class="label">Revision of {{revision.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}} <span ng-if="revision.edited_by">by {{revision.edited_by}}</span></span></td></tr><tr ng-show="revisions.length == 0"><td>No revisions found.</td></tr></table><div id="app-sidebar" class="detailsView scroll-container app_sidebar" ng-show="selectedRevision"><span class="close icon-close" ng-click="closeSelected()" alt="Close"></span> <b ng-show="selectedRevision">Revision of {{selectedRevision.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</b><table class="revision-details"><tr ng-show="selectedRevision.credential_data.label"><td>Label</td><td>{{selectedRevision.credential_data.label}}</td></tr><tr ng-show="selectedRevision.credential_data.username"><td>Account</td><td><span credential-field value="selectedRevision.credential_data.username"></span></td></tr><tr ng-show="selectedRevision.credential_data.password"><td>Password</td><td><span credential-field value="selectedRevision.credential_data.password" secret="\'true\'"></span></td></tr><tr ng-show="selectedRevision.credential_data.otp.secret"><td>OTP</td><td><span otp-generator secret="selectedRevision.credential_data.otp.secret"></span></td></tr><tr ng-show="selectedRevision.credential_data.email"><td>E-mail</td><td><span credential-field value="selectedRevision.credential_data.email"></span></td></tr><tr ng-show="selectedRevision.credential_data.url"><td>URL</td><td><span credential-field value="selectedRevision.url"></span></td></tr><tr ng-show="selectedRevision.credential_data.files.length > 0"><td>Files</td><td><div ng-repeat="file in selectedRevision.credential_data.files" class="link" ng-click="downloadFile(file)">{{file.filename}} ({{file.size | bytes}})</div></td></tr><tr ng-repeat="field in selectedRevision.credential_data.custom_fields"><td>{{field.label}}</td><td><span credential-field value="field.value" secret="field.secret"></span></td></tr><tr ng-show="selectedRevision.credential_data.changed"><td>Changed</td><td>{{selectedRevision.credential_data.changed * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</td></tr><tr ng-show="selectedRevision.credential_data.created"><td>Created</td><td>{{selectedRevision.credential_data.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</td></tr></table><div ng-show="selectedRevision"><button class="button" ng-click="restoreRevision(selectedRevision)"><span class="fa fa-edit"></span> Restore revision</button> <button class="button" ng-click="deleteRevision(selectedRevision)"><span class="fa fa-trash"></span> Delete revision</button></div></div></div>');
|
||||
'<div id="controls"><div class="actions creatable"><div class="breadcrumb"><div class="crumb svg ui-droppable" data-dir="/"><a ng-click="logout()"><i class="fa fa-home"></i></a></div><div class="crumb svg" data-dir="/Test"><a ng-click="cancel()">{{active_vault.name}}</a></div><div class="crumb svg last" data-dir="/Test"><a ng-if="storedCredential.credential_id">Showing revisions of "{{storedCredential.label}}"</a></div></div></div></div><div off-click="closeSelected()"><table class="credential-table" ng-init="menuOpen = false;"><tr ng-repeat="revision in revisions | orderBy:\'-created\'" ng-click="selectRevision(revision)" ng-class="{\'selected\': selectedRevision.revision_id == revision.revision_id}"><td><span class="icon"><i class="fa fa-lock"></i></span> <span class="label">Revision of {{revision.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}} ({{revision.credential_data.label}}) <span ng-if="revision.edited_by">by {{revision.edited_by}}</span></span></td></tr><tr ng-show="revisions.length == 0"><td>No revisions found.</td></tr></table><div id="app-sidebar" class="detailsView scroll-container app_sidebar" ng-show="selectedRevision"><span class="close icon-close" ng-click="closeSelected()" alt="Close"></span> <b ng-show="selectedRevision">Revision of {{selectedRevision.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</b><table class="revision-details"><tr ng-show="selectedRevision.credential_data.label"><td>Label</td><td>{{selectedRevision.credential_data.label}}</td></tr><tr ng-show="selectedRevision.credential_data.username"><td>Account</td><td><span credential-field value="selectedRevision.credential_data.username"></span></td></tr><tr ng-show="selectedRevision.credential_data.password"><td>Password</td><td><span credential-field value="selectedRevision.credential_data.password" secret="\'true\'"></span></td></tr><tr ng-show="selectedRevision.credential_data.otp.secret"><td>OTP</td><td><span otp-generator secret="selectedRevision.credential_data.otp.secret"></span></td></tr><tr ng-show="selectedRevision.credential_data.email"><td>E-mail</td><td><span credential-field value="selectedRevision.credential_data.email"></span></td></tr><tr ng-show="selectedRevision.credential_data.url"><td>URL</td><td><span credential-field value="selectedRevision.url"></span></td></tr><tr ng-show="selectedRevision.credential_data.files.length > 0"><td>Files</td><td><div ng-repeat="file in selectedRevision.credential_data.files" class="link" ng-click="downloadFile(file)">{{file.filename}} ({{file.size | bytes}})</div></td></tr><tr ng-repeat="field in selectedRevision.credential_data.custom_fields"><td>{{field.label}}</td><td><span credential-field value="field.value" secret="field.secret"></span></td></tr><tr ng-show="selectedRevision.credential_data.changed"><td>Changed</td><td>{{selectedRevision.credential_data.changed * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</td></tr><tr ng-show="selectedRevision.credential_data.created"><td>Created</td><td>{{selectedRevision.credential_data.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</td></tr></table><div ng-show="selectedRevision"><button class="button" ng-click="restoreRevision(selectedRevision)"><span class="fa fa-edit"></span> Restore revision</button> <button class="button" ng-click="deleteRevision(selectedRevision)"><span class="fa fa-trash"></span> Delete revision</button></div></div></div>');
|
||||
}]);
|
||||
|
||||
angular.module('views/edit_credential.html', []).run(['$templateCache', function($templateCache) {
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class CredentialRevision extends Entity implements \JsonSerializable {
|
|||
'revision_id' => $this->getId(),
|
||||
'guid' => $this->getGuid(),
|
||||
'created' => $this->getCreated(),
|
||||
'credential_data' => unserialize(base64_decode($this->getCredentialData())),
|
||||
'credential_data' => json_decode(base64_decode($this->getCredentialData())),
|
||||
'edited_by' => $this->getEditedBy(),
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ class CredentialRevisionMapper extends Mapper {
|
|||
$revision->setCreated($this->utils->getTime());
|
||||
$revision->setCredentialId($credential_id);
|
||||
$revision->setEditedBy($edited_by);
|
||||
$revision->setCredentialData(base64_encode(serialize($credential)));
|
||||
$revision->setCredentialData(base64_encode(json_encode($credential)));
|
||||
return $this->insert($revision);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
ng-class="{'selected': selectedRevision.revision_id == revision.revision_id}">
|
||||
<td>
|
||||
<span class="icon"><i class="fa fa-lock"></i> </span>
|
||||
<span class="label">Revision of {{revision.created * 1000 | date:'dd-MM-yyyy @ HH:mm:ss'}} <span ng-if="revision.edited_by">by {{revision.edited_by}}</span></span>
|
||||
<span class="label">Revision of {{revision.created * 1000 | date:'dd-MM-yyyy @ HH:mm:ss'}} ({{revision.credential_data.label}}) <span ng-if="revision.edited_by">by {{revision.edited_by}}</span></span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-show="revisions.length == 0">
|
||||
|
|
|
|||
Loading…
Reference in a new issue