From 510e8e89f230c81dac79b6ecd0169afa7795eefe Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 21 Mar 2016 15:22:05 -0700 Subject: [PATCH] fix a crash in DS with missing cert/key --- domain-server/src/DomainServer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index f0df67a6f6..374fbd5407 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -681,7 +681,12 @@ unsigned int DomainServer::countConnectedUsers() { } QUrl DomainServer::oauthRedirectURL() { - return QString("https://%1:%2/oauth").arg(_hostname).arg(_httpsManager->serverPort()); + if (_httpsManager) { + return QString("http://%1:%2/oauth").arg(_hostname).arg(_httpsManager->serverPort()); + } else { + qWarning() << "Attempting to determine OAuth re-direct URL with no HTTPS server configured."; + return QUrl(); + } } const QString OAUTH_CLIENT_ID_QUERY_KEY = "client_id";