From eb566d28e7c4f91ac3dacbd3972c30d1d2f7e8a5 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Thu, 14 Jun 2018 21:56:18 -0700
Subject: [PATCH] Remove groupdb._addDefaultGroups

Putting this in db code causes issues when we merge in the
accesscontrol/roles variables (groupdb needs to source those
variables)
---
 src/database.js           | 3 +--
 src/groupdb.js            | 8 +-------
 src/test/apps-test.js     | 1 +
 src/test/database-test.js | 2 ++
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/database.js b/src/database.js
index 8e4cb5a6f..72c4685dc 100644
--- a/src/database.js
+++ b/src/database.js
@@ -91,8 +91,7 @@ function clear(callback) {
 
     async.series([
         child_process.exec.bind(null, cmd),
-        require('./clientdb.js')._addDefaultClients,
-        require('./groupdb.js')._addDefaultGroups
+        require('./clientdb.js')._addDefaultClients
     ], callback);
 }
 
diff --git a/src/groupdb.js b/src/groupdb.js
index 8b921875e..a775ff562 100644
--- a/src/groupdb.js
+++ b/src/groupdb.js
@@ -18,12 +18,10 @@ exports = module.exports = {
     getGroups: getGroups,
     setGroups: setGroups,
 
-    _clear: clear,
-    _addDefaultGroups: addDefaultGroups
+    _clear: clear
 };
 
 var assert = require('assert'),
-    constants = require('./constants.js'),
     database = require('./database.js'),
     DatabaseError = require('./databaseerror');
 
@@ -234,7 +232,3 @@ function isMember(groupId, userId, callback) {
         callback(null, result.length !== 0);
     });
 }
-
-function addDefaultGroups(callback) {
-    add(constants.ADMIN_GROUP_ID, 'admin', callback);
-}
diff --git a/src/test/apps-test.js b/src/test/apps-test.js
index f46c6b6ba..3442b2c67 100644
--- a/src/test/apps-test.js
+++ b/src/test/apps-test.js
@@ -148,6 +148,7 @@ describe('Apps', function () {
             database._clear,
             domains.add.bind(null, DOMAIN_0.domain, DOMAIN_0.zoneName, DOMAIN_0.provider, DOMAIN_0.config, null, DOMAIN_0.tlsConfig),
             domains.add.bind(null, DOMAIN_1.domain, DOMAIN_1.zoneName, DOMAIN_1.provider, DOMAIN_1.config, null, DOMAIN_1.tlsConfig),
+            groupdb.add.bind(null, constants.ADMIN_GROUP_ID, constants.ADMIN_GROUP_NAME),
             userdb.add.bind(null, ADMIN_0.id, ADMIN_0),
             userdb.add.bind(null, USER_0.id, USER_0),
             userdb.add.bind(null, USER_1.id, USER_1),
diff --git a/src/test/database-test.js b/src/test/database-test.js
index dff00a668..98377147f 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -11,6 +11,7 @@ var appdb = require('../appdb.js'),
     backupdb = require('../backupdb.js'),
     clientdb = require('../clientdb.js'),
     config = require('../config.js'),
+    constants = require('../constants.js'),
     database = require('../database'),
     DatabaseError = require('../databaseerror.js'),
     domaindb = require('../domaindb'),
@@ -1451,6 +1452,7 @@ describe('database', function () {
             async.series([
                 database.initialize,
                 database._clear,
+                groupdb.add.bind(null, constants.ADMIN_GROUP_ID, constants.ADMIN_GROUP_NAME),
                 userdb.add.bind(null, USER_0.id, USER_0),
                 userdb.add.bind(null, USER_1.id, USER_1),
                 userdb.add.bind(null, USER_2.id, USER_2)