@things-factory/shell 6.0.0-zeta.40 → 6.0.0-zeta.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "6.0.0-zeta.40",
+  "version": "6.0.0-zeta.43",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -131,5 +131,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "8f2076b1512cc74d339c08577690a0c42fe4d3c3"
+  "gitHead": "f43b9c1e5447ff2d5739a057c7154e1e1adc31b0"
 }

package/server/service/domain/domain-resolver.ts

@@ -12,7 +12,7 @@ import { DomainList, DomainPatch } from './domain-types'
 
 @Resolver(Domain)
 export class DomainResolver {
-  @Directive('@privilege(category: "system", privilege: "mutation", domainOwnerGranted: true, superUserGranted: true)')
+  @Directive('@privilege(category: "system", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
   @Query(returns => Domain, { description: 'To fetch domain' })
   async domain(@Arg('id') id: string): Promise<Domain> {
     const repository = getRepository(Domain)
@@ -20,8 +20,8 @@ export class DomainResolver {
     return await repository.findOneBy({ id })
   }
 
-  @Directive('@privilege(category: "system", privilege: "query", superUserGranted: true)')
-  @Query(returns => DomainList, { description: 'To fetch multiple domain' })
+  @Directive('@privilege(superUserGranted: true)')
+  @Query(returns => DomainList, { description: 'To fetch all domains (Only superuser is granted this privilege.)' })
   async domains(@Args() params: ListParam, @Ctx() context: any): Promise<DomainList> {
     const queryBuilder = await getQueryBuilderFromListParams({
       repository: getRepository(Domain),
@@ -35,22 +35,22 @@ export class DomainResolver {
     return { items, total }
   }
 
-  @Query(returns => Boolean, { description: 'To check if given domain is exist' })
-  async checkExistsDomain(@Arg('name') name: string) {
-    const domainRepository: Repository<Domain> = getRepository(Domain)
-    const targetSubdomain: string = slugger(name)
+  // @Query(returns => Boolean, { description: 'To check if given domain is exist' })
+  // async checkExistsDomain(@Arg('name') name: string) {
+  //   const domainRepository: Repository<Domain> = getRepository(Domain)
+  //   const targetSubdomain: string = slugger(name)
 
-    const oldDomain = await domainRepository.findOneBy({ subdomain: targetSubdomain })
-    if (oldDomain) {
-      throw new Error('domain is duplicated')
-    }
+  //   const oldDomain = await domainRepository.findOneBy({ subdomain: targetSubdomain })
+  //   if (oldDomain) {
+  //     throw new Error('domain is duplicated')
+  //   }
 
-    return true
-  }
+  //   return true
+  // }
 
   @Directive('@transaction')
-  @Directive('@privilege(category: "system", privilege: "mutation", superUserGranted: true)')
-  @Mutation(returns => Domain, { description: 'To create domain' })
+  @Directive('@privilege(superUserGranted: true)')
+  @Mutation(returns => Domain, { description: 'To create domain (Only superuser is granted this privilege.)' })
   async createDomain(@Arg('domainInput') domainInput: DomainPatch) {
     const { name, description } = domainInput
     const domainRepo: Repository<Domain> = getRepository(Domain)
@@ -65,15 +65,17 @@ export class DomainResolver {
   }
 
   @Directive('@transaction')
-  @Directive('@privilege(category: "system", privilege: "mutation", superUserGranted: true)')
-  @Mutation(returns => Domain, { description: 'To delete domain' })
+  @Directive('@privilege(superUserGranted: true)')
+  @Mutation(returns => Domain, { description: 'To delete domain (Only superuser is granted this privilege.)' })
   async deleteDomain(@Arg('name') name: string) {
     return await getRepository(Domain).delete({ name })
   }
 
   @Directive('@transaction')
-  @Directive('@privilege(category: "system", privilege: "mutation", superUserGranted: true)')
-  @Mutation(returns => Boolean, { description: 'To delete multiple domains' })
+  @Directive('@privilege(superUserGranted: true)')
+  @Mutation(returns => Boolean, {
+    description: 'To delete multiple domains (Only superuser is granted this privilege.)'
+  })
   async deleteDomains(@Arg('names', () => [String]) names: string[]) {
     const domains: Domain[] = await getRepository(Domain).find({ where: { name: In(names) } })
     const domainIds: string[] = domains.map(domain => domain.id)
@@ -82,25 +84,25 @@ export class DomainResolver {
   }
 
   @Directive('@transaction')
-  @Directive('@privilege(category: "system", privilege: "mutation", domainOwnerGranted: true, superUserGranted: true)')
-  @Mutation(returns => Domain, { description: 'To update domain' })
+  @Directive('@privilege(superUserGranted: true)')
+  @Mutation(returns => Domain, {
+    description: 'To update domain (Only superuser is granted this privilege.)'
+  })
   async updateDomain(@Arg('name') name: string, @Arg('patch', () => DomainPatch) patch: DomainPatch) {
     const repository = getRepository(Domain)
     const domain: Domain = await repository.findOneBy({ name })
 
-    var owner = patch.ownerUser?.id
-    delete patch.ownerUser
-
     return await repository.save({
       ...domain,
-      ...patch,
-      owner
+      ...patch
     } as any)
   }
 
   @Directive('@transaction')
-  @Directive('@privilege(category: "system", privilege: "mutation", superUserGranted: true)')
-  @Mutation(returns => Boolean, { description: 'To update multiple domains' })
+  @Directive('@privilege(superUserGranted: true)')
+  @Mutation(returns => Boolean, {
+    description: 'To update multiple domains (Only superuser is granted this privilege.)'
+  })
   async updateDomains(@Arg('patches', () => [DomainPatch]) patches: DomainPatch[]): Promise<boolean> {
     const domainRepo: Repository<Domain> = getRepository(Domain)
 
@@ -114,13 +116,9 @@ export class DomainResolver {
           updateRecord.subdomain = slugger(updateRecord.name)
         }
 
-        var owner = updateRecord.ownerUser?.id
-        delete updateRecord.ownerUser
-
         await domainRepo.save({
           ...domain,
-          ...updateRecord,
-          owner
+          ...updateRecord
         } as any)
       })
     }

package/server/service/domain/domain-types.ts

@@ -42,9 +42,6 @@ export class DomainPatch {
 
   @Field({ nullable: true })
   theme?: string
-
-  @Field(type => ObjectRef, { nullable: true })
-  ownerUser?: ObjectRef
 }
 
 @ObjectType()

package/server/service/subscription-data/data-resolver.ts

@@ -16,7 +16,8 @@ export class DataResolver {
         throw new Error('domain and tag required')
       }
 
-      if (!user.domains?.find(d => d.subdomain === subdomain)) {
+      //@ts-ignore
+      if (!user.domains?.find(d => d.subdomain === subdomain) && !process.superUserGranted(domain, user)) {
         throw new Error(`domain(${subdomain}) is not working for user(${user.email}).`)
       }