@things-factory/auth-base 5.0.7 → 6.0.0-alpha.0

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

@@ -1,10 +1,10 @@
 import Router from 'koa-router'
+
 import { config } from '@things-factory/env'
+
 import { signup } from '../controllers/signup'
-import { setAccessTokenCookie } from '../utils/access-token-cookie'
 import { accepts } from '../utils/accepts'
-
-const debug = require('debug')('things-factory:auth-base:auth-signup-router')
+import { setAccessTokenCookie } from '../utils/access-token-cookie'
 
 const passwordRule = config.get('password') || {
   lowerCase: true,
@@ -23,8 +23,6 @@ export const authSignupRouter = new Router()
 authSignupRouter.get('/auth/signup', async (context, next) => {
   const { email } = context.query
 
-  debug('get:/auth/signup', email)
-
   await context.render('auth-page', {
     pageElement: 'auth-signup',
     elementScript: '/auth/signup.js',
@@ -40,51 +38,46 @@ authSignupRouter.post('/auth/signup', async (context, next) => {
   const { domain } = context.state
   const user = context.request.body
 
-  try {
-    debug('post:/auth/signup', domain?.subdomain, {
+  // try {
+  const { token } = await signup(
+    {
       ...user,
-      password: 'N/A'
-    })
-
-    const { token } = await signup(
-      {
-        ...user,
-        context,
-        domain
-      },
-      true
-    )
+      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,10 +1,10 @@
 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'
 
-const debug = require('debug')('things-factory:auth-base:oauth2-authorize-router')
-
 export const oauth2AuthorizeRouter = new Router()
 
 // user authorization endpoint
@@ -26,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 의 허용 범위는 ?
@@ -34,8 +34,6 @@ oauth2AuthorizeRouter.get(
     //   return false
     // }
 
-    debug('authorize fetch client', clientID, redirectURI, client)
-
     return [client || NonClient, redirectURI]
   }),
   async function (context, next) {
@@ -45,13 +43,10 @@ oauth2AuthorizeRouter.get(
     let elementScript: string = '/oauth2/oauth2-decision-page.js'
 
     if (oauth2.client.id === NonClient.id) {
-      debug('authorize client not found : will render not found error in the decision page')
       pageElement = 'oauth2-decision-error'
       elementScript = '/oauth2/oauth2-decision-error-page.js'
     }
 
-    debug('authorize render page', oauth2)
-
     try {
       await context.render('oauth2-page', {
         pageElement,
@@ -74,7 +69,6 @@ oauth2AuthorizeRouter.get(
       //   availableScopes
       // })
     } catch (e) {
-      debug('render decision page error', e)
       throw e
     }
   }

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'
@@ -22,17 +21,13 @@ declare global {
   }
 }
 
-const debug = require('debug')('things-factory:auth-base:oauth2-router')
-
 export const oauth2Router = new Router()
 
 passport.use(
   'oauth2-client-password',
   new ClientPasswordStrategy({}, (clientId, clientSecret, done) => {
-    debug('oauth2-client-password', clientId, clientSecret)
-
     getRepository(Application)
-      .findOne({
+      .findOneBy({
         appKey: clientId
       })
       .then(client => {
@@ -84,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
   })
 
@@ -122,8 +117,6 @@ oauth2Router.post('/refresh-token', async (context, next) => {
 oauth2Router.get('/profile', jwtAuthenticateMiddleware, async (context, next) => {
   const { user, domain } = context.state
 
-  debug('getting user/application profile', user, domain)
-
   const { name, description, email, userType: type, locale } = user
   const { name: domainName, subdomain, brandName, brandImage, contentImage, timezone } = domain || {}
 
@@ -154,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,15 +1,14 @@
 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'
 import { User, UserStatus } from '../../service/user/user'
 
 const crypto = require('crypto')
-const debug = require('debug')('things-factory:auth-base:oauth2-server')
 
 export const NOTFOUND = 'NOTFOUND'
 export const NonClient = {
@@ -33,18 +32,15 @@ export const server = oauth2orize.createServer()
 // the client by ID from the database.
 
 server.serializeClient(async function (client) {
-  debug('serialze', client)
   return client.id
 })
 
 server.deserializeClient(async function (id) {
   if (id == NOTFOUND) {
-    debug('deserialize - not found')
     return {}
   }
 
-  const application = await getRepository(Application).findOne(id)
-  debug('deserialize', id, application)
+  const application = await getRepository(Application).findOneBy({ id })
   return application
 })
 
@@ -81,24 +77,19 @@ server.exchange(
     try {
       /* authorization code */
       var decoded: any = Application.verifyAuthCode(code)
-      debug('exchange code - decoded', decoded)
     } catch (e) {
-      debug('exchange code', e)
       return false
     }
     let { email, appKey, subdomain, scopes } = decoded
 
-    const application: Application = await getRepository(Application).findOne({
+    const application: Application = await getRepository(Application).findOneBy({
       appKey
     })
 
     if (!application) {
-      debug('exchange code', 'application is not exist')
       return false
     }
 
-    debug('exchange code - application', application)
-
     /* DONT-FORGET uncomment after test */
     // if (redirectUrl !== application.redirectUrl && redirectUrl.indexOf(application.redirectUrl) != 0) {
     //   logger.error(
@@ -112,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 || {}),
@@ -179,7 +169,6 @@ server.exchange(
     try {
       /* refresh token */
       var decoded: any = Application.verifyAuthCode(refreshToken)
-      debug('exchange refresh-token - decoded', decoded)
     } catch (e) {
       logger.error(e)
       return false
@@ -194,7 +183,7 @@ server.exchange(
       exp: expires_in
     } = decoded
 
-    const application: Application = await getRepository(Application).findOne({
+    const application: Application = await getRepository(Application).findOneBy({
       appKey
     })
 
@@ -203,34 +192,30 @@ server.exchange(
       return false
     }
 
-    debug('exchange refresh-token - application', application?.name)
-
     if (Date.now() > expires_in * 1000) {
       logger.error('refresh token is expired')
       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')
@@ -251,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/router/path-base-domain-router.ts

@@ -1,12 +1,8 @@
 import Router from 'koa-router'
 
-const debug = require('debug')('things-factory:auth-base:path-base-domain-router')
-
 export const pathBaseDomainRouter = new Router()
 
 /* browser history fallback 을 위한 라우터. */
 pathBaseDomainRouter.get('/(.*)', async (context, next) => {
-  debug('get:/(.*)', context.path)
-
   await next()
 })

package/server/router/site-root-router.ts

@@ -1,11 +1,11 @@
-import { Domain, domainMiddleware } from '@things-factory/shell'
 import Router from 'koa-router'
 import passport from 'passport'
+
+import { Domain, domainMiddleware } from '@things-factory/shell'
+
 import { User } from '../service/user/user'
 import { getUserDomains } from '../utils/get-user-domains'
 
-const debug = require('debug')('things-factory:auth-base:site-root-router')
-
 export const siteRootRouter = new Router()
 
 async function findAuth(context, next) {
@@ -14,9 +14,7 @@ async function findAuth(context, next) {
       try {
         const user = await User.checkAuth(decoded)
         context.state.user = user
-      } catch (e) {
-        debug('not signed in', e)
-      }
+      } catch (e) {}
     }
 
     await next()
@@ -25,24 +23,19 @@ async function findAuth(context, next) {
 
 siteRootRouter.get('/', findAuth, domainMiddleware, async (context, next) => {
   const { user, domain } = context.state
-  debug('get:/', user?.email, domain?.subdomain)
 
   const subdomain = domain?.subdomain
 
   if (user && subdomain) {
     const userDomains: Domain[] = await getUserDomains(user)
     if (userDomains.find(userDomain => userDomain.subdomain == subdomain)) {
-      debug('get:/', user.email, subdomain, 'user have access right to the subdomain. so, redirect to business-home')
       return await next()
     }
 
-    debug('get:/', user.email, subdomain, "user doesn't have access right to the subdomain. so, redirect to checkin")
-
     return context.redirect(`/auth/checkin/${subdomain}`)
   }
 
   if (user && !subdomain) {
-    debug('get:/', user?.email, 'redirect to checkin')
     context.redirect('/auth/checkin')
 
     return

package/server/routes.ts

@@ -1,25 +1,24 @@
+import session from 'koa-session'
+
 import { config } from '@things-factory/env'
+
 import { domainAuthenticateMiddleware, jwtAuthenticateMiddleware } from './middlewares'
 import {
-  authSignupRouter,
+  authCheckinRouter,
   authPrivateProcessRouter,
   authPublicProcessRouter,
   authSigninRouter,
-  pathBaseDomainRouter,
-  siteRootRouter,
+  authSignupRouter,
+  oauth2AuthorizeRouter,
   oauth2Router,
-  authCheckinRouter,
-  oauth2AuthorizeRouter
+  pathBaseDomainRouter,
+  siteRootRouter
 } from './router'
-import session from 'koa-session'
 import { SECRET } from './utils/get-secret'
 
 const isPathBaseDomain = !config.get('subdomain') && !config.get('useVirtualHostBasedDomain')
-const debug = require('debug')('things-factory:auth-base:routes')
 
 process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {
-  debug('bootstrap-module-global-public-route')
-
   globalPublicRouter.use(siteRootRouter.routes(), siteRootRouter.allowedMethods())
   globalPublicRouter.use(authPublicProcessRouter.routes(), authPublicProcessRouter.allowedMethods())
 })
@@ -33,8 +32,6 @@ process.on('bootstrap-module-global-private-route' as any, (app, globalPrivateRo
 })
 
 process.on('bootstrap-module-domain-public-route' as any, (app, domainPublicRouter) => {
-  debug('bootstrap-module-domain-public-route')
-
   /* domainPublicRouter based nested-routers */
   domainPublicRouter.use(authSigninRouter.routes(), authSigninRouter.allowedMethods())
   domainPublicRouter.use(authSignupRouter.routes(), authSignupRouter.allowedMethods())
@@ -71,8 +68,6 @@ process.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRo
   // '(.[^.]+)' 은 '', '/'는 제외하고, '/xxx', '/yyy/zzz' 등 모두를 포함하지만, path에 '.'가 있는 경우는 제외한다.
   // (테스트는 여기서 : http://forbeslindesay.github.io/express-route-tester/)
   domainPrivateRouter.get('(.[^.]+)', async (context, next) => {
-    const { path } = context
-    debug('get:(.[^.]+)', path)
     await next()
   })
 })

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

@@ -1,18 +1,16 @@
-import { AppBinding } from './app-binding'
-import { Resolver, Mutation, Arg, Ctx } from 'type-graphql'
-import { User } from '../user/user'
-import { getRepository } from 'typeorm'
+import { Arg, Ctx, Mutation, Resolver } from 'type-graphql'
+
+import { getRepository } from '@things-factory/shell'
 
-const debug = require('debug')('things-factory:auth-base:delete-app-binding')
+import { User } from '../user/user'
+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
 
-    debug('user', id)
-
     // TODO 이 사용자가 이 도메인에 속한 사용자인지 확인해야함.
     // TODO 다른 도메인에도 포함되어있다면, domains-users 관게와 해당 도메인 관련 정보만 삭제해야 함.
     await getRepository(User).delete({

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, convertListParams, 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,22 +13,23 @@ 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)
-    convertedParams.where = {
-      ...convertedParams.where,
-      userType: 'application'
-    }
+    // const convertedParams = convertListParams(params)
+    // convertedParams.where = {
+    //   ...convertedParams.where,
+    //   userType: 'application'
+    // } as any
 
     const alias: string = 'USER'
     const qb: SelectQueryBuilder<User> = buildDomainUsersQueryBuilder(domain.id, alias)
@@ -47,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
     //       })
 
@@ -65,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)
@@ -81,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'
@@ -7,12 +8,13 @@ import { AppliancePatch, NewAppliance } from './appliance-types'
 
 const crypto = require('crypto')
 
-const debug = require('debug')('things-factory:auth-base:appliance')
-
 @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,
@@ -22,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 관게와 해당 도메인 관련 정보만 삭제해야 함.
@@ -31,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({
@@ -69,10 +71,7 @@ export class ApplianceMutation {
       context.throw(401, 'appliance is not allowed for this domain')
     }
 
-    debug('appiance user', appuser)
-
     appuser.password = Appliance.generateAccessToken(domain, appuser, appliance)
-    debug('access token', appuser.password)
 
     await getRepository(User).save(appuser)
 
@@ -87,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({