Show message if an credential is expired

js/app/controllers/public_shared_credential.js

@@ -6,7 +6,7 @@
  * Controller of the passmanApp
  */
 angular.module('passmanApp')
-	.controller('PublicSharedCredential', ['$scope', 'ShareService', function ($scope, ShareService) {
+	.controller('PublicSharedCredential', ['$scope', 'ShareService','$window', function ($scope, ShareService, $window) {
 		$scope.test = 'hello world';
 
 		$scope.loading = false;
@@ -75,12 +75,18 @@ angular.module('passmanApp')
 
 		$scope.loadSharedCredential = function () {
 			$scope.loading = true;
-			ShareService.getPublicSharedCredential().then(function (sharedCredential) {
-				//Decrypt stuff here
-
-				//And then set it
+			var guid = $window.location.hash.replace('#','');
+			ShareService.getPublicSharedCredential(guid).then(function (sharedCredential) {
 				$scope.loading = false;
+				console.log(sharedCredential)
+				if(sharedCredential.status === 200){
 					$scope.shared_credential = example_shared_credential;
+				} else {
+					$scope.expired = true;
+				}
+
+			}, function(error){
+				return false;
 			})
 
 		}

js/app/services/shareservice.js

@@ -77,11 +77,14 @@ angular.module('passmanApp')
 				var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/credential/' + credential_guid);
 				return $http.get(queryUrl).then(function (response) {
 						if (response.data) {
-						return response.data;
+							return response;
 						} else {
 							return response;
 						}
-				});
+					},
+					function (result) {
+						return result;
+					})
 			},
 			getCredendialsSharedWithUs: function (vault_guid) {
 				var queryUrl = OC.generateUrl('apps/passman/api/v2/sharing/vault/' + vault_guid + '/get');

templates/public_share.php

@@ -64,7 +64,7 @@ style('passman', 'public-page');
 	<div class="row">
 		<div class="col-xs-8 col-xs-push-2 col-xs-pull-2 credential_container">
 			<h2>Passman</h2>
-			<div ng-if="!shared_credential">
+			<div ng-if="!shared_credential && !expired">
 				<span class="text">{name} has shared a credential with you.</span>
 				<button class="button-geen" ng-if="!loading"
 						ng-click="loadSharedCredential()">Click here to request
@@ -74,6 +74,9 @@ style('passman', 'public-page');
 						class="fa fa-spinner fa-spin"></i>Loading...
 				</button>
 			</div>
+			<div ng-if="expired">
+				Awwhh.... this credential is expired :(.
+			</div>
 			<div ng-if="shared_credential">
 				<table class="table">
 					<tr ng-show="shared_credential.label">