From 969fba83eac72b8a25baffc037792801f06b87c8 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Wed, 10 Jan 2018 15:40:39 -0800
Subject: [PATCH] Do not use config.fqdn to determine application name

---
 src/routes/oauth2.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/routes/oauth2.js b/src/routes/oauth2.js
index ce92c73dc..1dc6b4576 100644
--- a/src/routes/oauth2.js
+++ b/src/routes/oauth2.js
@@ -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) {