diff --git a/services/web/Gruntfile.coffee b/services/web/Gruntfile.coffee index 479190332f..0845b435c2 100644 --- a/services/web/Gruntfile.coffee +++ b/services/web/Gruntfile.coffee @@ -320,7 +320,7 @@ module.exports = (grunt) -> ext: '.js' } config.mochaTest["module_#{module}_unit"] = { - src: ["modules/#{module}/test/unit/js/*.js"] + src: ["modules/#{module}/test/unit/js/**/*.js"] options: reporter: grunt.option('reporter') or 'spec' grep: grunt.option("grep") diff --git a/services/web/app/coffee/models/Project.coffee b/services/web/app/coffee/models/Project.coffee index c63f9efef3..4cbf05143e 100644 --- a/services/web/app/coffee/models/Project.coffee +++ b/services/web/app/coffee/models/Project.coffee @@ -17,15 +17,15 @@ DeletedDocSchema = new Schema ProjectSchema = new Schema name : {type:String, default:'new project'} lastUpdated : {type:Date, default: () -> new Date()} - lastOpened : {type:Date} - active : { type: Boolean, default: true } + lastOpened : {type:Date} + active : { type: Boolean, default: true } owner_ref : {type:ObjectId, ref:'User'} collaberator_refs : [ type:ObjectId, ref:'User' ] readOnly_refs : [ type:ObjectId, ref:'User' ] rootDoc_id : {type: ObjectId} rootFolder : [FolderSchema] publicAccesLevel : {type: String, default: 'private'} - compiler : {type:String, default:'pdflatex'} + compiler : {type:String, default:'pdflatex'} spellCheckLanguage : {type:String, default:'en'} deletedByExternalDataSource : {type: Boolean, default: false} description : {type:String, default:''} @@ -33,6 +33,9 @@ ProjectSchema = new Schema deletedDocs : [DeletedDocSchema] imageName : { type: String } track_changes : { type: Object } + overleaf : + id : { type: Number } + imported_at_version : { type: Number } ProjectSchema.statics.getProject = (project_or_id, fields, callback)-> if project_or_id._id? diff --git a/services/web/npm-shrinkwrap.json b/services/web/npm-shrinkwrap.json index 042a93f8af..52d85f8d6e 100644 --- a/services/web/npm-shrinkwrap.json +++ b/services/web/npm-shrinkwrap.json @@ -3075,6 +3075,11 @@ "from": "passport-local@>=1.0.0 <2.0.0", "resolved": "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz" }, + "passport-oauth2-refresh": { + "version": "1.0.0", + "from": "passport-oauth2-refresh@latest", + "resolved": "https://registry.npmjs.org/passport-oauth2-refresh/-/passport-oauth2-refresh-1.0.0.tgz" + }, "passport-oauth2": { "version": "1.4.0", "from": "passport-oauth2@latest", diff --git a/services/web/package.json b/services/web/package.json index 2c3dab21d8..9812a544f7 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -50,6 +50,7 @@ "passport-ldapauth": "^0.6.0", "passport-local": "^1.0.0", "passport-oauth2": "^1.4.0", + "passport-oauth2-refresh": "^1.0.0", "passport-saml": "^0.15.0", "pug": "^2.0.0-beta6", "redis": "0.10.1",