jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Show cloudron name for webadmin login

Browse Source 
Fixes #80
This commit is contained in:
Johannes Zellner
2016-10-13 13:27:58 +02:00
parent e533f506cc
commit bca57b5e47
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/routes/oauth2.js
View File

@@ -18,6 +18,7 @@ var appdb = require('../appdb'),
passport = require('passport'), passport = require('passport'),
querystring = require('querystring'), querystring = require('querystring'),
session = require('connect-ensure-login'), session = require('connect-ensure-login'),
settings = require('../settings'),
tokendb = require('../tokendb'), tokendb = require('../tokendb'),
url = require('url'), url = require('url'),
user = require('../user.js'), user = require('../user.js'),
@@ -207,11 +208,22 @@ function loginForm(req, res) {
}); });
} }
function renderBuiltIn() {
settings.getCloudronName(function (error, cloudronName) {
if (error) {
console.error(error);
cloudronName = 'Cloudron';
}
render(cloudronName, '/api/v1/cloudron/avatar');
});
}
clients.get(u.query.client_id, function (error, result) { clients.get(u.query.client_id, function (error, result) {
if (error) return sendError(req, res, 'Unknown OAuth client'); if (error) return sendError(req, res, 'Unknown OAuth client');
switch (result.type) { switch (result.type) {
case clients.TYPE_BUILT_IN: return render(result.appId, '/api/v1/cloudron/avatar'); case clients.TYPE_BUILT_IN: return renderBuiltIn();
case clients.TYPE_EXTERNAL: return render(result.appId, '/api/v1/cloudron/avatar'); case clients.TYPE_EXTERNAL: return render(result.appId, '/api/v1/cloudron/avatar');
case clients.TYPE_SIMPLE_AUTH: return sendError(req, res, 'Unknown OAuth client'); case clients.TYPE_SIMPLE_AUTH: return sendError(req, res, 'Unknown OAuth client');
default: break; default: break;