From a1e6e1d12888afcc330667ed5ecfef4bb2eb637b Mon Sep 17 00:00:00 2001
From: Alexei KLENIN <alexei.klenin@gmail.com>
Date: Sat, 11 Jan 2025 01:45:18 +0100
Subject: [PATCH] Fix factory method for AmazonCognitoAuth

---
 .../oauth2/providers/AmazonCognitoAuth.java   | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/vertx-auth-oauth2/src/main/java/io/vertx/ext/auth/oauth2/providers/AmazonCognitoAuth.java b/vertx-auth-oauth2/src/main/java/io/vertx/ext/auth/oauth2/providers/AmazonCognitoAuth.java
index 5ee2f99da..8c0486353 100644
--- a/vertx-auth-oauth2/src/main/java/io/vertx/ext/auth/oauth2/providers/AmazonCognitoAuth.java
+++ b/vertx-auth-oauth2/src/main/java/io/vertx/ext/auth/oauth2/providers/AmazonCognitoAuth.java
@@ -20,6 +20,7 @@
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpClientOptions;
+import io.vertx.ext.auth.JWTOptions;
 import io.vertx.ext.auth.oauth2.OAuth2Auth;
 import io.vertx.ext.auth.oauth2.OAuth2Options;
 
@@ -37,10 +38,11 @@ public interface AmazonCognitoAuth extends OpenIDConnectAuth {
    * @param region       the region to use
    * @param clientId     the client id given to you by Amazon Cognito
    * @param clientSecret the client secret given to you by Amazon Cognito
+   * @param domain       the Cognito domain
    * @param guid         the guid of your application given to you by Amazon Cognito
    */
-  static OAuth2Auth create(Vertx vertx, String region, String clientId, String clientSecret, String guid) {
-    return create(vertx, region, clientId, clientSecret, guid, new HttpClientOptions());
+  static OAuth2Auth create(Vertx vertx, String region, String clientId, String clientSecret, String domain, String guid) {
+    return create(vertx, region, clientId, clientSecret, domain, guid, new HttpClientOptions());
   }
 
   /**
@@ -49,27 +51,33 @@ static OAuth2Auth create(Vertx vertx, String region, String clientId, String cli
    * @param region            the region to use
    * @param clientId          the client id given to you by Amazon Cognito
    * @param clientSecret      the client secret given to you by Amazon Cognito
+   * @param domain            the Cognito domain
    * @param userPoolId        the userPoolId of your application given to you by Amazon Cognito
    * @param httpClientOptions custom http client options
    */
-  static OAuth2Auth create(Vertx vertx, String region, String clientId, String clientSecret, String userPoolId, HttpClientOptions httpClientOptions) {
+  static OAuth2Auth create(Vertx vertx, String region, String clientId, String clientSecret, String domain, String userPoolId, HttpClientOptions httpClientOptions) {
     if (region == null) {
       throw new IllegalStateException("region cannot be null");
     }
 
+    final String siteBase = String.format("https://cognito-idp.%s.amazonaws.com", region);
+    final String domainUrl = String.format("https://%s.auth.%s.amazoncognito.com", domain, region);
+
     return
       OAuth2Auth.create(vertx, new OAuth2Options()
         .setHttpClientOptions(httpClientOptions)
         .setClientId(clientId)
         .setClientSecret(clientSecret)
         .setTenant(userPoolId)
-        .setSite("https://cognito-idp." + region + ".amazonaws.com/{tenant}")
-        .setTokenPath("/oauth2/token")
-        .setAuthorizationPath("/oauth2/authorize")
-        .setUserInfoPath("/oauth2/userInfo")
-        .setJwkPath("/.well-known/jwks.json")
-        .setLogoutPath("/logout")
-        .setScopeSeparator("+"));
+        .setSite(siteBase + "/{tenant}")
+        .setTokenPath(domainUrl + "/oauth2/token")
+        .setAuthorizationPath(domainUrl + "/oauth2/authorize")
+        .setUserInfoPath(domainUrl + "/oauth2/userInfo")
+        .setRevocationPath(domainUrl + "/oauth/revoke")
+        .setJwkPath(siteBase + "/{tenant}/.well-known/jwks.json")
+        .setLogoutPath(domainUrl + "/logout")
+        .setScopeSeparator(" ")
+        .setJWTOptions(new JWTOptions().setIssuer(siteBase + "/{tenant}")));
   }
 
   /**