Skip to content

Commit 140d590

Browse files
author
FusionAuth Automation
committed
Sync from monorepo 2f087c552f53
1 parent e348f5d commit 140d590

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

src/main/java/io/fusionauth/domain/Application.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ public class Application implements Buildable<Application>, Tenantable {
5555

5656
public AuthenticationTokenConfiguration authenticationTokenConfiguration = new AuthenticationTokenConfiguration();
5757

58+
public URI baseURL;
59+
5860
public CleanSpeakConfiguration cleanSpeakConfiguration;
5961

6062
public Map<String, Object> data = new LinkedHashMap<>();
@@ -126,6 +128,7 @@ public Application(Application other) {
126128
this.active = other.active;
127129
this.accessControlConfiguration = new ApplicationAccessControlConfiguration(other.accessControlConfiguration);
128130
this.authenticationTokenConfiguration = new AuthenticationTokenConfiguration(other.authenticationTokenConfiguration);
131+
this.baseURL = other.baseURL;
129132
if (other.cleanSpeakConfiguration != null) {
130133
this.cleanSpeakConfiguration = new CleanSpeakConfiguration(other.cleanSpeakConfiguration);
131134
}
@@ -196,6 +199,7 @@ public boolean equals(Object o) {
196199
return verifyRegistration == that.verifyRegistration &&
197200
Objects.equals(accessControlConfiguration, that.accessControlConfiguration) &&
198201
Objects.equals(authenticationTokenConfiguration, that.authenticationTokenConfiguration) &&
202+
Objects.equals(baseURL, that.baseURL) &&
199203
Objects.equals(cleanSpeakConfiguration, that.cleanSpeakConfiguration) &&
200204
Objects.equals(data, that.data) &&
201205
Objects.equals(emailConfiguration, that.emailConfiguration) &&
@@ -264,7 +268,7 @@ public boolean hasDefaultRole() {
264268
@Override
265269
public int hashCode() {
266270
// active is omitted
267-
return Objects.hash(accessControlConfiguration, authenticationTokenConfiguration, cleanSpeakConfiguration, data, emailConfiguration, externalIdentifierConfiguration, formConfiguration, id, insertInstant, jwtConfiguration, lambdaConfiguration, lastUpdateInstant, loginConfiguration, multiFactorConfiguration, name, oauthConfiguration, passwordlessConfiguration, phoneConfiguration, registrationConfiguration, registrationDeletePolicy, roles, samlv2Configuration, scopes, state, tenantId, themeId, universalConfiguration, unverified, verificationEmailTemplateId, verificationStrategy, verifyRegistration, webAuthnConfiguration);
271+
return Objects.hash(accessControlConfiguration, authenticationTokenConfiguration, baseURL, cleanSpeakConfiguration, data, emailConfiguration, externalIdentifierConfiguration, formConfiguration, id, insertInstant, jwtConfiguration, lambdaConfiguration, lastUpdateInstant, loginConfiguration, multiFactorConfiguration, name, oauthConfiguration, passwordlessConfiguration, phoneConfiguration, registrationConfiguration, registrationDeletePolicy, roles, samlv2Configuration, scopes, state, tenantId, themeId, universalConfiguration, unverified, verificationEmailTemplateId, verificationStrategy, verifyRegistration, webAuthnConfiguration);
268272
}
269273

270274
public void normalize() {

src/main/java/io/fusionauth/domain/Tenant.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019-2025, FusionAuth, All Rights Reserved
2+
* Copyright (c) 2019-2026, FusionAuth, All Rights Reserved
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -43,6 +43,8 @@ public class Tenant implements Buildable<Tenant> {
4343

4444
public TenantAccessControlConfiguration accessControlConfiguration = new TenantAccessControlConfiguration();
4545

46+
public URI baseURL;
47+
4648
public TenantCaptchaConfiguration captchaConfiguration = new TenantCaptchaConfiguration();
4749

4850
public boolean configured;
@@ -129,6 +131,7 @@ public Tenant() {
129131
}
130132

131133
public Tenant(Tenant other) {
134+
this.baseURL = other.baseURL;
132135
this.captchaConfiguration = new TenantCaptchaConfiguration(other.captchaConfiguration);
133136
this.configured = other.configured;
134137
this.connectorPolicies.addAll(other.connectorPolicies.stream().map(ConnectorPolicy::new).collect(Collectors.toList()));
@@ -179,6 +182,7 @@ public boolean equals(Object o) {
179182
Tenant tenant = (Tenant) o;
180183
return configured == tenant.configured &&
181184
httpSessionMaxInactiveInterval == tenant.httpSessionMaxInactiveInterval &&
185+
Objects.equals(baseURL, tenant.baseURL) &&
182186
Objects.equals(captchaConfiguration, tenant.captchaConfiguration) &&
183187
Objects.equals(connectorPolicies, tenant.connectorPolicies) &&
184188
Objects.equals(data, tenant.data) &&
@@ -222,7 +226,8 @@ public ConnectorPolicy getPolicyByConnectorId(UUID connectorId) {
222226

223227
@Override
224228
public int hashCode() {
225-
return Objects.hash(captchaConfiguration,
229+
return Objects.hash(baseURL,
230+
captchaConfiguration,
226231
configured,
227232
connectorPolicies,
228233
data,

0 commit comments

Comments
 (0)