Merge branch 'master' into proxy-to-alpha

Conflicts: config.py
2026-02-02 08:45:16 -05:00 · 2016-01-19 14:11:20 +00:00
parent a56c7f59d3 6141a11e7f
commit 7ecede46e5
4 changed files with 30 additions and 33 deletions
--- a/app/authentication/auth.py
+++ b/app/authentication/auth.py
@@ -46,7 +46,14 @@ def requires_auth():


 def fetch_client(client):
-    return {
-        "client": client,
-        "secret": get_unsigned_secret(client)
-    }
+    from flask import current_app
+    if client == current_app.config.get('ADMIN_CLIENT_USER_NAME'):
+        return {
+            "client": client,
+            "secret": current_app.config.get('ADMIN_CLIENT_SECRET')
+        }
+    else:
+        return {
+            "client": client,
+            "secret": get_unsigned_secret(client)
+        }