yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-26 00:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into enhance/register

Browse Source
This commit is contained in:
Jim LAURIE 2018-03-14 16:12:23 +01:00 committed by GitHub
commit 31ee1583b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/strapi-generate-new/files/config/environments/production/database.json
View File

@ -11,7 +11,8 @@
"database": "${process.env.DATABASE_NAME || 'production'}", "database": "${process.env.DATABASE_NAME || 'production'}",
"username": "${process.env.DATABASE_USERNAME || ''}", "username": "${process.env.DATABASE_USERNAME || ''}",
"password": "${process.env.DATABASE_PASSWORD || ''}", "password": "${process.env.DATABASE_PASSWORD || ''}",
"ssl": false "ssl": "${process.env.DATABASE_SSL || false}",
"authenticationDatabase": "${process.env.DATABASE_AUTHENTICATION_DATABASE || ''}"
}, },
"options": {} "options": {}
} }

3
packages/strapi-generate-new/files/config/environments/test/database.json
View File

@ -10,7 +10,8 @@
"database": "test", "database": "test",
"username": "", "username": "",
"password": "", "password": "",
"ssl": false "ssl": false,
"authenticationDatabase": ""
}, },
"options": {} "options": {}
} }

9
packages/strapi-generate-new/lib/before.js
View File

@ -194,6 +194,14 @@ module.exports = (scope, cb) => {
mask: '*', mask: '*',
default: _.get(scope.database, 'password', undefined) default: _.get(scope.database, 'password', undefined)
}, },
{
when: !hasDatabaseConfig,
type: 'input',
prefix: '',
name: 'authenticationDatabase',
message: 'Authentication database:',
default: _.get(scope.database, 'authenticationDatabase', undefined)
},
{ {
when: !hasDatabaseConfig, when: !hasDatabaseConfig,
type: 'boolean', type: 'boolean',
@ -214,6 +222,7 @@ module.exports = (scope, cb) => {
scope.database.settings.database = answers.database; scope.database.settings.database = answers.database;
scope.database.settings.username = answers.username; scope.database.settings.username = answers.username;
scope.database.settings.password = answers.password; scope.database.settings.password = answers.password;
scope.database.settings.authenticationDatabase = answers.authenticationDatabase;
scope.database.settings.ssl = answers.ssl; scope.database.settings.ssl = answers.ssl;
logger.info('Testing database connection...'); logger.info('Testing database connection...');

6
packages/strapi-mongoose/lib/index.js
View File

@ -31,6 +31,7 @@ module.exports = function (strapi) {
host: 'localhost', host: 'localhost',
port: 27017, port: 27017,
database: 'strapi', database: 'strapi',
authenticationDatabase: '',
ssl: false ssl: false
}, },
@ -41,7 +42,7 @@ module.exports = function (strapi) {
initialize: cb => { initialize: cb => {
_.forEach(_.pickBy(strapi.config.connections, {connector: 'strapi-mongoose'}), (connection, connectionName) => { _.forEach(_.pickBy(strapi.config.connections, {connector: 'strapi-mongoose'}), (connection, connectionName) => {
const instance = new Mongoose(); const instance = new Mongoose();
const { uri, host, port, username, password, database, ssl } = _.defaults(connection.settings, strapi.config.hook.settings.mongoose); const { uri, host, port, username, password, database, authenticationDatabase, ssl } = _.defaults(connection.settings, strapi.config.hook.settings.mongoose);
// Connect to mongo database // Connect to mongo database
const connectOptions = {} const connectOptions = {}
@ -51,6 +52,9 @@ module.exports = function (strapi) {
connectOptions.pass = password connectOptions.pass = password
} }
} }
if (!_.isEmpty(authenticationDatabase)) {
connectOptions.authSource = authenticationDatabase;
}
connectOptions.ssl = ssl ? true : false; connectOptions.ssl = ssl ? true : false;
instance.connect(uri || `mongodb://${host}:${port}/${database}`, connectOptions); instance.connect(uri || `mongodb://${host}:${port}/${database}`, connectOptions);

5
packages/strapi-mongoose/lib/utils/connectivity.js
View File

@ -10,7 +10,7 @@ const logger = require('strapi-utils').logger;
module.exports = (scope, success, error) => { module.exports = (scope, success, error) => {
const Mongoose = require(path.resolve(`${scope.tmpPath}/node_modules/mongoose`)); const Mongoose = require(path.resolve(`${scope.tmpPath}/node_modules/mongoose`));
const { username, password, ssl } = scope.database.settings const { username, password, authenticationDatabase, ssl } = scope.database.settings
const connectOptions = {} const connectOptions = {}
if (username) { if (username) {
connectOptions.user = username connectOptions.user = username
@ -18,6 +18,9 @@ module.exports = (scope, success, error) => {
connectOptions.pass = password connectOptions.pass = password
} }
} }
if (authenticationDatabase) {
connectOptions.authSource = authenticationDatabase;
}
connectOptions.ssl = ssl ? true : false connectOptions.ssl = ssl ? true : false
Mongoose.connect(`mongodb://${scope.database.settings.host}:${scope.database.settings.port}/${scope.database.settings.database}`, connectOptions, function (err) { Mongoose.connect(`mongodb://${scope.database.settings.host}:${scope.database.settings.port}/${scope.database.settings.database}`, connectOptions, function (err) {
if (err) { if (err) {