To release 5.2.1 (#142)

* EDGPATRON-157: Implement secure endpoints to support congressional loans * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} (#138) * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * EDGPATRON-160 - Updated raml pieces (#139) * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-160] - Add put API for /patron/{externalSystemId} * [EDGPATRON-161] - Extend get API for /patron/registration-status with externalSystemId (#140) * [EDGPATRON-161] - Extend get API for /patron/registration-status with {externalSystemId} * [EDGPATRON-161] - Extend get API for /patron/registration-status with {externalSystemId} * EDGPATRON-161 (#141) * [EDGPATRON-161] - Extend get API for /patron/registration-status with {externalSystemId} * [EDGPATRON-161] - Extend get API for /patron/registration-status with {externalSystemId} * [EDGPATRON-161] - Extend get API for /patron/registration-status with {externalSystemId} * [EDGPATRON-161] - Extend get API for /patron/registration-status with {externalSystemId} * [EDGPATRON-161] - Extend get API for /patron/registration-status with {externalSystemId} * Update NEWS.md --------- Co-authored-by: izhunke <[email protected]>
folio-org · Jan 13, 2025 · ab78698 · ab78698
1 parent f1259cf
commit ab78698
Show file tree

Hide file tree

Showing 27 changed files with 1,524 additions and 169 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+## 5.2.1 2025-01-13
+
+* Implement secure endpoints to support congressional loans ([EDGPATRON-157](https://issues.folio.org/browse/EDGPATRON-157))
+* Add put API for /patron/{externalSystemId} ([EDGPATRON-160](https://issues.folio.org/browse/EDGPATRON-160))
+* Extend get API for /patron/registration-status with externalSystemId ([EDGPATRON-161](https://issues.folio.org/browse/EDGPATRON-161))
+
 ## 5.2.0 2024-10-31
 
 * Add new API contract for POST and GET API of LC User registration ([EDGPATRON-151](https://issues.folio.org/browse/EDGPATRON-151))

diff --git a/README.md b/README.md
@@ -32,20 +32,28 @@ Configuration information is specified in two forms:
 
 ### System Properties
 
-| Property                      | Default             | Description                                                                |
-|-------------------------------|---------------------|----------------------------------------------------------------------------|
-| `port`                        | `8081`              | Server port to listen on                                                   |
-| `okapi_url`                   | *required*          | Where to find Okapi (URL)                                                  |
-| `secure_store`                | `Ephemeral`         | Type of secure store to use.  Valid: `Ephemeral`, `AwsSsm`, `Vault`        |
-| `secure_store_props`          | `NA`                | Path to a properties file specifying secure store configuration            |
-| `token_cache_ttl_ms`          | `3600000`           | How long to cache JWTs, in milliseconds (ms)                               |
-| `null_token_cache_ttl_ms`     | `30000`             | How long to cache login failures (null JWTs), in milliseconds (ms)         |
-| `token_cache_capacity`        | `100`               | Max token cache size                                                       |
-| `patron_id_cache_ttl_ms`      | `3600000`           | How long to cache patron ID mappings in milliseconds (ms)                  |
-| `null_patron_id_cache_ttl_ms` | `30000`             | How long to cache patron lookup failures in milliseconds (ms)              |
-| `patron_id_cache_capacity`    | `1000`              | Max token cache size                                                       |
-| `log_level`                   | `INFO`              | Log4j Log Level                                                            |
-| `request_timeout_ms`          | `30000`             | Request Timeout                                                            |
+| Property                         | Default             | Description                                                                |
+|----------------------------------|---------------------|----------------------------------------------------------------------------|
+| `port`                           | `8081`              | Server port to listen on                                                   |
+| `okapi_url`                      | *required*          | Where to find Okapi (URL)                                                  |
+| `secure_store`                   | `Ephemeral`         | Type of secure store to use.  Valid: `Ephemeral`, `AwsSsm`, `Vault`        |
+| `secure_store_props`             | `NA`                | Path to a properties file specifying secure store configuration            |
+| `token_cache_ttl_ms`             | `3600000`           | How long to cache JWTs, in milliseconds (ms)                               |
+| `null_token_cache_ttl_ms`        | `30000`             | How long to cache login failures (null JWTs), in milliseconds (ms)         |
+| `token_cache_capacity`           | `100`               | Max token cache size                                                       |
+| `patron_id_cache_ttl_ms`         | `3600000`           | How long to cache patron ID mappings in milliseconds (ms)                  |
+| `null_patron_id_cache_ttl_ms`    | `30000`             | How long to cache patron lookup failures in milliseconds (ms)              |
+| `patron_id_cache_capacity`       | `1000`              | Max token cache size                                                       |
+| `keycloak_key_cache_ttl_ms`      | `3600000`           | How long to cache patron ID mappings in milliseconds (ms)                  |
+| `null_keycloak_key_cache_ttl_ms` | `30000`             | How long to cache patron lookup failures in milliseconds (ms)              |
+| `keycloak_key_cache_capacity`    | `1000`              | Max token cache size                                                       |
+| `log_level`                      | `INFO`              | Log4j Log Level                                                            |
+| `request_timeout_ms`             | `30000`             | Request Timeout                                                            |
+
+### Env variables for secure requests
+| Property | Default        | Description                              |
+|----------|----------------|------------------------------------------|
+| `KC_URL` | ``             | Keycloak url for secure token validation |
 
 ### Env variables for TLS configuration for Http server
 

diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
@@ -5,7 +5,7 @@
   "requires": [
     {
       "id": "patron",
-      "version": "6.0"
+      "version": "6.3"
     },
     {
       "id": "circulation",

diff --git a/pom.xml b/pom.xml
@@ -86,8 +86,13 @@
     </dependency>
     <dependency>
       <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt-api</artifactId>
-      <version>0.11.5</version>
+      <artifactId>jjwt-impl</artifactId>
+      <version>0.12.6</version>
+    </dependency>
+    <dependency>
+      <groupId>io.jsonwebtoken</groupId>
+      <artifactId>jjwt-jackson</artifactId>
+      <version>0.12.6</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>