Change the way the credentials are loaded, load credentials every 5 min, Decline share request works

js/app/controllers/credential.js

@@ -9,8 +9,8 @@
  */
 angular.module('passmanApp')
 	.controller('CredentialCtrl', ['$scope', 'VaultService', 'SettingsService', '$location', 'CredentialService',
-		'$rootScope', 'FileService', 'EncryptService', 'TagService', '$timeout', 'NotificationService', 'CacheService', 'ShareService', 'SharingACL',
+		'$rootScope', 'FileService', 'EncryptService', 'TagService', '$timeout', 'NotificationService', 'CacheService', 'ShareService', 'SharingACL', '$interval',
-		function ($scope, VaultService, SettingsService, $location, CredentialService, $rootScope, FileService, EncryptService, TagService, $timeout, NotificationService, CacheService, ShareService, SharingACL) {
+		function ($scope, VaultService, SettingsService, $location, CredentialService, $rootScope, FileService, EncryptService, TagService, $timeout, NotificationService, CacheService, ShareService, SharingACL, $interval) {
 			$scope.active_vault = VaultService.getActiveVault();
 			if (!SettingsService.getSetting('defaultVault') || !SettingsService.getSetting('defaultVaultPass')) {
 				if (!$scope.active_vault) {
@@ -30,8 +30,42 @@ angular.module('passmanApp')
 
 			$scope.show_spinner = true;
 
-			var getSharedCredentials = function() {
+			var fetchCredentials = function () {
-				ShareService.getCredendialsSharedWithUs($scope.active_vault.guid).then(function (shared_credentials) {
+				VaultService.getVault($scope.active_vault).then(function (vault) {
+
+					var vaultKey = angular.copy($scope.active_vault.vaultKey);
+					var _credentials = angular.copy(vault.credentials);
+					vault.credentials = [];
+					$scope.active_vault = vault;
+					$scope.active_vault.vaultKey = vaultKey;
+					VaultService.setActiveVault($scope.active_vault);
+					console.log(vault);
+					for (var i = 0; i < _credentials.length; i++) {
+						var _credential = _credentials[i];
+						try {
+							if (!_credential.shared_key) {
+								_credential = CredentialService.decryptCredential(angular.copy(_credential));
+
+							} else {
+								var enc_key = EncryptService.decryptString(_credential.shared_key);
+								_credential = ShareService.decryptSharedCredential(angular.copy(_credential), enc_key);
+							}
+							_credential.tags_raw = _credential.tags;
+						} catch (e) {
+							NotificationService.showNotification('An error happend during decryption', 5000);
+							//$rootScope.$broadcast('logout');
+							//SettingsService.setSetting('defaultVaultPass', null);
+							//.setSetting('defaultVault', null);
+							//$location.path('/')
+
+						}
+						if (_credential.tags) {
+							TagService.addTags(_credential.tags);
+						}
+						_credentials[i] = _credential;
+					}
+
+					ShareService.getCredendialsSharedWithUs(vault.guid).then(function (shared_credentials) {
 						console.log('Shared credentials', shared_credentials);
 						for (var c = 0; c < shared_credentials.length; c++) {
 							var _shared_credential = shared_credentials[c];
@@ -46,51 +80,21 @@ angular.module('passmanApp')
 								_shared_credential_data.acl = _shared_credential;
 								_shared_credential_data.acl.permissions = new SharingACL(_shared_credential_data.acl.permissions);
 								_shared_credential_data.tags_raw = _shared_credential_data.tags;
-							$scope.active_vault.credentials.push(_shared_credential_data);
+								if (_shared_credential_data.tags) {
+									TagService.addTags(_shared_credential_data.tags);
+								}
+								_credentials.push(_shared_credential_data);
 							}
 						}
+						angular.merge($scope.active_vault.credentials, _credentials);
 					});
-			};
 
-			var fetchCredentials = function () {
+					//getSharedCredentials();
-				VaultService.getVault($scope.active_vault).then(function (vault) {
-					var vaultKey = angular.copy($scope.active_vault.vaultKey);
-					$scope.active_vault = vault;
-					$scope.active_vault.vaultKey = vaultKey;
-					VaultService.setActiveVault($scope.active_vault);
-					var _credentials = [];
-					for (var i = 0; i < $scope.active_vault.credentials.length; i++) {
-						try {
-							if(!$scope.active_vault.credentials[i].shared_key) {
-								$scope.active_vault.credentials[i] = CredentialService.decryptCredential(angular.copy(vault.credentials[i]));
-
-							} else {
-								var enc_key = EncryptService.decryptString(vault.credentials[i].shared_key);
-								$scope.active_vault.credentials[i] = ShareService.decryptSharedCredential(angular.copy(vault.credentials[i]), enc_key);
-							}
-							$scope.active_vault.credentials[i].tags_raw = $scope.active_vault.credentials[i].tags;
-						} catch (e) {
-							NotificationService.showNotification('An error happend during decryption', 5000);
-							$rootScope.$broadcast('logout');
-							SettingsService.setSetting('defaultVaultPass', null);
-							SettingsService.setSetting('defaultVault', null);
-							$location.path('/')
-
-						}
-						if ($scope.active_vault.credentials[i].tags) {
-							TagService.addTags($scope.active_vault.credentials[i].tags);
-						}
-					}
-					getSharedCredentials();
 					$scope.show_spinner = false;
 				});
 			};
 
-			if ($scope.active_vault) {
+			var getPendingShareRequests = function () {
-				$scope.$parent.selectedVault = true;
-				fetchCredentials()
-			}
-
 				ShareService.getPendingRequests().then(function (shareRequests) {
 					if (shareRequests.length > 0) {
 						$scope.incoming_share_requests = shareRequests;
@@ -100,6 +104,23 @@ angular.module('passmanApp')
 						});
 					}
 				});
+			};
+
+
+			var refresh_data_interval = null;
+			if ($scope.active_vault) {
+				$scope.$parent.selectedVault = true;
+				fetchCredentials();
+				getPendingShareRequests();
+				refresh_data_interval = $interval(function () {
+					fetchCredentials();
+					getPendingShareRequests();
+				}, 60000 * 5)
+			}
+			$scope.$on('$destroy', function() {
+				$interval.cancel(refresh_data_interval);
+			});
+
 
 			$scope.permissions = new SharingACL(0);
 
@@ -132,13 +153,28 @@ angular.module('passmanApp')
 					}
 					if (active_share_requests === false) {
 						jQuery('.ui-dialog').remove();
-						getSharedCredentials();
+						fetchCredentials();
 					}
 					console.log(result)
 				})
 			};
 
-
+			$scope.declineShareRequest = function(share_request){
+				ShareService.declineSharingRequest(share_request).then(function () {
+					var idx = $scope.incoming_share_requests.indexOf(share_request);
+					$scope.incoming_share_requests.splice(idx, 1);
+					var active_share_requests = false;
+					for (var v = 0; v < $scope.incoming_share_requests.length; v++) {
+						if ($scope.incoming_share_requests[v].target_vault_id == $scope.active_vault.vault_id) {
+							active_share_requests = true;
+						}
+					}
+					if (active_share_requests === false) {
+						jQuery('.ui-dialog').remove();
+						fetchCredentials();
+					}
+				})
+			};
 
 
 			$scope.addCredential = function () {

js/app/services/shareservice.js

@@ -67,6 +67,12 @@ angular.module('passmanApp')
 					return response.data;
 				})
 			},
+			declineSharingRequest: function (request ) {
+				var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/decline/'+ request.req_id);
+				return $http.delete(queryUrl).then(function (response) {
+					return response.data;
+				})
+			},
 			unshareCredential: function (credential) {
 				var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/' + credential.guid);
 				return $http.delete(queryUrl).then(function (response) {

templates/views/show_vault.html

@@ -283,7 +283,7 @@
 			</td>
 			<td>
 				<span class="link" ng-click="acceptShareRequest(share_request)">Accept</span>
-				| <span class="link">Decline</span>
+				| <span class="link" ng-click="declineShareRequest(share_request)">Decline</span>
 			</td>
 		</tr>
 	</table>