@things-factory/board-service 6.2.52 → 6.2.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-service",
-  "version": "6.2.52",
+  "version": "6.2.57",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,11 +24,11 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^6.2.52",
+    "@things-factory/auth-base": "^6.2.54",
     "@things-factory/env": "^6.2.33",
-    "@things-factory/fav-base": "^6.2.52",
-    "@things-factory/font-base": "^6.2.52",
-    "@things-factory/integration-base": "^6.2.52",
+    "@things-factory/fav-base": "^6.2.54",
+    "@things-factory/font-base": "^6.2.54",
+    "@things-factory/integration-base": "^6.2.57",
     "@things-factory/operato-license-checker": "^4.0.4",
     "content-disposition": "^0.5.3",
     "generic-pool": "^3.8.2"
@@ -37,5 +37,5 @@
     "@thiagoelg/node-printer": "0.6.2",
     "puppeteer": "^20.7.3"
   },
-  "gitHead": "234f95b63937521f1791a9e2141024ee7816d26d"
+  "gitHead": "de09b15757a2bad601a2e23dc52f16b0d816a420"
 }

package/server/index.ts

@@ -3,3 +3,34 @@ export * from './migrations'
 export * from './controllers'
 
 import './routes'
+
+import { getPermission } from '@things-factory/operato-license-checker'
+
+export function initMiddlewares(app) {
+  const licensedPermissions = (getPermission('Permissions For Board Usage') || 'Modeller, Viewer')
+    .split(',')
+    .map(p => p.trim())
+
+  const prohibited = !licensedPermissions.includes('Modeller') && [
+    {
+      privilege: 'mutation',
+      category: 'board'
+    },
+    {
+      privilege: 'mutation',
+      category: 'board-template'
+    }
+  ]
+
+  /*
+   * board-permission을 prohibitedPrivileges에 반영한다.
+   */
+  app.use(async (context, next) => {
+    if (prohibited) {
+      const { prohibitedPrivileges } = context.state
+
+      context.state.prohibitedPrivileges = [...(prohibitedPrivileges || []), ...prohibited]
+    }
+    await next()
+  })
+}

package/server/service/board/board-query.ts

@@ -14,27 +14,6 @@ import { BoardHistory } from './board-history'
 import { LicenseError } from '../../errors/license-error'
 @Resolver(Board)
 export class BoardQuery {
-  @Query(returns => [String], { description: 'Board Usage Permissions' })
-  async boardPermissions(@Ctx() context: ResolverContext): Promise<string[]> {
-    const { user, domain } = context.state
-
-    const licensedPermissions = (getPermission('Permissions For Board Usage') || 'Modeller, Viewer')
-      .split(',')
-      .map(p => p.trim())
-
-    var permissions = []
-
-    licensedPermissions.includes('Modeller') &&
-      (await User.hasPrivilege('mutation', 'board', domain, user)) &&
-      permissions.push('Modeller')
-
-    licensedPermissions.includes('Viewer') &&
-      (await User.hasPrivilege('query', 'board', domain, user)) &&
-      permissions.push('Viewer')
-
-    return permissions
-  }
-
   @Directive('@privilege(category: "board", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => Board, { description: 'To fetch a board' })
   async board(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Board> {