Procfile

@@ -1,2 +1 @@
-web: gunicorn server:app
+web: gunicorn app:app
-release: python manage.py db upgrade 

api/decorators.py

@@ -8,12 +8,9 @@ def jwt_required():
             auth_header = request.headers.get('Authorization') or None
             if auth_header:
                 auth_token = auth_header.split(" ")[1]
-                try:
+                if jwt.decode(auth_token, os.environ.get('SECRET_KEY')):
-                    if jwt.decode(auth_token, os.environ.get('SECRET_KEY')):
+                    return func(*args, **kwargs)
-                        return func(*args, **kwargs)
+                else:
-                    else:
-                        abort(401)
-                except:
                     abort(401)
             else:
                 abort(401)

api/games/api_games.py

@@ -26,6 +26,7 @@ def get_room(game_id):
         game.player_black = user['id']
         db.session.add(game)
         db.session.commit()
+    print(game.player_black)
     join_game_notice(game)
     response = {'game': game_schema.dumps(game)}
     if game.player_black:

server.py

@@ -1,32 +1,17 @@
 from app import create_app, db
-import os
 
 # Blueprints
 from api.api import register_api_endpoints
 from auth.auth import auth
 
 # Web sockets
-from websockets.socket import socketio 
+from websockets.socket import socketio
 
 import configuration.models_mount
 from flask_migrate import Migrate
 
-from flask import Blueprint, jsonify
-import psycopg2
-server = Blueprint('server', __name__, url_prefix='/')
-
-@server.route('/', methods=['GET'])
-def api_home():
-    response = {"message": "hello world"}
-    return jsonify(response)
-
-app = create_app()
-register_api_endpoints(app)
-app.register_blueprint(server)
-migrate = Migrate(app, db)
-# added 10/14
-DATABASE_URL = os.environ['DATABASE_URL']
-# conn = psycopg2.connect(DATABASE_URL, sslmode='require')
-
 if __name__ == '__main__':
-    socketio.run(app, debug=True)
+    app = create_app()
+    register_api_endpoints(app)
+    migrate = Migrate(app, db)
+    socketio.run(app, debug=True)