From 1c2032790a156c81f9513bd58dc67eefc42376d1 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 25 Apr 2014 17:02:19 -0700
Subject: [PATCH] allow passing of OAuth client secret to DS on command-line

---
 domain-server/src/DomainServer.cpp | 9 +++++++--
 domain-server/src/DomainServer.h   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 650c79c5c7..75411ef936 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -153,15 +153,20 @@ bool DomainServer::optionallyReadX509KeyAndCertificate() {
 bool DomainServer::optionallySetupOAuth() {
     const QString OAUTH_PROVIDER_URL_OPTION = "oauth-provider";
     const QString OAUTH_CLIENT_ID_OPTION = "oauth-client-id";
+    const QString OAUTH_CLIENT_SECRET_ENV = "DOMAIN_SERVER_CLIENT_SECRET";
     const QString REDIRECT_HOSTNAME_OPTION = "hostname";
     
     _oauthProviderURL = QUrl(_argumentVariantMap.value(OAUTH_PROVIDER_URL_OPTION).toString());
     _oauthClientID = _argumentVariantMap.value(OAUTH_CLIENT_ID_OPTION).toString();
+    _oauthClientSecret = QProcessEnvironment::systemEnvironment().value(OAUTH_CLIENT_SECRET_ENV);
     QString oauthRedirectHostname = _argumentVariantMap.value(REDIRECT_HOSTNAME_OPTION).toString();
     
     if (!_oauthProviderURL.isEmpty() || !oauthRedirectHostname.isEmpty() || !_oauthClientID.isEmpty()) {
-        if (_oauthProviderURL.isEmpty() || oauthRedirectHostname.isEmpty() || _oauthClientID.isEmpty()) {
-            qDebug() << "Missing OAuth provider URL or hostname. domain-server will now quit.";
+        if (_oauthProviderURL.isEmpty()
+            || oauthRedirectHostname.isEmpty()
+            || _oauthClientID.isEmpty()
+            || _oauthClientSecret.isEmpty()) {
+            qDebug() << "Missing OAuth provider URL, hostname, client ID, or client secret. domain-server will now quit.";
             QMetaObject::invokeMethod(this, "quit", Qt::QueuedConnection);
             return false;
         } else {
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 2a81c2921d..da43e76d60 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -99,6 +99,7 @@ private:
     
     QUrl _oauthProviderURL;
     QString _oauthClientID;
+    QString _oauthClientSecret;
 };
 
 #endif // hifi_DomainServer_h