Merge pull request #59 from Authing/feat/authorizeurl-tenant-accesstoken-aud

feat: oidc/auth 支持多租户, access_token 解析支持 tenant_id 属性

Author: lixpng

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cn.authing</groupId>
     <artifactId>authing-java-sdk</artifactId>
-    <version>3.1.4</version>
+    <version>3.1.5</version>
 
     <name>Authing Java SDK</name>
     <description>java backend sdk for authing</description>

src/main/java/cn/authing/sdk/java/client/AuthenticationClient.java

@@ -388,6 +388,11 @@ public String buildAuthorizeUrl(IOidcParams params) {
             map.put("prompt", params.getScope() != null && params.getScope().contains("offline_access") ? "consent"
                             : null);
         }
+
+        if (StrUtil.isNotBlank(params.getTenantId())) {
+            map.put("tenant_id", params.getTenantId());
+        }
+
         return HttpUtils.buildUrlWithQueryParams(options.getAppHost() + "/oidc/auth", map);
     }
 
@@ -461,6 +466,10 @@ public String buildAuthorizeUrl(IOauthParams params) {
                 params.getScope() != null && params.getScope().contains("offline_access") ? "consent"
                         : null);
 
+        if (StrUtil.isNotBlank(params.getTenantId())) {
+            map.put("tenant_id", params.getTenantId());
+        }
+
         return HttpUtils.buildUrlWithQueryParams(options.getAppHost() + "/oidc/auth", map);
     }
 

src/main/java/cn/authing/sdk/java/dto/authentication/AccessToken.java

@@ -45,6 +45,12 @@ public class AccessToken {
     @JsonProperty("aud")
     private String aud;
 
+    /**
+     * 租户 ID
+     */
+    @JsonProperty("tenant_id")
+    private String tenantId;
+
     public String getJti() {
         return jti;
     }
@@ -100,4 +106,12 @@ public String getAud() {
     public void setAud(String aud) {
         this.aud = aud;
     }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
 }

src/main/java/cn/authing/sdk/java/dto/authentication/IOauthParams.java

@@ -9,6 +9,11 @@ public class IOauthParams {
 
     private String redirectUri;
 
+    /**
+     * Tenant ID, optional field
+     */
+    private String tenantId;
+
     public String getScope() {
         return scope;
     }
@@ -40,4 +45,12 @@ public String getRedirectUri() {
     public void setRedirectUri(String redirectUri) {
         this.redirectUri = redirectUri;
     }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
 }

src/main/java/cn/authing/sdk/java/dto/authentication/IOidcParams.java

@@ -17,6 +17,11 @@ public class IOidcParams {
 
     private String prompt;
 
+    /**
+     * Tenant ID, optional field
+     */
+    private String tenantId;
+
     public String getScope() {
         return scope;
     }
@@ -72,4 +77,12 @@ public void setPrompt(String prompt) {
     public String getPrompt() {
         return prompt;
     }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
 }