Reorganizing API

README.md

@@ -3,17 +3,28 @@
 ## Back End
 
 ```
-Pages/Form Endpoints
-GET  / -> Page with 3 forms for set name, new game, and join game
-POST /name -> Receive name (and secret?) from form
-POST /newGame -> Receive time limit from form
-POST /joinGame -> Receive ID from form
-GET  /summary/{ID} -> Return page summarizing game
-GET  /play/{ID} -> returns Front End w/ ID and name set
-
 API Endpoints
+GET /
+    Returns {
+        "version": string
+    }
+POST /name
+    Accepts {
+        "name": string,
+        "secret": string
+    }
+    Returns 400 vs 204, sets session cookie
+PUT /game
+    Requires session cookie
+    Accepts {
+        "timer": number
+    }
+    Returns {
+        "gameId": string
+    }
 GET /game/{ID}
-    {
+    Requires session cookie
+    Returns {
         "timer": number,
         "coords": {
             "1": {
@@ -23,7 +34,8 @@ GET /game/{ID}
         }
     }
 GET /game/{ID}/guesses/{name}
-    {
+    Requires session cookie
+    Returns {
         "currentRound": string || null,
         "guesses": {
             "1": {
@@ -34,11 +46,12 @@ GET /game/{ID}/guesses/{name}
         }
     }
 POST /game/{ID}/guesses/{name}/{round}
+    Requires session cookie
     Accepts {
         "lat": number,
         "lon": number,
     }
-    400 vs 201
+    Returns 400 vs 201
 ```
 
 ## Front End

server/app.py

@@ -2,7 +2,7 @@ from flask import Flask
 import toml
 
 from db import db
-from forms import forms
+from misc_api import misc
 from game_api import game
 
 
@@ -17,7 +17,7 @@ def init_app():
     app.config["SQLALCHEMY_DATABASE_URI"] = secrets["db_uri"]
     app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
-    app.register_blueprint(forms)
+    app.register_blueprint(misc)
     app.register_blueprint(game, url_prefix="/game")
 
     db.init_app(app)

server/db.py

@@ -5,6 +5,8 @@ db = SQLAlchemy()
 class Game(db.Model):
     game_id = db.Column(db.String, primary_key=True)
     timer = db.Column(db.Integer)
+    creator = db.Column(db.String)
 
     def __str__(self):
         return f"Game({self.game_id}, {self.timer})"
+

server/forms.py

@@ -1,28 +0,0 @@
-from flask import Blueprint
-
-forms = Blueprint("forms", __name__)
-
-
-@forms.route("/")
-def home():
-    pass
-
-
-@forms.route("/name", methods=["POST"])
-def set_name():
-    pass
-
-
-@forms.route("/newGame", methods=["POST"])
-def new_game():
-    pass
-
-
-@forms.route("/joinGame", methods=["POST"])
-def join_game():
-    pass
-
-
-@forms.route("/summary/<game_id>")
-def summary(game_id):
-    pass

server/game_api.py

@@ -1,8 +1,22 @@
-from flask import Blueprint, jsonify
+from functools import wraps
+
+from flask import Blueprint, session, abort
 
 game = Blueprint("game", __name__)
 
 
+def require_name():
+    name = session.get("name", None)
+    if name is None:
+        abort(401)
+    return name
+
+
+@game.route("/", methods=["PUT"])
+def create_game():
+    pass
+
+
 @game.route("/<game_id>")
 def game_settings(game_id):
     pass

server/misc_api.py

@@ -0,0 +1,20 @@
+from flask import Blueprint, jsonify, session, request, current_app, abort
+
+misc = Blueprint("misc", __name__)
+
+
+@misc.route("/")
+def version():
+    return jsonify({"version": "1"})
+
+
+@misc.route("/name", methods=["POST"])
+def name():
+    js = request.json()
+    if current_app.config["GROUP_PASS"] != js.get("secret", None):
+        abort(400)
+    name = js.get("name", None)
+    if name is None:
+        abort(400)
+    session["name"] = name
+    return "", 204