login

2 files changed, 9 insertions, 11 deletions

diff --git a/backend/src/API/AuthenticationAPI.zig b/backend/src/API/AuthenticationAPI.zig
index a792e33..9b45ff4 100644
--- a/backend/src/API/AuthenticationAPI.zig
+++ b/backend/src/API/AuthenticationAPI.zig
@@ -6,12 +6,12 @@ const errDesc = @import("ErrorDescription.zig");
 const Handler = @import("../Handler.zig");
 const Tokens = @import("../Authentication/Tokens.zig");
 
-pub fn RegisterEndpoints(router: *httpz.Router(*Handler.Handler,*const fn (*Handler.Handler, *httpz.request.Request, *httpz.response.Response) anyerror!void)) void {
+pub fn RegisterEndpoints(router: *httpz.Router(*Handler.Handler,*const fn (*Handler.RequestData, *httpz.request.Request, *httpz.response.Response) anyerror!void)) void {
     router.post("/auth/register", register, .{});
     router.post("/auth/login", login, .{});
 }
 
-fn register(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Response) !void {
+fn register(_: *Handler.RequestData, req: *httpz.Request, res: *httpz.Response) !void {
     var body = try req.json(model.RequestBody) orelse {
         res.setStatus(.bad_request);
         return;
@@ -31,7 +31,7 @@ fn register(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Response) !voi
     res.setStatus(.created);
 }
 
-fn login(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Response) !void {
+fn login(_: *Handler.RequestData, req: *httpz.Request, res: *httpz.Response) !void {
     const body = try req.json(model.RequestBody) orelse {
         res.setStatus(.bad_request);
         return;
@@ -53,6 +53,4 @@ fn login(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Response) !void {
 
     const token = try Tokens.GenerateNewSession(res.arena, user);
     try res.json(.{ .Token = token } , .{});
-
-    // TODO: add token here
 }
diff --git a/backend/src/API/WeaponsAPI.zig b/backend/src/API/WeaponsAPI.zig
index 901bbb0..66871df 100644
--- a/backend/src/API/WeaponsAPI.zig
+++ b/backend/src/API/WeaponsAPI.zig
@@ -5,7 +5,7 @@ const db = @import("../Database/Connection.zig");
 const errDesc = @import("ErrorDescription.zig");
 const Handler = @import("../Handler.zig");
 
-pub fn RegisterEndpoints(router: *httpz.Router(*Handler.Handler,*const fn (*Handler.Handler, *httpz.request.Request, *httpz.response.Response) anyerror!void)) void {
+pub fn RegisterEndpoints(router: *httpz.Router(*Handler.Handler,*const fn (*Handler.RequestData, *httpz.request.Request, *httpz.response.Response) anyerror!void)) void {
     router.get("/weapons/ranged", getAllRangedWeapons, .{});
     router.post("/weapons/ranged", newRangedWeapon, .{});
     router.get("/weapons/ranged/:id", getRangedWeaponById, .{});
@@ -13,14 +13,14 @@ pub fn RegisterEndpoints(router: *httpz.Router(*Handler.Handler,*const fn (*Hand
     router.delete("/weapons/ranged/:id", deleteRangedWeapon, .{});
 }
 
-fn getAllRangedWeapons(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Response) !void {
+fn getAllRangedWeapons(_: *Handler.RequestData, req: *httpz.Request, res: *httpz.Response) !void {
     var found = try db.RangedWeapons.GetAll(req.arena);
     defer found.deinit(req.arena);
 
     try res.json(found.items, .{});
 }
 
-fn getRangedWeaponById(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Response) !void {
+fn getRangedWeaponById(_: *Handler.RequestData, req: *httpz.Request, res: *httpz.Response) !void {
     const id = req.param("id") orelse {
         res.setStatus(.bad_request);
         return;
@@ -39,7 +39,7 @@ fn getRangedWeaponById(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Res
     try res.json(found, .{});
 }
 
-fn newRangedWeapon(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Response) !void {
+fn newRangedWeapon(_: *Handler.RequestData, req: *httpz.Request, res: *httpz.Response) !void {
     var body = try req.json(model.RequestBody) orelse {
         res.setStatus(.bad_request);
         return;
@@ -60,7 +60,7 @@ fn newRangedWeapon(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Respons
     res.setStatus(.created);
 }
 
-fn updateRangedWeapon(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Response) !void {
+fn updateRangedWeapon(_: *Handler.RequestData, req: *httpz.Request, res: *httpz.Response) !void {
     const id = req.param("id") orelse {
         res.setStatus(.bad_request);
         return;
@@ -82,7 +82,7 @@ fn updateRangedWeapon(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Resp
     };  
 }
 
-fn deleteRangedWeapon(_: *Handler.Handler, req: *httpz.Request, res: *httpz.Response) !void {
+fn deleteRangedWeapon(_: *Handler.RequestData, req: *httpz.Request, res: *httpz.Response) !void {
     const id = req.param("id") orelse {
         res.setStatus(.bad_request);
         return;