remove * as models

Author: a60814billy

lib/app.ts

@@ -22,7 +22,7 @@ import {Server as WsServer} from 'ws'
 import config from "./config";
 import {logger} from "./logger";
 import * as response from "./response";
-import * as models from "./models";
+import {sequelize} from "./models";
 import * as csp from "./csp";
 import {Environment} from "./config/enum";
 import {checkAllNotesRevision} from "./services/note";
@@ -101,7 +101,7 @@ app.use(methodOverride('_method'))
 
 // session store
 const sessionStore = new SequelizeStore({
-  db: models.sequelize
+  db: sequelize
 })
 
 // use hsts to tell https users stick to this
@@ -286,7 +286,7 @@ function startListen() {
 }
 
 // sync db then start listen
-models.sequelize.sync().then(function () {
+sequelize.sync().then(function () {
   // check if realtime is ready
   if (realtime.isReady()) {
     checkAllNotesRevision(function (err, notes) {

lib/auth/email/index.ts

@@ -3,8 +3,8 @@ import passport from "passport";
 import validator from "validator";
 import {Strategy as LocalStrategy} from 'passport-local';
 
-import * as models from '../../models';
 import config from '../../config';
+import {User} from '../../models';
 import {logger} from "../../logger";
 import {setReturnToFromReferer} from "../utils";
 import {urlencodedParser} from "../../utils";
@@ -19,7 +19,7 @@ passport.use(new LocalStrategy({
   if (!validator.isEmail(email)) return done(null, false)
 
   try {
-    const user = await models.User.findOne({
+    const user = await User.findOne({
       where: {
         email: email
       }
@@ -39,7 +39,7 @@ if (config.allowEmailRegister) {
     if (!req.body.email || !req.body.password) return response.errorBadRequest(req, res)
     if (!validator.isEmail(req.body.email)) return response.errorBadRequest(req, res)
     try {
-      const [user, created] = await models.User.findOrCreate({
+      const [user, created] = await User.findOrCreate({
         where: {
           email: req.body.email
         },

lib/auth/index.ts

@@ -3,7 +3,7 @@ import {Router} from "express";
 import passport from "passport";
 import config from "../config";
 import {logger} from "../logger";
-import * as models from "../models";
+import {User} from "../models";
 
 const authRouter = Router()
 export = authRouter
@@ -15,7 +15,7 @@ passport.serializeUser(function (user: any, done) {
 })
 
 passport.deserializeUser(function (id, done) {
-  models.User.findOne({
+  User.findOne({
     where: {
       id: id
     }

lib/auth/ldap/index.ts

@@ -3,7 +3,7 @@ import passport from "passport";
 import LDAPStrategy from "passport-ldapauth";
 
 import config from "../../config";
-import * as models from "../../models";
+import {User} from "../../models";
 import {logger} from "../../logger";
 import * as response from "../../response";
 import {setReturnToFromReferer} from "../utils";
@@ -50,7 +50,7 @@ passport.use(new LDAPStrategy({
     provider: 'ldap'
   }
   const stringifiedProfile = JSON.stringify(profile)
-  models.User.findOrCreate({
+  User.findOrCreate({
     where: {
       profileid: profile.id.toString()
     },

lib/auth/openid/index.ts

@@ -3,7 +3,7 @@ import passport from "passport";
 import {Strategy as OpenIDStrategy} from "@passport-next/passport-openid";
 
 import config from "../../config";
-import * as models from "../../models";
+import {User} from "../../models";
 import {logger} from "../../logger";
 import {urlencodedParser} from "../../utils";
 import {setReturnToFromReferer} from "../utils";
@@ -17,7 +17,7 @@ passport.use(new OpenIDStrategy({
   profile: true
 }, function (openid, profile, done) {
   const stringifiedProfile = JSON.stringify(profile)
-  models.User.findOrCreate({
+  User.findOrCreate({
     where: {
       profileid: openid
     },

lib/auth/saml/index.ts

@@ -4,7 +4,7 @@ import passport from "passport";
 import {Strategy as SamlStrategy} from "passport-saml";
 
 import config from "../../config";
-import * as models from "../../models";
+import {User} from "../../models";
 import {logger} from "../../logger";
 import {urlencodedParser} from "../../utils";
 
@@ -49,7 +49,7 @@ passport.use(new SamlStrategy({
     profile.emails.push(user.nameID)
   }
   const stringifiedProfile = JSON.stringify(profile)
-  models.User.findOrCreate({
+  User.findOrCreate({
     where: {
       profileid: profile.id.toString()
     },

lib/auth/utils.ts

@@ -1,6 +1,6 @@
 'use strict'
 
-import * as models from "../models";
+import {User} from "../models";
 import config from "../config";
 import {logger} from "../logger";
 
@@ -32,7 +32,7 @@ export function setReturnToFromReferer(req) {
 
 export function passportGeneralCallback(accessToken, refreshToken, profile, done) {
   const stringifiedProfile = JSON.stringify(profile)
-  models.User.findOrCreate({
+  User.findOrCreate({
     where: {
       profileid: profile.id.toString()
     },

lib/history/index.ts

@@ -2,13 +2,13 @@
 // external modules
 import LZString from '@hackmd/lz-string'
 
-import * as models from '../models'
+import {Note, User} from '../models'
 import {logger} from '../logger'
 import config from '../config'
 import * as response from '../response'
 
-function getHistory (userid, callback) {
-  models.User.findOne({
+function getHistory(userid, callback) {
+  User.findOne({
     where: {
       id: userid
     }
@@ -32,8 +32,8 @@ function getHistory (userid, callback) {
         }
         try {
           const id = LZString.decompressFromBase64(history[i].id)
-          if (id && models.Note.checkNoteIdValid(id)) {
-            history[i].id = models.Note.encodeNoteId(id)
+          if (id && Note.checkNoteIdValid(id)) {
+            history[i].id = Note.encodeNoteId(id)
           }
         } catch (err) {
           // most error here comes from LZString, ignore
@@ -56,8 +56,8 @@ function getHistory (userid, callback) {
   })
 }
 
-function setHistory (userid, history, callback) {
-  models.User.update({
+function setHistory(userid, history, callback) {
+  User.update({
     history: JSON.stringify(parseHistoryToArray(history))
   }, {
     where: {
@@ -71,15 +71,15 @@ function setHistory (userid, history, callback) {
   })
 }
 
-export function updateHistory (userid, noteId, document?: string, time?: any) {
+export function updateHistory(userid, noteId, document?: string, time?: any) {
   if (userid && noteId && typeof document !== 'undefined') {
     getHistory(userid, function (err, history) {
       if (err || !history) return
       if (!history[noteId]) {
         history[noteId] = {}
       }
       const noteHistory = history[noteId]
-      const noteInfo = models.Note.parseNoteInfo(document)
+      const noteInfo = Note.parseNoteInfo(document)
       noteHistory.id = noteId
       noteHistory.text = noteInfo.title
       noteHistory.time = time || Date.now()
@@ -93,7 +93,7 @@ export function updateHistory (userid, noteId, document?: string, time?: any) {
   }
 }
 
-function parseHistoryToArray (history) {
+function parseHistoryToArray(history) {
   const _history = []
   Object.keys(history).forEach(function (key) {
     const item = history[key]
@@ -102,7 +102,7 @@ function parseHistoryToArray (history) {
   return _history
 }
 
-function parseHistoryToObject (history) {
+function parseHistoryToObject(history) {
   const _history = {}
   for (let i = 0, l = history.length; i < l; i++) {
     const item = history[i]
@@ -111,7 +111,7 @@ function parseHistoryToObject (history) {
   return _history
 }
 
-export function historyGet (req, res) {
+export function historyGet(req, res) {
   if (req.isAuthenticated()) {
     getHistory(req.user.id, function (err, history) {
       if (err) return response.errorInternalError(req, res)
@@ -125,12 +125,14 @@ export function historyGet (req, res) {
   }
 }
 
-export function historyPost (req, res) {
+export function historyPost(req, res) {
   if (req.isAuthenticated()) {
     const noteId = req.params.noteId
     if (!noteId) {
       if (typeof req.body.history === 'undefined') return response.errorBadRequest(req, res)
-      if (config.debug) { logger.info('SERVER received history from [' + req.user.id + ']: ' + req.body.history) }
+      if (config.debug) {
+        logger.info('SERVER received history from [' + req.user.id + ']: ' + req.body.history)
+      }
       let history = null
       try {
         history = JSON.parse(req.body.history)
@@ -167,7 +169,7 @@ export function historyPost (req, res) {
   }
 }
 
-export function historyDelete (req, res) {
+export function historyDelete(req, res) {
   if (req.isAuthenticated()) {
     const noteId = req.params.noteId
     if (!noteId) {

lib/homepage/index.ts

@@ -1,8 +1,6 @@
 import * as fs from 'fs'
 import * as path from 'path'
 import config from '../config'
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
 import {User} from '../models'
 import {logger} from '../logger'
 import {Request, Response} from "express";