Skip to content

Commit 0ff80c6

Browse files
a60814billya60814billy
committed
fix all eslint error
1 parent f5c867f commit 0ff80c6

File tree

27 files changed

+236
-198
lines changed

27 files changed

+236
-198
lines changed

‎lib/auth/index.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ passport.deserializeUser(function (id, done) {
2222
}).then(function (user) {
2323
// Don't die on non-existent user
2424
if (user == null) {
25+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
2526
// @ts-ignore
2627
return done(null, false, {message: 'Invalid UserID'})
2728
}
@@ -34,18 +35,31 @@ passport.deserializeUser(function (id, done) {
3435
})
3536
})
3637

38+
// eslint-disable-next-line @typescript-eslint/no-var-requires
3739
if (config.isFacebookEnable) authRouter.use(require('./facebook'))
40+
// eslint-disable-next-line @typescript-eslint/no-var-requires
3841
if (config.isTwitterEnable) authRouter.use(require('./twitter'))
42+
// eslint-disable-next-line @typescript-eslint/no-var-requires
3943
if (config.isGitHubEnable) authRouter.use(require('./github'))
44+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4045
if (config.isBitbucketEnable) authRouter.use(require('./bitbucket'))
46+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4147
if (config.isGitLabEnable) authRouter.use(require('./gitlab'))
48+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4249
if (config.isMattermostEnable) authRouter.use(require('./mattermost'))
50+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4351
if (config.isDropboxEnable) authRouter.use(require('./dropbox'))
52+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4453
if (config.isGoogleEnable) authRouter.use(require('./google'))
54+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4555
if (config.isLDAPEnable) authRouter.use(require('./ldap'))
56+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4657
if (config.isSAMLEnable) authRouter.use(require('./saml'))
58+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4759
if (config.isOAuth2Enable) authRouter.use(require('./oauth2'))
60+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4861
if (config.isEmailEnable) authRouter.use(require('./email'))
62+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4963
if (config.isOpenIDEnable) authRouter.use(require('./openid'))
5064

5165
// logout

‎lib/auth/ldap/index.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ passport.use(new LDAPStrategy({
2323
tlsOptions: config.ldap.tlsOptions || null
2424
}
2525
}, function (user, done) {
26-
var uuid = user.uidNumber || user.uid || user.sAMAccountName || undefined
26+
let uuid = user.uidNumber || user.uid || user.sAMAccountName || undefined
2727
if (config.ldap.useridField && user[config.ldap.useridField]) {
2828
uuid = user[config.ldap.useridField]
2929
}
@@ -35,12 +35,12 @@ passport.use(new LDAPStrategy({
3535
'"useridField" option in ldap settings.')
3636
}
3737

38-
var username = uuid
38+
let username = uuid
3939
if (config.ldap.usernameField && user[config.ldap.usernameField]) {
4040
username = user[config.ldap.usernameField]
4141
}
4242

43-
var profile = {
43+
const profile = {
4444
id: 'LDAP-' + uuid,
4545
username: username,
4646
displayName: user.displayName,
@@ -49,7 +49,7 @@ passport.use(new LDAPStrategy({
4949
profileUrl: null,
5050
provider: 'ldap'
5151
}
52-
var stringifiedProfile = JSON.stringify(profile)
52+
const stringifiedProfile = JSON.stringify(profile)
5353
models.User.findOrCreate({
5454
where: {
5555
profileid: profile.id.toString()
@@ -59,7 +59,7 @@ passport.use(new LDAPStrategy({
5959
}
6060
}).spread(function (user, created) {
6161
if (user) {
62-
var needSave = false
62+
let needSave = false
6363
if (user.profile !== stringifiedProfile) {
6464
user.profile = stringifiedProfile
6565
needSave = true

‎lib/auth/openid/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ passport.use(new OpenIDStrategy({
1616
realm: config.serverURL,
1717
profile: true
1818
}, function (openid, profile, done) {
19-
var stringifiedProfile = JSON.stringify(profile)
19+
const stringifiedProfile = JSON.stringify(profile)
2020
models.User.findOrCreate({
2121
where: {
2222
profileid: openid
@@ -26,7 +26,7 @@ passport.use(new OpenIDStrategy({
2626
}
2727
}).spread(function (user, created) {
2828
if (user) {
29-
var needSave = false
29+
let needSave = false
3030
if (user.profile !== stringifiedProfile) {
3131
user.profile = stringifiedProfile
3232
needSave = true

‎lib/auth/saml/index.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ passport.use(new SamlStrategy({
2525
}, function (user, done) {
2626
// check authorization if needed
2727
if (config.saml.externalGroups && config.saml.groupAttribute) {
28-
var externalGroups = intersection(config.saml.externalGroups, user[config.saml.groupAttribute])
28+
const externalGroups = intersection(config.saml.externalGroups, user[config.saml.groupAttribute])
2929
if (externalGroups.length > 0) {
3030
logger.error('saml permission denied: ' + externalGroups.join(', '))
3131
return done('Permission denied', null)
@@ -38,8 +38,8 @@ passport.use(new SamlStrategy({
3838
}
3939
}
4040
// user creation
41-
var uuid = user[config.saml.attribute.id] || user.nameID
42-
var profile = {
41+
const uuid = user[config.saml.attribute.id] || user.nameID
42+
const profile = {
4343
provider: 'saml',
4444
id: 'SAML-' + uuid,
4545
username: user[config.saml.attribute.username] || user.nameID,
@@ -48,7 +48,7 @@ passport.use(new SamlStrategy({
4848
if (profile.emails.length === 0 && config.saml.identifierFormat === 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress') {
4949
profile.emails.push(user.nameID)
5050
}
51-
var stringifiedProfile = JSON.stringify(profile)
51+
const stringifiedProfile = JSON.stringify(profile)
5252
models.User.findOrCreate({
5353
where: {
5454
profileid: profile.id.toString()
@@ -58,7 +58,7 @@ passport.use(new SamlStrategy({
5858
}
5959
}).spread(function (user, created) {
6060
if (user) {
61-
var needSave = false
61+
let needSave = false
6262
if (user.profile !== stringifiedProfile) {
6363
user.profile = stringifiedProfile
6464
needSave = true

‎lib/auth/utils.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ import * as logger from "../logger";
77
export function setReturnToFromReferer(req) {
88
if (!req.session) req.session = {}
99

10-
var referer = req.get('referer')
11-
var nextURL
10+
const referer = req.get('referer')
11+
let nextURL
1212
if (referer) {
1313
try {
14-
var refererSearchParams = new URLSearchParams(new URL(referer).search)
14+
const refererSearchParams = new URLSearchParams(new URL(referer).search)
1515
nextURL = refererSearchParams.get('next')
1616
} catch (err) {
1717
logger.warn(err)
1818
}
1919
}
2020

2121
if (nextURL) {
22-
var isRelativeNextURL = nextURL.indexOf('://') === -1 && !nextURL.startsWith('//')
22+
const isRelativeNextURL = nextURL.indexOf('://') === -1 && !nextURL.startsWith('//')
2323
if (isRelativeNextURL) {
2424
req.session.returnTo = (new URL(nextURL, config.serverURL)).toString()
2525
} else {
@@ -31,7 +31,7 @@ export function setReturnToFromReferer(req) {
3131
}
3232

3333
export function passportGeneralCallback(accessToken, refreshToken, profile, done) {
34-
var stringifiedProfile = JSON.stringify(profile)
34+
const stringifiedProfile = JSON.stringify(profile)
3535
models.User.findOrCreate({
3636
where: {
3737
profileid: profile.id.toString()
@@ -43,7 +43,7 @@ export function passportGeneralCallback(accessToken, refreshToken, profile, done
4343
}
4444
}).spread(function (user, created) {
4545
if (user) {
46-
var needSave = false
46+
let needSave = false
4747
if (user.profile !== stringifiedProfile) {
4848
user.profile = stringifiedProfile
4949
needSave = true

‎lib/config/index.ts‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const debugConfig = {
1515
}
1616

1717
// Get version string from package.json
18+
// eslint-disable-next-line @typescript-eslint/no-var-requires
1819
const {version, repository} = require(path.join(appRootPath, 'package.json'))
1920

2021
const commitID = getGitCommit(appRootPath)
@@ -30,14 +31,19 @@ const packageConfig = {
3031

3132
const configFilePath = path.resolve(appRootPath, process.env.CMD_CONFIG_FILE ||
3233
'config.json')
34+
// eslint-disable-next-line @typescript-eslint/no-var-requires
3335
const fileConfig = fs.existsSync(configFilePath) ? require(configFilePath)[env] : undefined
3436

37+
// eslint-disable-next-line @typescript-eslint/no-var-requires
3538
let config: any = require('./default')
39+
// eslint-disable-next-line @typescript-eslint/no-var-requires
3640
merge(config, require('./defaultSSL'))
3741
merge(config, debugConfig)
3842
merge(config, packageConfig)
3943
merge(config, fileConfig)
44+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4045
merge(config, require('./environment'))
46+
// eslint-disable-next-line @typescript-eslint/no-var-requires
4147
merge(config, require('./dockerSecret'))
4248

4349
if (['debug', 'verbose', 'info', 'warn', 'error'].includes(config.loglevel)) {
@@ -86,9 +92,9 @@ config.isStandardHTTPPort = (function isStandardHTTPPort() {
8692

8793
// cache serverURL
8894
config.serverURL = (function getserverurl() {
89-
var url = ''
95+
let url = ''
9096
if (config.domain) {
91-
var protocol = config.protocolUseSSL ? 'https://' : 'http://'
97+
const protocol = config.protocolUseSSL ? 'https://' : 'http://'
9298
url = protocol + config.domain
9399
if (config.urlAddPort) {
94100
if (!config.isStandardHTTPPort || !config.isStandardHTTPsPort) {

‎lib/config/utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export function toBooleanConfig(configValue) {
88
return configValue
99
}
1010

11-
export function toArrayConfig(configValue, separator: string = ',', fallback ?: any) {
11+
export function toArrayConfig(configValue, separator = ',', fallback ?: any) {
1212
if (configValue && typeof configValue === 'string') {
1313
return (configValue.split(separator).map(arrayItem => arrayItem.trim()))
1414
}

‎lib/csp.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as config from "./config";
22
import * as uuid from "uuid";
33

4-
var CspStrategy: any = {}
4+
const CspStrategy: any = {}
55

6-
var defaultDirectives = {
6+
const defaultDirectives = {
77
defaultSrc: ['\'self\''],
88
scriptSrc: ['\'self\'', 'vimeo.com', 'https://gist.github.com', 'www.slideshare.net', 'https://query.yahooapis.com', '\'unsafe-eval\''],
99
// ^ TODO: Remove unsafe-eval - webpack script-loader issues https://github.com/hackmdio/codimd/issues/594
@@ -16,28 +16,28 @@ var defaultDirectives = {
1616
connectSrc: ['*']
1717
}
1818

19-
var dropboxDirectives = {
19+
const dropboxDirectives = {
2020
scriptSrc: ['https://www.dropbox.com']
2121
}
2222

23-
var cdnDirectives = {
23+
const cdnDirectives = {
2424
scriptSrc: ['https://cdnjs.cloudflare.com', 'https://cdn.jsdelivr.net', 'https://cdn.mathjax.org'],
2525
styleSrc: ['https://cdnjs.cloudflare.com', 'https://cdn.jsdelivr.net', 'https://fonts.googleapis.com'],
2626
fontSrc: ['https://cdnjs.cloudflare.com', 'https://fonts.gstatic.com']
2727
}
2828

29-
var disqusDirectives = {
29+
const disqusDirectives = {
3030
scriptSrc: ['https://disqus.com', 'https://*.disqus.com', 'https://*.disquscdn.com'],
3131
styleSrc: ['https://*.disquscdn.com'],
3232
fontSrc: ['https://*.disquscdn.com']
3333
}
3434

35-
var googleAnalyticsDirectives = {
35+
const googleAnalyticsDirectives = {
3636
scriptSrc: ['https://www.google-analytics.com']
3737
}
3838

3939
CspStrategy.computeDirectives = function () {
40-
var directives = {}
40+
const directives = {}
4141
mergeDirectives(directives, config.csp.directives)
4242
mergeDirectivesIf(config.csp.addDefaults, directives, defaultDirectives)
4343
mergeDirectivesIf(config.useCDN, directives, cdnDirectives)
@@ -53,10 +53,10 @@ CspStrategy.computeDirectives = function () {
5353
}
5454

5555
function mergeDirectives(existingDirectives, newDirectives) {
56-
for (var propertyName in newDirectives) {
57-
var newDirective = newDirectives[propertyName]
56+
for (const propertyName in newDirectives) {
57+
const newDirective = newDirectives[propertyName]
5858
if (newDirective) {
59-
var existingDirective = existingDirectives[propertyName] || []
59+
const existingDirective = existingDirectives[propertyName] || []
6060
existingDirectives[propertyName] = existingDirective.concat(newDirective)
6161
}
6262
}
@@ -86,10 +86,10 @@ function getCspNonce(req, res) {
8686
function addUpgradeUnsafeRequestsOptionTo(directives) {
8787
if (config.csp.upgradeInsecureRequests === 'auto' && config.useSSL) {
8888
directives.upgradeInsecureRequests = true
89-
} else { // @ts-ignore
89+
} else {
9090
if (config.csp.upgradeInsecureRequests === true) {
91-
directives.upgradeInsecureRequests = true
92-
}
91+
directives.upgradeInsecureRequests = true
92+
}
9393
}
9494
}
9595

‎lib/history/index.ts‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function getHistory (userid, callback) {
1616
if (!user) {
1717
return callback(null, null)
1818
}
19-
var history : [] | {} = []
19+
let history: any = []
2020
if (user.history) {
2121
history = JSON.parse(user.history)
2222
// migrate LZString encoded note id to base64url encoded note id
@@ -78,8 +78,8 @@ export function updateHistory (userid, noteId, document?: string, time?: any) {
7878
if (!history[noteId]) {
7979
history[noteId] = {}
8080
}
81-
var noteHistory = history[noteId]
82-
var noteInfo = models.Note.parseNoteInfo(document)
81+
const noteHistory = history[noteId]
82+
const noteInfo = models.Note.parseNoteInfo(document)
8383
noteHistory.id = noteId
8484
noteHistory.text = noteInfo.title
8585
noteHistory.time = time || Date.now()
@@ -94,18 +94,18 @@ export function updateHistory (userid, noteId, document?: string, time?: any) {
9494
}
9595

9696
function parseHistoryToArray (history) {
97-
var _history = []
97+
const _history = []
9898
Object.keys(history).forEach(function (key) {
99-
var item = history[key]
99+
const item = history[key]
100100
_history.push(item)
101101
})
102102
return _history
103103
}
104104

105105
function parseHistoryToObject (history) {
106-
var _history = {}
107-
for (var i = 0, l = history.length; i < l; i++) {
108-
var item = history[i]
106+
const _history = {}
107+
for (let i = 0, l = history.length; i < l; i++) {
108+
const item = history[i]
109109
_history[item.id] = item
110110
}
111111
return _history
@@ -127,12 +127,13 @@ export function historyGet (req, res) {
127127

128128
export function historyPost (req, res) {
129129
if (req.isAuthenticated()) {
130-
var noteId = req.params.noteId
130+
const noteId = req.params.noteId
131131
if (!noteId) {
132132
if (typeof req.body.history === 'undefined') return response.errorBadRequest(req, res)
133133
if (config.debug) { logger.info('SERVER received history from [' + req.user.id + ']: ' + req.body.history) }
134+
let history = null
134135
try {
135-
var history = JSON.parse(req.body.history)
136+
history = JSON.parse(req.body.history)
136137
} catch (err) {
137138
return response.errorBadRequest(req, res)
138139
}
@@ -168,7 +169,7 @@ export function historyPost (req, res) {
168169

169170
export function historyDelete (req, res) {
170171
if (req.isAuthenticated()) {
171-
var noteId = req.params.noteId
172+
const noteId = req.params.noteId
172173
if (!noteId) {
173174
setHistory(req.user.id, [], function (err, count) {
174175
if (err) return response.errorInternalError(req, res)

‎lib/homepage/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as fs from 'fs'
22
import * as path from 'path'
33
import * as config from '../config'
4+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
45
// @ts-ignore
56
import {User} from '../models'
67
import * as logger from '../logger'

0 commit comments

Comments
 (0)