@things-factory/auth-base 6.2.6 → 6.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "6.2.6",
+  "version": "6.2.10",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -32,7 +32,7 @@
   "dependencies": {
     "@things-factory/email-base": "^6.2.6",
     "@things-factory/env": "^6.2.0",
-    "@things-factory/i18n-base": "^6.2.6",
+    "@things-factory/i18n-base": "^6.2.10",
     "@things-factory/shell": "^6.2.6",
     "@things-factory/utils": "^6.2.0",
     "jsonwebtoken": "^9.0.0",
@@ -42,5 +42,5 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0"
   },
-  "gitHead": "d8a4f36c559797233b24fa20097bfb2d081229e8"
+  "gitHead": "a93e333b304f0452e1f5dafedf497cecebdbe03e"
 }

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

@@ -12,6 +12,7 @@ import { clearAccessTokenCookie, setAccessTokenCookie } from '../utils/access-to
 import { getUserDomains } from '../utils/get-user-domains'
 
 const domainType = config.get('domainType')
+const languages = config.get('i18n/languages') || []
 
 export const authPrivateProcessRouter = new Router({
   prefix: '/auth'
@@ -84,6 +85,7 @@ authPrivateProcessRouter
       domain: domain && {
         name: domain.name,
         subdomain: domain.subdomain
-      }
+      },
+      languages
     }
   })

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

@@ -11,6 +11,8 @@ import { User } from '../service/user/user'
 import { accepts } from '../utils/accepts'
 import { clearAccessTokenCookie } from '../utils/access-token-cookie'
 
+const disableUserFavoredLanguage = config.get('i18n/disableUserFavoredLanguage', false)
+const languages = config.get('i18n/languages', false)
 const passwordRule = config.get('password') || {
   lowerCase: true,
   upperCase: true,
@@ -59,7 +61,9 @@ authPublicProcessRouter.get('/forgot-password', async (context, next) => {
     pageElement: 'forgot-password',
     elementScript: '/auth/forgot-password.js',
     data: {
-      email
+      email,
+      disableUserFavoredLanguage,
+      languages
     }
   })
 })
@@ -72,7 +76,9 @@ authPublicProcessRouter.get('/reset-password', async (context, next) => {
     elementScript: '/auth/reset-password.js',
     data: {
       token,
-      passwordRule
+      passwordRule,
+      disableUserFavoredLanguage,
+      languages
     }
   })
 })
@@ -84,7 +90,9 @@ authPublicProcessRouter.get('/unlock-user', async (context, next) => {
     pageElement: 'unlock-user',
     elementScript: '/auth/unlock-user.js',
     data: {
-      token
+      token,
+      disableUserFavoredLanguage,
+      languages
     }
   })
 })
@@ -96,7 +104,9 @@ authPublicProcessRouter.get('/activate/:email', async (context, next) => {
     pageElement: 'auth-activate',
     elementScript: '/auth/activate.js',
     data: {
-      email
+      email,
+      disableUserFavoredLanguage,
+      languages
     }
   })
 })
@@ -116,7 +126,9 @@ authPublicProcessRouter.get('/verify/:token', async (context, next) => {
       pageElement: 'auth-result',
       elementScript: '/auth/result.js',
       data: {
-        message
+        message,
+        disableUserFavoredLanguage,
+        languages
       }
     })
   }
@@ -201,7 +213,9 @@ authPublicProcessRouter.post('/reset-password', async (context, next) => {
           data: {
             token,
             message,
-            passwordRule
+            passwordRule,
+            disableUserFavoredLanguage,
+            languages
           }
         })
       }
@@ -221,7 +235,9 @@ authPublicProcessRouter.post('/reset-password', async (context, next) => {
         pageElement: 'auth-result',
         elementScript: '/auth/result.js',
         data: {
-          message
+          message,
+          disableUserFavoredLanguage,
+          languages
         }
       })
     }
@@ -234,7 +250,9 @@ authPublicProcessRouter.post('/reset-password', async (context, next) => {
         pageElement: 'auth-result',
         elementScript: '/auth/result.js',
         data: {
-          message: e.message
+          message: e.message,
+          disableUserFavoredLanguage,
+          languages
         }
       })
     }
@@ -265,7 +283,9 @@ authPublicProcessRouter.post('/unlock-user', async (context, next) => {
       pageElement: 'auth-result',
       elementScript: '/auth/result.js',
       data: {
-        message: t('text.account is reactivated')
+        message: t('text.account is reactivated'),
+        disableUserFavoredLanguage,
+        languages
       }
     })
   }

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

@@ -5,6 +5,10 @@ import { signinMiddleware } from '../middlewares'
 import { accepts } from '../utils/accepts'
 import { setAccessTokenCookie } from '../utils/access-token-cookie'
 
+const disableUserSignupProcess = config.get('disableUserSignupProcess', false)
+const disableUserFavoredLanguage = config.get('i18n/disableUserFavoredLanguage', false)
+const languages = config.get('i18n/languages', false)
+
 const SSOConfig = config.get('sso', {} as any)
 const SSOLinks = Object.values(SSOConfig)
   .filter(({ link, title }) => link && title)
@@ -23,7 +27,10 @@ authSigninRouter.get('/auth/signin', async (context, next) => {
     data: {
       email,
       redirectTo: redirect_to,
-      ssoLinks: SSOLinks
+      ssoLinks: SSOLinks,
+      disableUserSignupProcess,
+      disableUserFavoredLanguage,
+      languages
     }
   })
 })

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

@@ -6,6 +6,10 @@ import { signup } from '../controllers/signup'
 import { accepts } from '../utils/accepts'
 import { setAccessTokenCookie } from '../utils/access-token-cookie'
 
+const disableUserSignupProcess = config.get('disableUserSignupProcess', false)
+const disableUserFavoredLanguage = config.get('i18n/disableUserFavoredLanguage', false)
+const languages = config.get('i18n/languages', false)
+
 const passwordRule = config.get('password') || {
   lowerCase: true,
   upperCase: true,
@@ -20,64 +24,70 @@ const passwordRule = config.get('password') || {
 
 export const authSignupRouter = new Router()
 
-authSignupRouter.get('/auth/signup', async (context, next) => {
-  const { email } = context.query
+if (!disableUserSignupProcess) {
+  authSignupRouter.get('/auth/signup', async (context, next) => {
+    const { email } = context.query
 
-  await context.render('auth-page', {
-    pageElement: 'auth-signup',
-    elementScript: '/auth/signup.js',
-    data: {
-      email,
-      passwordRule
-    }
+    await context.render('auth-page', {
+      pageElement: 'auth-signup',
+      elementScript: '/auth/signup.js',
+      data: {
+        email,
+        passwordRule,
+        disableUserFavoredLanguage,
+        languages
+      }
+    })
   })
-})
 
-authSignupRouter.post('/auth/signup', async (context, next) => {
-  const { header, t } = context
-  const { domain } = context.state
-  const user = context.request.body
+  authSignupRouter.post('/auth/signup', async (context, next) => {
+    const { header, t } = context
+    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
-  }
+    const message = t('text.user registered successfully')
+    context.body = {
+      message,
+      token
+    }
 
-  setAccessTokenCookie(context, token)
+    setAccessTokenCookie(context, 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
+    if (accepts(header.accept, ['text/html', '*/*'])) {
+      await context.render('auth-page', {
+        pageElement: 'auth-result',
+        elementScript: '/auth/result.js',
+        data: {
+          message,
+          disableUserFavoredLanguage,
+          languages
+        }
+      })
+    }
+    // } 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
-  //       }
-  //     })
-  //   }
-  // }
-})
+    //   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,12 +1,16 @@
 import Router from 'koa-router'
 
 import { getRepository } from '@things-factory/shell'
+import { config } from '@things-factory/env'
 
 import { Application } from '../../service/application/application'
 import { NonClient, server as oauth2orizeServer } from './oauth2-server'
 
 export const oauth2AuthorizeRouter = new Router()
 
+const disableUserFavoredLanguage = config.get('i18n/disableUserFavoredLanguage', false)
+const languages = config.get('i18n/languages', false)
+
 // user authorization endpoint
 //
 // `authorization` middleware accepts a `validate` callback which is
@@ -60,7 +64,9 @@ oauth2AuthorizeRouter.get(
               name: oauth2.user.name,
               email: oauth2.user.email
             }
-          }
+          },
+          disableUserFavoredLanguage,
+          languages
         }
       })
       // await context.render(decisionPage, {

package/server/service/privilege/privilege-directive.ts

@@ -24,7 +24,7 @@ export const privilegeDirectiveResolver = (schema: GraphQLSchema) =>
         const { resolve = defaultFieldResolver, args } = fieldConfig
 
         if (!args) {
-          throw new Error(`Unexpected Error. args should be defined in @privilige directive for field ${fieldName}.`)
+          throw new Error(`Unexpected Error. args should be defined in @privilege directive for field ${fieldName}.`)
         }
 
         const { domainOwnerGranted, superUserGranted, category, privilege } = privilegeDirective

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

@@ -38,7 +38,7 @@ export class RoleQuery {
   }
 
   @Directive('@privilege(category: "user", privilege: "query", domainOwnerGranted: true, superUserGranted: true)')
-  @Query(returns => [RolePrivilege], { description: 'To fetch priviliges of a role' })
+  @Query(returns => [RolePrivilege], { description: 'To fetch privileges of a role' })
   async rolePrivileges(@Arg('roleId') roleId: string, @Ctx() context: ResolverContext): Promise<RolePrivilege[]> {
     const rolePrivileges = await getRepository(Privilege).query(
       `