From 9c0ffb62c68632cfc3089f8df5615f6bddebfc1d Mon Sep 17 00:00:00 2001 From: jeffcheasey88 Date: Sat, 1 Feb 2025 16:19:58 +0100 Subject: [PATCH] Update framework -> move jwt depdencies from user --- PeerAtCodeFramework.jar | Bin 544536 -> 544510 bytes src/dev/peerat/backend/Main.java | 6 ++++-- src/dev/peerat/backend/model/PeerAtUser.java | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/PeerAtCodeFramework.jar b/PeerAtCodeFramework.jar index e10f0c92a3c55bf0aa6fe8c68a6e15969dfffbc2..6fed303a362dc0de1ba98a686400874de95a4b8b 100644 GIT binary patch delta 21494 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 delta 21991 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 diff --git a/src/dev/peerat/backend/Main.java b/src/dev/peerat/backend/Main.java index 2ebb89f..4956290 100644 --- a/src/dev/peerat/backend/Main.java +++ b/src/dev/peerat/backend/Main.java @@ -59,18 +59,20 @@ public class Main{ for(Entry entry : json.entries()) params.put(entry.getKey(), entry.getValue()); auth = new JwtAuthenticator().configure( (builder) -> builder.setExpectedIssuer(config.getTokenIssuer()), - (claims) -> { + (claims, user) -> { claims.setIssuer(config.getTokenIssuer()); claims.setExpirationTimeMinutesInTheFuture(config.getTokenExpiration()); + user.write(claims); }, (claims) -> new PeerAtUser(claims), params); }else{ auth = new JwtAuthenticator().configure( (builder) -> builder.setExpectedIssuer(config.getTokenIssuer()), - (claims) -> { + (claims, user) -> { claims.setIssuer(config.getTokenIssuer()); claims.setExpirationTimeMinutesInTheFuture(config.getTokenExpiration()); + user.write(claims); }, (claims) -> new PeerAtUser(claims)); JsonMap json = new JsonMap(); diff --git a/src/dev/peerat/backend/model/PeerAtUser.java b/src/dev/peerat/backend/model/PeerAtUser.java index 28d9642..84b28d8 100644 --- a/src/dev/peerat/backend/model/PeerAtUser.java +++ b/src/dev/peerat/backend/model/PeerAtUser.java @@ -14,7 +14,6 @@ public class PeerAtUser extends dev.peerat.framework.User{ this.id = ((Long) claims.getClaimValue("id")).intValue(); } - @Override public void write(JwtClaims claims){ claims.setClaim("id", this.id); }