2 files changed, 7 insertions, 17 deletions
diff --git a/api/game/info.py b/api/game/info.py
index 73c31ff..b150dbc 100644
--- a/api/game/info.py
+++ b/api/game/info.py
@@ -4,6 +4,7 @@ from db import cursor
 from user.info import format_user
 from rating import outcome
 from ruleset import resolve_ruleset
+from hierarchy import game_id_with_viewer
 import valid
 
 
@@ -33,6 +34,7 @@ def format_game(game_id, user_id=None):
 	is_player_1 = game[4] != user_id
 
 	# get opponent from perspective of `user_id`
+	#TODO: return .players as array of player_1 and player_2 but format_user()'d
 	opponent = game[4] if is_player_1 else game[3]
 
 	# parse moves into list and return empty list if moves string is empty
@@ -61,20 +63,9 @@ game_info = Blueprint('game_info', __name__)
 
 
 @game_info.route('/info', methods=['POST'])
-def index():
-	data = request.get_json()
-	if not data: return "", 400
-
-	game_id = data.get("id") or ""
-	if not game_id: return "", 400
-
-	user_id = None
-	token = request.cookies.get("token") or ""
-	if token: user_id = token_login(token)
-
-	if not valid.game_id(game_id): return "", 403
-
-	return format_game(game_id, user_id), 200
+@game_id_with_viewer
+def index(game_id, viewer):
+	return format_game(game_id, viewer), 200
 
 
 dynamic_route = ["/game", game_info]
diff --git a/api/game/socket.py b/api/game/socket.py
index 6038586..69dc07e 100644
--- a/api/game/socket.py
+++ b/api/game/socket.py
@@ -4,7 +4,6 @@ from game.voerbak_connector import bord
 from db import cursor, connection
 from socket_io import io
 from hierarchy import io_auth_required
-from auth.login_token import token_login
 import time
 import json
 
@@ -23,12 +22,12 @@ def participants_only(func):
 		game_id = data["game_id"]
 
 		if not game_id or \
-           not game_id in games:
+                 not game_id in games:
 			return
 
 		game = games[game_id]
 		if game.player_1_id != user_id and \
-           game.player_2_id != user_id:
+                 game.player_2_id != user_id:
 			return
 
 		return func(data, user_id, game)