@things-factory/auth-base 5.0.11 → 6.0.0-alpha.3

package/server/migrations/1548206416130-SeedUser.ts

@@ -1,7 +1,7 @@
-import { getRepository, MigrationInterface, QueryRunner } from 'typeorm'
+import { MigrationInterface, QueryRunner } from 'typeorm'
 
 import { config, logger } from '@things-factory/env'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { User, UserStatus } from '../service/user/user'
 
@@ -52,7 +52,7 @@ export class SeedUsers1548206416130 implements MigrationInterface {
     const repository = getRepository(User)
 
     SEED_USERS.reverse().forEach(async user => {
-      let record = await repository.findOne({ email: user.email })
+      let record = await repository.findOneBy({ email: user.email })
       await repository.remove(record)
     })
   }

package/server/migrations/1566805283882-SeedPrivilege.ts

@@ -1,6 +1,7 @@
-import { getRepository, MigrationInterface, QueryRunner } from 'typeorm'
+import { MigrationInterface, QueryRunner } from 'typeorm'
 
 import { logger } from '@things-factory/env'
+import { getRepository } from '@things-factory/shell'
 
 import { Privilege } from '../service/privilege/privilege'
 

package/server/router/auth-checkin-router.ts

@@ -87,7 +87,7 @@ authCheckinRouter.get('/auth/domains', async context => {
   context.body = domains
 })
 
-async function checkIn(checkInDomain: Domain, redirectTo: string | null, context: any): Promise<void> {
+async function checkIn(checkInDomain: Domain, redirectTo: string | null, context: ResolverContext): Promise<void> {
   const user: User = context.state.user
   await LoginHistory.stamp(checkInDomain, user, context.req.connection.remoteAddress)
 

package/server/router/auth-private-process-router.ts

@@ -1,8 +1,7 @@
 import Router from 'koa-router'
-import { getRepository } from 'typeorm'
 
 import { config } from '@things-factory/env'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { changePwd } from '../controllers/change-pwd'
 import { deleteUser } from '../controllers/delete-user'

package/server/router/auth-public-process-router.ts

@@ -1,8 +1,7 @@
 import Router from 'koa-router'
-import { getRepository } from 'typeorm'
 
 import { config } from '@things-factory/env'
-import { getSiteRootPath } from '@things-factory/shell'
+import { getRepository, getSiteRootPath } from '@things-factory/shell'
 
 import { resendInvitationEmail } from '../controllers/invitation'
 import { resetPassword, sendPasswordResetEmail } from '../controllers/reset-password'
@@ -31,7 +30,7 @@ export const authPublicProcessRouter = new Router({
 authPublicProcessRouter.post('/join', async (context, next) => {
   const { email } = context.request.body || {}
 
-  const user: User = await getRepository(User).findOne({
+  const user: User = await getRepository(User).findOneBy({
     email
   })
 

package/server/router/auth-signup-router.ts

@@ -38,46 +38,46 @@ authSignupRouter.post('/auth/signup', async (context, next) => {
   const { domain } = context.state
   const user = context.request.body
 
-  try {
-    const { token } = await signup(
-      {
-        ...user,
-        context,
-        domain
-      },
-      true
-    )
+  // try {
+  const { token } = await signup(
+    {
+      ...user,
+      context,
+      domain
+    },
+    true
+  )
 
-    const message = t('text.user registered successfully')
-    context.body = {
-      message,
-      token
-    }
-
-    setAccessTokenCookie(context, token)
+  const message = t('text.user registered successfully')
+  context.body = {
+    message,
+    token
+  }
 
-    if (accepts(header.accept, ['text/html', '*/*'])) {
-      await context.render('auth-page', {
-        pageElement: 'auth-result',
-        elementScript: '/auth/result.js',
-        data: {
-          message
-        }
-      })
-    }
-  } catch (e) {
-    context.status = 401
-    context.body = e.message
+  setAccessTokenCookie(context, token)
 
-    if (accepts(header.accept, ['text/html', '*/*'])) {
-      await context.render('auth-page', {
-        pageElement: 'auth-signup',
-        elementScript: '/auth/signup.js',
-        data: {
-          message: e.message,
-          passwordRule
-        }
-      })
-    }
+  if (accepts(header.accept, ['text/html', '*/*'])) {
+    await context.render('auth-page', {
+      pageElement: 'auth-result',
+      elementScript: '/auth/result.js',
+      data: {
+        message
+      }
+    })
   }
+  // } catch (e) {
+  //   context.status = 401
+  //   context.body = e.message
+
+  //   if (accepts(header.accept, ['text/html', '*/*'])) {
+  //     await context.render('auth-page', {
+  //       pageElement: 'auth-signup',
+  //       elementScript: '/auth/signup.js',
+  //       data: {
+  //         message: e instanceof AuthError ? t(`error.${e.message}`) : e.message,
+  //         passwordRule
+  //       }
+  //     })
+  //   }
+  // }
 })

package/server/router/oauth2/oauth2-authorize-router.ts

@@ -1,5 +1,6 @@
 import Router from 'koa-router'
-import { getRepository } from 'typeorm'
+
+import { getRepository } from '@things-factory/shell'
 
 import { Application } from '../../service/application/application'
 import { NonClient, server as oauth2orizeServer } from './oauth2-server'
@@ -25,7 +26,7 @@ export const oauth2AuthorizeRouter = new Router()
 oauth2AuthorizeRouter.get(
   '/authorize',
   oauth2orizeServer.authorize(async function (clientID, redirectURI) {
-    const client = await getRepository(Application).findOne({
+    const client = await getRepository(Application).findOneBy({
       appKey: clientID
     })
     // CONFIRM-ME redirectUrl 의 허용 범위는 ?

package/server/router/oauth2/oauth2-router.ts

@@ -2,9 +2,8 @@ import jwt from 'jsonwebtoken'
 import compose from 'koa-compose'
 import passport from 'koa-passport'
 import Router from 'koa-router'
-import { getRepository } from 'typeorm'
 
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { jwtAuthenticateMiddleware } from '../../middlewares'
 import { Application } from '../../service/application/application'
@@ -28,7 +27,7 @@ passport.use(
   'oauth2-client-password',
   new ClientPasswordStrategy({}, (clientId, clientSecret, done) => {
     getRepository(Application)
-      .findOne({
+      .findOneBy({
         appKey: clientId
       })
       .then(client => {
@@ -80,7 +79,7 @@ oauth2Router.post('/refresh-token', async (context, next) => {
   const refreshToken: string | undefined = context.request?.body?.refreshToken
   if (!refreshToken) throw new Error('Missing refresh token')
 
-  const appUser: User | undefined = await getRepository(User).findOne({
+  const appUser: User | undefined = await getRepository(User).findOneBy({
     password: refreshToken
   })
 
@@ -148,7 +147,7 @@ oauth2Router.get('/profile', jwtAuthenticateMiddleware, async (context, next) =>
 
 oauth2Router.post('/disconnect', jwtAuthenticateMiddleware, async (context, next) => {
   try {
-    let { user }: { user: User } = context.state
+    let { user } = context.state
 
     if (typeof process.oauthDisconnect === 'function') {
       await process.oauthDisconnect(user)

package/server/router/oauth2/oauth2-server.ts

@@ -1,8 +1,8 @@
 import oauth2orize from 'oauth2orize-koa'
-import { getRepository, In } from 'typeorm'
+import { In } from 'typeorm'
 
 import { logger } from '@things-factory/env'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { Application } from '../../service/application/application'
 import { Role } from '../../service/role/role'
@@ -40,7 +40,7 @@ server.deserializeClient(async function (id) {
     return {}
   }
 
-  const application = await getRepository(Application).findOne(id)
+  const application = await getRepository(Application).findOneBy({ id })
   return application
 })
 
@@ -82,7 +82,7 @@ server.exchange(
     }
     let { email, appKey, subdomain, scopes } = decoded
 
-    const application: Application = await getRepository(Application).findOne({
+    const application: Application = await getRepository(Application).findOneBy({
       appKey
     })
 
@@ -103,24 +103,23 @@ server.exchange(
     //   )
     // }
 
-    const domain: Domain = await getRepository(Domain).findOne({
+    const domain: Domain = await getRepository(Domain).findOneBy({
       subdomain
     })
 
-    const creator: User = await getRepository(User).findOne({ email })
+    const creator: User = await getRepository(User).findOneBy({ email })
 
     const appuserEmail = `${crypto.randomUUID()}@${subdomain}`
 
-    var appuser: User = await getRepository(User).findOne(
-      {
+    var appuser: User = await getRepository(User).findOne({
+      where: {
         email: appuserEmail,
         reference: application.id,
         userType: 'application'
       },
-      {
-        relations: ['domains', 'creator', 'updater']
-      }
-    )
+
+      relations: ['domains', 'creator', 'updater']
+    })
 
     appuser = await getRepository(User).save({
       ...(appuser || {}),
@@ -184,7 +183,7 @@ server.exchange(
       exp: expires_in
     } = decoded
 
-    const application: Application = await getRepository(Application).findOne({
+    const application: Application = await getRepository(Application).findOneBy({
       appKey
     })
 
@@ -198,27 +197,25 @@ server.exchange(
       return false
     }
 
-    const domain: Domain = await getRepository(Domain).findOne({
+    const domain: Domain = await getRepository(Domain).findOneBy({
       subdomain
     })
 
-    const creator: User = await getRepository(User).findOne({
+    const creator: User = await getRepository(User).findOneBy({
       id,
       userType
     })
 
     const appuserEmail = `${appKey}@${subdomain}`
 
-    var appuser: User = await getRepository(User).findOne(
-      {
+    var appuser: User = await getRepository(User).findOne({
+      where: {
         email: appuserEmail,
         reference: application.id,
         userType: 'application'
       },
-      {
-        relations: ['domain', 'creator', 'updater']
-      }
-    )
+      relations: ['domain', 'creator', 'updater']
+    })
 
     if (!appuser) {
       logger.error('application is not bound')
@@ -239,7 +236,7 @@ server.exchange(
       return false
     }
 
-    const roles = await getRepository(Role).find({
+    const roles = await getRepository(Role).findBy({
       name: In(scopes),
       domain
     })

package/server/service/app-binding/app-binding-mutation.ts

@@ -1,5 +1,6 @@
 import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
-import { getRepository } from 'typeorm'
+
+import { getRepository } from '@things-factory/shell'
 
 import { User } from '../user/user'
 import { AppBinding } from './app-binding'
@@ -7,7 +8,7 @@ import { AppBinding } from './app-binding'
 @Resolver(AppBinding)
 export class AppBindingMutation {
   @Mutation(returns => Boolean)
-  async deleteAppBinding(@Arg('id') id: string, @Ctx() context: any) {
+  async deleteAppBinding(@Arg('id') id: string, @Ctx() context: ResolverContext) {
     const { domain } = context.state
 
     // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.

package/server/service/app-binding/app-binding-query.ts

@@ -1,7 +1,7 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository, SelectQueryBuilder } from 'typeorm'
+import { SelectQueryBuilder } from 'typeorm'
 
-import { buildQuery, ListParam } from '@things-factory/shell'
+import { buildQuery, getRepository, ListParam } from '@things-factory/shell'
 
 import { buildDomainUsersQueryBuilder } from '../../utils/get-domain-users'
 import { Application } from '../application/application'
@@ -13,16 +13,16 @@ import { AppBindingList } from './app-binding-types'
 @Resolver(AppBinding)
 export class AppBindingQuery {
   @Query(returns => AppBinding)
-  async appBinding(@Arg('id') id: string, @Ctx() context: any): Promise<User> {
+  async appBinding(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<User> {
     const { domain } = context.state
 
     // TODO should check domain is available
-    return await getRepository(User).findOne({ id, userType: 'application' })
+    return await getRepository(User).findOneBy({ id, userType: 'application' })
   }
 
   /* TODO optimize query */
   @Query(returns => AppBindingList)
-  async appBindings(@Args() params: ListParam, @Ctx() context: any): Promise<UserList> {
+  async appBindings(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<UserList> {
     const { domain } = context.state
 
     // const convertedParams = convertListParams(params)
@@ -48,7 +48,7 @@ export class AppBindingQuery {
     //     .map(async (user: User) => {
     //       const email = user.email
     //       const appKey = email.substr(0, email.lastIndexOf('@'))
-    //       const application = await getRepository(Application).findOne({
+    //       const application = await getRepository(Application).findOneBy({
     //         appKey
     //       })
 
@@ -66,7 +66,7 @@ export class AppBindingQuery {
 
   @FieldResolver(type => Application)
   async application(@Root() appBinding: AppBinding): Promise<Application> {
-    return await getRepository(Application).findOne(appBinding.reference)
+    return await getRepository(Application).findOneBy({ id: appBinding.reference })
   }
 
   @FieldResolver(type => String)
@@ -82,11 +82,11 @@ export class AppBindingQuery {
 
   @FieldResolver(type => User)
   async updater(@Root() appBinding: AppBinding): Promise<User> {
-    return await getRepository(User).findOne(appBinding.updater)
+    return await getRepository(User).findOneBy({ id: appBinding.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() appBinding: AppBinding): Promise<User> {
-    return await getRepository(User).findOne(appBinding.creator)
+    return await getRepository(User).findOneBy({ id: appBinding.creatorId })
   }
 }

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

@@ -1,5 +1,6 @@
 import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
-import { getRepository } from 'typeorm'
+
+import { getRepository } from '@things-factory/shell'
 
 import { User, UserStatus } from '../user/user'
 import { Appliance } from './appliance'
@@ -10,7 +11,10 @@ const crypto = require('crypto')
 @Resolver(Appliance)
 export class ApplianceMutation {
   @Mutation(returns => Appliance, { description: 'To create new appliance' })
-  async createAppliance(@Arg('appliance') appliance: NewAppliance, @Ctx() context: any): Promise<Appliance> {
+  async createAppliance(
+    @Arg('appliance') appliance: NewAppliance,
+    @Ctx() context: ResolverContext
+  ): Promise<Appliance> {
     return await getRepository(Appliance).save({
       domain: context.state.domain,
       creator: context.state.user,
@@ -20,7 +24,7 @@ export class ApplianceMutation {
   }
 
   @Mutation(returns => Boolean, { description: 'To delete appliance' })
-  async deleteAppliance(@Arg('id') id: string, @Ctx() context: any): Promise<Boolean> {
+  async deleteAppliance(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Boolean> {
     const { domain } = context.state
     // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.
     // TODO 다른 도메인에도 포함되어있다면, domains-users 관게와 해당 도메인 관련 정보만 삭제해야 함.
@@ -29,16 +33,16 @@ export class ApplianceMutation {
       userType: 'appliance'
     })
 
-    await getRepository(Appliance).delete({ domain, id })
+    await getRepository(Appliance).delete({ domain: { id: domain.id }, id })
 
     return true
   }
 
   @Mutation(returns => Appliance)
-  async generateApplianceSecret(@Arg('id') id: string, @Ctx() context: any): Promise<Appliance> {
+  async generateApplianceSecret(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Appliance> {
     const { domain, user } = context.state
 
-    const appliance: Appliance = await getRepository(Appliance).findOne({ id, domain })
+    const appliance: Appliance = await getRepository(Appliance).findOneBy({ domain: { id: domain.id }, id })
 
     const appuserEmail = `${crypto.randomUUID()}@${domain?.subdomain}`
     let appuser: User = await getRepository(User).findOne({
@@ -82,11 +86,13 @@ export class ApplianceMutation {
   async updateAppliance(
     @Arg('id') id: string,
     @Arg('patch') patch: AppliancePatch,
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<Appliance> {
+    const { domain } = context.state
+
     const applianceRepository = getRepository(Appliance)
     const userRepository = getRepository(User)
-    const appliance = await applianceRepository.findOne({ where: { domain: context.state.domain, id } })
+    const appliance = await applianceRepository.findOne({ where: { domain: { id: domain.id }, id } })
     const user = await userRepository.findOne({ where: { reference: id, userType: 'appliance' } })
 
     userRepository.save({

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

@@ -1,20 +1,21 @@
-import { Args, Arg, Query, Resolver, Ctx, Root, FieldResolver } from 'type-graphql'
-import { User } from '../user/user'
+import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+
+import { buildQuery, Domain, getRepository, ListParam } from '@things-factory/shell'
+
 import { Appliance } from '../appliance/appliance'
-import { buildQuery, ListParam, Domain } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
+import { User } from '../user/user'
 import { ApplianceList } from './appliance-types'
 
 @Resolver(Appliance)
 export class ApplianceQuery {
   @Query(returns => Appliance, { description: ' To fetch appliance' })
-  async appliance(@Arg('id') id: string, @Ctx() context: any): Promise<Appliance> {
+  async appliance(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Appliance> {
     const { domain } = context.state
-    return await getRepository(Appliance).findOne({ domain, id })
+    return await getRepository(Appliance).findOneBy({ domain: { id: domain.id }, id })
   }
 
   @Query(returns => ApplianceList, { description: 'To fetch multiple appliance' })
-  async appliances(@Args() params: ListParam, @Ctx() context: any): Promise<ApplianceList> {
+  async appliances(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ApplianceList> {
     const queryBuilder = getRepository(Appliance).createQueryBuilder()
     buildQuery(queryBuilder, params, context)
 
@@ -24,17 +25,17 @@ export class ApplianceQuery {
   }
 
   @FieldResolver(type => Domain)
-  async domain(@Ctx() context: any) {
+  async domain(@Ctx() context: ResolverContext) {
     return context.state.domain
   }
 
   @FieldResolver(type => User)
   async updater(@Root() appliance: Appliance): Promise<User> {
-    return await getRepository(User).findOne(appliance.updaterId)
+    return await getRepository(User).findOneBy({ id: appliance.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() appliance: Appliance): Promise<User> {
-    return await getRepository(User).findOne(appliance.creatorId)
+    return await getRepository(User).findOneBy({ id: appliance.creatorId })
   }
 }

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

@@ -1,5 +1,6 @@
 import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
-import { getRepository } from 'typeorm'
+
+import { getRepository } from '@things-factory/shell'
 
 import { User } from '../user/user'
 import { Application } from './application'
@@ -8,7 +9,7 @@ import { AccessToken, ApplicationPatch, NewApplication } from './application-typ
 @Resolver(Application)
 export class ApplicationMutation {
   @Mutation(returns => Application, { description: 'To create new application' })
-  async createApplication(@Arg('application') application: NewApplication, @Ctx() context: any) {
+  async createApplication(@Arg('application') application: NewApplication, @Ctx() context: ResolverContext) {
     const { domain } = context.state
     return await getRepository(Application).save({
       ...application,
@@ -21,20 +22,20 @@ export class ApplicationMutation {
   }
 
   @Mutation(returns => Boolean, { description: 'To delete application' })
-  async deleteApplication(@Arg('id') id: string, @Ctx() context: any) {
+  async deleteApplication(@Arg('id') id: string, @Ctx() context: ResolverContext) {
     const { domain } = context.state
     await getRepository(Application).delete({
-      id,
-      domain
+      domain: { id: domain.id },
+      id
     })
     return true
   }
 
   @Mutation(returns => Application)
-  async generateApplicationSecret(@Arg('id') id: string, @Ctx() context: any) {
+  async generateApplicationSecret(@Arg('id') id: string, @Ctx() context: ResolverContext) {
     const { domain } = context.state
     const repository = getRepository(Application)
-    const application = await repository.findOne({ id, domain })
+    const application = await repository.findOneBy({ domain: { id: domain.id }, id })
 
     return await repository.save({
       ...application,
@@ -44,10 +45,14 @@ export class ApplicationMutation {
   }
 
   @Mutation(returns => AccessToken)
-  async renewApplicationAccessToken(@Arg('id') id: string, @Ctx() context: any, @Arg('scope') scope?: string) {
+  async renewApplicationAccessToken(
+    @Arg('id') id: string,
+    @Ctx() context: ResolverContext,
+    @Arg('scope') scope?: string
+  ) {
     const { domain } = context.state
 
-    var appuser: User = await getRepository(User).findOne({
+    var appuser: User = await getRepository(User).findOneBy({
       id,
       userType: 'application'
     })
@@ -57,7 +62,7 @@ export class ApplicationMutation {
     }
 
     const repository = getRepository(Application)
-    const application = await repository.findOne(appuser.reference)
+    const application = await repository.findOneBy({ id: appuser.reference })
     if (!application) {
       throw new Error('application not found')
     }
@@ -77,9 +82,13 @@ export class ApplicationMutation {
   }
 
   @Mutation(returns => Application)
-  async updateApplication(@Arg('id') id: string, @Arg('patch') patch: ApplicationPatch, @Ctx() context: any) {
+  async updateApplication(
+    @Arg('id') id: string,
+    @Arg('patch') patch: ApplicationPatch,
+    @Ctx() context: ResolverContext
+  ) {
     const repository = getRepository(Application)
-    const application = await repository.findOne(id)
+    const application = await repository.findOneBy({ id })
 
     return await repository.save({
       ...application,