@things-factory/lite-menu 6.2.49 → 6.2.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/lite-menu",
-  "version": "6.2.49",
+  "version": "6.2.51",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -34,13 +34,13 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/apptool-base": "^6.2.48",
-    "@things-factory/auth-base": "^6.2.49",
-    "@things-factory/board-service": "^6.2.49",
-    "@things-factory/board-ui": "^6.2.49",
-    "@things-factory/more-base": "^6.2.48",
-    "@things-factory/setting-base": "^6.2.49",
+    "@things-factory/apptool-base": "^6.2.51",
+    "@things-factory/auth-base": "^6.2.51",
+    "@things-factory/board-service": "^6.2.51",
+    "@things-factory/board-ui": "^6.2.51",
+    "@things-factory/more-base": "^6.2.51",
+    "@things-factory/setting-base": "^6.2.51",
     "@things-factory/utils": "^6.2.48"
   },
-  "gitHead": "57266c96220301729f9c5cd633af1a4e2a651096"
+  "gitHead": "365e8ae6475eede1a4fd51460c24569d13de14b6"
 }

package/server/service/lite-menu/lite-menu-query.ts

@@ -2,45 +2,12 @@ import { In } from 'typeorm'
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
-import { PrivilegeObject, User } from '@things-factory/auth-base'
+import { PrivilegeObject, User, checkPermission } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
 
 import { LiteMenu } from './lite-menu'
 import { LiteMenuList } from './lite-menu-type'
 
-async function checkPermission(
-  privilegeObject: PrivilegeObject,
-  user: User,
-  domain: Domain,
-  protectedIP: boolean
-): Promise<boolean> {
-  if (!privilegeObject) {
-    return true
-  }
-
-  const {
-    owner: domainOwnerGranted,
-    super: superUserGranted,
-    category,
-    privilege,
-    protected: protectedIPOnly
-  } = privilegeObject
-
-  if (protectedIPOnly && !protectedIP) {
-    return false
-  }
-
-  if (!privilege || !category) {
-    return true
-  }
-
-  return (
-    (domainOwnerGranted && (await process.domainOwnerGranted(domain, user))) ||
-    (superUserGranted && (await process.superUserGranted(domain, user))) ||
-    (category && privilege && (await User.hasPrivilege(privilege, category, domain, user)))
-  )
-}
-
 @Resolver(LiteMenu)
 export class LiteMenuQuery {
   @Query(returns => LiteMenu, { description: 'To fetch a LiteMenu' })
@@ -73,7 +40,7 @@ export class LiteMenuQuery {
 
   @Query(returns => LiteMenuList, { description: 'To fetch my own LiteMenus' })
   async myLiteMenus(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<LiteMenuList> {
-    const { domain, user, protected: protectedIP } = context.state
+    const { domain, user, unsafeIP, prohibitedPrivileges } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
       repository: getRepository(LiteMenu),
@@ -86,7 +53,7 @@ export class LiteMenuQuery {
     const filtered = []
 
     for (let item of items) {
-      if (await checkPermission(item.privilege, user, domain, protectedIP)) {
+      if (await checkPermission(item.privilege, user, domain, unsafeIP, prohibitedPrivileges)) {
         filtered.push(item)
       }
     }