Skip to content

Commit 97b96ed

Browse files
xgpxgp
authored
changed org and invite attribute column lengths to varchar 4000 (#188)
Signed-off-by: Garth <244253+xgp@users.noreply.github.com>
1 parent 1d127ca commit 97b96ed

23 files changed

+1498
-1334
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3131
<main.java.package>io.phasetwo.service</main.java.package>
3232
<junit.version>5.8.2</junit.version>
33-
<keycloak.version>23.0.6</keycloak.version>
33+
<keycloak.version>23.0.7</keycloak.version>
3434
<resteasy.version>6.2.4.Final</resteasy.version>
3535
<lombok.version>1.18.30</lombok.version>
3636
<auto-service.version>1.1.1</auto-service.version>

‎src/main/java/io/phasetwo/service/protocol/oidc/mappers/AbstractOrganizationMapper.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ protected void setClaim(
7878
ClientSessionContext clientSessionCtx) {
7979
log.debugf("adding org claim to idToken for %s", userSession.getUser().getUsername());
8080
Object claim =
81-
getOrganizationClaim(keycloakSession, userSession.getRealm(), userSession.getUser(), mappingModel);
81+
getOrganizationClaim(
82+
keycloakSession, userSession.getRealm(), userSession.getUser(), mappingModel);
8283
if (claim == null) return;
8384
OIDCAttributeMapperHelper.mapClaim(token, mappingModel, claim);
8485
}
@@ -93,7 +94,8 @@ protected void setClaim(
9394
log.debugf("adding org claim to accessToken for %s", userSession.getUser().getUsername());
9495
UserModel user = userSession.getUser();
9596
Object claim =
96-
getOrganizationClaim(keycloakSession, userSession.getRealm(), userSession.getUser(), mappingModel);
97+
getOrganizationClaim(
98+
keycloakSession, userSession.getRealm(), userSession.getUser(), mappingModel);
9799
if (claim == null) return;
98100
OIDCAttributeMapperHelper.mapClaim(accessTokenResponse, mappingModel, claim);
99101
}

‎src/main/java/io/phasetwo/service/protocol/oidc/mappers/ActiveOrganizationMapper.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
public class ActiveOrganizationMapper extends AbstractOrganizationMapper {
2222

2323
public static final String PROVIDER_ID = "oidc-active-organization-mapper";
24-
public static final String INCLUDED_ORGANIZATION_PROPERTIES = "included.active.organization.properties";
24+
public static final String INCLUDED_ORGANIZATION_PROPERTIES =
25+
"included.active.organization.properties";
2526
private static final String ID = "id";
2627
private static final String NAME = "name";
2728
private static final String ROLE = "role";
@@ -33,9 +34,10 @@ public class ActiveOrganizationMapper extends AbstractOrganizationMapper {
3334
ProviderConfigProperty property = new ProviderConfigProperty();
3435
property.setName(INCLUDED_ORGANIZATION_PROPERTIES);
3536
property.setLabel("Active Organization Properties");
36-
property.setHelpText("Properties of the active organization to map into the token claims, "
37-
+ "it can be multiple, separated by comma. Available properties are: id, name, role and attribute. "
38-
+ "For example you can write: id or id, role");
37+
property.setHelpText(
38+
"Properties of the active organization to map into the token claims, "
39+
+ "it can be multiple, separated by comma. Available properties are: id, name, role and attribute. "
40+
+ "For example you can write: id or id, role");
3941
property.setType(ProviderConfigProperty.STRING_TYPE);
4042
property.setDefaultValue("id, name, role, attribute");
4143
configProperties.add(property);
@@ -66,8 +68,7 @@ protected Map<String, Object> getOrganizationClaim(
6668
}
6769

6870
String inputProperties = mappingModel.getConfig().get(INCLUDED_ORGANIZATION_PROPERTIES);
69-
List<String> properties = Arrays.asList(inputProperties
70-
.replaceAll("\\s", "").split(","));
71+
List<String> properties = Arrays.asList(inputProperties.replaceAll("\\s", "").split(","));
7172

7273
Map<String, Object> claim = Maps.newHashMap();
7374
if (properties.contains(ID)) {

‎src/main/java/io/phasetwo/service/representation/BulkResponseItem.java

Lines changed: 83 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,93 @@
11
package io.phasetwo.service.representation;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import java.util.Objects;
54
import jakarta.validation.Valid;
5+
import java.util.Objects;
66

77
public class BulkResponseItem {
8-
private @Valid int status = 0;
9-
private @Valid String error = null;
10-
private @Valid Object item = null;
11-
12-
public BulkResponseItem status(int status) {
13-
this.status = status;
14-
return this;
15-
}
16-
17-
@JsonProperty("status")
18-
public int getStatus() {
19-
return status;
20-
}
21-
22-
public void setStatus(int status) {
23-
this.status = status;
24-
}
25-
26-
public BulkResponseItem item(Object item) {
27-
this.item = item;
28-
return this;
29-
}
30-
31-
@JsonProperty("item")
32-
public Object getItem() {
33-
return item;
34-
}
35-
36-
public void setItem(Object item) {
37-
this.item = item;
8+
private @Valid int status = 0;
9+
private @Valid String error = null;
10+
private @Valid Object item = null;
11+
12+
public BulkResponseItem status(int status) {
13+
this.status = status;
14+
return this;
15+
}
16+
17+
@JsonProperty("status")
18+
public int getStatus() {
19+
return status;
20+
}
21+
22+
public void setStatus(int status) {
23+
this.status = status;
24+
}
25+
26+
public BulkResponseItem item(Object item) {
27+
this.item = item;
28+
return this;
29+
}
30+
31+
@JsonProperty("item")
32+
public Object getItem() {
33+
return item;
34+
}
35+
36+
public void setItem(Object item) {
37+
this.item = item;
38+
}
39+
40+
public BulkResponseItem error(String error) {
41+
this.error = error;
42+
return this;
43+
}
44+
45+
@JsonProperty("error")
46+
public String getError() {
47+
return error;
48+
}
49+
50+
public void setError(String error) {
51+
this.error = error;
52+
}
53+
54+
@Override
55+
public boolean equals(java.lang.Object o) {
56+
if (this == o) {
57+
return true;
3858
}
39-
40-
public BulkResponseItem error(String error) {
41-
this.error = error;
42-
return this;
43-
}
44-
45-
@JsonProperty("error")
46-
public String getError() {
47-
return error;
59+
if (o == null || getClass() != o.getClass()) {
60+
return false;
4861
}
49-
50-
public void setError(String error) {
51-
this.error = error;
62+
BulkResponseItem it = (BulkResponseItem) o;
63+
return Objects.equals(status, it.status)
64+
&& Objects.equals(error, it.error)
65+
&& Objects.equals(item, it.item);
66+
}
67+
68+
@Override
69+
public int hashCode() {
70+
return Objects.hash(status, error, item);
71+
}
72+
73+
@Override
74+
public String toString() {
75+
StringBuilder sb = new StringBuilder();
76+
sb.append("class BulkResponseItem {\n");
77+
sb.append(" status: ").append(toIndentedString(status)).append("\n");
78+
sb.append(" error: ").append(toIndentedString(error)).append("\n");
79+
sb.append(" item: ").append(toIndentedString(item)).append("\n");
80+
sb.append("}");
81+
return sb.toString();
82+
}
83+
84+
/**
85+
* Convert the given object to string with each line indented by 4 spaces (except the first line).
86+
*/
87+
private String toIndentedString(java.lang.Object o) {
88+
if (o == null) {
89+
return "null";
5290
}
53-
54-
@Override
55-
public boolean equals(java.lang.Object o) {
56-
if (this == o) {
57-
return true;
58-
}
59-
if (o == null || getClass() != o.getClass()) {
60-
return false;
61-
}
62-
BulkResponseItem it = (BulkResponseItem) o;
63-
return Objects.equals(status, it.status) && Objects.equals(error, it.error)
64-
&& Objects.equals(item, it.item);
65-
}
66-
67-
@Override
68-
public int hashCode() {
69-
return Objects.hash(status, error, item);
70-
}
71-
72-
@Override
73-
public String toString() {
74-
StringBuilder sb = new StringBuilder();
75-
sb.append("class BulkResponseItem {\n");
76-
sb.append(" status: ").append(toIndentedString(status)).append("\n");
77-
sb.append(" error: ").append(toIndentedString(error)).append("\n");
78-
sb.append(" item: ").append(toIndentedString(item)).append("\n");
79-
sb.append("}");
80-
return sb.toString();
81-
}
82-
83-
/**
84-
* Convert the given object to string with each line indented by 4 spaces (except the first line).
85-
*/
86-
private String toIndentedString(java.lang.Object o) {
87-
if (o == null) {
88-
return "null";
89-
}
90-
return o.toString().replace("\n", "\n ");
91-
}
92-
91+
return o.toString().replace("\n", "\n ");
92+
}
9393
}

‎src/main/java/io/phasetwo/service/resource/DomainsResource.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.phasetwo.service.resource;
22

3+
import static io.phasetwo.service.resource.OrganizationResourceType.DOMAIN;
4+
35
import com.google.common.base.Joiner;
46
import com.google.common.hash.Hashing;
57
import io.phasetwo.service.model.DomainModel;
@@ -14,6 +16,8 @@
1416
import jakarta.ws.rs.Produces;
1517
import jakarta.ws.rs.core.MediaType;
1618
import jakarta.ws.rs.core.Response;
19+
import java.nio.charset.StandardCharsets;
20+
import java.util.stream.Stream;
1721
import lombok.extern.jbosslog.JBossLog;
1822
import org.keycloak.events.admin.OperationType;
1923
import org.xbill.DNS.Lookup;
@@ -22,11 +26,6 @@
2226
import org.xbill.DNS.TXTRecord;
2327
import org.xbill.DNS.Type;
2428

25-
import java.nio.charset.StandardCharsets;
26-
import java.util.stream.Stream;
27-
28-
import static io.phasetwo.service.resource.OrganizationResourceType.DOMAIN;
29-
3029
@JBossLog
3130
public class DomainsResource extends OrganizationAdminResource {
3231

@@ -122,11 +121,11 @@ public Response verifyDomain(@PathParam("domainName") String domainName) {
122121
log.infof("endVerification %s %s %s", domainName, organization.getId(), domain);
123122

124123
adminEvent
125-
.resource(DOMAIN.name())
126-
.operation(OperationType.UPDATE)
127-
.resourcePath(session.getContext().getUri())
128-
.representation(domainName)
129-
.success();
124+
.resource(DOMAIN.name())
125+
.operation(OperationType.UPDATE)
126+
.resourcePath(session.getContext().getUri())
127+
.representation(domainName)
128+
.success();
130129
return Response.accepted().entity(domain).build();
131130
} else {
132131
throw new NotAuthorizedException(

‎src/main/java/io/phasetwo/service/resource/MembersResource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public Response removeMember(@PathParam("userId") String userId) {
6666
if (member != null && organization.hasMembership(member)) {
6767

6868
ActiveOrganization activeOrganizationUtil = new ActiveOrganization(session, realm, member);
69-
if (activeOrganizationUtil.isValid() &&
70-
activeOrganizationUtil.getActiveOrganization().getId().equals(organization.getId())) {
69+
if (activeOrganizationUtil.isValid()
70+
&& activeOrganizationUtil.getActiveOrganization().getId().equals(organization.getId())) {
7171
member.removeAttribute(ACTIVE_ORGANIZATION);
7272
}
7373

‎src/main/java/io/phasetwo/service/resource/RoleResource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
import jakarta.ws.rs.*;
1212
import jakarta.ws.rs.core.MediaType;
1313
import jakarta.ws.rs.core.Response;
14-
import java.util.Arrays;
1514
import java.util.Objects;
16-
import java.util.concurrent.Callable;
1715
import java.util.function.Consumer;
1816
import java.util.stream.Stream;
1917
import lombok.extern.jbosslog.JBossLog;
@@ -30,7 +28,9 @@ public class RoleResource extends OrganizationAdminResource {
3028
private Consumer<String> deleteOrganizationRole;
3129

3230
public RoleResource(
33-
OrganizationAdminResource parent, OrganizationModel organization, String name,
31+
OrganizationAdminResource parent,
32+
OrganizationModel organization,
33+
String name,
3434
Consumer<String> deleteOrganizationRole) {
3535
super(parent);
3636
this.organization = organization;

0 commit comments

Comments
 (0)