Skip to content

Commit aaa379b

Browse files
Add option to create admin user at db creation time
1 parent 7e6974b commit aaa379b

File tree

3 files changed

+37
-4
lines changed

3 files changed

+37
-4
lines changed

src/controllers/login-controller.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,11 @@ LoginModule.controller("LoginController", ['$scope', '$rootScope', '$routeParams
6666
modalScope.sso = $scope.sso;
6767
modalScope.types = ['document', 'graph']
6868
modalScope.stypes = ['plocal', 'memory']
69+
6970
var modalPromise = $modal({templateUrl: 'views/database/newDatabase.html', scope: modalScope, show: false});
70-
modalScope.createNew = function (name, type, stype, username, password, lightweight) {
71+
modalScope.createNew = function (name, type, stype, username, password, createAdmin, adminPassword, lightweight) {
7172
modalScope.creating = true;
72-
DatabaseApi.createDatabase(name, type, stype, username, password, function (data) {
73+
DatabaseApi.createDatabase(name, type, stype, username, password, createAdmin, adminPassword, function (data) {
7374

7475
$scope.databases.push(name);
7576
$scope.database = name;

src/services/database-services.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,8 @@ database.factory("DatabaseApi", [
620620
stype,
621621
username,
622622
password,
623+
createAdmin,
624+
adminPassword,
623625
callback,
624626
error
625627
) {
@@ -629,8 +631,16 @@ database.factory("DatabaseApi", [
629631
headers["Authorization"] =
630632
"Basic " + Base64.Base64.encode(username + ":" + password);
631633
}
634+
635+
console.log("CREATE DATABASE - createAdmin = "+ createAdmin);
636+
637+
var payload = null;
638+
if(createAdmin){
639+
payload = {"adminPassword": adminPassword}
640+
}
641+
632642
$http
633-
.post(API + "database/" + name + "/" + stype + "/" + type, null, {
643+
.post(API + "database/" + name + "/" + stype + "/" + type, payload, {
634644
headers: headers
635645
})
636646
.success(function(data) {

src/views/database/newDatabase.html

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,28 @@ <h3>New Database </h3>
3737
</div>
3838

3939

40+
<div class="form-group">
41+
<div class="col-sm-offset-2 col-sm-10">
42+
<div class="checkbox">
43+
<label>
44+
<input type="checkbox" ng-model="createAdmin"> Create Admin user
45+
</label>
46+
</div>
47+
</div>
48+
</div>
49+
50+
<div class="form-group" ng-show="createAdmin">
51+
<label class="control-label col-md-2">Admin Password</label>
52+
53+
<div class="col-md-10">
54+
<input id="adminPassword" type="password" class="form-control"
55+
ng-model="adminPassword"
56+
value=""/>
57+
</div>
58+
</div>
59+
60+
61+
4062
<div class="form-group">
4163
<div class="col-sm-offset-2 col-sm-10">
4264
<div class="checkbox">
@@ -89,7 +111,7 @@ <h3>New Database </h3>
89111
<div class="modal-footer">
90112
<button type="button" class="btn btn-default" ng-click="$hide()">Close</button>
91113
<button id="new-database-create-button" class="btn btn-primary" ng-disabled="!sso && newDB.$invalid"
92-
ng-click="createNew(name, type, stype, username, password, lightweight)">Create database
114+
ng-click="createNew(name, type, stype, username, password, createAdmin, adminPassword, lightweight)">Create database
93115
</button>
94116
</div>
95117
</div>

0 commit comments

Comments
 (0)