@things-factory/shell 6.2.170 → 6.2.178

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "6.2.170",
+  "version": "6.2.178",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -35,12 +35,9 @@
     "@apollo/server": "^4.5.0",
     "@as-integrations/koa": "^0.3.0",
     "@fontsource/roboto": "^5.0.3",
-    "@graphql-codegen/cli": "^3.2.2",
-    "@graphql-codegen/typescript": "^3.0.2",
-    "@graphql-codegen/typescript-resolvers": "^3.1.1",
-    "@graphql-tools/merge": "^8.3.0",
-    "@graphql-tools/schema": "^8.5.0",
-    "@graphql-tools/utils": "^8.8.0",
+    "@graphql-tools/merge": "^8.0.0",
+    "@graphql-tools/schema": "^9.0.0",
+    "@graphql-tools/utils": "^9.0.0",
     "@hatiolab/koa-webpack": "^6.0.2",
     "@hatiolab/things-scene": "^3.2.0",
     "@koa/cors": "^3.3.0",
@@ -134,5 +131,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "5a4f3894a63e770de9320c28a1a3c0f38d070ab5"
+  "gitHead": "b21612202e8acb60a6d29e3e5913a06346352bc5"
 }

package/server/schema.ts

@@ -1,5 +1,5 @@
 import { GraphQLSchema } from 'graphql'
-import { GraphQLUpload } from 'graphql-upload/GraphQLUpload.js'
+import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'
 import { buildSchema } from 'type-graphql'
 import { typeDefs as scalarTypeDefs, resolvers as scalarResolvers } from 'graphql-scalars'
 

package/server/service/domain/index.ts

@@ -1,6 +1,6 @@
 import { Domain } from './domain'
 import { DomainQuery } from './domain-query'
-import { DomainMutation } from './domain-Mutation'
+import { DomainMutation } from './domain-mutation'
 
 export const entities = [Domain]
 export const resolvers = [DomainQuery, DomainMutation]

package/dist-server/service/domain/domain-Mutation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"domain-Mutation.js","sourceRoot":"","sources":["../../../server/service/domain/domain-Mutation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Args, Ctx, Directive, Mutation, Query, Resolver, Root } from 'type-graphql'\nimport { In, Repository } from 'typeorm'\n\nimport { slugger } from '@things-factory/utils'\n\nimport { getRepository } from '../../initializers/database'\n\nimport { Domain, IPList } from './domain'\nimport { DomainPatch } from './domain-types'\nimport { ScalarObject } from '../common-types'\n\n@Resolver(Domain)\nexport class DomainMutation {\n  @Directive('@transaction')\n  @Directive('@privilege(superUserGranted: true)')\n  @Mutation(returns => Domain, { description: 'To create domain (Only superuser is granted this privilege.)' })\n  async createDomain(@Arg('domainInput') domainInput: DomainPatch) {\n    const { name, description } = domainInput\n    const domainRepo: Repository<Domain> = getRepository(Domain)\n    const subdomain: string = slugger(name)\n\n    const domain: Domain = await domainRepo.findOneBy({ subdomain })\n    if (domain) {\n      throw new Error('domain is duplicated')\n    }\n\n    return await domainRepo.save({ name, description, subdomain })\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(superUserGranted: true)')\n  @Mutation(returns => Domain, { description: 'To delete domain (Only superuser is granted this privilege.)' })\n  async deleteDomain(@Arg('name') name: string) {\n    return await getRepository(Domain).delete({ name })\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(superUserGranted: true)')\n  @Mutation(returns => Boolean, {\n    description: 'To delete multiple domains (Only superuser is granted this privilege.)'\n  })\n  async deleteDomains(@Arg('names', () => [String]) names: string[]) {\n    const domains: Domain[] = await getRepository(Domain).find({ where: { name: In(names) } })\n    const domainIds: string[] = domains.map(domain => domain.id)\n\n    await getRepository(Domain).delete({ id: In(domainIds) })\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(superUserGranted: true)')\n  @Mutation(returns => Domain, {\n    description: 'To update domain (Only superuser is granted this privilege.)'\n  })\n  async updateDomain(@Arg('name') name: string, @Arg('patch', () => DomainPatch) patch: DomainPatch) {\n    const repository = getRepository(Domain)\n    const domain: Domain = await repository.findOneBy({ name })\n\n    if (patch.parent && patch.parent.id == domain.id) {\n      delete patch.parent\n    }\n\n    return await repository.save({\n      ...domain,\n      ...patch\n    } as any)\n  }\n\n  @Directive('@transaction')\n  @Directive('@privilege(superUserGranted: true)')\n  @Mutation(returns => Boolean, {\n    description: 'To update multiple domains (Only superuser is granted this privilege.)'\n  })\n  async updateDomains(@Arg('patches', () => [DomainPatch]) patches: DomainPatch[]): Promise<boolean> {\n    const domainRepo: Repository<Domain> = getRepository(Domain)\n\n    const patchIds = patches.filter((patch: any) => patch.id)\n\n    if (patchIds.length > 0) {\n      patchIds.forEach(async updateRecord => {\n        const domain: Domain = await domainRepo.findOne({ where: { id: updateRecord.id } })\n\n        if (updateRecord.name) {\n          updateRecord.subdomain = slugger(updateRecord.name)\n        }\n\n        if (updateRecord.parent && updateRecord.parent.id == domain.id) {\n          delete updateRecord.parent\n        }\n\n        await domainRepo.save({\n          ...domain,\n          ...updateRecord\n        } as any)\n      })\n    }\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Directive(\n    '@privilege(category: \"security\", privilege: \"mutation\", domainOwnerGranted: true, superUserGranted: true)'\n  )\n  @Mutation(returns => ScalarObject, { nullable: true, description: 'To update secure IP list for domain' })\n  async updateSecureIPList(\n    @Arg('iplist', type => ScalarObject) iplist: IPList,\n    @Ctx() context: any\n  ): Promise<IPList | null> {\n    const { domain } = context.state\n    const repository = getRepository(Domain)\n    // const domain: Domain = await repository.findOneBy({ id })\n\n    const { iplist: result } = await repository.save({\n      ...domain,\n      iplist\n    } as any)\n\n    return result\n  }\n}\n"]}