Merge pull request #27 from oesteban/master

[ENH] Reset old default token
nipreps · Jun 5, 2017 · 80d5137 · 80d5137
2 parents b97c6fa + d6264b9
commit 80d5137
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/circle.yml b/circle.yml
@@ -1,14 +1,14 @@
 dependencies:
   override:
-    - pip install docker-compose 
+    - pip install docker-compose
     - pip install requests
 
 machine:
     environment:
         SECRET_KEY: CI
         MONGODB_HOST: mongodb
         MONGODB_PORT: 27017
-        API_TOKEN: afaketoken
+        API_TOKEN: <secret_token>
         API_URL: "http://localhost/docs/api"
     services:
         - docker

diff --git a/dockereve-master/.env b/dockereve-master/.env
@@ -1,5 +1,5 @@
 MONGODB_HOST=mongodb
 MONGODB_PORT=27017
 
-API_TOKEN=afaketoken
+API_TOKEN=<secret_token>
 API_URL=http://localhost/docs/api
diff --git a/dockereve-master/eve-app/app.py b/dockereve-master/eve-app/app.py
@@ -9,9 +9,11 @@
 from eve_swagger import swagger
 from settings import settings
 
+API_TOKEN = os.environ.get("API_TOKEN")
+
 class TokenAuth(TokenAuth):
     def check_auth(self, token, allowed_roles, resource, method):
-        return token == os.environ.get("API_TOKEN", '<secret_token>')
+        return token == API_TOKEN
 
 app = Eve(settings=settings, auth=TokenAuth)
 app.register_blueprint(swagger, url_prefix='/docs/api')