@things-factory/auth-base 6.2.65 → 6.2.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "6.2.65",
+  "version": "6.2.77",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -30,10 +30,10 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/email-base": "^6.2.65",
+    "@things-factory/email-base": "^6.2.77",
     "@things-factory/env": "^6.2.33",
-    "@things-factory/i18n-base": "^6.2.65",
-    "@things-factory/shell": "^6.2.65",
+    "@things-factory/i18n-base": "^6.2.77",
+    "@things-factory/shell": "^6.2.77",
     "@things-factory/utils": "^6.2.48",
     "jsonwebtoken": "^9.0.0",
     "koa-passport": "^6.0.0",
@@ -43,5 +43,5 @@
     "passport-local": "^1.0.0",
     "popsicle-cookie-jar": "^1.0.0"
   },
-  "gitHead": "320f62ab586b0c7058e7879f3e6592c960ae97bc"
+  "gitHead": "91090127331d8e4cdbbfeb2f82c8dfe8dc65bfee"
 }

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

@@ -1,4 +1,5 @@
 import { Field, InputType, Int, ObjectType } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 
 import { Application, ApplicationType } from './application'
 
@@ -28,7 +29,7 @@ export class ApplicationPatch {
   @Field({ nullable: true })
   description?: string
 
-  @Field({ nullable: true })
+  @Field(type => GraphQLEmailAddress, { nullable: true })
   email?: string
 
   @Field({ nullable: true })
@@ -55,7 +56,7 @@ export class NewApplication {
   @Field({ nullable: true })
   description?: string
 
-  @Field({ nullable: true })
+  @Field(type => GraphQLEmailAddress, { nullable: true })
   email?: string
 
   @Field({ nullable: true })

package/server/service/application/application.ts

@@ -1,6 +1,7 @@
 import crypto from 'crypto'
 import jwt from 'jsonwebtoken'
 import { Directive, Field, ID, ObjectType, registerEnumType } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 import {
   Column,
   CreateDateColumn,
@@ -50,53 +51,45 @@ registerEnumType(ApplicationType, {
 export class Application {
   @PrimaryGeneratedColumn('uuid')
   @Field(type => ID)
-  readonly id: string
+  readonly id?: string
 
   @ManyToOne(type => Domain)
-  domain: Domain
+  domain?: Domain
 
   @RelationId((application: Application) => application.domain)
-  domainId: string
+  domainId?: string
 
   @Column()
   @Field()
-  name: string
+  name?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
-  description: string
+  description?: string
 
   @Column()
-  @Field()
-  email: string
+  @Field(type => GraphQLEmailAddress)
+  email?: string
 
   @Column()
   @Field()
-  url: string
+  url?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
-  icon: string
+  icon?: string
 
   @Column()
   @Field()
-  redirectUrl: string
+  redirectUrl?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
-  webhook: string
+  webhook?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
-  appKey: string
+  appKey?: string
 
   @Column({
     nullable: true,
@@ -109,13 +102,11 @@ export class Application {
   })
   @Field({ nullable: true })
   @Directive('@privilege(category: "security", privilege: "query", domainOwnerGranted: true)')
-  appSecret: string
+  appSecret?: string
 
-  @Column({
-    default: ApplicationStatus.DRAFT
-  })
+  @Column({ default: ApplicationStatus.DRAFT })
   @Field()
-  status: ApplicationStatus
+  status?: ApplicationStatus
 
   @Column({
     type:
@@ -128,29 +119,29 @@ export class Application {
     default: ApplicationType.OTHERS
   })
   @Field()
-  type: ApplicationType
+  type?: ApplicationType
 
   @CreateDateColumn()
   @Field({ nullable: true })
-  createdAt: Date
+  createdAt?: Date
 
   @UpdateDateColumn()
   @Field({ nullable: true })
-  updatedAt: Date
+  updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
-  creator: User
+  creator?: User
 
   @RelationId((application: Application) => application.creator)
-  creatorId: string
+  creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
-  updater: User
+  updater?: User
 
   @RelationId((application: Application) => application.updater)
-  updaterId: string
+  updaterId?: string
 
   /* generateAppSecret */
   static generateAppSecret() {

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

@@ -1,4 +1,5 @@
 import { Field, InputType } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 import { DomainInput } from '@things-factory/shell'
 import { NewRole } from '../role/role-types'
 
@@ -28,7 +29,7 @@ export class NewUserByDomainWizardInput {
   @Field()
   name: string
 
-  @Field()
+  @Field(type => GraphQLEmailAddress)
   email: string
 
   @Field({ nullable: true })

package/server/service/invitation/invitation-mutation.ts

@@ -1,4 +1,5 @@
 import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 
 import { getRepository } from '@things-factory/shell'
 
@@ -8,7 +9,11 @@ import { Invitation } from './invitation'
 @Resolver(Invitation)
 export class InvitationMutation {
   @Mutation(returns => Boolean)
-  async cancelInvitation(@Arg('email') email: string, @Arg('reference') reference: string, @Arg('type') type: string) {
+  async cancelInvitation(
+    @Arg('email', type => GraphQLEmailAddress) email: string,
+    @Arg('reference') reference: string,
+    @Arg('type') type: string
+  ) {
     const repository = getRepository(Invitation)
 
     await repository.delete({
@@ -22,7 +27,7 @@ export class InvitationMutation {
 
   @Mutation(returns => Invitation)
   async sendInvitation(
-    @Arg('email') email: string,
+    @Arg('email', type => GraphQLEmailAddress) email: string,
     @Arg('reference') reference: string,
     @Arg('type') type: string,
     @Ctx() context: ResolverContext

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

@@ -1,3 +1,4 @@
+import { GraphQLEmailAddress } from 'graphql-scalars'
 import { Arg, Query, Resolver } from 'type-graphql'
 
 import { getRepository } from '@things-factory/shell'
@@ -8,7 +9,11 @@ import { InvitationList } from './invitation-types'
 @Resolver(Invitation)
 export class InvitationQuery {
   @Query(returns => Invitation)
-  async invitation(@Arg('email') email: string, @Arg('reference') reference: string, @Arg('type') type: string) {
+  async invitation(
+    @Arg('email', type => GraphQLEmailAddress) email: string,
+    @Arg('reference') reference: string,
+    @Arg('type') type: string
+  ) {
     return await getRepository(Invitation).findOneBy({
       email,
       reference,

package/server/service/invitation/invitation.ts

@@ -9,6 +9,7 @@ import {
   PrimaryGeneratedColumn
 } from 'typeorm'
 import { ObjectType, Field, ID } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 import { User } from '../user/user'
 
 @Entity()
@@ -23,7 +24,7 @@ export class Invitation {
   readonly id: string
 
   @Column()
-  @Field()
+  @Field(type => GraphQLEmailAddress)
   email: string
 
   @Column()

package/server/service/user/user-mutation.ts

@@ -1,4 +1,5 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 import { ILike, In, SelectQueryBuilder } from 'typeorm'
 
 import { config } from '@things-factory/env'
@@ -54,7 +55,11 @@ export class UserMutation {
   @Directive('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => User, { description: 'To modify user information' })
-  async updateUser(@Arg('email') email: string, @Arg('patch') patch: UserPatch, @Ctx() context: ResolverContext) {
+  async updateUser(
+    @Arg('email', type => GraphQLEmailAddress) email: string,
+    @Arg('patch') patch: UserPatch,
+    @Ctx() context: ResolverContext
+  ) {
     const { domain, user: updater }: { domain: Domain; user: User } = context.state
     const qb: SelectQueryBuilder<User> = buildDomainUsersQueryBuilder(domain.id, 'USER')
     const user: User = await qb
@@ -174,7 +179,7 @@ export class UserMutation {
   @Directive('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To delete a user' })
-  async deleteUser(@Arg('email') email: string, @Ctx() context: ResolverContext) {
+  async deleteUser(@Arg('email', type => GraphQLEmailAddress) email: string, @Ctx() context: ResolverContext) {
     const { tx } = context.state
 
     await commonDeleteUser({ email }, tx)
@@ -194,7 +199,10 @@ export class UserMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To invite new user' })
-  async inviteUser(@Arg('email') email: string, @Ctx() context: ResolverContext): Promise<boolean> {
+  async inviteUser(
+    @Arg('email', type => GraphQLEmailAddress) email: string,
+    @Ctx() context: ResolverContext
+  ): Promise<boolean> {
     const { domain } = context.state
     const invitee: User = await getRepository(User).findOne({
       where: { email: ILike(email) },
@@ -218,7 +226,10 @@ export class UserMutation {
   @Directive('@transaction')
   @Directive('@privilege(category: "user", privilege: "mutation", domainOwnerGranted: true)')
   @Mutation(returns => Boolean, { description: 'To delete domain user' })
-  async deleteDomainUser(@Arg('email') email: string, @Ctx() context: ResolverContext): Promise<boolean> {
+  async deleteDomainUser(
+    @Arg('email', type => GraphQLEmailAddress) email: string,
+    @Ctx() context: ResolverContext
+  ): Promise<boolean> {
     const { tx, domain } = context.state
 
     let user: User = await tx
@@ -247,7 +258,10 @@ export class UserMutation {
   @Directive('@privilege(domainOwnerGranted: true, superUserGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To transfer owner of domain' })
-  async transferOwner(@Arg('email') email: string, @Ctx() context: ResolverContext): Promise<boolean> {
+  async transferOwner(
+    @Arg('email', type => GraphQLEmailAddress) email: string,
+    @Ctx() context: ResolverContext
+  ): Promise<boolean> {
     const { domain } = context.state
     const user: User = await getRepository(User).findOne({
       where: { email: ILike(email) }

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

@@ -1,4 +1,5 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 import { ILike, SelectQueryBuilder } from 'typeorm'
 
 import { config } from '@things-factory/env'
@@ -15,7 +16,7 @@ import { UserList } from './user-types'
 export class UserQuery {
   @Directive('@privilege(category: "user", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
   @Query(returns => User, { description: 'To fetch user' })
-  async user(@Arg('email') email: string, @Ctx() context: ResolverContext): Promise<User> {
+  async user(@Arg('email', type => GraphQLEmailAddress) email: string, @Ctx() context: ResolverContext): Promise<User> {
     const { domain } = context.state
 
     const qb: SelectQueryBuilder<User> = buildDomainUsersQueryBuilder(domain.id, 'USER')
@@ -116,7 +117,7 @@ export class UserQuery {
 
   @Directive('@privilege(category: "user", privilege: "query")')
   @Query(returns => Boolean, { description: '...' })
-  async checkUserExistence(@Arg('email') email: string): Promise<Boolean> {
+  async checkUserExistence(@Arg('email', type => GraphQLEmailAddress) email: string): Promise<Boolean> {
     return Boolean(await getRepository(User).count({ where: { email: ILike(email) } }))
   }
 

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

@@ -1,4 +1,5 @@
 import { ObjectType, InputType, Field, ID, Int } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 import { ObjectRef } from '@things-factory/shell'
 import { User } from './user'
 
@@ -10,7 +11,7 @@ export class NewUser {
   @Field({ nullable: true })
   description?: string
 
-  @Field()
+  @Field(type => GraphQLEmailAddress)
   email: string
 
   @Field({ nullable: true })
@@ -37,7 +38,7 @@ export class UserPatch {
   @Field({ nullable: true })
   description?: string
 
-  @Field({ nullable: true })
+  @Field(type => GraphQLEmailAddress, { nullable: true })
   email?: string
 
   @Field({ nullable: true })

package/server/service/user/user.ts

@@ -1,6 +1,7 @@
 import crypto from 'crypto'
 import jwt from 'jsonwebtoken'
 import { Directive, Field, ID, ObjectType } from 'type-graphql'
+import { GraphQLEmailAddress } from 'graphql-scalars'
 import {
   Column,
   CreateDateColumn,
@@ -64,7 +65,7 @@ export class User {
   domains?: Domain[]
 
   @Column()
-  @Field()
+  @Field(type => GraphQLEmailAddress)
   email: string
 
   @Directive('@privilege(category: "security", privilege: "query", domainOwnerGranted: true)')