@things-factory/auth-base 8.0.2 → 8.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/auth-base",
-  "version": "8.0.2",
+  "version": "8.0.5",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -46,5 +46,5 @@
     "passport-jwt": "^4.0.0",
     "passport-local": "^1.0.0"
   },
-  "gitHead": "39d60f56e142561233ddf6d47b539c637971357c"
+  "gitHead": "9ab6fca18eeb58b9d2f3411661508a39d0ab6aee"
 }

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

@@ -18,22 +18,32 @@ const SSOLinks = Object.values(SSOConfig)
 
 export const authSigninRouter = new Router()
 
-authSigninRouter.get('/auth/signin', async (context, next) => {
-  const { redirect_to, email } = context.query
-
-  await context.render('auth-page', {
-    pageElement: 'auth-signin',
-    elementScript: '/auth/signin.js',
-    data: {
-      email,
-      redirectTo: redirect_to,
-      ssoLinks: SSOLinks,
-      disableUserSignupProcess,
-      disableUserFavoredLanguage,
-      languages
+authSigninRouter.get(
+  '/auth/signin',
+  async (ctx, next) => {
+    /* For forward compatibility, cover the case of logging in with username instead of email */
+    if (!ctx.request.body.email && ctx.request.body.username) {
+      ctx.request.body.email = ctx.request.body.username
     }
-  })
-})
+    await next()
+  },
+  async (context, next) => {
+    const { redirect_to, email } = context.query
+
+    await context.render('auth-page', {
+      pageElement: 'auth-signin',
+      elementScript: '/auth/signin.js',
+      data: {
+        email,
+        redirectTo: redirect_to,
+        ssoLinks: SSOLinks,
+        disableUserSignupProcess,
+        disableUserFavoredLanguage,
+        languages
+      }
+    })
+  }
+)
 
 authSigninRouter.post('/auth/signin', signinMiddleware, async (context, next) => {
   const { request, t } = context