gh-238. Add conditional validation for auth route

apps/web-portal/lib/rest-api-v1/auth.mjs

@@ -1,13 +1,9 @@
 import {AuthLogin} from '../use-cases/auth'
-import {AuthLoginToken} from '../use-cases/auth'
 
 export default ({makeRunner}) => {
   return {
     login: makeRunner(AuthLogin, {
       toParams: (req) => ({...req.body}),
     }),
-    loginWithToken: makeRunner(AuthLoginToken, {
-      toParams: (req) => ({...req.body}),
-    }),
   }
 }

apps/web-portal/lib/rest-api-v1/index.mjs

@@ -21,7 +21,6 @@ export function route(deps) {
   router.get('/specs', specController.list)
   router.get('/specs/:id', specController.read)
   router.post('/auth/login', authController.login)
-  router.post('/auth/login/token', authController.loginWithToken)
   router.post('/log', logController.save)
 
   return router

apps/web-portal/lib/use-cases/auth/AuthLogin.mjs

@@ -3,11 +3,29 @@ import {apiToken} from '../utils'
 
 export class AuthLogin extends UseCase {
   static rules = {
-    email: ['required', 'email'],
-    password: 'required',
+    credentials: [{
+      or: [{
+        nested_object: {
+          password: ['required'],
+          email: ['required', 'email']
+        }
+      }, {
+        nested_object: {
+          token: ['required']
+        }
+      }]
+    }, 'required']
   }
 
+
   async run(params) {
+    // eslint-disable-next-line no-unused-vars
+    const {credentials: { token, password, email }} = params
+
+    if (token) {
+      apiToken.verify(token)
+    }
+
     return {
       token: apiToken.sign(params),
       email: '[email protected]',

apps/web-portal/lib/use-cases/auth/index.mjs

@@ -1,2 +1 @@
 export * from './AuthLogin'
-export * from './AuthLoginToken'

packages/util-web-api-client/lib/axios/AxiosAuthApi.mjs

@@ -13,12 +13,7 @@ export class AxiosAuthApi extends AuthApi {
   }
 
   async login(params) {
-    let response
-    if (params.token) {
-      response = await this.#http.post('/api/v1/auth/login/token', params)
-    } else {
-      response = await this.#http.post('/api/v1/auth/login', params)
-    }
+    const response = await this.#http.post('/api/v1/auth/login', { credentials: { ...params } })
     return response ? response.data : {status: 1}
   }
 }