fix : removed every function from route guards

mrellipse · Aug 21, 2018 · 1670d98 · 1670d98
1 parent 4825515
commit 1670d98
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/ui/app/services/authentication/authentication-service.ts b/src/ui/app/services/authentication/authentication-service.ts
@@ -1,5 +1,4 @@
 import { default as Axios, AxiosResponse } from "axios";
-import { every } from "lodash/fp";
 import { IClaimsHelper } from "./claims-helper";
 import { GlobalConfig, PayloadMessageTypes, TokenHelper } from "../../common";
 import {
@@ -49,13 +48,17 @@ export class AuthenticationService extends StoreService
   satisfies(user: IUser, claims: string[]): boolean {
     if (!user.claims) return false;
 
-    return every(o => user["claims"] !== undefined, claims);
+    var actual = claims.filter(o => user.claims[o] !== undefined).length;
+
+    return actual === claims.length;
   }
 
   satisfiesAny(user: IUser, claims: string[]): boolean {
     if (!user.claims) return false;
 
-    return claims.find(o => user["claims"] !== undefined) !== undefined;
+    var actual = claims.filter(o => user.claims[o] !== undefined).length;
+
+    return actual > 0;
   }
 
   login(credentials: ICredential) {

diff --git a/src/ui/package.json b/src/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "toucan.ui",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "UI project for Toucan template",
   "keywords": [
     "vuejs",