agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-14 06:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "update to newest mongoose"

Browse Source 
This reverts commit 7b05891ba0e87e4cf00fd6b1ea87d7406dc70989.
This commit is contained in:
Shane Kilkelly
2017-05-10 15:31:17 +01:00
parent 08567ff220
commit 01ee104f77
15 changed files with 95 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/coffee/Features/Project/ProjectCreationHandler.coffee
+1 -1
View File
@@ -2,7 +2,7 @@ logger = require('logger-sharelatex')
async = require("async") async = require("async")
metrics = require('metrics-sharelatex') metrics = require('metrics-sharelatex')
Settings = require('settings-sharelatex') Settings = require('settings-sharelatex')
ObjectId = require('../../infrastructure/Mongoose').Types.ObjectId ObjectId = require('mongoose').Types.ObjectId
Project = require('../../models/Project').Project Project = require('../../models/Project').Project
Folder = require('../../models/Folder').Folder Folder = require('../../models/Folder').Folder
ProjectEntityHandler = require('./ProjectEntityHandler') ProjectEntityHandler = require('./ProjectEntityHandler')
services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee
+1 -1
View File
@@ -534,7 +534,7 @@ module.exports = ProjectEntityHandler =
fileSystem: "#{path.fileSystem}/#{element.name}" fileSystem: "#{path.fileSystem}/#{element.name}"
mongo: path.mongo mongo: path.mongo
id = element._id+'' id = element._id+''
element._id = require('../../infrastructure/Mongoose').Types.ObjectId(id) element._id = require('mongoose').Types.ObjectId(id)
conditions = _id:project._id conditions = _id:project._id
mongopath = "#{path.mongo}.#{type}" mongopath = "#{path.mongo}.#{type}"
update = "$push":{} update = "$push":{}
services/web/app/coffee/Features/Subscription/SubscriptionLocator.coffee
+1 -1
View File
@@ -1,6 +1,6 @@
Subscription = require('../../models/Subscription').Subscription Subscription = require('../../models/Subscription').Subscription
logger = require("logger-sharelatex") logger = require("logger-sharelatex")
ObjectId = require('../../infrastructure/Mongoose').Types.ObjectId ObjectId = require('mongoose').Types.ObjectId
module.exports = module.exports =
services/web/app/coffee/Features/Subscription/SubscriptionUpdater.coffee
+1 -1
View File
@@ -6,7 +6,7 @@ UserFeaturesUpdater = require("./UserFeaturesUpdater")
PlansLocator = require("./PlansLocator") PlansLocator = require("./PlansLocator")
Settings = require("settings-sharelatex") Settings = require("settings-sharelatex")
logger = require("logger-sharelatex") logger = require("logger-sharelatex")
ObjectId = require('../../infrastructure/Mongoose').Types.ObjectId ObjectId = require('mongoose').Types.ObjectId
ReferalAllocator = require("../Referal/ReferalAllocator") ReferalAllocator = require("../Referal/ReferalAllocator")
oneMonthInSeconds = 60 * 60 * 24 * 30 oneMonthInSeconds = 60 * 60 * 24 * 30
services/web/app/coffee/infrastructure/Mongoose.coffee
-2
View File
@@ -2,8 +2,6 @@ mongoose = require('mongoose')
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
logger = require('logger-sharelatex') logger = require('logger-sharelatex')
mongoose.Promise = global.Promise
mongoose.connect(Settings.mongo.url, server: poolSize: 10) mongoose.connect(Settings.mongo.url, server: poolSize: 10)
mongoose.connection.on 'connected', () -> mongoose.connection.on 'connected', () ->
services/web/app/coffee/models/Doc.coffee
+1 -1
View File
@@ -1,4 +1,4 @@
mongoose = require '../infrastructure/Mongoose' mongoose = require 'mongoose'
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
Schema = mongoose.Schema Schema = mongoose.Schema
services/web/app/coffee/models/File.coffee
+1 -1
View File
@@ -1,4 +1,4 @@
mongoose = require '../infrastructure/Mongoose' mongoose = require 'mongoose'
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
Schema = mongoose.Schema Schema = mongoose.Schema
services/web/app/coffee/models/Folder.coffee
+1 -1
View File
@@ -1,4 +1,4 @@
mongoose = require('../infrastructure/Mongoose') mongoose = require('mongoose')
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
DocSchema = require('./Doc').DocSchema DocSchema = require('./Doc').DocSchema
FileSchema = require('./File').FileSchema FileSchema = require('./File').FileSchema
services/web/app/coffee/models/Project.coffee
+1 -1
View File
@@ -1,4 +1,4 @@
mongoose = require('../infrastructure/Mongoose') mongoose = require('mongoose')
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
_ = require('underscore') _ = require('underscore')
FolderSchema = require('./Folder.js').FolderSchema FolderSchema = require('./Folder.js').FolderSchema
services/web/app/coffee/models/ProjectInvite.coffee
+1 -1
View File
@@ -1,4 +1,4 @@
mongoose = require '../infrastructure/Mongoose' mongoose = require 'mongoose'
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
services/web/app/coffee/models/Subscription.coffee
+2 -2
View File
@@ -1,4 +1,4 @@
mongoose = require '../infrastructure/Mongoose' mongoose = require 'mongoose'
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
Schema = mongoose.Schema Schema = mongoose.Schema
@@ -31,4 +31,4 @@ Subscription = conn.model('Subscription', SubscriptionSchema)
mongoose.model 'Subscription', SubscriptionSchema mongoose.model 'Subscription', SubscriptionSchema
exports.Subscription = Subscription exports.Subscription = Subscription
exports.SubscriptionSchema = SubscriptionSchema exports.SubscriptionSchema = SubscriptionSchema
services/web/app/coffee/models/SystemMessage.coffee
+1 -1
View File
@@ -1,4 +1,4 @@
mongoose = require '../infrastructure/Mongoose' mongoose = require 'mongoose'
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
Schema = mongoose.Schema Schema = mongoose.Schema
services/web/app/coffee/models/User.coffee
+1 -1
View File
@@ -1,7 +1,7 @@
Project = require('./Project').Project Project = require('./Project').Project
Settings = require 'settings-sharelatex' Settings = require 'settings-sharelatex'
_ = require('underscore') _ = require('underscore')
mongoose = require('../infrastructure/Mongoose') mongoose = require('mongoose')
uuid = require('uuid') uuid = require('uuid')
Schema = mongoose.Schema Schema = mongoose.Schema
ObjectId = Schema.ObjectId ObjectId = Schema.ObjectId
services/web/npm-shrinkwrap.json
Generated
+81 -61
View File
@@ -292,6 +292,20 @@
"from": "bson@>=1.0.4 <1.1.0", "from": "bson@>=1.0.4 <1.1.0",
"resolved": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz" "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz"
}, },
"bson-ext": {
"version": "0.1.13",
"from": "bson-ext@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/bson-ext/-/bson-ext-0.1.13.tgz",
"optional": true,
"dependencies": {
"nan": {
"version": "2.0.9",
"from": "nan@>=2.0.9 <2.1.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz",
"optional": true
}
}
},
"buffer": { "buffer": {
"version": "4.9.1", "version": "4.9.1",
"from": "buffer@4.9.1", "from": "buffer@4.9.1",
@@ -1236,9 +1250,9 @@
"resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz" "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
}, },
"hooks-fixed": { "hooks-fixed": {
"version": "2.0.0", "version": "1.1.0",
"from": "hooks-fixed@2.0.0", "from": "hooks-fixed@1.1.0",
"resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-2.0.0.tgz" "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-1.1.0.tgz"
}, },
"http-errors": { "http-errors": {
"version": "1.6.1", "version": "1.6.1",
@@ -1461,9 +1475,23 @@
} }
}, },
"kareem": { "kareem": {
"version": "1.4.1", "version": "1.0.1",
"from": "kareem@1.4.1", "from": "kareem@1.0.1",
"resolved": "https://registry.npmjs.org/kareem/-/kareem-1.4.1.tgz" "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.0.1.tgz"
},
"kerberos": {
"version": "0.0.23",
"from": "kerberos@>=0.0.0 <0.1.0",
"resolved": "https://registry.npmjs.org/kerberos/-/kerberos-0.0.23.tgz",
"optional": true,
"dependencies": {
"nan": {
"version": "2.5.1",
"from": "nan@>=2.5.1 <2.6.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz",
"optional": true
}
}
}, },
"kind-of": { "kind-of": {
"version": "3.1.0", "version": "3.1.0",
@@ -2068,49 +2096,46 @@
} }
}, },
"mongoose": { "mongoose": {
"version": "4.9.8", "version": "4.1.0",
"from": "mongoose@4.9.8", "from": "mongoose@4.1.0",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.9.8.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.1.0.tgz",
"dependencies": { "dependencies": {
"async": { "async": {
"version": "2.1.4", "version": "0.9.0",
"from": "async@2.1.4", "from": "async@0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz" "resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
}, },
"es6-promise": { "bson": {
"version": "3.2.1", "version": "0.3.2",
"from": "es6-promise@3.2.1", "from": "bson@>=0.3.0 <0.4.0",
"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz" "resolved": "https://registry.npmjs.org/bson/-/bson-0.3.2.tgz"
},
"isarray": {
"version": "1.0.0",
"from": "isarray@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
}, },
"mongodb": { "mongodb": {
"version": "2.2.26", "version": "2.0.34",
"from": "mongodb@2.2.26", "from": "mongodb@2.0.34",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.26.tgz" "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.0.34.tgz"
}, },
"mongodb-core": { "mongodb-core": {
"version": "2.1.10", "version": "1.2.0",
"from": "mongodb-core@2.1.10", "from": "mongodb-core@1.2.0",
"resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.10.tgz" "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.2.0.tgz",
"dependencies": {
"bson": {
"version": "0.4.23",
"from": "bson@>=0.4.0 <0.5.0",
"resolved": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz"
}
}
}, },
"ms": { "ms": {
"version": "0.7.2", "version": "0.1.0",
"from": "ms@0.7.2", "from": "ms@0.1.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz" "resolved": "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz"
}, },
"readable-stream": { "readable-stream": {
"version": "2.2.7", "version": "1.0.31",
"from": "readable-stream@2.2.7", "from": "readable-stream@1.0.31",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz" "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz"
},
"string_decoder": {
"version": "1.0.0",
"from": "string_decoder@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.0.tgz"
} }
} }
}, },
@@ -2120,24 +2145,24 @@
"resolved": "https://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz" "resolved": "https://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz"
}, },
"mpath": { "mpath": {
"version": "0.2.1", "version": "0.1.1",
"from": "mpath@0.2.1", "from": "mpath@0.1.1",
"resolved": "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz" "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz"
}, },
"mpromise": { "mpromise": {
"version": "0.5.5", "version": "0.5.4",
"from": "mpromise@0.5.5", "from": "mpromise@0.5.4",
"resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz" "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.4.tgz"
}, },
"mquery": { "mquery": {
"version": "2.3.0", "version": "1.6.1",
"from": "mquery@2.3.0", "from": "mquery@1.6.1",
"resolved": "https://registry.npmjs.org/mquery/-/mquery-2.3.0.tgz", "resolved": "https://registry.npmjs.org/mquery/-/mquery-1.6.1.tgz",
"dependencies": { "dependencies": {
"bluebird": { "bluebird": {
"version": "2.10.2", "version": "2.9.26",
"from": "bluebird@2.10.2", "from": "bluebird@2.9.26",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz" "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.26.tgz"
}, },
"debug": { "debug": {
"version": "2.2.0", "version": "2.2.0",
@@ -2148,11 +2173,6 @@
"version": "0.7.1", "version": "0.7.1",
"from": "ms@0.7.1", "from": "ms@0.7.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz" "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
},
"sliced": {
"version": "0.0.5",
"from": "sliced@0.0.5",
"resolved": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz"
} }
} }
}, },
@@ -2194,9 +2214,9 @@
} }
}, },
"muri": { "muri": {
"version": "1.2.1", "version": "1.0.0",
"from": "muri@1.2.1", "from": "muri@1.0.0",
"resolved": "https://registry.npmjs.org/muri/-/muri-1.2.1.tgz" "resolved": "https://registry.npmjs.org/muri/-/muri-1.0.0.tgz"
}, },
"mv": { "mv": {
"version": "0.0.5", "version": "0.0.5",
@@ -3182,9 +3202,9 @@
"resolved": "https://registry.npmjs.org/sixpack-client/-/sixpack-client-1.0.0.tgz" "resolved": "https://registry.npmjs.org/sixpack-client/-/sixpack-client-1.0.0.tgz"
}, },
"sliced": { "sliced": {
"version": "1.0.1", "version": "0.0.5",
"from": "sliced@1.0.1", "from": "sliced@0.0.5",
"resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz" "resolved": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz"
}, },
"smtp-connection": { "smtp-connection": {
"version": "2.0.1", "version": "2.0.1",
services/web/package.json
+1 -1
View File
@@ -39,7 +39,7 @@
"mimelib": "0.2.14", "mimelib": "0.2.14",
"mocha": "1.17.1", "mocha": "1.17.1",
"mongojs": "2.4.0", "mongojs": "2.4.0",
"mongoose": "4.9.8", "mongoose": "4.1.0",
"multer": "^0.1.8", "multer": "^0.1.8",
"nodemailer": "2.1.0", "nodemailer": "2.1.0",
"nodemailer-sendgrid-transport": "^0.2.0", "nodemailer-sendgrid-transport": "^0.2.0",