From 552fee73d0971e962387e72cc8c22df0897cd6ca Mon Sep 17 00:00:00 2001 From: Spencer Witt <3409780+spwitt@users.noreply.github.com> Date: Tue, 27 Jan 2026 14:43:41 -0600 Subject: [PATCH 1/3] int build ENG-3774 --- src/main/domain/io.fusionauth.domain.AuditLog.json | 3 +++ .../io.fusionauth.domain.search.AuditLogSearchCriteria.json | 3 +++ src/main/domainNG/io.fusionauth.domain.AuditLog.json | 6 +++++- .../io.fusionauth.domain.search.AuditLogSearchCriteria.json | 6 +++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/domain/io.fusionauth.domain.AuditLog.json b/src/main/domain/io.fusionauth.domain.AuditLog.json index c24d87e..fa15b3a 100644 --- a/src/main/domain/io.fusionauth.domain.AuditLog.json +++ b/src/main/domain/io.fusionauth.domain.AuditLog.json @@ -39,6 +39,9 @@ }, "reason" : { "type" : "String" + }, + "tenantId" : { + "type" : "UUID" } } } \ No newline at end of file diff --git a/src/main/domain/io.fusionauth.domain.search.AuditLogSearchCriteria.json b/src/main/domain/io.fusionauth.domain.search.AuditLogSearchCriteria.json index 0e9e78a..44a6439 100644 --- a/src/main/domain/io.fusionauth.domain.search.AuditLogSearchCriteria.json +++ b/src/main/domain/io.fusionauth.domain.search.AuditLogSearchCriteria.json @@ -30,6 +30,9 @@ "start" : { "type" : "ZonedDateTime" }, + "tenantId" : { + "type" : "UUID" + }, "user" : { "type" : "String" } diff --git a/src/main/domainNG/io.fusionauth.domain.AuditLog.json b/src/main/domainNG/io.fusionauth.domain.AuditLog.json index b6cbcad..97bf50f 100644 --- a/src/main/domainNG/io.fusionauth.domain.AuditLog.json +++ b/src/main/domainNG/io.fusionauth.domain.AuditLog.json @@ -43,9 +43,13 @@ "reason" : { "className" : "java.lang.String", "type" : "String" + }, + "tenantId" : { + "className" : "java.util.UUID", + "type" : "UUID" } }, - "imports" : [ "io.fusionauth.domain.Buildable", "com.inversoft.mybatis.JSONColumnable", "java.util.Map", "java.lang.String", "java.lang.Long", "java.time.ZonedDateTime" ], + "imports" : [ "io.fusionauth.domain.Buildable", "com.inversoft.mybatis.JSONColumnable", "java.util.Map", "java.lang.String", "java.lang.Long", "java.time.ZonedDateTime", "java.util.UUID" ], "interfaces" : [ { "className" : "io.fusionauth.domain.Buildable", "type" : "Buildable", diff --git a/src/main/domainNG/io.fusionauth.domain.search.AuditLogSearchCriteria.json b/src/main/domainNG/io.fusionauth.domain.search.AuditLogSearchCriteria.json index e3c5e40..872e974 100644 --- a/src/main/domainNG/io.fusionauth.domain.search.AuditLogSearchCriteria.json +++ b/src/main/domainNG/io.fusionauth.domain.search.AuditLogSearchCriteria.json @@ -40,12 +40,16 @@ "className" : "java.time.ZonedDateTime", "type" : "ZonedDateTime" }, + "tenantId" : { + "className" : "java.util.UUID", + "type" : "UUID" + }, "user" : { "className" : "java.lang.String", "type" : "String" } }, - "imports" : [ "io.fusionauth.domain.search.BaseSearchCriteria", "io.fusionauth.domain.Buildable", "java.util.Map", "java.lang.String", "java.time.ZonedDateTime" ], + "imports" : [ "io.fusionauth.domain.search.BaseSearchCriteria", "io.fusionauth.domain.Buildable", "java.util.Map", "java.lang.String", "java.time.ZonedDateTime", "java.util.UUID" ], "interfaces" : [ { "className" : "io.fusionauth.domain.Buildable", "type" : "Buildable", From 090cc0aec1a04063b784bfd44dd775a6e8d150b2 Mon Sep 17 00:00:00 2001 From: Spencer Witt <3409780+spwitt@users.noreply.github.com> Date: Thu, 29 Jan 2026 16:42:45 -0600 Subject: [PATCH 2/3] add IdentityProvider.source and IdentityProviderSource enum to clients ENG-3773 --- ...o.fusionauth.domain.provider.BaseIdentityProvider.json | 3 +++ ...fusionauth.domain.provider.IdentityProviderSource.json | 6 ++++++ ...auth.domain.search.IdentityProviderSearchCriteria.json | 3 +++ ...o.fusionauth.domain.provider.BaseIdentityProvider.json | 6 +++++- ...fusionauth.domain.provider.IdentityProviderSource.json | 8 ++++++++ ...auth.domain.search.IdentityProviderSearchCriteria.json | 6 +++++- 6 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 src/main/domain/io.fusionauth.domain.provider.IdentityProviderSource.json create mode 100644 src/main/domainNG/io.fusionauth.domain.provider.IdentityProviderSource.json diff --git a/src/main/domain/io.fusionauth.domain.provider.BaseIdentityProvider.json b/src/main/domain/io.fusionauth.domain.provider.BaseIdentityProvider.json index 7efaeed..f879296 100644 --- a/src/main/domain/io.fusionauth.domain.provider.BaseIdentityProvider.json +++ b/src/main/domain/io.fusionauth.domain.provider.BaseIdentityProvider.json @@ -52,6 +52,9 @@ "name" : { "type" : "String" }, + "source" : { + "type" : "IdentityProviderSource" + }, "tenantConfiguration" : { "type" : "Map", "typeArguments" : [ { diff --git a/src/main/domain/io.fusionauth.domain.provider.IdentityProviderSource.json b/src/main/domain/io.fusionauth.domain.provider.IdentityProviderSource.json new file mode 100644 index 0000000..630211d --- /dev/null +++ b/src/main/domain/io.fusionauth.domain.provider.IdentityProviderSource.json @@ -0,0 +1,6 @@ +{ + "packageName" : "io.fusionauth.domain.provider", + "type" : "IdentityProviderSource", + "description" : "/**\n * The source of an identity provider configuration.\n */\n", + "enum" : [ "System", "TenantManager" ] +} \ No newline at end of file diff --git a/src/main/domain/io.fusionauth.domain.search.IdentityProviderSearchCriteria.json b/src/main/domain/io.fusionauth.domain.search.IdentityProviderSearchCriteria.json index 2188070..05f2d40 100644 --- a/src/main/domain/io.fusionauth.domain.search.IdentityProviderSearchCriteria.json +++ b/src/main/domain/io.fusionauth.domain.search.IdentityProviderSearchCriteria.json @@ -12,6 +12,9 @@ "name" : { "type" : "String" }, + "source" : { + "type" : "IdentityProviderSource" + }, "tenantId" : { "type" : "UUID" }, diff --git a/src/main/domainNG/io.fusionauth.domain.provider.BaseIdentityProvider.json b/src/main/domainNG/io.fusionauth.domain.provider.BaseIdentityProvider.json index 8038aa5..6602a1d 100644 --- a/src/main/domainNG/io.fusionauth.domain.provider.BaseIdentityProvider.json +++ b/src/main/domainNG/io.fusionauth.domain.provider.BaseIdentityProvider.json @@ -55,6 +55,10 @@ "className" : "java.lang.String", "type" : "String" }, + "source" : { + "className" : "io.fusionauth.domain.provider.IdentityProviderSource", + "type" : "IdentityProviderSource" + }, "tenantConfiguration" : { "className" : "java.util.Map", "type" : "Map", @@ -71,7 +75,7 @@ "type" : "UUID" } }, - "imports" : [ "io.fusionauth.domain.provider.BaseIdentityProviderApplicationConfiguration", "com.inversoft.mybatis.JSONColumnable", "io.fusionauth.domain.Enableable", "java.util.Map", "java.lang.String", "java.util.UUID", "java.time.ZonedDateTime", "io.fusionauth.domain.provider.BaseIdentityProvider$LambdaConfiguration", "io.fusionauth.domain.provider.IdentityProviderLinkingStrategy", "io.fusionauth.domain.provider.IdentityProviderTenantConfiguration" ], + "imports" : [ "io.fusionauth.domain.provider.BaseIdentityProviderApplicationConfiguration", "com.inversoft.mybatis.JSONColumnable", "io.fusionauth.domain.Enableable", "java.util.Map", "java.lang.String", "java.util.UUID", "java.time.ZonedDateTime", "io.fusionauth.domain.provider.BaseIdentityProvider$LambdaConfiguration", "io.fusionauth.domain.provider.IdentityProviderLinkingStrategy", "io.fusionauth.domain.provider.IdentityProviderSource", "io.fusionauth.domain.provider.IdentityProviderTenantConfiguration" ], "interfaces" : [ { "className" : "com.inversoft.mybatis.JSONColumnable", "type" : "JSONColumnable" diff --git a/src/main/domainNG/io.fusionauth.domain.provider.IdentityProviderSource.json b/src/main/domainNG/io.fusionauth.domain.provider.IdentityProviderSource.json new file mode 100644 index 0000000..2e9934b --- /dev/null +++ b/src/main/domainNG/io.fusionauth.domain.provider.IdentityProviderSource.json @@ -0,0 +1,8 @@ +{ + "className" : "io.fusionauth.domain.provider.IdentityProviderSource", + "enum" : [ "System", "TenantManager" ], + "imports" : [ ], + "objectType" : "Enum", + "packageName" : "io.fusionauth.domain.provider", + "type" : "IdentityProviderSource" +} \ No newline at end of file diff --git a/src/main/domainNG/io.fusionauth.domain.search.IdentityProviderSearchCriteria.json b/src/main/domainNG/io.fusionauth.domain.search.IdentityProviderSearchCriteria.json index 959c1cb..6c81612 100644 --- a/src/main/domainNG/io.fusionauth.domain.search.IdentityProviderSearchCriteria.json +++ b/src/main/domainNG/io.fusionauth.domain.search.IdentityProviderSearchCriteria.json @@ -21,6 +21,10 @@ "className" : "java.lang.String", "type" : "String" }, + "source" : { + "className" : "io.fusionauth.domain.provider.IdentityProviderSource", + "type" : "IdentityProviderSource" + }, "tenantId" : { "className" : "java.util.UUID", "type" : "UUID" @@ -30,7 +34,7 @@ "type" : "IdentityProviderType" } }, - "imports" : [ "java.util.Map", "java.lang.String", "java.util.UUID", "io.fusionauth.domain.provider.IdentityProviderType" ], + "imports" : [ "java.util.Map", "java.lang.String", "java.util.UUID", "io.fusionauth.domain.provider.IdentityProviderSource", "io.fusionauth.domain.provider.IdentityProviderType" ], "interfaces" : [ ], "objectType" : "Object", "packageName" : "io.fusionauth.domain.search", From 3617699579c19e6a8789fb2bf615f70aba9df620 Mon Sep 17 00:00:00 2001 From: Spencer Witt <3409780+spwitt@users.noreply.github.com> Date: Fri, 30 Jan 2026 15:20:17 -0600 Subject: [PATCH 3/3] add KeySource and key.source to clients ENG-3772 --- src/main/domain/io.fusionauth.domain.Key$KeySource.json | 6 ++++++ src/main/domain/io.fusionauth.domain.Key.json | 3 +++ .../io.fusionauth.domain.search.KeySearchCriteria.json | 3 +++ src/main/domainNG/io.fusionauth.domain.Key$KeySource.json | 8 ++++++++ src/main/domainNG/io.fusionauth.domain.Key.json | 6 +++++- .../io.fusionauth.domain.search.KeySearchCriteria.json | 6 +++++- 6 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 src/main/domain/io.fusionauth.domain.Key$KeySource.json create mode 100644 src/main/domainNG/io.fusionauth.domain.Key$KeySource.json diff --git a/src/main/domain/io.fusionauth.domain.Key$KeySource.json b/src/main/domain/io.fusionauth.domain.Key$KeySource.json new file mode 100644 index 0000000..7f4d646 --- /dev/null +++ b/src/main/domain/io.fusionauth.domain.Key$KeySource.json @@ -0,0 +1,6 @@ +{ + "packageName" : "io.fusionauth.domain", + "type" : "KeySource", + "description" : "/**\n * The source of a key.\n */\n", + "enum" : [ "System", "TenantManager" ] +} \ No newline at end of file diff --git a/src/main/domain/io.fusionauth.domain.Key.json b/src/main/domain/io.fusionauth.domain.Key.json index 1101dfd..7cf4597 100644 --- a/src/main/domain/io.fusionauth.domain.Key.json +++ b/src/main/domain/io.fusionauth.domain.Key.json @@ -54,6 +54,9 @@ "secret" : { "type" : "String" }, + "source" : { + "type" : "KeySource" + }, "type" : { "type" : "KeyType" } diff --git a/src/main/domain/io.fusionauth.domain.search.KeySearchCriteria.json b/src/main/domain/io.fusionauth.domain.search.KeySearchCriteria.json index cfdbe97..5dc1a13 100644 --- a/src/main/domain/io.fusionauth.domain.search.KeySearchCriteria.json +++ b/src/main/domain/io.fusionauth.domain.search.KeySearchCriteria.json @@ -12,6 +12,9 @@ "name" : { "type" : "String" }, + "source" : { + "type" : "KeySource" + }, "type" : { "type" : "KeyType" } diff --git a/src/main/domainNG/io.fusionauth.domain.Key$KeySource.json b/src/main/domainNG/io.fusionauth.domain.Key$KeySource.json new file mode 100644 index 0000000..bab2027 --- /dev/null +++ b/src/main/domainNG/io.fusionauth.domain.Key$KeySource.json @@ -0,0 +1,8 @@ +{ + "className" : "io.fusionauth.domain.Key$KeySource", + "enum" : [ "System", "TenantManager" ], + "imports" : [ ], + "objectType" : "Enum", + "packageName" : "io.fusionauth.domain", + "type" : "Key$KeySource" +} \ No newline at end of file diff --git a/src/main/domainNG/io.fusionauth.domain.Key.json b/src/main/domainNG/io.fusionauth.domain.Key.json index 320de0a..46547ca 100644 --- a/src/main/domainNG/io.fusionauth.domain.Key.json +++ b/src/main/domainNG/io.fusionauth.domain.Key.json @@ -65,12 +65,16 @@ "className" : "java.lang.String", "type" : "String" }, + "source" : { + "className" : "io.fusionauth.domain.Key$KeySource", + "type" : "Key$KeySource" + }, "type" : { "className" : "io.fusionauth.domain.Key$KeyType", "type" : "Key$KeyType" } }, - "imports" : [ "io.fusionauth.domain.Buildable", "io.fusionauth.domain.Key$KeyAlgorithm", "java.lang.String", "io.fusionauth.domain.Key$CertificateInformation", "java.time.ZonedDateTime", "java.lang.Boolean", "java.util.UUID", "java.lang.Integer", "io.fusionauth.domain.Key$KeyType" ], + "imports" : [ "io.fusionauth.domain.Buildable", "io.fusionauth.domain.Key$KeyAlgorithm", "java.lang.String", "io.fusionauth.domain.Key$CertificateInformation", "java.time.ZonedDateTime", "java.lang.Boolean", "java.util.UUID", "java.lang.Integer", "io.fusionauth.domain.Key$KeySource", "io.fusionauth.domain.Key$KeyType" ], "interfaces" : [ { "className" : "io.fusionauth.domain.Buildable", "type" : "Buildable", diff --git a/src/main/domainNG/io.fusionauth.domain.search.KeySearchCriteria.json b/src/main/domainNG/io.fusionauth.domain.search.KeySearchCriteria.json index e8967f0..3e7f69c 100644 --- a/src/main/domainNG/io.fusionauth.domain.search.KeySearchCriteria.json +++ b/src/main/domainNG/io.fusionauth.domain.search.KeySearchCriteria.json @@ -29,12 +29,16 @@ "className" : "java.lang.String", "type" : "String" }, + "source" : { + "className" : "io.fusionauth.domain.Key$KeySource", + "type" : "Key$KeySource" + }, "type" : { "className" : "io.fusionauth.domain.Key$KeyType", "type" : "Key$KeyType" } }, - "imports" : [ "java.util.Set", "java.lang.String", "java.util.Map", "io.fusionauth.domain.Key$KeyAlgorithm", "io.fusionauth.domain.Key$KeyType" ], + "imports" : [ "java.util.Set", "java.lang.String", "java.util.Map", "io.fusionauth.domain.Key$KeyAlgorithm", "io.fusionauth.domain.Key$KeySource", "io.fusionauth.domain.Key$KeyType" ], "interfaces" : [ ], "objectType" : "Object", "packageName" : "io.fusionauth.domain.search",