new optional tenant id param added (breaking)

lyleschemmerling · lyleschemmerling · commit 7be8e6499c91 · 2025-09-17T16:47:58.000-06:00
diff --git a/src/main/api/approveDevice.json b/src/main/api/approveDevice.json
@@ -41,6 +41,14 @@
       "type": "form",
       "parameterName": "user_code",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "form",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/clientCredentialsGrant.json b/src/main/api/clientCredentialsGrant.json
@@ -44,6 +44,14 @@
       ],
       "type": "form",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "form",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/exchangeOAuthCodeForAccessToken.json b/src/main/api/exchangeOAuthCodeForAccessToken.json
@@ -52,6 +52,14 @@
       ],
       "type": "form",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "form",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/exchangeOAuthCodeForAccessTokenUsingPKCE.json b/src/main/api/exchangeOAuthCodeForAccessTokenUsingPKCE.json
@@ -60,6 +60,14 @@
       ],
       "type": "form",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "form",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/exchangeRefreshTokenForAccessToken.json b/src/main/api/exchangeRefreshTokenForAccessToken.json
@@ -60,6 +60,14 @@
       ],
       "type": "form",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request. Required if the request is for a universal application."
+      ],
+      "type": "form",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/exchangeUserCredentialsForAccessToken.json b/src/main/api/exchangeUserCredentialsForAccessToken.json
@@ -68,6 +68,14 @@
       ],
       "type": "form",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "form",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/introspectAccessToken.json b/src/main/api/introspectAccessToken.json
@@ -24,6 +24,14 @@
       ],
       "type": "form",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "form",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/introspectClientCredentialsAccessToken.json b/src/main/api/introspectClientCredentialsAccessToken.json
@@ -16,6 +16,14 @@
       ],
       "type": "form",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "form",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/retrieveUserCode.json b/src/main/api/retrieveUserCode.json
@@ -37,6 +37,15 @@
       "type": "form",
       "parameterName": "user_code",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "urlParameter",
+      "parameterName": "tenantId",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/retrieveUserCodeUsingAPIKey.json b/src/main/api/retrieveUserCodeUsingAPIKey.json
@@ -21,6 +21,15 @@
       "type": "form",
       "parameterName": "user_code",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "urlParameter",
+      "parameterName": "tenantId",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/retrieveUserInfoFromAccessToken.json b/src/main/api/retrieveUserInfoFromAccessToken.json
@@ -17,6 +17,15 @@
       ],
       "type": "notUsed",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "urlParameter",
+      "parameterName": "tenantId",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/api/validateDevice.json b/src/main/api/validateDevice.json
@@ -27,6 +27,15 @@
       "type": "urlParameter",
       "parameterName": "client_id",
       "javaType": "String"
+    },
+    {
+      "name": "tenantId",
+      "comments": [
+        "(Optional) The Id of the tenant to use for this request."
+      ],
+      "type": "urlParameter",
+      "parameterName": "tenantId",
+      "javaType": "UUID"
     }
   ]
 }
diff --git a/src/main/client/java.client.ftl b/src/main/client/java.client.ftl
@@ -363,8 +363,16 @@ public class FusionAuthClient {
   [#if formPost]
     Map<String, List<String>> parameters = new HashMap<>();
     [#list api.params![] as param]
+      [#assign pval = param.name /]
       [#if param.type == "form"]
-    parameters.put("${param.name}", Arrays.asList(${(param.constant?? && param.constant)?then("\""+param.value+"\"", param.name)}));
+      [#if param.constant?? && param.constant]
+        [#assign pval = "\""+param.value+"\"" /]
+      [#else]
+        [#if param.javaType != "String"]
+          [#assign pval = "\"\" + ${param.name}" /]
+        [/#if]
+      [/#if]
+    parameters.put("${param.name}", Arrays.asList(${pval}));
       [/#if]
     [/#list]
   [/#if]

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,14 @@`
`41`	`41`	`"type": "form",`
`42`	`42`	`"parameterName": "user_code",`
`43`	`43`	`"javaType": "String"`
	`44`	`+ },`
	`45`	`+ {`
	`46`	`+ "name": "tenantId",`
	`47`	`+ "comments": [`
	`48`	`+ "(Optional) The Id of the tenant to use for this request."`
	`49`	`+ ],`
	`50`	`+ "type": "form",`
	`51`	`+ "javaType": "UUID"`
`44`	`52`	`}`
`45`	`53`	`]`
`46`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,14 @@`
`44`	`44`	`],`
`45`	`45`	`"type": "form",`
`46`	`46`	`"javaType": "String"`
	`47`	`+ },`
	`48`	`+ {`
	`49`	`+ "name": "tenantId",`
	`50`	`+ "comments": [`
	`51`	`+ "(Optional) The Id of the tenant to use for this request."`
	`52`	`+ ],`
	`53`	`+ "type": "form",`
	`54`	`+ "javaType": "UUID"`
`47`	`55`	`}`
`48`	`56`	`]`
`49`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,14 @@`
`52`	`52`	`],`
`53`	`53`	`"type": "form",`
`54`	`54`	`"javaType": "String"`
	`55`	`+ },`
	`56`	`+ {`
	`57`	`+ "name": "tenantId",`
	`58`	`+ "comments": [`
	`59`	`+ "(Optional) The Id of the tenant to use for this request."`
	`60`	`+ ],`
	`61`	`+ "type": "form",`
	`62`	`+ "javaType": "UUID"`
`55`	`63`	`}`
`56`	`64`	`]`
`57`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,14 @@`
`60`	`60`	`],`
`61`	`61`	`"type": "form",`
`62`	`62`	`"javaType": "String"`
	`63`	`+ },`
	`64`	`+ {`
	`65`	`+ "name": "tenantId",`
	`66`	`+ "comments": [`
	`67`	`+ "(Optional) The Id of the tenant to use for this request."`
	`68`	`+ ],`
	`69`	`+ "type": "form",`
	`70`	`+ "javaType": "UUID"`
`63`	`71`	`}`
`64`	`72`	`]`
`65`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,14 @@`
`68`	`68`	`],`
`69`	`69`	`"type": "form",`
`70`	`70`	`"javaType": "String"`
	`71`	`+ },`
	`72`	`+ {`
	`73`	`+ "name": "tenantId",`
	`74`	`+ "comments": [`
	`75`	`+ "(Optional) The Id of the tenant to use for this request."`
	`76`	`+ ],`
	`77`	`+ "type": "form",`
	`78`	`+ "javaType": "UUID"`
`71`	`79`	`}`
`72`	`80`	`]`
`73`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,14 @@`
`24`	`24`	`],`
`25`	`25`	`"type": "form",`
`26`	`26`	`"javaType": "String"`
	`27`	`+ },`
	`28`	`+ {`
	`29`	`+ "name": "tenantId",`
	`30`	`+ "comments": [`
	`31`	`+ "(Optional) The Id of the tenant to use for this request."`
	`32`	`+ ],`
	`33`	`+ "type": "form",`
	`34`	`+ "javaType": "UUID"`
`27`	`35`	`}`
`28`	`36`	`]`
`29`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,14 @@`
`16`	`16`	`],`
`17`	`17`	`"type": "form",`
`18`	`18`	`"javaType": "String"`
	`19`	`+ },`
	`20`	`+ {`
	`21`	`+ "name": "tenantId",`
	`22`	`+ "comments": [`
	`23`	`+ "(Optional) The Id of the tenant to use for this request."`
	`24`	`+ ],`
	`25`	`+ "type": "form",`
	`26`	`+ "javaType": "UUID"`
`19`	`27`	`}`
`20`	`28`	`]`
`21`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,15 @@`
`37`	`37`	`"type": "form",`
`38`	`38`	`"parameterName": "user_code",`
`39`	`39`	`"javaType": "String"`
	`40`	`+ },`
	`41`	`+ {`
	`42`	`+ "name": "tenantId",`
	`43`	`+ "comments": [`
	`44`	`+ "(Optional) The Id of the tenant to use for this request."`
	`45`	`+ ],`
	`46`	`+ "type": "urlParameter",`
	`47`	`+ "parameterName": "tenantId",`
	`48`	`+ "javaType": "UUID"`
`40`	`49`	`}`
`41`	`50`	`]`
`42`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,15 @@`
`21`	`21`	`"type": "form",`
`22`	`22`	`"parameterName": "user_code",`
`23`	`23`	`"javaType": "String"`
	`24`	`+ },`
	`25`	`+ {`
	`26`	`+ "name": "tenantId",`
	`27`	`+ "comments": [`
	`28`	`+ "(Optional) The Id of the tenant to use for this request."`
	`29`	`+ ],`
	`30`	`+ "type": "urlParameter",`
	`31`	`+ "parameterName": "tenantId",`
	`32`	`+ "javaType": "UUID"`
`24`	`33`	`}`
`25`	`34`	`]`
`26`	`35`	`}`