lint: lib/auth/utils.ts

- install @types/express-session for req.session
- add returnTo into sessionData
- add typing annotate in passportGeneralCallback and remove unused var

Author: a60814billy

lib/auth/utils.ts

@@ -1,10 +1,13 @@
 'use strict'
 
+import {Request} from "express";
 import {User} from "../models";
 import config from "../config";
 import {logger} from "../logger";
 
-export function setReturnToFromReferer(req) {
+export function setReturnToFromReferer(req: Request): void {
+  // eslint-disable-next-line
+  // @ts-ignore
   if (!req.session) req.session = {}
 
   const referer = req.get('referer')
@@ -30,7 +33,11 @@ export function setReturnToFromReferer(req) {
   }
 }
 
-export function passportGeneralCallback(accessToken, refreshToken, profile, done) {
+interface Profile {
+  id?: string
+}
+
+export function passportGeneralCallback(accessToken: string, refreshToken: string, profile: Profile, done: (err: Error | null, user?: User) => void): void {
   const stringifiedProfile = JSON.stringify(profile)
   User.findOrCreate({
     where: {
@@ -41,7 +48,7 @@ export function passportGeneralCallback(accessToken, refreshToken, profile, done
       accessToken: accessToken,
       refreshToken: refreshToken
     }
-  }).spread(function (user, created) {
+  }).spread(function (user) {
     if (user) {
       let needSave = false
       if (user.profile !== stringifiedProfile) {

package-lock.json

@@ -113,6 +113,7 @@
     "@susisu/mte-kernel": "^2.1.0",
     "@types/express": "4.17.9",
     "@types/express-flash": "0.0.2",
+    "@types/express-session": "^1.17.3",
     "@types/lodash": "^4.14.170",
     "@types/minio": "^7.0.7",
     "@types/node": "~12.20.15",

package.json

@@ -0,0 +1,7 @@
+declare module 'express-session' {
+  interface SessionData {
+    returnTo?: string
+  }
+}
+
+export {}