Repository: ignite Updated Branches: refs/heads/master 6ab2cc38d -> e5005d917
IGNITE-6920 Web Console: Create default account for direct-install package. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5005d91 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5005d91 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5005d91 Branch: refs/heads/master Commit: e5005d917cb8d11130b67b82d65e0b740aa81fe3 Parents: 6ab2cc3 Author: Andrey Novikov <[email protected]> Authored: Fri Jan 19 10:05:03 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Jan 19 10:05:03 2018 +0700 ---------------------------------------------------------------------- modules/web-console/backend/app/mongo.js | 54 +++++++++++++++++++++++---- modules/web-console/backend/package.json | 7 ++-- modules/web-console/pom.xml | 3 +- 3 files changed, 52 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e5005d91/modules/web-console/backend/app/mongo.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js index 189f45b..f65da03 100644 --- a/modules/web-console/backend/app/mongo.js +++ b/modules/web-console/backend/app/mongo.js @@ -1200,17 +1200,57 @@ module.exports.factory = function(settings, mongoose) { mongodRun = helper.run(); return mongodRun - .catch((err) => console.log('Failed to start embedded MongoDB', err)) + .catch((err) => { + console.log('Failed to start embedded MongoDB', err); + + return Promise.reject(err); + }) .then(() => { console.log('Embedded MongoDB successfully started'); - return mongoose.connect(settings.mongoUrl, {server: {poolSize: 4}}); + return mongoose.connect(settings.mongoUrl, {server: {poolSize: 4}}) + .catch((err) => { + console.log('Failed to connect to embedded MongoDB', err); + + return Promise.reject(err); + }); }) - .catch((err) => { - console.log('Failed to connect to embedded MongoDB', err); + .then(() => defineSchema(mongoose)) + .then((mongo) => { + if (settings.packaged) { + return mongo.Account.count() + .then((count) => { + if (count === 0) { + return Promise.all([ + mongo.Account.create({ + _id: '59fc0c25e145c32be0f83b33', + salt: '7b4ccb9e375508a8f87c8f347083ce98cb8785d857dd18208f9a480e992a26bb', + hash: '909d5ed6e0b0a656ef542e2e8e851e9eb00cfb77984e0a6b4597c335d1436a577b3b289601eb8d1f3646e488cd5ea2bbb3e97fcc131cd6a9571407a45b1817bf1af1dd0ccdd070f07733da19e636ff9787369c5f38f86075f78c60809fe4a52288a68ca38aae0ad2bd0cc77b4cae310abf260e9523d361fd9be60e823a7d8e73954ddb18091e668acd3f57baf9fa7db4267e198d829761997a4741734335589ab62793ceb089e8fffe6e5b0e86f332b33a3011ba44e6efd29736f31cbd2b2023e5173baf517f337eb7a4321ea2b67ec827cffa271d26d3f2def93b5efa3ae7e6e327e55feb121ee96b8ff5016527cc7d854a9b49b44c993387c1093705cb26b1802a2e4c1d34508fb93d051d7e5e2e6cc65b6048a999f94c369973b46b204295f0b2f23f8e30723f9e984ddb2c53dcbf0a77a6d0795d44c3ad97a4ae49d6767db9630e2ef76c2069da87088f1400b1292df9bd787122b2cfef1f26a884a298a0bab3d6e6b689381cf6389d2f019e6cd19e82c84048bacfdd1bee946f9d40dda040be426e583abf92529a1c4f032d5058a9799a77e6642312b8d231d79300d5d0d3f74d62797f9d192e8581698e9539812a539ef1b9fbf718f44dd549896ea9449f6ea744586222e5fc29dfcd5eb79e7646ad3d37868f507383 3c554853dee6b067bf2bbfab44c011f2de98a8570292f8109b6bde11e3be51075a656c32b521b7', + email: 'admin@admin', + firstName: 'admin', + lastName: 'admin', + company: 'admin', + country: 'United States', + admin: true, + token: 'ruQvlWff09zqoVYyh6WJ', + attempts: 0, + resetPasswordToken: 'O2GWgOkKkhqpDcxjYnSP' + }), + mongo.Space.create({ + _id: '59fc0c26e145c32be0f83b34', + name: 'Personal space', + owner: '59fc0c25e145c32be0f83b33', + usedBy: [], + demo: false + }) + ]); + } + }) + .then(() => mongo) + .catch(() => mongo); + } - return Promise.reject(err); + return mongo; }); - }) - .then(() => defineSchema(mongoose)); + }); }; http://git-wip-us.apache.org/repos/asf/ignite/blob/e5005d91/modules/web-console/backend/package.json ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/package.json b/modules/web-console/backend/package.json index 889c40d..0aa56c9 100644 --- a/modules/web-console/backend/package.json +++ b/modules/web-console/backend/package.json @@ -8,7 +8,8 @@ "test": "cross-env NODE_ENV=test CONFIG_PATH='./test/config/settings.json' node ./test/index.js", "eslint": "eslint --env node --format node_modules/eslint-friendly-formatter ./ -- --eff-by-issue", "start": "node ./index.js", - "build": "pkg . --out-path build" + "build": "pkg . --out-path build", + "mongodb-download": "./node_modules/.bin/mongodb-download" }, "author": "", "contributors": [ @@ -71,7 +72,8 @@ "passport-local-mongoose": "4.0.0", "passport.socketio": "3.7.0", "socket.io": "1.7.3", - "uuid": "3.1.0" + "uuid": "3.1.0", + "pkg": "4.2.4" }, "devDependencies": { "chai": "4.1.0", @@ -81,7 +83,6 @@ "mocha": "3.4.2", "mocha-teamcity-reporter": "1.1.1", "mockgoose": "6.0.8", - "pkg": "4.2.4", "supertest": "3.0.0" } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e5005d91/modules/web-console/pom.xml ---------------------------------------------------------------------- diff --git a/modules/web-console/pom.xml b/modules/web-console/pom.xml index 1ef1992..f398378 100644 --- a/modules/web-console/pom.xml +++ b/modules/web-console/pom.xml @@ -132,7 +132,6 @@ </executions> </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> @@ -235,7 +234,7 @@ <executions> <execution> - <id>release-web-agent</id> + <id>release-direct-install</id> <phase>package</phase> <goals> <goal>single</goal>
