Testing is complete!! And a nice build runner script to boot

backend/lib/authenticator.dart

@@ -4,6 +4,7 @@ import 'package:backend/database.dart';
 import 'package:backend/service/db_access.dart';
 import 'package:dart_jsonwebtoken/dart_jsonwebtoken.dart';
 import 'package:logging/logging.dart';
+import 'package:shared_models/jwt.dart';
 import 'package:shared_models/user.dart';
 
 final jwtSecret = _getSecret();
@@ -18,21 +19,16 @@ enum JWTTokenStatus {
 }
 
 class Authenticator {
-  Future<String?> generateToken(CreateUserRequest req) async {
+  Future<(String?, User?)> generateToken(CreateUserRequest req) async {
     final newUser = await Db.createUser(username: req.username, roomCode: req.roomCode);
-    if (newUser == null) return null;
+    if (newUser == null) return (null, null);
 
     final iat = DateTime.now().millisecondsSinceEpoch ~/ 1000;
     final jwt = JWT(
-      {
-        'uid': newUser.uuid,
-        'roomUuid': newUser.gameRoomUuid,
-        'iat': iat,
-        'exp': iat + expTimeSecs,
-      },
+      JWTBody(uuid: newUser.uuid, roomUuid: newUser.gameRoomUuid, iat: iat, exp: iat + expTimeSecs).toJson(),
     );
 
-    return jwt.sign(SecretKey(jwtSecret));
+    return (jwt.sign(SecretKey(jwtSecret)), newUser);
   }
 
   Future<(User?, JWTTokenStatus)> verifyToken(
@@ -45,18 +41,15 @@ class Authenticator {
         SecretKey(jwtSecret),
       );
 
-      final payloadData = payload.payload as Map<String, dynamic>;
+      final jwt = JWTBody.fromJson(payload.payload as Map<String, dynamic>);
 
-      final iat = payloadData['iat'] as int;
-      final exp = payloadData['exp'] as int;
-
-      if (iat + expTimeSecs != exp || DateTime.now().millisecondsSinceEpoch ~/ 1000 > exp) {
+      if (jwt.iat + expTimeSecs != jwt.exp || DateTime.now().millisecondsSinceEpoch ~/ 1000 > jwt.exp) {
         return (null, JWTTokenStatus.expired);
       }
 
-      final uuid = payloadData['uuid'] as String;
-      return (await Db.getUser(uuid), JWTTokenStatus.valid);
+      return (await Db.getUserById(jwt.uuid), JWTTokenStatus.valid);
     } catch (e) {
+      log.fine('Error verifying token', e);
       return (null, JWTTokenStatus.invalid);
     }
   }

backend/lib/middleware/auth_middleware.dart

@@ -22,7 +22,7 @@ Middleware tokenAuthMiddleware({
         }
         final auth = context.read<Authenticator>();
         // use `auth.verifyToken(token)` to check the jwt that came in the request header bearer
-        final authHeader = context.request.headers['authorization'];
+        final authHeader = context.request.headers['authorization'] ?? context.request.headers['Authorization'];
         final auths = authHeader?.split(' ');
         if (authHeader == null || !authHeader.startsWith('Bearer ') || auths == null || auths.length != 2) {
           log.fine('Denied request - No Auth - ${context.request.method.value} ${context.request.uri.path}');
@@ -34,7 +34,8 @@ Middleware tokenAuthMiddleware({
 
         if (user == null) {
           log.fine(
-              'Denied request - Bad Auth:$tokStatus - ${context.request.method.value} ${context.request.uri.path}, no auth');
+            'Denied request - Bad Auth:$tokStatus - ${context.request.method.value} ${context.request.uri.path}',
+          );
           return Response(statusCode: HttpStatus.unauthorized);
         }
 

backend/lib/service/db_access.dart

@@ -8,9 +8,9 @@ final log = Logger('Db');
 class Db {
   static final _db = AppDatabase();
 
-  static Future<User> getUser(String uuid) {
+  static Future<User?> getUserById(String uuid) {
     log.finer('Getting user $uuid');
-    return _db.managers.users.filter((f) => f.uuid.equals(uuid)).getSingle();
+    return _db.managers.users.filter((f) => f.uuid.equals(uuid)).getSingleOrNull();
   }
 
   static Future<User?> createUser({required String username, required String roomCode}) async {
@@ -32,14 +32,21 @@ class Db {
     });
   }
 
-  static Future<GameRoom> createRoom({required String roomCode}) => _db.managers.gameRooms
-          .createReturning(
+  static Future<GameRoom?> createRoom({required String roomCode}) => _db.managers.gameRooms
+          .createReturningOrNull(
         (o) => o(createdAt: Value(DateTime.now()), status: GameStatus.open, uuid: const Uuid().v4(), code: roomCode),
       )
           .catchError(
         (Object err) {
           log.severe('Failed to create room', err, StackTrace.current);
-          throw Exception(err.toString());
+          return null;
         },
       );
+
+  static Future<GameRoom?> getRoomByCode(String? roomCode) async {
+    final room = await _db.managers.gameRooms
+        .filter((f) => f.code.equals(roomCode) & f.status.isIn([GameStatus.open, GameStatus.running]))
+        .getSingleOrNull();
+    return room;
+  }
 }