Merge remote-tracking branch 'origin/master'

devkit-core/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
 
     <artifactId>devkit-core</artifactId>

devkit-utils/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
 
     <artifactId>devkit-utils</artifactId>

devkit-utils/src/main/java/cn/org/codecrafters/devkit/utils/Base64Util.java

@@ -60,6 +60,10 @@ public final class Base64Util {
 
     private static Base64.Decoder decoder;
 
+    private static Base64.Encoder urlEncoder;
+
+    private static Base64.Decoder urlDecoder;
+
     /**
      * Ensure that there is only one Base64 Encoder.
      *
@@ -84,6 +88,20 @@ public final class Base64Util {
         return decoder;
     }
 
+    private static Base64.Encoder getUrlEncoder() {
+        if (Objects.isNull(urlEncoder)) {
+            urlEncoder = Base64.getUrlEncoder();
+        }
+        return urlEncoder;
+    }
+
+    public static Base64.Decoder getUrlDecoder() {
+        if (Objects.isNull(urlDecoder)) {
+            urlDecoder = Base64.getUrlDecoder();
+        }
+        return urlDecoder;
+    }
+
     /**
      * Private constructor to prevent instantiation of the class.
      */
@@ -136,4 +154,50 @@ public final class Base64Util {
         return decode(value, StandardCharsets.UTF_8);
     }
 
+    /**
+     * Encodes the given string using the specified charset.
+     *
+     * @param value   the string to be encoded
+     * @param charset the charset to be used for encoding
+     * @return the Base64 encoded string
+     */
+    public static String encodeUrlComponents(String value, Charset charset) {
+        var encoded = getUrlEncoder().encode(value.getBytes(charset));
+
+        return new String(encoded);
+    }
+
+    /**
+     * Encodes the given string using the default UTF-8 charset.
+     *
+     * @param value the string to be encoded
+     * @return the Base64 encoded string
+     */
+    public static String encodeUrlComponents(String value) {
+        return encodeUrlComponents(value, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * Decodes the given Base64 encoded string using the specified charset.
+     *
+     * @param value   the Base64 encoded string to be decoded
+     * @param charset the charset to be used for decoding
+     * @return the decoded string
+     */
+    public static String decodeUrlComponents(String value, Charset charset) {
+        var decoded = getUrlDecoder().decode(value.getBytes(charset));
+
+        return new String(decoded);
+    }
+
+    /**
+     * Decodes the given Base64 encoded string using the default UTF-8 charset.
+     *
+     * @param value the Base64 encoded string to be decoded
+     * @return the decoded string
+     */
+    public static String decodeUrlComponents(String value) {
+        return decodeUrlComponents(value, StandardCharsets.UTF_8);
+    }
+
 }

guid/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
 
     <artifactId>guid</artifactId>

pom.xml

@@ -29,7 +29,7 @@
 
     <groupId>cn.org.codecrafters</groupId>
     <artifactId>jdevkit</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <inceptionYear>2023</inceptionYear>
 
     <packaging>pom</packaging>
@@ -93,6 +93,7 @@
         <jackson.version>2.15.2</jackson.version>
         <auth0-jwt.version>4.4.0</auth0-jwt.version>
         <jjwt-jwt.version>0.11.5</jjwt-jwt.version>
+        <ok-http.version>4.11.0</ok-http.version>
 
         <!-- Spring Dependency Versions -->
         <spring.version>6.0.9</spring.version>

property-guard-spring-boot-starter/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
 
     <artifactId>property-guard-spring-boot-starter</artifactId>

simple-jwt-authzero/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
 
     <artifactId>simple-jwt-authzero</artifactId>

simple-jwt-authzero/src/main/java/cn/org/codecrafters/simplejwt/authzero/AuthzeroTokenResolver.java

@@ -429,7 +429,7 @@ public class AuthzeroTokenResolver implements TokenResolver<DecodedJWT> {
     public <T extends TokenPayload> T extract(String token, Class<T> targetType) {
         try {
             // Get claims from token.
-            var payloads = objectMapper.readValue(Base64Util.decode(resolve(token).getPayload()), new MapTypeReference());
+            var payloads = objectMapper.readValue(Base64Util.decodeUrlComponents(resolve(token).getPayload()), new MapTypeReference());
             // Get the no-argument constructor to create an instance.
             var bean = targetType.getConstructor().newInstance();
 
@@ -478,7 +478,7 @@ public class AuthzeroTokenResolver implements TokenResolver<DecodedJWT> {
         var resolved = resolve(oldToken);
 
         try {
-            var payload = objectMapper.readValue(Base64Util.decode(resolved.getPayload()), ObjectNode.class);
+            var payload = objectMapper.readValue(Base64Util.decodeUrlComponents(resolved.getPayload()), ObjectNode.class);
             payload.remove(PredefinedKeys.KEYS);
 
             var payloadMap = objectMapper.convertValue(payload, new MapTypeReference());

simple-jwt-facade/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
 
     <artifactId>simple-jwt-facade</artifactId>

simple-jwt-jjwt/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
 
     <artifactId>simple-jwt-jjwt</artifactId>

simple-jwt-spring-boot-starter/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
 
     <artifactId>simple-jwt-spring-boot-starter</artifactId>

webcal/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>cn.org.codecrafters</groupId>
         <artifactId>jdevkit</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
     </parent>
 
     <artifactId>webcal</artifactId>