summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/auth.js2
-rw-r--r--lib/config.js6
-rw-r--r--lib/history.js1
-rw-r--r--lib/letter-avatars.js1
-rw-r--r--lib/logger.js1
-rw-r--r--lib/migrations/20160515114000-user-add-tokens.js1
-rw-r--r--lib/migrations/20160607060246-support-revision.js1
-rw-r--r--lib/migrations/20160703062241-support-authorship.js1
-rw-r--r--lib/migrations/20161009040430-support-delete-note.js1
-rw-r--r--lib/migrations/20161201050312-support-email-signin.js1
-rw-r--r--lib/models/author.js1
-rw-r--r--lib/models/index.js1
-rw-r--r--lib/models/note.js3
-rw-r--r--lib/models/revision.js1
-rw-r--r--lib/models/temp.js1
-rw-r--r--lib/models/user.js1
-rw-r--r--lib/realtime.js1
-rwxr-xr-xlib/response.js1
-rw-r--r--lib/workers/dmpWorker.js1
19 files changed, 24 insertions, 3 deletions
diff --git a/lib/auth.js b/lib/auth.js
index ef1d6464..3e129b95 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -1,3 +1,4 @@
+'use strict'
// auth
// external modules
var passport = require('passport')
@@ -90,6 +91,7 @@ function registerAuthMethod () {
baseURL: config.gitlab.baseURL,
clientID: config.gitlab.clientID,
clientSecret: config.gitlab.clientSecret,
+ scope: config.gitlab.scope,
callbackURL: config.serverurl + '/auth/gitlab/callback'
}, callback))
}
diff --git a/lib/config.js b/lib/config.js
index af4c22cd..674dd113 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -1,3 +1,4 @@
+'use strict'
// external modules
var fs = require('fs')
var path = require('path')
@@ -101,8 +102,9 @@ var github = ((process.env.HMD_GITHUB_CLIENTID && process.env.HMD_GITHUB_CLIENTS
var gitlab = ((process.env.HMD_GITLAB_CLIENTID && process.env.HMD_GITLAB_CLIENTSECRET) || (fs.existsSync('/run/secrets/gitlab_clientID') && fs.existsSync('/run/secrets/gitlab_clientSecret'))) ? {
baseURL: process.env.HMD_GITLAB_BASEURL,
clientID: handleDockerSecret('gitlab_clientID') || process.env.HMD_GITLAB_CLIENTID,
- clientSecret: handleDockerSecret('gitlab_clientSecret') || process.env.HMD_GITLAB_CLIENTSECRET
-} : config.gitlab || false
+ clientSecret: handleDockerSecret('gitlab_clientSecret') || process.env.HMD_GITLAB_CLIENTSECRET,
+ scope: process.env.HMD_GITLAB_SCOPE
+} : (config.gitlab && config.gitlab.clientID && config.gitlab.clientSecret && config.gitlab) || false
var dropbox = ((process.env.HMD_DROPBOX_CLIENTID && process.env.HMD_DROPBOX_CLIENTSECRET) || (fs.existsSync('/run/secrets/dropbox_clientID') && fs.existsSync('/run/secrets/dropbox_clientSecret'))) ? {
clientID: handleDockerSecret('dropbox_clientID') || process.env.HMD_DROPBOX_CLIENTID,
clientSecret: handleDockerSecret('dropbox_clientSecret') || process.env.HMD_DROPBOX_CLIENTSECRET
diff --git a/lib/history.js b/lib/history.js
index 69337dc5..ffed3b96 100644
--- a/lib/history.js
+++ b/lib/history.js
@@ -1,3 +1,4 @@
+'use strict'
// history
// external modules
diff --git a/lib/letter-avatars.js b/lib/letter-avatars.js
index 92bd36ee..7ba336b6 100644
--- a/lib/letter-avatars.js
+++ b/lib/letter-avatars.js
@@ -1,3 +1,4 @@
+'use strict'
// external modules
var randomcolor = require('randomcolor')
diff --git a/lib/logger.js b/lib/logger.js
index 23e302da..2111d69a 100644
--- a/lib/logger.js
+++ b/lib/logger.js
@@ -1,3 +1,4 @@
+'use strict'
var winston = require('winston')
winston.emitErrs = true
diff --git a/lib/migrations/20160515114000-user-add-tokens.js b/lib/migrations/20160515114000-user-add-tokens.js
index 20c0e03c..4f051887 100644
--- a/lib/migrations/20160515114000-user-add-tokens.js
+++ b/lib/migrations/20160515114000-user-add-tokens.js
@@ -1,3 +1,4 @@
+'use strict'
module.exports = {
up: function (queryInterface, Sequelize) {
queryInterface.addColumn('Users', 'accessToken', Sequelize.STRING)
diff --git a/lib/migrations/20160607060246-support-revision.js b/lib/migrations/20160607060246-support-revision.js
index 618bb4d7..114aec2e 100644
--- a/lib/migrations/20160607060246-support-revision.js
+++ b/lib/migrations/20160607060246-support-revision.js
@@ -1,3 +1,4 @@
+'use strict'
module.exports = {
up: function (queryInterface, Sequelize) {
queryInterface.addColumn('Notes', 'savedAt', Sequelize.DATE)
diff --git a/lib/migrations/20160703062241-support-authorship.js b/lib/migrations/20160703062241-support-authorship.js
index 98381d4e..a1d695e5 100644
--- a/lib/migrations/20160703062241-support-authorship.js
+++ b/lib/migrations/20160703062241-support-authorship.js
@@ -1,3 +1,4 @@
+'use strict'
module.exports = {
up: function (queryInterface, Sequelize) {
queryInterface.addColumn('Notes', 'authorship', Sequelize.TEXT)
diff --git a/lib/migrations/20161009040430-support-delete-note.js b/lib/migrations/20161009040430-support-delete-note.js
index 984920b8..6e6fa20e 100644
--- a/lib/migrations/20161009040430-support-delete-note.js
+++ b/lib/migrations/20161009040430-support-delete-note.js
@@ -1,3 +1,4 @@
+'use strict'
module.exports = {
up: function (queryInterface, Sequelize) {
queryInterface.addColumn('Notes', 'deletedAt', Sequelize.DATE)
diff --git a/lib/migrations/20161201050312-support-email-signin.js b/lib/migrations/20161201050312-support-email-signin.js
index a97d3be5..1f3abb1e 100644
--- a/lib/migrations/20161201050312-support-email-signin.js
+++ b/lib/migrations/20161201050312-support-email-signin.js
@@ -1,3 +1,4 @@
+'use strict'
module.exports = {
up: function (queryInterface, Sequelize) {
queryInterface.addColumn('Users', 'email', Sequelize.TEXT)
diff --git a/lib/models/author.js b/lib/models/author.js
index 5e39c347..8b4f74e5 100644
--- a/lib/models/author.js
+++ b/lib/models/author.js
@@ -1,3 +1,4 @@
+'use strict'
// external modules
var Sequelize = require('sequelize')
diff --git a/lib/models/index.js b/lib/models/index.js
index 96babc2a..a378ee67 100644
--- a/lib/models/index.js
+++ b/lib/models/index.js
@@ -1,3 +1,4 @@
+'use strict'
// external modules
var fs = require('fs')
var path = require('path')
diff --git a/lib/models/note.js b/lib/models/note.js
index bef9ee21..f7c25bde 100644
--- a/lib/models/note.js
+++ b/lib/models/note.js
@@ -1,3 +1,4 @@
+'use strict'
// external modules
var fs = require('fs')
var path = require('path')
@@ -153,7 +154,7 @@ module.exports = function (sequelize, DataTypes) {
authorship = Note.updateAuthorshipByOperation(operations[i], null, authorship)
}
note.update({
- authorship: JSON.stringify(authorship)
+ authorship: authorship
}).then(function (note) {
return callback(null, note.id)
}).catch(function (err) {
diff --git a/lib/models/revision.js b/lib/models/revision.js
index d8dab30a..581e7ea5 100644
--- a/lib/models/revision.js
+++ b/lib/models/revision.js
@@ -1,3 +1,4 @@
+'use strict'
// external modules
var Sequelize = require('sequelize')
var async = require('async')
diff --git a/lib/models/temp.js b/lib/models/temp.js
index e770bb3a..2ad23fb5 100644
--- a/lib/models/temp.js
+++ b/lib/models/temp.js
@@ -1,3 +1,4 @@
+'use strict'
// external modules
var shortId = require('shortid')
diff --git a/lib/models/user.js b/lib/models/user.js
index f7e533b7..042b0d2f 100644
--- a/lib/models/user.js
+++ b/lib/models/user.js
@@ -1,3 +1,4 @@
+'use strict'
// external modules
var md5 = require('blueimp-md5')
var Sequelize = require('sequelize')
diff --git a/lib/realtime.js b/lib/realtime.js
index cff795c7..618fdad0 100644
--- a/lib/realtime.js
+++ b/lib/realtime.js
@@ -1,3 +1,4 @@
+'use strict'
// realtime
// external modules
var cookie = require('cookie')
diff --git a/lib/response.js b/lib/response.js
index 31fa18b2..13a94bbf 100755
--- a/lib/response.js
+++ b/lib/response.js
@@ -1,3 +1,4 @@
+'use strict'
// response
// external modules
var fs = require('fs')
diff --git a/lib/workers/dmpWorker.js b/lib/workers/dmpWorker.js
index 6a1da981..b0ed0f43 100644
--- a/lib/workers/dmpWorker.js
+++ b/lib/workers/dmpWorker.js
@@ -1,3 +1,4 @@
+'use strict'
// external modules
var DiffMatchPatch = require('diff-match-patch')
var dmp = new DiffMatchPatch()
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 22:32:28 +0000