@things-factory/auth-base 6.2.9 → 6.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "6.2.9",
+  "version": "6.2.11",
   "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": "693195e55200a1160edb9837ea5498b746f82577"
+  "gitHead": "702c73270456544f84da2194e2e71a7795e678f3"
 }

package/server/middlewares/authenticate-401-middleware.ts

@@ -1,7 +1,13 @@
+import { config } from '@things-factory/env'
+
 import { SUBDOMAIN_NOTFOUND, USER_DUPLICATED, USER_LOCKED, USER_NOT_ACTIVATED } from '../constants/error-code'
 import { AuthError } from '../errors/auth-error'
 import { accepts } from '../utils/accepts'
 
+const disableUserSignupProcess = config.get('disableUserSignupProcess', false)
+const disableUserFavoredLanguage = config.get('i18n/disableUserFavoredLanguage', false)
+const languages = config.get('i18n/languages', false)
+
 export async function authenticate401Middleware(context, next) {
   try {
     await next()
@@ -55,7 +61,10 @@ export async function authenticate401Middleware(context, next) {
           data: {
             ...err.detail,
             message,
-            redirectTo
+            redirectTo,
+            disableUserSignupProcess,
+            disableUserFavoredLanguage,
+            languages
           }
         })
 
@@ -66,7 +75,10 @@ export async function authenticate401Middleware(context, next) {
           data: {
             ...err.detail,
             message,
-            redirectTo
+            redirectTo,
+            disableUserSignupProcess,
+            disableUserFavoredLanguage,
+            languages
           }
         })
 
@@ -77,7 +89,10 @@ export async function authenticate401Middleware(context, next) {
           data: {
             ...err.detail,
             message,
-            redirectTo
+            redirectTo,
+            disableUserSignupProcess,
+            disableUserFavoredLanguage,
+            languages
           }
         })
 
@@ -88,7 +103,10 @@ export async function authenticate401Middleware(context, next) {
           data: {
             ...err.detail,
             message: err instanceof AuthError ? message : '',
-            redirectTo
+            redirectTo,
+            disableUserSignupProcess,
+            disableUserFavoredLanguage,
+            languages
           }
         })
     }

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,9 @@ import { User } from '../service/user/user'
 import { accepts } from '../utils/accepts'
 import { clearAccessTokenCookie } 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,
@@ -59,7 +62,10 @@ authPublicProcessRouter.get('/forgot-password', async (context, next) => {
     pageElement: 'forgot-password',
     elementScript: '/auth/forgot-password.js',
     data: {
-      email
+      email,
+      disableUserSignupProcess,
+      disableUserFavoredLanguage,
+      languages
     }
   })
 })
@@ -72,7 +78,10 @@ authPublicProcessRouter.get('/reset-password', async (context, next) => {
     elementScript: '/auth/reset-password.js',
     data: {
       token,
-      passwordRule
+      passwordRule,
+      disableUserSignupProcess,
+      disableUserFavoredLanguage,
+      languages
     }
   })
 })
@@ -84,7 +93,10 @@ authPublicProcessRouter.get('/unlock-user', async (context, next) => {
     pageElement: 'unlock-user',
     elementScript: '/auth/unlock-user.js',
     data: {
-      token
+      token,
+      disableUserSignupProcess,
+      disableUserFavoredLanguage,
+      languages
     }
   })
 })
@@ -96,7 +108,10 @@ authPublicProcessRouter.get('/activate/:email', async (context, next) => {
     pageElement: 'auth-activate',
     elementScript: '/auth/activate.js',
     data: {
-      email
+      email,
+      disableUserSignupProcess,
+      disableUserFavoredLanguage,
+      languages
     }
   })
 })
@@ -116,7 +131,10 @@ authPublicProcessRouter.get('/verify/:token', async (context, next) => {
       pageElement: 'auth-result',
       elementScript: '/auth/result.js',
       data: {
-        message
+        message,
+        disableUserSignupProcess,
+        disableUserFavoredLanguage,
+        languages
       }
     })
   }
@@ -201,7 +219,10 @@ authPublicProcessRouter.post('/reset-password', async (context, next) => {
           data: {
             token,
             message,
-            passwordRule
+            passwordRule,
+            disableUserSignupProcess,
+            disableUserFavoredLanguage,
+            languages
           }
         })
       }
@@ -221,7 +242,10 @@ authPublicProcessRouter.post('/reset-password', async (context, next) => {
         pageElement: 'auth-result',
         elementScript: '/auth/result.js',
         data: {
-          message
+          message,
+          disableUserSignupProcess,
+          disableUserFavoredLanguage,
+          languages
         }
       })
     }
@@ -234,7 +258,10 @@ authPublicProcessRouter.post('/reset-password', async (context, next) => {
         pageElement: 'auth-result',
         elementScript: '/auth/result.js',
         data: {
-          message: e.message
+          message: e.message,
+          disableUserSignupProcess,
+          disableUserFavoredLanguage,
+          languages
         }
       })
     }
@@ -265,7 +292,10 @@ 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'),
+        disableUserSignupProcess,
+        disableUserFavoredLanguage,
+        languages
       }
     })
   }

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

@@ -5,7 +5,9 @@ import { signinMiddleware } from '../middlewares'
 import { accepts } from '../utils/accepts'
 import { setAccessTokenCookie } from '../utils/access-token-cookie'
 
-const userSignupProcess = config.get('userSignupProcess', true)
+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)
@@ -25,8 +27,10 @@ authSigninRouter.get('/auth/signin', async (context, next) => {
     data: {
       email,
       redirectTo: redirect_to,
-      userSignupProcess,
-      ssoLinks: SSOLinks
+      ssoLinks: SSOLinks,
+      disableUserSignupProcess,
+      disableUserFavoredLanguage,
+      languages
     }
   })
 })

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

@@ -6,7 +6,9 @@ import { signup } from '../controllers/signup'
 import { accepts } from '../utils/accepts'
 import { setAccessTokenCookie } from '../utils/access-token-cookie'
 
-const userSignupProcess = config.get('userSignupProcess', true)
+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,
@@ -22,7 +24,7 @@ const passwordRule = config.get('password') || {
 
 export const authSignupRouter = new Router()
 
-if (userSignupProcess) {
+if (!disableUserSignupProcess) {
   authSignupRouter.get('/auth/signup', async (context, next) => {
     const { email } = context.query
 
@@ -31,7 +33,10 @@ if (userSignupProcess) {
       elementScript: '/auth/signup.js',
       data: {
         email,
-        passwordRule
+        passwordRule,
+        disableUserSignupProcess,
+        disableUserFavoredLanguage,
+        languages
       }
     })
   })
@@ -64,7 +69,10 @@ if (userSignupProcess) {
         pageElement: 'auth-result',
         elementScript: '/auth/result.js',
         data: {
-          message
+          message,
+          disableUserSignupProcess,
+          disableUserFavoredLanguage,
+          languages
         }
       })
     }

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(
       `