@things-factory/process 7.0.0-alpha.0 → 7.0.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/process",
-  "version": "7.0.0-alpha.0",
+  "version": "7.0.0-alpha.1",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -31,15 +31,15 @@
     "@operato/graphql": "^2.0.0-alpha.0",
     "@operato/grist-editor": "^2.0.0-alpha.0",
     "@operato/shell": "^2.0.0-alpha.0",
-    "@things-factory/attachment-base": "^7.0.0-alpha.0",
-    "@things-factory/auth-base": "^7.0.0-alpha.0",
-    "@things-factory/board-service": "^7.0.0-alpha.0",
-    "@things-factory/context-ui": "^7.0.0-alpha.0",
-    "@things-factory/organization": "^7.0.0-alpha.0",
-    "@things-factory/scheduler-client": "^7.0.0-alpha.0",
-    "@things-factory/shell": "^7.0.0-alpha.0",
-    "@things-factory/worklist": "^7.0.0-alpha.0",
+    "@things-factory/attachment-base": "^7.0.0-alpha.1",
+    "@things-factory/auth-base": "^7.0.0-alpha.1",
+    "@things-factory/board-service": "^7.0.0-alpha.1",
+    "@things-factory/context-ui": "^7.0.0-alpha.1",
+    "@things-factory/organization": "^7.0.0-alpha.1",
+    "@things-factory/scheduler-client": "^7.0.0-alpha.1",
+    "@things-factory/shell": "^7.0.0-alpha.1",
+    "@things-factory/worklist": "^7.0.0-alpha.1",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "0eb7f1db7ca559df530b3242c48456fc565ef4c0"
+  "gitHead": "778315d165d7f15e147583a45d5079c3d7cbce38"
 }

package/server/service/process-instance/process-instance-subscription.ts

@@ -1,15 +1,15 @@
-import { withFilter } from 'graphql-subscriptions'
+import { filter, pipe } from 'graphql-yoga'
 import { Resolver, Root, Subscription } from 'type-graphql'
 
+import { pubsub } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
-import { getRepository, pubsub } from '@things-factory/shell'
 
 import { ProcessInstance } from './process-instance'
 
 @Resolver(ProcessInstance)
 export class ProcessInstanceSubscription {
   @Subscription({
-    subscribe: (_, args, context, info) => {
+    subscribe: ({ args, context, info }) => {
       const { domain, user } = context.state
       const subdomain = domain?.subdomain
 
@@ -21,9 +21,9 @@ export class ProcessInstanceSubscription {
         throw new Error(`domain(${subdomain}) is not working for user(${user.email}).`)
       }
 
-      return withFilter(
-        () => pubsub.asyncIterator('process-instance'),
-        async (payload, variables, context, info) => {
+      return pipe(
+        pubsub.subscribe('process-instance'),
+        filter(async (payload: { processInstance: ProcessInstance }) => {
           const { processInstance } = payload
           const { domainId } = processInstance
 
@@ -35,15 +35,9 @@ export class ProcessInstanceSubscription {
             return true
           }
 
-          // check if the user has that role
-          const userWithRoles: User = await getRepository(User).findOne({
-            where: { id: user.id },
-            relations: ['roles']
-          })
-
-          return !!userWithRoles.roles.find(role => role.id === processInstance.assigneeRoleId)
-        }
-      )(_, args, context, info)
+          return await User.hasPrivilege('query', 'process-instance', domain, user)
+        })
+      )
     }
   })
   processInstance(@Root() payload: { processInstance: ProcessInstance }): ProcessInstance {

package/server/service/process-thread/process-thread-subscription.ts

@@ -1,14 +1,15 @@
-import { withFilter } from 'graphql-subscriptions'
+import { filter, pipe } from 'graphql-yoga'
 import { Resolver, Root, Subscription } from 'type-graphql'
 
 import { pubsub } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
 
 import { ProcessThread } from './process-thread'
 
 @Resolver(ProcessThread)
 export class ProcessThreadSubscription {
   @Subscription({
-    subscribe: (_, args, context, info) => {
+    subscribe: ({ args, context, info }) => {
       const { domain, user } = context.state
       const subdomain = domain?.subdomain
 
@@ -20,9 +21,9 @@ export class ProcessThreadSubscription {
         throw new Error(`domain(${subdomain}) is not working for user(${user.email}).`)
       }
 
-      return withFilter(
-        () => pubsub.asyncIterator('process-thread'),
-        async (payload, variables, context, info) => {
+      return pipe(
+        pubsub.subscribe('process-thread'),
+        filter(async (payload: { processThread: ProcessThread }) => {
           const { processThread } = payload
           const { domainId } = processThread
 
@@ -30,9 +31,9 @@ export class ProcessThreadSubscription {
             return false
           }
 
-          return processThread.assigneeId === user.id
-        }
-      )(_, args, context, info)
+          return await User.hasPrivilege('query', 'process-thread', domain, user)
+        })
+      )
     }
   })
   processThread(@Root() payload: { processThread: ProcessThread }): ProcessThread {