@things-factory/lite-menu 6.2.44 → 6.2.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/lite-menu",
-  "version": "6.2.44",
+  "version": "6.2.48",
   "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.44",
-    "@things-factory/auth-base": "^6.2.44",
-    "@things-factory/board-service": "^6.2.44",
-    "@things-factory/board-ui": "^6.2.44",
-    "@things-factory/more-base": "^6.2.44",
-    "@things-factory/setting-base": "^6.2.44",
-    "@things-factory/utils": "^6.2.33"
+    "@things-factory/apptool-base": "^6.2.48",
+    "@things-factory/auth-base": "^6.2.48",
+    "@things-factory/board-service": "^6.2.48",
+    "@things-factory/board-ui": "^6.2.48",
+    "@things-factory/more-base": "^6.2.48",
+    "@things-factory/setting-base": "^6.2.48",
+    "@things-factory/utils": "^6.2.48"
   },
-  "gitHead": "a2a1ebf823f6b1315e751b12a01372e9a867d7af"
+  "gitHead": "70ed4f01ef662cde4d99911dc9374abd564cbe0e"
 }

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

@@ -1,4 +1,4 @@
-import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 
 import { getRepository } from '@things-factory/shell'
 
@@ -7,6 +7,7 @@ import { LiteMenuPatch, NewLiteMenu } from './lite-menu-type'
 
 @Resolver(LiteMenu)
 export class LiteMenuMutation {
+  @Directive('@privilege(category: "menu", privilege: "mutation", domainOwnerGranted: true)')
   @Mutation(returns => LiteMenu, { description: 'To create new LiteMenu' })
   async createLiteMenu(@Arg('liteMenu') liteMenu: NewLiteMenu, @Ctx() context: ResolverContext): Promise<LiteMenu> {
     const { domain, user } = context.state
@@ -19,6 +20,7 @@ export class LiteMenuMutation {
     })
   }
 
+  @Directive('@privilege(category: "menu", privilege: "mutation", domainOwnerGranted: true)')
   @Mutation(returns => LiteMenu, { description: 'To modify LiteMenu information' })
   async updateLiteMenu(
     @Arg('id') id: string,
@@ -41,6 +43,7 @@ export class LiteMenuMutation {
     })
   }
 
+  @Directive('@privilege(category: "menu", privilege: "mutation", domainOwnerGranted: true)')
   @Mutation(returns => Boolean, { description: 'To delete LiteMenu' })
   async deleteLiteMenu(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain } = context.state

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

@@ -8,12 +8,31 @@ 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): Promise<boolean> {
-  if (!privilegeObject || !privilegeObject.privilege || !privilegeObject.category) {
+async function checkPermission(
+  privilegeObject: PrivilegeObject,
+  user: User,
+  domain: Domain,
+  protectedIP: boolean
+): Promise<boolean> {
+  if (!privilegeObject) {
     return true
   }
 
-  const { owner: domainOwnerGranted, super: superUserGranted, category, privilege } = privilegeObject
+  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))) ||
@@ -54,7 +73,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 } = context.state
+    const { domain, user, protected: protectedIP } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
       repository: getRepository(LiteMenu),
@@ -67,7 +86,7 @@ export class LiteMenuQuery {
     const filtered = []
 
     for (let item of items) {
-      if (await checkPermission(item.privilege, user, domain)) {
+      if (await checkPermission(item.privilege, user, domain, protectedIP)) {
         filtered.push(item)
       }
     }