Add default clients in clients.js

src/clientdb.js

@@ -10,6 +10,8 @@ exports = module.exports = {
     getByAppId: getByAppId,
     getByAppIdAndType: getByAppIdAndType,
 
+    upsert: upsert,
+
     delByAppId: delByAppId,
     delByAppIdAndType: delByAppIdAndType,
 
@@ -112,6 +114,25 @@ function add(id, appId, type, clientSecret, redirectURI, scope, callback) {
     });
 }
 
+function upsert(id, appId, type, clientSecret, redirectURI, scope, callback) {
+    assert.strictEqual(typeof id, 'string');
+    assert.strictEqual(typeof appId, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert.strictEqual(typeof clientSecret, 'string');
+    assert.strictEqual(typeof redirectURI, 'string');
+    assert.strictEqual(typeof scope, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var data = [ id, appId, type, clientSecret, redirectURI, scope ];
+
+    database.query('REPLACE INTO clients (id, appId, type, clientSecret, redirectURI, scope) VALUES (?, ?, ?, ?, ?, ?)', data, function (error, result) {
+        if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS));
+        if (error || result.affectedRows === 0) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
+
+        callback(null);
+    });
+}
+
 function del(id, callback) {
     assert.strictEqual(typeof id, 'string');
     assert.strictEqual(typeof callback, 'function');

src/clients.js

@@ -14,6 +14,8 @@ exports = module.exports = {
     addClientTokenByUserId: addClientTokenByUserId,
     delToken: delToken,
 
+    addDefaultClients: addDefaultClients,
+
     // keep this in sync with start.sh ADMIN_SCOPES that generates the cid-webadmin
     SCOPE_APPS: 'apps',
     SCOPE_DEVELOPER: 'developer',
@@ -34,14 +36,16 @@ exports = module.exports = {
     TYPE_PROXY: 'addon-proxy'
 };
 
-var assert = require('assert'),
-    util = require('util'),
-    hat = require('hat'),
-    appdb = require('./appdb.js'),
-    tokendb = require('./tokendb.js'),
+var appdb = require('./appdb.js'),
+    assert = require('assert'),
     async = require('async'),
     clientdb = require('./clientdb.js'),
+    config = require('./config.js'),
     DatabaseError = require('./databaseerror.js'),
+    debug = require('debug')('box:clients'),
+    hat = require('hat'),
+    tokendb = require('./tokendb.js'),
+    util = require('util'),
     uuid = require('node-uuid');
 
 function ClientsError(reason, errorOrMessage) {
@@ -304,7 +308,7 @@ function delToken(clientId, tokenId, callback) {
     assert.strictEqual(typeof tokenId, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    get(clientId, function (error, result) {
+    get(clientId, function (error) {
         if (error) return callback(error);
 
         tokendb.del(tokenId, function (error) {
@@ -315,3 +319,20 @@ function delToken(clientId, tokenId, callback) {
         });
     });
 }
+
+function addDefaultClients(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('Adding default clients');
+
+    // The domain might have changed, therefor we have to update the record
+    // !!! This needs to be in sync with the webadmin, specifically login_callback.js
+    const ADMIN_SCOPES="cloudron,developer,profile,users,apps,settings";
+
+    // id, appId, type, clientSecret, redirectURI, scope
+    async.series([
+        clientdb.upsert.bind(null, 'cid-webadmin', 'Settings', 'built-in', 'secret-webadmin', config.adminOrigin(), ADMIN_SCOPES),
+        clientdb.upsert.bind(null, 'cid-sdk', 'SDK', 'built-in', 'secret-sdk', config.adminOrigin(), '*,roleSdk'),
+        clientdb.upsert.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', config.adminOrigin(), '*, roleSdk')
+    ], callback);
+}

src/cloudron.js

@@ -151,6 +151,7 @@ function onConfigured(callback) {
     platform.events.on(platform.EVENT_READY, onPlatformReady);
 
     async.series([
+        clients.addDefaultClients,
         cron.initialize,
         certificates.ensureFallbackCertificate,
         platform.initialize, // requires fallback certs in mail container