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

Do not use config.fqdn to determine application name

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-01-10 15:40:39 -08:00
parent 70a15d01c9
commit 969fba83ea
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/routes/oauth2.js
View File

@@ -1,7 +1,6 @@
'use strict';
var appdb = require('../appdb'),
apps = require('../apps'),
var apps = require('../apps'),
assert = require('assert'),
auth = require('../auth.js'),
authcodedb = require('../authcodedb'),
@@ -237,10 +236,10 @@ function loginForm(req, res) {
default: break;
}
appdb.get(result.appId, function (error, result) {
apps.get(result.appId, function (error, result) {
if (error) return sendErrorPageOrRedirect(req, res, 'Unknown Application for those OAuth credentials');
var applicationName = result.location || config.fqdn();
var applicationName = result.altDomain || result.intrinsicFqdn;
render(applicationName, '/api/v1/apps/' + result.id + '/icon');
});
});
@@ -452,7 +451,7 @@ var authorization = [
return next();
}
appdb.get(req.oauth2.client.appId, function (error, appObject) {
apps.get(req.oauth2.client.appId, function (error, appObject) {
if (error) return sendErrorPageOrRedirect(req, res, 'Invalid request. Unknown app for this client_id.');
apps.hasAccessTo(appObject, req.oauth2.user, function (error, access) {