diff --git a/src/addons.js b/src/addons.js index 8671f6d33..5d1538381 100644 --- a/src/addons.js +++ b/src/addons.js @@ -283,19 +283,18 @@ function setupOauth(app, options, callback) { assert.strictEqual(typeof callback, 'function'); var appId = app.id; - var clientSecret = hat(256); var redirectURI = 'https://' + config.appFqdn(app.location); var scope = 'profile'; clients.delByAppIdAndType(appId, clients.TYPE_OAUTH, function (error) { // remove existing creds if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error); - clients.add(appId, clients.TYPE_OAUTH, clientSecret, redirectURI, scope, function (error, result) { + clients.add(appId, clients.TYPE_OAUTH, redirectURI, scope, function (error, result) { if (error) return callback(error); var env = [ 'OAUTH_CLIENT_ID=' + result.id, - 'OAUTH_CLIENT_SECRET=' + clientSecret, + 'OAUTH_CLIENT_SECRET=' + result.clientSecret, 'OAUTH_ORIGIN=' + config.adminOrigin() ]; @@ -331,7 +330,7 @@ function setupSimpleAuth(app, options, callback) { clients.delByAppIdAndType(app.id, clients.TYPE_SIMPLE_AUTH, function (error) { // remove existing creds if (error && error.reason !== DatabaseError.NOT_FOUND) return callback(error); - clients.add(appId, clients.TYPE_SIMPLE_AUTH, '', '', scope, function (error, result) { + clients.add(appId, clients.TYPE_SIMPLE_AUTH, '', scope, function (error, result) { if (error) return callback(error); var env = [ diff --git a/src/apptask.js b/src/apptask.js index 53e91b74e..27f241d9d 100644 --- a/src/apptask.js +++ b/src/apptask.js @@ -44,7 +44,6 @@ var addons = require('./addons.js'), docker = require('./docker.js'), ejs = require('ejs'), fs = require('fs'), - hat = require('hat'), manifestFormat = require('cloudron-manifestformat'), net = require('net'), nginx = require('./nginx.js'), @@ -162,11 +161,10 @@ function allocateOAuthProxyCredentials(app, callback) { if (!nginx.requiresOAuthProxy(app)) return callback(null); - var clientSecret = hat(256); var redirectURI = 'https://' + config.appFqdn(app.location); var scope = 'profile'; - clients.add(app.id, clients.TYPE_PROXY, clientSecret, redirectURI, scope, callback); + clients.add(app.id, clients.TYPE_PROXY, redirectURI, scope, callback); } function removeOAuthProxyCredentials(app, callback) {