refactor: clean up typescript smells (#65)

Author: aeneasr

src/helpers.ts

@@ -0,0 +1 @@
+export const isString = (x: any): x is string => typeof x === 'string'

src/routes/auth.ts

@@ -8,6 +8,7 @@ import {
   RegistrationRequest,
 } from '@oryd/kratos-client'
 import {IncomingMessage} from 'http'
+import {isString} from "../helpers";
 
 const kratos = new AdminApi(config.kratos.admin)
 
@@ -19,11 +20,11 @@ export const authHandler = (type: 'login' | 'registration') => (
   res: Response,
   next: NextFunction
 ) => {
-  const request = String(req.query.request)
+  const request = req.query.request
 
   // The request is used to identify the login and registration request and
   // return data like the csrf_token and so on.
-  if (!request) {
+  if (!request || !isString(request)) {
     console.log('No request found in URL, initializing auth flow.')
     res.redirect(`${config.kratos.browser}/self-service/browser/flows/${type}`)
     return
@@ -78,8 +79,5 @@ export const authHandler = (type: 'login' | 'registration') => (
         password: methodConfig("password"),
       })
     })
-    .catch(err => {
-      console.error(err)
-      next(err)
-    })
+    .catch(next)
 }

src/routes/error.ts

@@ -2,13 +2,14 @@ import {NextFunction, Request, Response} from 'express'
 import config from '../config'
 import {CommonApi, ErrorContainer} from '@oryd/kratos-client'
 import {IncomingMessage} from 'http'
+import {isString} from "../helpers";
 
 const kratos = new CommonApi(config.kratos.admin)
 
 export default (req: Request, res: Response, next: NextFunction) => {
-  const error = String(req.query.error)
+  const error = req.query.error
 
-  if (!error) {
+  if (!error || !isString(error)) {
     // No error was send, redirecting back to home.
     res.redirect(config.baseUrl)
     return
@@ -47,5 +48,5 @@ export default (req: Request, res: Response, next: NextFunction) => {
         )}`
       )
     })
-    .catch(err => next(err))
+    .catch(next)
 }

src/routes/recovery.ts

@@ -2,15 +2,16 @@ import {NextFunction, Request, Response} from 'express'
 import config from '../config'
 import {CommonApi} from '@oryd/kratos-client'
 import {IncomingMessage} from 'http'
+import {isString} from "../helpers";
 
 const kratos = new CommonApi(config.kratos.admin)
 
 export default (req: Request, res: Response, next: NextFunction) => {
-  const request = String(req.query.request)
+  const request = req.query.request
 
   // The request is used to identify the account recovery request and
   // return data like the csrf_token and so on.
-  if (!request) {
+  if (!request || !isString(request)) {
     console.log('No request found in URL, initializing recovery flow.')
     res.redirect(`${config.kratos.browser}/self-service/browser/flows/recovery`)
     return
@@ -19,32 +20,29 @@ export default (req: Request, res: Response, next: NextFunction) => {
   kratos
     .getSelfServiceBrowserRecoveryRequest(request)
     .then(({body, response}: { response: IncomingMessage, body?: any }) => {
-        if (response.statusCode == 404) {
-          res.redirect(
-            `${config.kratos.browser}/self-service/browser/flows/recovery`
-          )
-          return
-        } else if (response.statusCode != 200) {
-          return Promise.reject(body)
-        }
-
-        return body
+      if (response.statusCode == 404) {
+        res.redirect(
+          `${config.kratos.browser}/self-service/browser/flows/recovery`
+        )
+        return
+      } else if (response.statusCode != 200) {
+        return Promise.reject(body)
       }
-    ).then((request: any) => {
+
       // This helper returns a request method config (e.g. for the password flow).
       // If active is set and not the given request method key, it wil be omitted.
       // This prevents the user from e.g. signing up with email but still seeing
       // other sign up form elements when an input is incorrect.
       const methodConfig = (key: string) => {
-        if (request?.active === key || !request?.active) {
-          return request?.methods[key]?.config
+        if (body?.active === key || !body?.active) {
+          return body?.methods[key]?.config
         }
       }
 
       res.render('recovery', {
-        ...request,
+        ...body,
         token: methodConfig('link')
       })
-    }
-  ).catch((err: any) => next(err))
+    })
+    .catch(next)
 }

src/routes/settings.ts

@@ -1,14 +1,15 @@
 import {NextFunction, Request, Response} from 'express'
 import config from '../config'
 import {CommonApi} from '@oryd/kratos-client'
+import {isString} from "../helpers";
 
 const kratos = new CommonApi(config.kratos.admin)
 
 const settingsHandler = (req: Request, res: Response, next: NextFunction) => {
-  const request = String(req.query.request)
+  const request = req.query.request
   // The request is used to identify the account settings request and
   // return data like the csrf_token and so on.
-  if (!request) {
+  if (!request || !isString(request)) {
     console.log('No request found in URL, initializing flow.')
     res.redirect(`${config.kratos.browser}/self-service/browser/flows/settings`)
     return
@@ -26,29 +27,16 @@ const settingsHandler = (req: Request, res: Response, next: NextFunction) => {
         return Promise.reject(body)
       }
 
-      return Promise.resolve(body)
-    })
-    .then(request => {
-      const methodConfig = (key: string) => request?.methods[key]?.config
+      const methodConfig = (key: string) => body?.methods[key]?.config
 
-      if (request) {
-        res.render('settings', {
-          ...request,
-          password: methodConfig("password"),
-          profile: methodConfig("profile"),
-          oidc: methodConfig("oidc"),
-        })
-        return
-      }
-
-      return Promise.reject(
-        'Expected self service settings request to be defined.'
-      )
-    })
-    .catch(err => {
-      console.error(err)
-      next(err)
+      res.render('settings', {
+        ...body,
+        password: methodConfig("password"),
+        profile: methodConfig("profile"),
+        oidc: methodConfig("oidc"),
+      })
     })
+    .catch(next)
 }
 
 export default settingsHandler

src/routes/verification.ts

@@ -2,15 +2,16 @@ import {NextFunction, Request, Response} from 'express'
 import config from '../config'
 import {CommonApi} from '@oryd/kratos-client'
 import {IncomingMessage} from 'http'
+import {isString} from "../helpers";
 
 const kratos = new CommonApi(config.kratos.admin)
 
 export default (req: Request, res: Response, next: NextFunction) => {
-  const request = String(req.query.request)
+  const request = req.query.request
 
   // The request is used to identify the login and registration request and
   // return data like the csrf_token and so on.
-  if (!request) {
+  if (!request || !isString(request)) {
     console.log('No request found in URL, initializing verify flow.')
     res.redirect(`${config.kratos.browser}/self-service/browser/flows/verification/email`)
     return
@@ -28,12 +29,8 @@ export default (req: Request, res: Response, next: NextFunction) => {
           return Promise.reject(body)
         }
 
-        return body
+        res.render('verification', body)
       }
-    ).then((request: any) => {
-      res.render('verification', {
-        ...request
-      })
-    }
-  ).catch((err: any) => next(err))
+    )
+    .catch(next)
 }