mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-19 01:35:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Migrate models to TypeScript

Browse source 
Co-authored-by: David Mehren <dmehren1@gmail.com>
Co-authored-by: Yannick Bungers <git@innay.de>
Co-authored-by: Philipp Hochkamp <me@phochkamp.de>
Co-authored-by: nzbr <mail@nzbr.de>

Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
David Mehren 2020-04-10 22:06:12 +02:00
parent 54cd556f2f
commit 1d4107fe90
No known key found for this signature in database
GPG key ID: 6017AF117F9756CB
13 changed files with 565 additions and 539 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/app.js
View file

@ -257,7 +257,7 @@ function startListen () {
models.sequelize.authenticate().then(function () { models.sequelize.authenticate().then(function () {
// check if realtime is ready // check if realtime is ready
if (realtime.isReady()) { if (realtime.isReady()) {
models.Revision.checkAllNotesRevision(function (err, notes) { Revision.checkAllNotesRevision(function (err, notes) {
if (err) throw new Error(err) if (err) throw new Error(err)
if (!notes || notes.length <= 0) return startListen() if (!notes || notes.length <= 0) return startListen()
}) })

69
lib/models/author.ts
View file

@ -1,43 +1,32 @@
import {DataTypes} from 'sequelize'; import { AutoIncrement, Table, Column, DataType, PrimaryKey, Model, BelongsTo, createIndexDecorator, ForeignKey } from 'sequelize-typescript'
import { Note } from './note';
import { User } from './user';
const NoteUserIndex = createIndexDecorator({unique: true});
function createAuthorModel(sequelize) { @Table
const Author = sequelize.define('Author', { export class Author extends Model<Author> {
id: { @PrimaryKey
type: DataTypes.INTEGER, @AutoIncrement
primaryKey: true, @Column(DataType.INTEGER)
autoIncrement: true id: number;
},
color: { @Column(DataType.STRING)
type: DataTypes.STRING color: string;
@ForeignKey(() => Note)
@NoteUserIndex
@Column
noteId: string;
@BelongsTo(() => Note, { foreignKey: 'noteId', onDelete: 'CASCADE', constraints: false, hooks: true })
note: Note;
@ForeignKey(() => User)
@NoteUserIndex
@Column
userId: string;
@BelongsTo(() => User, { foreignKey: 'userId', onDelete: 'CASCADE', constraints: false, hooks: true })
user: User;
} }
}, {
indexes: [
{
unique: true,
fields: ['noteId', 'userId']
}
]
});
Author.associate = function (models) {
Author.belongsTo(models.Note, {
foreignKey: 'noteId',
as: 'note',
constraints: false,
onDelete: 'CASCADE',
hooks: true
});
Author.belongsTo(models.User, {
foreignKey: 'userId',
as: 'user',
constraints: false,
onDelete: 'CASCADE',
hooks: true
})
};
return Author
}
export = createAuthorModel

44
lib/models/index.js → lib/models/index.ts
View file

@ -1,8 +1,11 @@
'use strict' import {Sequelize} from 'sequelize-typescript';
// external modules import { Author } from './author';
import { Note } from './note';
import { Revision } from './revision';
import { Temp } from './temp';
import { User } from './user';
var fs = require('fs') var fs = require('fs')
var path = require('path') var path = require('path');
var Sequelize = require('sequelize')
const { cloneDeep } = require('lodash') const { cloneDeep } = require('lodash')
// core // core
@ -14,7 +17,7 @@ dbconfig.logging = config.debug ? (data) => {
logger.info(data) logger.info(data)
} : false } : false
var sequelize = null var sequelize: any = null;
// Heroku specific // Heroku specific
if (config.dbURL) { if (config.dbURL) {
@ -34,26 +37,25 @@ sequelize.stripNullByte = stripNullByte
function processData (data, _default, process) { function processData (data, _default, process) {
if (data === undefined) return data if (data === undefined) return data
else return data === null ? _default : (process ? process(data) : data) else if (process) {
if (data === null) {
return _default
} else {
return process(data)
}
} else {
if (data === null) {
return _default
} else {
return data
}
}
} }
sequelize.processData = processData sequelize.processData = processData
var db = {} var db: any = {}
fs.readdirSync(__dirname) sequelize.addModels([Author, Note, Revision, Temp, User]);
.filter(function (file) {
return (file.indexOf('.') !== 0) && (file !== 'index.js')
})
.forEach(function (file) {
var model = sequelize.import(path.join(__dirname, file))
db[model.name] = model
})
Object.keys(db).forEach(function (modelName) {
if ('associate' in db[modelName]) {
db[modelName].associate(db)
}
})
db.sequelize = sequelize db.sequelize = sequelize
db.Sequelize = Sequelize db.Sequelize = Sequelize

277
lib/models/note.js → lib/models/note.ts
View file

@ -1,4 +1,15 @@
'use strict' import { AllowNull, AfterCreate, BeforeCreate, Default, Unique, IsUUID, Model, PrimaryKey, Column, DataType, Table, BelongsTo, HasMany, ForeignKey } from "sequelize-typescript";
import { generate as shortIdGenerate, isValid as shortIdIsValid } from "shortid";
import { Author } from "./author";
import { User } from './user';
import { Revision } from './revision';
// external modules
// external modules
var fs = require('fs')
var path = require('path')
var LZString = require('lz-string')
// external modules // external modules
var fs = require('fs') var fs = require('fs')
var path = require('path') var path = require('path')
@ -7,7 +18,6 @@ var base64url = require('base64url')
var md = require('markdown-it')() var md = require('markdown-it')()
var metaMarked = require('meta-marked') var metaMarked = require('meta-marked')
var cheerio = require('cheerio') var cheerio = require('cheerio')
var shortId = require('shortid')
var Sequelize = require('sequelize') var Sequelize = require('sequelize')
var async = require('async') var async = require('async')
var moment = require('moment') var moment = require('moment')
@ -23,75 +33,97 @@ var logger = require('../logger')
var ot = require('../ot') var ot = require('../ot')
// permission types // permission types
var permissionTypes = ['freely', 'editable', 'limited', 'locked', 'protected', 'private'] enum PermissionEnum {
freely = "freely",
editable = "editable",
limited = "limited",
locked = "locked",
protected = "protected",
private = "private"
};
module.exports = function (sequelize, DataTypes) { @Table({ paranoid: false })
var Note = sequelize.define('Note', { export class Note extends Model<Note> {
id: { @PrimaryKey
type: DataTypes.UUID, @Default(Sequelize.UUIDV4)
primaryKey: true, @Column(DataType.UUID)
defaultValue: Sequelize.UUIDV4 id: string;
},
shortid: { @AllowNull(false)
type: DataTypes.STRING, @Default(shortIdGenerate)
unique: true, @Unique
allowNull: false, @Column(DataType.STRING)
defaultValue: shortId.generate shortid: string;
},
alias: { @Unique
type: DataTypes.STRING, @Column(DataType.STRING)
unique: true alias: string;
},
permission: { @Column(DataType.ENUM({values: Object.keys(PermissionEnum).map(k => PermissionEnum[k as any])}))
type: DataTypes.ENUM, permission: PermissionEnum;
values: permissionTypes
}, @AllowNull(false)
viewcount: { @Default(0)
type: DataTypes.INTEGER, @Column(DataType.INTEGER)
allowNull: false, viewcount: number;
defaultValue: 0
}, @Column(DataType.TEXT)
title: { get title(): string {
type: DataTypes.TEXT, return Sequelize.processData(this.getDataValue('title'), '')
get: function () {
return sequelize.processData(this.getDataValue('title'), '')
},
set: function (value) {
this.setDataValue('title', sequelize.stripNullByte(value))
} }
}, set title(value: string) {
content: { this.setDataValue('title', Sequelize.stripNullByte(value))
type: DataTypes.TEXT('long'),
get: function () {
return sequelize.processData(this.getDataValue('content'), '')
},
set: function (value) {
this.setDataValue('content', sequelize.stripNullByte(value))
} }
},
authorship: { @Column(DataType.TEXT({ length: 'long' }))
type: DataTypes.TEXT('long'), get content(): string {
get: function () { return Sequelize.processData(this.getDataValue('content'), '')
return sequelize.processData(this.getDataValue('authorship'), [], JSON.parse) }
}, set content(value: string) {
set: function (value) { this.setDataValue('content', Sequelize.stripNullByte(value))
}
@Column(DataType.TEXT({ length: 'long' }))
get authorship(): string {
return Sequelize.processData(this.getDataValue('authorship'), [], JSON.parse)
}
set authorship(value: string) {
this.setDataValue('authorship', JSON.stringify(value)) this.setDataValue('authorship', JSON.stringify(value))
} }
},
lastchangeAt: { // ToDo: use @UpdatedAt instead? (https://www.npmjs.com/package/sequelize-typescript#createdat--updatedat--deletedat)
type: DataTypes.DATE @Column(DataType.DATE)
}, lastchangeAt: Date;
savedAt: {
type: DataTypes.DATE // ToDo: use @UpdatedAt instead? (https://www.npmjs.com/package/sequelize-typescript#createdat--updatedat--deletedat)
} @Column(DataType.DATE)
}, { savedAt: Date;
paranoid: false,
hooks: { @ForeignKey(() => User)
beforeCreate: function (note, options) { @Column
ownerId: string;
@BelongsTo(() => User, { foreignKey: 'ownerId', constraints: false, onDelete: 'CASCADE', hooks: true })
owner: User;
@ForeignKey(() => User)
@Column
lastchangeuserId: string;
@BelongsTo(() => User, { foreignKey: 'lastchangeuserId', constraints: false })
lastchangeuser: User;
@HasMany(() => Revision, { foreignKey: 'noteId', constraints: false })
revisions: Revision[];
@HasMany(() => Author, { foreignKey: 'noteId', constraints: false })
authors: Author[];
@BeforeCreate
static defaultContentAndPermissions(note: Note) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
// if no content specified then use default note // if no content specified then use default note
if (!note.content) { if (!note.content) {
var body = null
let filePath = null let filePath = null
if (!note.alias) { if (!note.alias) {
filePath = config.defaultNotePath filePath = config.defaultNotePath
@ -100,7 +132,7 @@ module.exports = function (sequelize, DataTypes) {
} }
if (Note.checkFileExist(filePath)) { if (Note.checkFileExist(filePath)) {
var fsCreatedTime = moment(fs.statSync(filePath).ctime) var fsCreatedTime = moment(fs.statSync(filePath).ctime)
body = fs.readFileSync(filePath, 'utf8') const body = fs.readFileSync(filePath, 'utf8')
note.title = Note.parseNoteTitle(body) note.title = Note.parseNoteTitle(body)
note.content = body note.content = body
if (filePath !== config.defaultNotePath) { if (filePath !== config.defaultNotePath) {
@ -110,18 +142,20 @@ module.exports = function (sequelize, DataTypes) {
} }
// if no permission specified and have owner then give default permission in config, else default permission is freely // if no permission specified and have owner then give default permission in config, else default permission is freely
if (!note.permission) { if (!note.permission) {
if (note.ownerId) { if (note.owner) {
note.permission = config.defaultPermission note.permission = config.defaultPermission
} else { } else {
note.permission = 'freely' note.permission = PermissionEnum.freely
} }
} }
return resolve(note) return resolve(note)
}) })
}, }
afterCreate: function (note, options, callback) {
@AfterCreate
static saveRevision(note) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
sequelize.models.Revision.saveNoteRevision(note, function (err, revision) { Sequelize.models.Revision.saveNoteRevision(note, function (err, revision) {
if (err) { if (err) {
return reject(err) return reject(err)
} }
@ -129,50 +163,27 @@ module.exports = function (sequelize, DataTypes) {
}) })
}) })
} }
}
})
Note.associate = function (models) { static checkFileExist(filePath) {
Note.belongsTo(models.User, {
foreignKey: 'ownerId',
as: 'owner',
constraints: false,
onDelete: 'CASCADE',
hooks: true
})
Note.belongsTo(models.User, {
foreignKey: 'lastchangeuserId',
as: 'lastchangeuser',
constraints: false
})
Note.hasMany(models.Revision, {
foreignKey: 'noteId',
constraints: false
})
Note.hasMany(models.Author, {
foreignKey: 'noteId',
as: 'authors',
constraints: false
})
}
Note.checkFileExist = function (filePath) {
try { try {
return fs.statSync(filePath).isFile() return fs.statSync(filePath).isFile()
} catch (err) { } catch (err) {
return false return false
} }
} }
Note.encodeNoteId = function (id) {
static encodeNoteId(id) {
// remove dashes in UUID and encode in url-safe base64 // remove dashes in UUID and encode in url-safe base64
let str = id.replace(/-/g, '') let str = id.replace(/-/g, '')
let hexStr = Buffer.from(str, 'hex') let hexStr = Buffer.from(str, 'hex')
return base64url.encode(hexStr) return base64url.encode(hexStr)
} }
Note.decodeNoteId = function (encodedId) {
static decodeNoteId(encodedId) {
// decode from url-safe base64 // decode from url-safe base64
let id = base64url.toBuffer(encodedId).toString('hex') let id: string = base64url.toBuffer(encodedId).toString('hex')
// add dashes between the UUID string parts // add dashes between the UUID string parts
let idParts = [] let idParts: string[] = []
idParts.push(id.substr(0, 8)) idParts.push(id.substr(0, 8))
idParts.push(id.substr(8, 4)) idParts.push(id.substr(8, 4))
idParts.push(id.substr(12, 4)) idParts.push(id.substr(12, 4))
@ -180,12 +191,12 @@ module.exports = function (sequelize, DataTypes) {
idParts.push(id.substr(20, 12)) idParts.push(id.substr(20, 12))
return idParts.join('-') return idParts.join('-')
} }
Note.checkNoteIdValid = function (id) { static checkNoteIdValid(id) {
var uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i var uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i
var result = id.match(uuidRegex) var result = id.match(uuidRegex)
if (result && result.length === 1) { return true } else { return false } if (result && result.length === 1) { return true } else { return false }
} }
Note.parseNoteId = function (noteId, callback) { static parseNoteId(noteId, callback) {
async.series({ async.series({
parseNoteIdByAlias: function (_callback) { parseNoteIdByAlias: function (_callback) {
// try to parse note id by alias (e.g. doc) // try to parse note id by alias (e.g. doc)
@ -210,7 +221,7 @@ module.exports = function (sequelize, DataTypes) {
content: body, content: body,
lastchangeAt: fsModifiedTime lastchangeAt: fsModifiedTime
}).then(function (note) { }).then(function (note) {
sequelize.models.Revision.saveNoteRevision(note, function (err, revision) { Sequelize.models.Revision.saveNoteRevision(note, function (err, revision) {
if (err) return _callback(err, null) if (err) return _callback(err, null)
// update authorship on after making revision of docs // update authorship on after making revision of docs
var patch = dmp.patch_fromText(revision.patch) var patch = dmp.patch_fromText(revision.patch)
@ -293,7 +304,7 @@ module.exports = function (sequelize, DataTypes) {
parseNoteIdByShortId: function (_callback) { parseNoteIdByShortId: function (_callback) {
// try to parse note id by shortId // try to parse note id by shortId
try { try {
if (shortId.isValid(noteId)) { if (shortIdIsValid(noteId)) {
Note.findOne({ Note.findOne({
where: { where: {
shortid: noteId shortid: noteId
@ -319,7 +330,7 @@ module.exports = function (sequelize, DataTypes) {
return callback(null, null) return callback(null, null)
}) })
} }
Note.parseNoteInfo = function (body) { parseNoteInfo(body) {
var parsed = Note.extractMeta(body) var parsed = Note.extractMeta(body)
var $ = cheerio.load(md.render(parsed.markdown)) var $ = cheerio.load(md.render(parsed.markdown))
return { return {
@ -327,12 +338,12 @@ module.exports = function (sequelize, DataTypes) {
tags: Note.extractNoteTags(parsed.meta, $) tags: Note.extractNoteTags(parsed.meta, $)
} }
} }
Note.parseNoteTitle = function (body) { static parseNoteTitle(body) {
var parsed = Note.extractMeta(body) const parsed = Note.extractMeta(body)
var $ = cheerio.load(md.render(parsed.markdown)) var $ = cheerio.load(md.render(parsed.markdown))
return Note.extractNoteTitle(parsed.meta, $) return Note.extractNoteTitle(parsed.meta, $)
} }
Note.extractNoteTitle = function (meta, $) { static extractNoteTitle(meta, $) {
var title = '' var title = ''
if (meta.title && (typeof meta.title === 'string' || typeof meta.title === 'number')) { if (meta.title && (typeof meta.title === 'string' || typeof meta.title === 'number')) {
title = meta.title title = meta.title
@ -343,23 +354,23 @@ module.exports = function (sequelize, DataTypes) {
if (!title) title = 'Untitled' if (!title) title = 'Untitled'
return title return title
} }
Note.generateDescription = function (markdown) { static generateDescription(markdown) {
return markdown.substr(0, 100).replace(/(?:\r\n|\r|\n)/g, ' ') return markdown.substr(0, 100).replace(/(?:\r\n|\r|\n)/g, ' ')
} }
Note.decodeTitle = function (title) { static decodeTitle(title) {
return title || 'Untitled' return title || 'Untitled'
} }
Note.generateWebTitle = function (title) { static generateWebTitle(title) {
title = !title || title === 'Untitled' ? 'CodiMD - Collaborative markdown notes' : title + ' - CodiMD' title = !title || title === 'Untitled' ? 'CodiMD - Collaborative markdown notes' : title + ' - CodiMD'
return title return title
} }
Note.extractNoteTags = function (meta, $) { static extractNoteTags(meta, $) {
var tags = [] var tags: string[] = []
var rawtags = [] var rawtags: string[] = []
if (meta.tags && (typeof meta.tags === 'string' || typeof meta.tags === 'number')) { if (meta.tags && (typeof meta.tags === 'string' || typeof meta.tags === 'number')) {
var metaTags = ('' + meta.tags).split(',') var metaTags = ('' + meta.tags).split(',')
for (let i = 0; i < metaTags.length; i++) { for (let i = 0; i < metaTags.length; i++) {
var text = metaTags[i].trim() var text: string = metaTags[i].trim()
if (text) rawtags.push(text) if (text) rawtags.push(text)
} }
} else { } else {
@ -386,22 +397,22 @@ module.exports = function (sequelize, DataTypes) {
} }
return tags return tags
} }
Note.extractMeta = function (content) {
var obj = null static extractMeta(content) {
try { try {
obj = metaMarked(content) var obj = metaMarked(content)
if (!obj.markdown) obj.markdown = '' if (!obj.markdown) obj.markdown = ''
if (!obj.meta) obj.meta = {} if (!obj.meta) obj.meta = {}
return obj;
} catch (err) { } catch (err) {
obj = { return {
markdown: content, markdown: content,
meta: {} meta: {}
} }
} }
return obj
} }
Note.parseMeta = function (meta) { static parseMeta(meta): NoteMetadata {
var _meta = {} var _meta = new NoteMetadata();
if (meta) { if (meta) {
if (meta.title && (typeof meta.title === 'string' || typeof meta.title === 'number')) { _meta.title = meta.title } if (meta.title && (typeof meta.title === 'string' || typeof meta.title === 'number')) { _meta.title = meta.title }
if (meta.description && (typeof meta.description === 'string' || typeof meta.description === 'number')) { _meta.description = meta.description } if (meta.description && (typeof meta.description === 'string' || typeof meta.description === 'number')) { _meta.description = meta.description }
@ -413,15 +424,15 @@ module.exports = function (sequelize, DataTypes) {
} }
return _meta return _meta
} }
Note.parseOpengraph = function (meta, title) { static parseOpengraph(meta, title) {
var _ogdata = {} var _ogdata: any = {}
if (meta.opengraph) { _ogdata = meta.opengraph } if (meta.opengraph) { _ogdata = meta.opengraph }
if (!(_ogdata.title && (typeof _ogdata.title === 'string' || typeof _ogdata.title === 'number'))) { _ogdata.title = title } if (!(_ogdata.title && (typeof _ogdata.title === 'string' || typeof _ogdata.title === 'number'))) { _ogdata.title = title }
if (!(_ogdata.description && (typeof _ogdata.description === 'string' || typeof _ogdata.description === 'number'))) { _ogdata.description = meta.description || '' } if (!(_ogdata.description && (typeof _ogdata.description === 'string' || typeof _ogdata.description === 'number'))) { _ogdata.description = meta.description || '' }
if (!(_ogdata.type && (typeof _ogdata.type === 'string'))) { _ogdata.type = 'website' } if (!(_ogdata.type && (typeof _ogdata.type === 'string'))) { _ogdata.type = 'website' }
return _ogdata return _ogdata
} }
Note.updateAuthorshipByOperation = function (operation, userId, authorships) { static updateAuthorshipByOperation(operation, userId, authorships) {
var index = 0 var index = 0
var timestamp = Date.now() var timestamp = Date.now()
for (let i = 0; i < operation.length; i++) { for (let i = 0; i < operation.length; i++) {
@ -522,8 +533,8 @@ module.exports = function (sequelize, DataTypes) {
} }
return authorships return authorships
} }
Note.transformPatchToOperations = function (patch, contentLength) { static transformPatchToOperations(patch, contentLength) {
var operations = [] var operations: any = []
if (patch.length > 0) { if (patch.length > 0) {
// calculate original content length // calculate original content length
for (let j = patch.length - 1; j >= 0; j--) { for (let j = patch.length - 1; j >= 0; j--) {
@ -544,7 +555,7 @@ module.exports = function (sequelize, DataTypes) {
var bias = 0 var bias = 0
var lengthBias = 0 var lengthBias = 0
for (let j = 0; j < patch.length; j++) { for (let j = 0; j < patch.length; j++) {
var operation = [] var operation: any = []
let p = patch[j] let p = patch[j]
var currIndex = p.start1 var currIndex = p.start1
var currLength = contentLength - bias var currLength = contentLength - bias
@ -581,6 +592,14 @@ module.exports = function (sequelize, DataTypes) {
} }
return operations return operations
} }
}
return Note
export class NoteMetadata {
title: string;
description: string;
robots: string;
GA: string;
disqus: string;
slideOptions: any;
opengraph: any;
} }

172
lib/models/revision.js → lib/models/revision.ts
View file

@ -1,26 +1,25 @@
'use strict' import {Table, Model, Column, DataType, BelongsTo, IsUUID, PrimaryKey, ForeignKey} from 'sequelize-typescript'
// external modules
var Sequelize = require('sequelize') var Sequelize = require('sequelize')
var async = require('async') import async = require('async')
var moment = require('moment') import moment = require('moment')
var childProcess = require('child_process') import childProcess = require('child_process')
var shortId = require('shortid') import shortId = require('shortid')
var path = require('path') import path = require('path')
var Op = Sequelize.Op var Op = Sequelize.Op
// core // core
var logger = require('../logger') import logger = require('../logger')
import {ChildProcess} from "child_process";
import { Note } from './note'
var dmpWorker = createDmpWorker() var dmpWorker : ChildProcess | null = createDmpWorker()
var dmpCallbackCache = {} var dmpCallbackCache = {}
function createDmpWorker () { function createDmpWorker () {
var worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker.js'), { var worker = childProcess.fork(path.resolve(__dirname, '../workers/dmpWorker.js'), ['ignore'])
stdio: 'ignore'
})
logger.debug('dmp worker process started') logger.debug('dmp worker process started')
worker.on('message', function (data) { worker.on('message', function (data: any) {
if (!data || !data.msg || !data.cacheKey) { if (!data || !data.msg || !data.cacheKey) {
return logger.error('dmp worker error: not enough data on message') return logger.error('dmp worker error: not enough data on message')
} }
@ -36,7 +35,7 @@ function createDmpWorker () {
delete dmpCallbackCache[cacheKey] delete dmpCallbackCache[cacheKey]
}) })
worker.on('close', function (code) { worker.on('close', function (code) {
dmpWorker = null dmpWorker = null;
logger.debug(`dmp worker process exited with code ${code}`) logger.debug(`dmp worker process exited with code ${code}`)
}) })
return worker return worker
@ -52,72 +51,64 @@ function sendDmpWorker (data, callback) {
dmpWorker.send(data) dmpWorker.send(data)
} }
module.exports = function (sequelize, DataTypes) { @Table
var Revision = sequelize.define('Revision', { export class Revision extends Model<Revision> {
id: { @IsUUID(4)
type: DataTypes.UUID, @PrimaryKey
primaryKey: true, @Column
defaultValue: Sequelize.UUIDV4 id: string;
},
patch: { @Column(DataType.TEXT({ length: 'long' }))
type: DataTypes.TEXT('long'), get patch(): string {
get: function () { return Sequelize.processData(this.getDataValue('patch'), '')
return sequelize.processData(this.getDataValue('patch'), '')
},
set: function (value) {
this.setDataValue('patch', sequelize.stripNullByte(value))
} }
}, set patch(value: string) {
lastContent: { this.setDataValue('patch', Sequelize.stripNullByte(value))
type: DataTypes.TEXT('long'),
get: function () {
return sequelize.processData(this.getDataValue('lastContent'), '')
},
set: function (value) {
this.setDataValue('lastContent', sequelize.stripNullByte(value))
} }
},
content: { @Column(DataType.TEXT({ length: 'long' }))
type: DataTypes.TEXT('long'), get lastContent(): string {
get: function () { return Sequelize.processData(this.getDataValue('lastContent'), '')
return sequelize.processData(this.getDataValue('content'), '')
},
set: function (value) {
this.setDataValue('content', sequelize.stripNullByte(value))
} }
}, set lastContent(value: string) {
length: { this.setDataValue('lastContent', Sequelize.stripNullByte(value))
type: DataTypes.INTEGER }
},
authorship: { @Column(DataType.TEXT({ length: 'long' }))
type: DataTypes.TEXT('long'), get content(): string {
get: function () { return Sequelize.processData(this.getDataValue('content'), '')
return sequelize.processData(this.getDataValue('authorship'), [], JSON.parse) }
}, set content(value: string) {
set: function (value) { this.setDataValue('content', Sequelize.stripNullByte(value))
}
@Column(DataType.INTEGER)
length : number
@Column(DataType.TEXT({ length: 'long' }))
get authorship(): string {
return Sequelize.processData(this.getDataValue('authorship'), [], JSON.parse)
}
set authorship(value: string) {
this.setDataValue('authorship', value ? JSON.stringify(value) : value) this.setDataValue('authorship', value ? JSON.stringify(value) : value)
} }
}
})
Revision.associate = function (models) { @ForeignKey(() => Note)
Revision.belongsTo(models.Note, { @Column
foreignKey: 'noteId', noteId: string
as: 'note',
constraints: false, @BelongsTo(() => Note, { foreignKey: 'noteId', constraints: false, onDelete: 'CASCADE', hooks: true })
onDelete: 'CASCADE', note: Note;
hooks: true
}) getNoteRevisions (note, callback) {
}
Revision.getNoteRevisions = function (note, callback) {
Revision.findAll({ Revision.findAll({
where: { where: {
noteId: note.id noteId: note.id
}, },
order: [['createdAt', 'DESC']] order: [['createdAt', 'DESC']]
}).then(function (revisions) { }).then(function (revisions) {
var data = [] var data : any[] = []
for (var i = 0, l = revisions.length; i < l; i++) { for (var i = 0; i < revisions.length; i++) {
var revision = revisions[i] var revision = revisions[i]
data.push({ data.push({
time : moment(revision.createdAt).valueOf(), time : moment(revision.createdAt).valueOf(),
@ -129,7 +120,7 @@ module.exports = function (sequelize, DataTypes) {
callback(err, null) callback(err, null)
}) })
} }
Revision.getPatchedNoteRevisionByTime = function (note, time, callback) { getPatchedNoteRevisionByTime (note, time, callback) {
// find all revisions to prepare for all possible calculation // find all revisions to prepare for all possible calculation
Revision.findAll({ Revision.findAll({
where: { where: {
@ -146,7 +137,6 @@ module.exports = function (sequelize, DataTypes) {
[Op.gte]: time [Op.gte]: time
} }
}, },
order: [['createdAt', 'DESC']]
}).then(function (count) { }).then(function (count) {
if (count <= 0) return callback(null, null) if (count <= 0) return callback(null, null)
sendDmpWorker({ sendDmpWorker({
@ -161,18 +151,18 @@ module.exports = function (sequelize, DataTypes) {
return callback(err, null) return callback(err, null)
}) })
} }
Revision.checkAllNotesRevision = function (callback) { checkAllNotesRevision (callback) {
Revision.saveAllNotesRevision(function (err, notes) { this.saveAllNotesRevision(function (err, notes) {
if (err) return callback(err, null) if (err) return callback(err, null)
if (!notes || notes.length <= 0) { if (!notes || notes.length <= 0) {
return callback(null, notes) return callback(null, notes)
} else { } else {
Revision.checkAllNotesRevision(callback) this.checkAllNotesRevision(callback)
} }
}) })
} }
Revision.saveAllNotesRevision = function (callback) { saveAllNotesRevision (callback) {
sequelize.models.Note.findAll({ Sequelize.models.Note.findAll({
// query all notes that need to save for revision // query all notes that need to save for revision
where: { where: {
[Op.and]: [ [Op.and]: [
@ -182,7 +172,7 @@ module.exports = function (sequelize, DataTypes) {
[Op.eq]: null, [Op.eq]: null,
[Op.and]: { [Op.and]: {
[Op.ne]: null, [Op.ne]: null,
[Op.gt]: sequelize.col('createdAt') [Op.gt]: Sequelize.col('createdAt')
} }
} }
} }
@ -191,7 +181,7 @@ module.exports = function (sequelize, DataTypes) {
savedAt: { savedAt: {
[Op.or]: { [Op.or]: {
[Op.eq]: null, [Op.eq]: null,
[Op.lt]: sequelize.col('lastchangeAt') [Op.lt]: Sequelize.col('lastchangeAt')
} }
} }
} }
@ -199,24 +189,24 @@ module.exports = function (sequelize, DataTypes) {
} }
}).then(function (notes) { }).then(function (notes) {
if (notes.length <= 0) return callback(null, notes) if (notes.length <= 0) return callback(null, notes)
var savedNotes = [] var savedNotes : any[] = []
async.each(notes, function (note, _callback) { async.each(notes, function (note : any, _callback) {
// revision saving policy: note not been modified for 5 mins or not save for 10 mins // revision saving policy: note not been modified for 5 mins or not save for 10 mins
if (note.lastchangeAt && note.savedAt) { if (note.lastchangeAt && note.savedAt) {
var lastchangeAt = moment(note.lastchangeAt) var lastchangeAt = moment(note.lastchangeAt)
var savedAt = moment(note.savedAt) var savedAt = moment(note.savedAt)
if (moment().isAfter(lastchangeAt.add(5, 'minutes'))) { if (moment().isAfter(lastchangeAt.add(5, 'minutes'))) {
savedNotes.push(note) savedNotes.push(note)
Revision.saveNoteRevision(note, _callback) this.saveNoteRevision(note, _callback)
} else if (lastchangeAt.isAfter(savedAt.add(10, 'minutes'))) { } else if (lastchangeAt.isAfter(savedAt.add(10, 'minutes'))) {
savedNotes.push(note) savedNotes.push(note)
Revision.saveNoteRevision(note, _callback) this.saveNoteRevision(note, _callback)
} else { } else {
return _callback(null, null) return _callback(null, null)
} }
} else { } else {
savedNotes.push(note) savedNotes.push(note)
Revision.saveNoteRevision(note, _callback) this.saveNoteRevision(note, _callback)
} }
}, function (err) { }, function (err) {
if (err) { if (err) {
@ -230,7 +220,7 @@ module.exports = function (sequelize, DataTypes) {
return callback(err, null) return callback(err, null)
}) })
} }
Revision.saveNoteRevision = function (note, callback) { saveNoteRevision (note, callback) {
Revision.findAll({ Revision.findAll({
where: { where: {
noteId: note.id noteId: note.id
@ -239,13 +229,13 @@ module.exports = function (sequelize, DataTypes) {
}).then(function (revisions) { }).then(function (revisions) {
if (revisions.length <= 0) { if (revisions.length <= 0) {
// if no revision available // if no revision available
Revision.create({ this.create({
noteId: note.id, noteId: note.id,
lastContent: note.content ? note.content : '', lastContent: note.content ? note.content : '',
length: note.content ? note.content.length : 0, length: note.content ? note.content.length : 0,
authorship: note.authorship authorship: note.authorship
}).then(function (revision) { }).then(function (revision) {
Revision.finishSaveNoteRevision(note, revision, callback) this.finishSaveNoteRevision(note, revision, callback)
}).catch(function (err) { }).catch(function (err) {
return callback(err, null) return callback(err, null)
}) })
@ -265,12 +255,12 @@ module.exports = function (sequelize, DataTypes) {
latestRevision.update({ latestRevision.update({
updatedAt: Date.now() updatedAt: Date.now()
}).then(function (revision) { }).then(function (revision) {
Revision.finishSaveNoteRevision(note, revision, callback) this.finishSaveNoteRevision(note, revision, callback)
}).catch(function (err) { }).catch(function (err) {
return callback(err, null) return callback(err, null)
}) })
} else { } else {
Revision.create({ this.create({
noteId: note.id, noteId: note.id,
patch: patch, patch: patch,
content: note.content, content: note.content,
@ -281,7 +271,7 @@ module.exports = function (sequelize, DataTypes) {
latestRevision.update({ latestRevision.update({
content: null content: null
}).then(function () { }).then(function () {
Revision.finishSaveNoteRevision(note, revision, callback) this.finishSaveNoteRevision(note, revision, callback)
}).catch(function (err) { }).catch(function (err) {
return callback(err, null) return callback(err, null)
}) })
@ -295,7 +285,7 @@ module.exports = function (sequelize, DataTypes) {
return callback(err, null) return callback(err, null)
}) })
} }
Revision.finishSaveNoteRevision = function (note, revision, callback) { finishSaveNoteRevision (note, revision, callback) {
note.update({ note.update({
savedAt: revision.updatedAt savedAt: revision.updatedAt
}).then(function () { }).then(function () {
@ -305,5 +295,7 @@ module.exports = function (sequelize, DataTypes) {
}) })
} }
return Revision
} }

18
lib/models/temp.js
View file

@ -1,18 +0,0 @@
'use strict'
// external modules
var shortId = require('shortid')
module.exports = function (sequelize, DataTypes) {
var Temp = sequelize.define('Temp', {
id: {
type: DataTypes.STRING,
primaryKey: true,
defaultValue: shortId.generate
},
data: {
type: DataTypes.TEXT
}
})
return Temp
}

13
lib/models/temp.ts Normal file
View file

@ -0,0 +1,13 @@
import { DataType, Model, Table, PrimaryKey, Column, Default } from 'sequelize-typescript'
import { generate as shortIdGenerate, isValid as shortIdIsValid } from "shortid";
@Table
export class Temp extends Model<Temp> {
@Default(shortIdGenerate)
@PrimaryKey
@Column(DataType.STRING)
id: string;
@Column(DataType.TEXT)
data: string
}

175
lib/models/user.js → lib/models/user.ts
View file

@ -1,97 +1,56 @@
'use strict' import { Note } from './note';
// external modules import { Table, BeforeCreate, BeforeUpdate, HasMany, Unique, IsUUID, IsEmail, Column, DataType, PrimaryKey, Model, Default } from 'sequelize-typescript';
const Sequelize = require('sequelize') import scrypt from 'scrypt-kdf';
const crypto = require('crypto') import { generateAvatarURL } from '../letter-avatars';
if (!crypto.scrypt) { import logger from '../logger';
// polyfill for node.js 8.0, see https://github.com/chrisveness/scrypt-kdf#openssl-implementation
const scryptAsync = require('scrypt-async')
crypto.scrypt = function (password, salt, keylen, options, callback) {
const opt = Object.assign({}, options, { dkLen: keylen })
scryptAsync(password, salt, opt, (derivedKey) => callback(null, Buffer.from(derivedKey)))
}
}
const scrypt = require('scrypt-kdf')
var Sequelize = require('sequelize')
// core // core
const logger = require('../logger')
const { generateAvatarURL } = require('../letter-avatars')
module.exports = function (sequelize, DataTypes) { @Table
var User = sequelize.define('User', { export class User extends Model<User> {
id: {
type: DataTypes.UUID,
primaryKey: true,
defaultValue: Sequelize.UUIDV4
},
profileid: {
type: DataTypes.STRING,
unique: true
},
profile: {
type: DataTypes.TEXT
},
history: {
type: DataTypes.TEXT
},
accessToken: {
type: DataTypes.TEXT
},
refreshToken: {
type: DataTypes.TEXT
},
deleteToken: {
type: DataTypes.UUID,
defaultValue: Sequelize.UUIDV4
},
email: {
type: Sequelize.TEXT,
validate: {
isEmail: true
}
},
password: {
type: Sequelize.TEXT
}
})
User.prototype.verifyPassword = function (attempt) { @PrimaryKey
return scrypt.verify(Buffer.from(this.password, 'hex'), attempt) @Default(Sequelize.UUIDV4)
@Column(DataType.UUID)
id: string;
@Unique
@Column(DataType.STRING)
profileid: string;
@Column(DataType.TEXT)
profile: string;
@Column(DataType.TEXT)
histroy: string;
@Column(DataType.TEXT)
accessToken: string;
@Column(DataType.TEXT)
refreshToken: string;
@IsUUID(4)
@Column
deleteToken: string;
@IsEmail
@Column(DataType.TEXT)
email: string;
@Column(DataType.TEXT)
password: string;
verifyPassword(attempt: string) {
return scrypt.verify(Buffer.from(this.password, 'hex'), attempt);
} }
User.associate = function (models) { @HasMany(() => Note, { foreignKey: 'lastchangeuserId', constraints: false })
User.hasMany(models.Note, { @HasMany(() => Note, { foreignKey: 'ownerId', constraints: false })
foreignKey: 'ownerId',
constraints: false static parsePhotoByProfile(profile: any, bigger: boolean) {
}) let photo: string;
User.hasMany(models.Note, {
foreignKey: 'lastchangeuserId',
constraints: false
})
}
User.getProfile = function (user) {
if (!user) {
return null
}
return user.profile ? User.parseProfile(user.profile) : (user.email ? User.parseProfileByEmail(user.email) : null)
}
User.parseProfile = function (profile) {
try {
profile = JSON.parse(profile)
} catch (err) {
logger.error(err)
profile = null
}
if (profile) {
profile = {
name: profile.displayName || profile.username,
photo: User.parsePhotoByProfile(profile),
biggerphoto: User.parsePhotoByProfile(profile, true)
}
}
return profile
}
User.parsePhotoByProfile = function (profile, bigger) {
var photo = null
switch (profile.provider) { switch (profile.provider) {
case 'facebook': case 'facebook':
photo = 'https://graph.facebook.com/' + profile.id + '/picture' photo = 'https://graph.facebook.com/' + profile.id + '/picture'
@ -137,7 +96,7 @@ module.exports = function (sequelize, DataTypes) {
} }
return photo return photo
} }
User.parseProfileByEmail = function (email) { static parseProfileByEmail(email: string) {
return { return {
name: email.substring(0, email.lastIndexOf('@')), name: email.substring(0, email.lastIndexOf('@')),
photo: generateAvatarURL('', email, false), photo: generateAvatarURL('', email, false),
@ -145,21 +104,43 @@ module.exports = function (sequelize, DataTypes) {
} }
} }
function updatePasswordHashHook (user, options) { @BeforeUpdate
@BeforeCreate
static async updatePasswordHashHook(user: User) {
// suggested way to hash passwords to be able to do this asynchronously: // suggested way to hash passwords to be able to do this asynchronously:
// @see https://github.com/sequelize/sequelize/issues/1821#issuecomment-44265819 // @see https://github.com/sequelize/sequelize/issues/1821#issuecomment-44265819
if (!user.changed('password')) { if (!user.changed('password')) {
return Promise.resolve() return Promise.resolve();
} }
return scrypt.kdf(user.getDataValue('password'), { logN: 15 }).then(keyBuf => { return scrypt.kdf(user.getDataValue('password'), { logN: 15, r: 8, p: 1 }).then(keyBuf => {
user.setDataValue('password', keyBuf.toString('hex')) user.setDataValue('password', keyBuf.toString('hex'));
}) })
} }
User.beforeCreate(updatePasswordHashHook) static getProfile(user: User) {
User.beforeUpdate(updatePasswordHashHook) if (!user) {
return null
return User }
return user.profile ? user.parseProfile(user.profile) : (user.email ? User.parseProfileByEmail(user.email) : null)
}
parseProfile(profile: any) {
try {
profile = JSON.parse(profile)
} catch (err) {
logger.error(err)
profile = null
}
if (profile) {
profile = {
name: profile.displayName || profile.username,
photo: User.parsePhotoByProfile(profile, false),
biggerphoto: User.parsePhotoByProfile(profile, true)
}
}
return profile
}
} }

89
lib/web/note/actions.js
View file

@ -1,89 +0,0 @@
const models = require('../../models')
const logger = require('../../logger')
const config = require('../../config')
const errors = require('../../errors')
const shortId = require('shortid')
const moment = require('moment')
const querystring = require('querystring')
exports.getInfo = function getInfo (req, res, note) {
const body = note.content
const extracted = models.Note.extractMeta(body)
const markdown = extracted.markdown
const meta = models.Note.parseMeta(extracted.meta)
const createtime = note.createdAt
const updatetime = note.lastchangeAt
const title = models.Note.decodeTitle(note.title)
const data = {
title: meta.title || title,
description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
viewcount: note.viewcount,
createtime: createtime,
updatetime: updatetime
}
res.set({
'Access-Control-Allow-Origin': '*', // allow CORS as API
'Access-Control-Allow-Headers': 'Range',
'Access-Control-Expose-Headers': 'Cache-Control, Content-Encoding, Content-Range',
'Cache-Control': 'private', // only cache by client
'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
})
res.send(data)
}
exports.createGist = function createGist (req, res, note) {
const data = {
client_id: config.github.clientID,
redirect_uri: config.serverURL + '/auth/github/callback/' + models.Note.encodeNoteId(note.id) + '/gist',
scope: 'gist',
state: shortId.generate()
}
const query = querystring.stringify(data)
res.redirect('https://github.com/login/oauth/authorize?' + query)
}
exports.getRevision = function getRevision (req, res, note) {
const actionId = req.params.actionId
if (actionId) {
const time = moment(parseInt(actionId))
if (time.isValid()) {
models.Revision.getPatchedNoteRevisionByTime(note, time, function (err, content) {
if (err) {
logger.error(err)
return errors.errorInternalError(res)
}
if (!content) {
return errors.errorNotFound(res)
}
res.set({
'Access-Control-Allow-Origin': '*', // allow CORS as API
'Access-Control-Allow-Headers': 'Range',
'Access-Control-Expose-Headers': 'Cache-Control, Content-Encoding, Content-Range',
'Cache-Control': 'private', // only cache by client
'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
})
res.send(content)
})
} else {
return errors.errorNotFound(res)
}
} else {
models.Revision.getNoteRevisions(note, function (err, data) {
if (err) {
logger.error(err)
return errors.errorInternalError(res)
}
const out = {
revision: data
}
res.set({
'Access-Control-Allow-Origin': '*', // allow CORS as API
'Access-Control-Allow-Headers': 'Range',
'Access-Control-Expose-Headers': 'Cache-Control, Content-Encoding, Content-Range',
'Cache-Control': 'private', // only cache by client
'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
})
res.send(out)
})
}
}

97
lib/web/note/actions.ts Normal file
View file

@ -0,0 +1,97 @@
import {Response} from "express";
const models = require('../../models')
const logger = require('../../logger')
const config = require('../../config')
const errors = require('../../errors')
const shortId = require('shortid')
const moment = require('moment')
const querystring = require('querystring')
export module ActionController {
// TODO: Use correct type for note
export function getInfo(req: any, res: Response, note: any) {
const body = note.content
const extracted = models.Note.extractMeta(body)
const markdown = extracted.markdown
const meta = models.Note.parseMeta(extracted.meta)
const createtime = note.createdAt
const updatetime = note.lastchangeAt
const title = models.Note.decodeTitle(note.title)
const data = {
title: meta.title || title,
description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
viewcount: note.viewcount,
createtime: createtime,
updatetime: updatetime
}
res.set({
'Access-Control-Allow-Origin': '*', // allow CORS as API
'Access-Control-Allow-Headers': 'Range',
'Access-Control-Expose-Headers': 'Cache-Control, Content-Encoding, Content-Range',
'Cache-Control': 'private', // only cache by client
'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
})
res.send(data)
}
// TODO: Use correct type for note
export function createGist(req: any, res: Response, note: any) {
const data = {
client_id: config.github.clientID,
redirect_uri: config.serverURL + '/auth/github/callback/' + models.Note.encodeNoteId(note.id) + '/gist',
scope: 'gist',
state: shortId.generate()
}
const query = querystring.stringify(data)
res.redirect('https://github.com/login/oauth/authorize?' + query)
}
// TODO: Use correct type for note
export function getRevision(req: any, res: Response, note: any) {
const actionId = req.params.actionId
if (actionId) {
const time = moment(parseInt(actionId))
if (time.isValid()) {
models.Revision.getPatchedNoteRevisionByTime(note, time, function (err, content) {
if (err) {
logger.error(err)
return errors.errorInternalError(res)
}
if (!content) {
return errors.errorNotFound(res)
}
res.set({
'Access-Control-Allow-Origin': '*', // allow CORS as API
'Access-Control-Allow-Headers': 'Range',
'Access-Control-Expose-Headers': 'Cache-Control, Content-Encoding, Content-Range',
'Cache-Control': 'private', // only cache by client
'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
})
res.send(content)
})
} else {
return errors.errorNotFound(res)
}
} else {
models.Revision.getNoteRevisions(note, function (err, data) {
if (err) {
logger.error(err)
return errors.errorInternalError(res)
}
const out = {
revision: data
}
res.set({
'Access-Control-Allow-Origin': '*', // allow CORS as API
'Access-Control-Allow-Headers': 'Range',
'Access-Control-Expose-Headers': 'Cache-Control, Content-Encoding, Content-Range',
'Cache-Control': 'private', // only cache by client
'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
})
res.send(out)
})
}
}
}

8
package.json
View file

@ -107,6 +107,7 @@
"randomcolor": "^0.5.3", "randomcolor": "^0.5.3",
"raphael": "git+https://github.com/dmitrybaranovskiy/raphael", "raphael": "git+https://github.com/dmitrybaranovskiy/raphael",
"readline-sync": "^1.4.7", "readline-sync": "^1.4.7",
"reflect-metadata": "^0.1.13",
"request": "^2.88.0", "request": "^2.88.0",
"reveal.js": "~3.9.2", "reveal.js": "~3.9.2",
"scrypt-async": "^2.0.1", "scrypt-async": "^2.0.1",
@ -167,8 +168,11 @@
"url": "https://github.com/codimd/server.git" "url": "https://github.com/codimd/server.git"
}, },
"devDependencies": { "devDependencies": {
"@types/express": "4.17.0", "@types/express": "^4.17.6",
"@types/node": "^12.12.12", "@types/node": "^13.11.1",
"@types/bluebird": "^3.5.30",
"@types/passport": "^1.0.3",
"@types/validator": "^13.0.0",
"awesome-typescript-loader": "^5.2.1", "awesome-typescript-loader": "^5.2.1",
"babel-cli": "^6.26.0", "babel-cli": "^6.26.0",
"babel-core": "^6.26.3", "babel-core": "^6.26.3",

3
tsconfig.json
View file

@ -6,7 +6,8 @@
"target": "es5", "target": "es5",
"module": "commonjs", "module": "commonjs",
"esModuleInterop": true, "esModuleInterop": true,
"experimentalDecorators": true "experimentalDecorators": true,
"emitDecoratorMetadata": true
}, },
"include": [ "include": [
"./lib/**/*" "./lib/**/*"

61
yarn.lock
View file

@ -64,6 +64,11 @@
resolved "https://registry.yarnpkg.com/@passport-next/passport-strategy/-/passport-strategy-1.1.0.tgz#4c0df069e2ec9262791b9ef1e23320c1d73bdb74" resolved "https://registry.yarnpkg.com/@passport-next/passport-strategy/-/passport-strategy-1.1.0.tgz#4c0df069e2ec9262791b9ef1e23320c1d73bdb74"
integrity sha512-2KhFjtPueJG6xVj2HnqXt9BlANOfYCVLyu+pXYjPGBDT8yk+vQwc/6tsceIj+mayKcoxMau2JimggXRPHgoc8w== integrity sha512-2KhFjtPueJG6xVj2HnqXt9BlANOfYCVLyu+pXYjPGBDT8yk+vQwc/6tsceIj+mayKcoxMau2JimggXRPHgoc8w==
"@types/bluebird@^3.5.30":
version "3.5.30"
resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.30.tgz#ee034a0eeea8b84ed868b1aa60d690b08a6cfbc5"
integrity sha512-8LhzvcjIoqoi1TghEkRMkbbmM+jhHnBokPGkJWjclMK+Ks0MxEBow3/p2/iFTZ+OIbJHQDSfpgdZEb+af3gfVw==
"@types/body-parser@*": "@types/body-parser@*":
version "1.19.0" version "1.19.0"
resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
@ -85,9 +90,9 @@
integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
"@types/express-serve-static-core@*": "@types/express-serve-static-core@*":
version "4.17.2" version "4.17.4"
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz#f6f41fa35d42e79dbf6610eccbb2637e6008a0cf" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.4.tgz#157c79c2d28b632d6418497c57c93185e392e444"
integrity sha512-El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg== integrity sha512-dPs6CaRWxsfHbYDVU51VjEJaUJEcli4UI0fFMT4oWmgCvHj+j7oIxz5MLHVL0Rv++N004c21ylJNdWQvPkkb5w==
dependencies: dependencies:
"@types/node" "*" "@types/node" "*"
"@types/range-parser" "*" "@types/range-parser" "*"
@ -101,13 +106,14 @@
"@types/express-serve-static-core" "*" "@types/express-serve-static-core" "*"
"@types/serve-static" "*" "@types/serve-static" "*"
"@types/express@4.17.0": "@types/express@^4.17.6":
version "4.17.0" version "4.17.6"
resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.0.tgz#49eaedb209582a86f12ed9b725160f12d04ef287" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.6.tgz#6bce49e49570507b86ea1b07b806f04697fac45e"
integrity sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw== integrity sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==
dependencies: dependencies:
"@types/body-parser" "*" "@types/body-parser" "*"
"@types/express-serve-static-core" "*" "@types/express-serve-static-core" "*"
"@types/qs" "*"
"@types/serve-static" "*" "@types/serve-static" "*"
"@types/geojson@^7946.0.7": "@types/geojson@^7946.0.7":
@ -127,7 +133,12 @@
resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw== integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
"@types/node@*", "@types/node@>=8.0.0": "@types/node@*", "@types/node@^13.11.1":
version "13.11.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.1.tgz#49a2a83df9d26daacead30d0ccc8762b128d53c7"
integrity sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==
"@types/node@>=8.0.0":
version "13.7.1" version "13.7.1"
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz#238eb34a66431b71d2aaddeaa7db166f25971a0d" resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.1.tgz#238eb34a66431b71d2aaddeaa7db166f25971a0d"
integrity sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA== integrity sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA==
@ -137,11 +148,6 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.15.tgz#bfff4e23e9e70be6eec450419d51e18de1daf8e7" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.15.tgz#bfff4e23e9e70be6eec450419d51e18de1daf8e7"
integrity sha512-daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A== integrity sha512-daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A==
"@types/node@^12.12.12":
version "12.12.28"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.28.tgz#3a2b5f8d21f96ace690a8832ae9779114612575f"
integrity sha512-g73GJYJDXgf0jqg+P9S8h2acWbDXNkoCX8DLtJVu7Fkn788pzQ/oJsrdJz/2JejRf/SjfZaAhsw+3nd1D5EWGg==
"@types/node@^12.12.17": "@types/node@^12.12.17":
version "12.12.27" version "12.12.27"
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.27.tgz#d7506f73160ad30fcebbcf5b8b7d2d976e649e42" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.27.tgz#d7506f73160ad30fcebbcf5b8b7d2d976e649e42"
@ -159,11 +165,23 @@
dependencies: dependencies:
"@types/express" "*" "@types/express" "*"
"@types/passport@^1.0.3":
version "1.0.3"
resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.3.tgz#e459ed6c262bf0686684d1b05901be0d0b192a9c"
integrity sha512-nyztuxtDPQv9utCzU0qW7Gl8BY2Dn8BKlYAFFyxKipFxjaVd96celbkLCV/tRqqBUZ+JB8If3UfgV8347DTo3Q==
dependencies:
"@types/express" "*"
"@types/q@^1.5.1": "@types/q@^1.5.1":
version "1.5.2" version "1.5.2"
resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8" resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw== integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
"@types/qs@*":
version "6.9.1"
resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.1.tgz#937fab3194766256ee09fcd40b781740758617e7"
integrity sha512-lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw==
"@types/range-parser@*": "@types/range-parser@*":
version "1.2.3" version "1.2.3"
resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
@ -192,6 +210,11 @@
dependencies: dependencies:
"@types/node" "*" "@types/node" "*"
"@types/validator@^13.0.0":
version "13.0.0"
resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.0.0.tgz#365f1bf936aeaddd0856fc41aa1d6f82d88ee5b3"
integrity sha512-WAy5txG7aFX8Vw3sloEKp5p/t/Xt8jD3GRD9DacnFv6Vo8ubudAsRTXgxpQwU0mpzY/H8U4db3roDuCMjShBmw==
"@webassemblyjs/ast@1.8.5": "@webassemblyjs/ast@1.8.5":
version "1.8.5" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
@ -8343,6 +8366,11 @@ referrer-policy@1.2.0:
resolved "https://registry.yarnpkg.com/referrer-policy/-/referrer-policy-1.2.0.tgz#b99cfb8b57090dc454895ef897a4cc35ef67a98e" resolved "https://registry.yarnpkg.com/referrer-policy/-/referrer-policy-1.2.0.tgz#b99cfb8b57090dc454895ef897a4cc35ef67a98e"
integrity sha512-LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA== integrity sha512-LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA==
reflect-metadata@^0.1.13:
version "0.1.13"
resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
regenerate-unicode-properties@^8.1.0: regenerate-unicode-properties@^8.1.0:
version "8.1.0" version "8.1.0"
resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
@ -8868,6 +8896,13 @@ sequelize-pool@^2.3.0:
resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d" resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d"
integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA== integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA==
sequelize-typescript@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/sequelize-typescript/-/sequelize-typescript-1.1.0.tgz#d5c2945e7fbfe55a934917b27d84589858d79123"
integrity sha512-FAPEQPeAhIaFQNLAcf9Q2IWcqWhNcvn5OZZ7BzGB0CJMtImIsGg4E/EAb7huMmPaPwDArxJUWGqk1KurphTNRA==
dependencies:
glob "7.1.2"
sequelize@^5.21.1: sequelize@^5.21.1:
version "5.21.4" version "5.21.4"
resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.4.tgz#a49597dbd7862e4e1fb8ec819de04705d06d9d17" resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.21.4.tgz#a49597dbd7862e4e1fb8ec819de04705d06d9d17"