Skip to content

Commit

Permalink
changed org and invite attribute column lengths to varchar 4000 (#188)
Browse files Browse the repository at this point in the history
Signed-off-by: Garth <[email protected]>
  • Loading branch information
xgp committed Feb 29, 2024
1 parent 1d127ca commit 97b96ed
Show file tree
Hide file tree
Showing 23 changed files with 1,498 additions and 1,334 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.java.package>io.phasetwo.service</main.java.package>
<junit.version>5.8.2</junit.version>
<keycloak.version>23.0.6</keycloak.version>
<keycloak.version>23.0.7</keycloak.version>
<resteasy.version>6.2.4.Final</resteasy.version>
<lombok.version>1.18.30</lombok.version>
<auto-service.version>1.1.1</auto-service.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ protected void setClaim(
ClientSessionContext clientSessionCtx) {
log.debugf("adding org claim to idToken for %s", userSession.getUser().getUsername());
Object claim =
getOrganizationClaim(keycloakSession, userSession.getRealm(), userSession.getUser(), mappingModel);
getOrganizationClaim(
keycloakSession, userSession.getRealm(), userSession.getUser(), mappingModel);
if (claim == null) return;
OIDCAttributeMapperHelper.mapClaim(token, mappingModel, claim);
}
Expand All @@ -93,7 +94,8 @@ protected void setClaim(
log.debugf("adding org claim to accessToken for %s", userSession.getUser().getUsername());
UserModel user = userSession.getUser();
Object claim =
getOrganizationClaim(keycloakSession, userSession.getRealm(), userSession.getUser(), mappingModel);
getOrganizationClaim(
keycloakSession, userSession.getRealm(), userSession.getUser(), mappingModel);
if (claim == null) return;
OIDCAttributeMapperHelper.mapClaim(accessTokenResponse, mappingModel, claim);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
public class ActiveOrganizationMapper extends AbstractOrganizationMapper {

public static final String PROVIDER_ID = "oidc-active-organization-mapper";
public static final String INCLUDED_ORGANIZATION_PROPERTIES = "included.active.organization.properties";
public static final String INCLUDED_ORGANIZATION_PROPERTIES =
"included.active.organization.properties";
private static final String ID = "id";
private static final String NAME = "name";
private static final String ROLE = "role";
Expand All @@ -33,9 +34,10 @@ public class ActiveOrganizationMapper extends AbstractOrganizationMapper {
ProviderConfigProperty property = new ProviderConfigProperty();
property.setName(INCLUDED_ORGANIZATION_PROPERTIES);
property.setLabel("Active Organization Properties");
property.setHelpText("Properties of the active organization to map into the token claims, "
+ "it can be multiple, separated by comma. Available properties are: id, name, role and attribute. "
+ "For example you can write: id or id, role");
property.setHelpText(
"Properties of the active organization to map into the token claims, "
+ "it can be multiple, separated by comma. Available properties are: id, name, role and attribute. "
+ "For example you can write: id or id, role");
property.setType(ProviderConfigProperty.STRING_TYPE);
property.setDefaultValue("id, name, role, attribute");
configProperties.add(property);
Expand Down Expand Up @@ -66,8 +68,7 @@ protected Map<String, Object> getOrganizationClaim(
}

String inputProperties = mappingModel.getConfig().get(INCLUDED_ORGANIZATION_PROPERTIES);
List<String> properties = Arrays.asList(inputProperties
.replaceAll("\\s", "").split(","));
List<String> properties = Arrays.asList(inputProperties.replaceAll("\\s", "").split(","));

Map<String, Object> claim = Maps.newHashMap();
if (properties.contains(ID)) {
Expand Down
166 changes: 83 additions & 83 deletions src/main/java/io/phasetwo/service/representation/BulkResponseItem.java
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
package io.phasetwo.service.representation;

import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Objects;
import jakarta.validation.Valid;
import java.util.Objects;

public class BulkResponseItem {
private @Valid int status = 0;
private @Valid String error = null;
private @Valid Object item = null;

public BulkResponseItem status(int status) {
this.status = status;
return this;
}

@JsonProperty("status")
public int getStatus() {
return status;
}

public void setStatus(int status) {
this.status = status;
}

public BulkResponseItem item(Object item) {
this.item = item;
return this;
}

@JsonProperty("item")
public Object getItem() {
return item;
}

public void setItem(Object item) {
this.item = item;
private @Valid int status = 0;
private @Valid String error = null;
private @Valid Object item = null;

public BulkResponseItem status(int status) {
this.status = status;
return this;
}

@JsonProperty("status")
public int getStatus() {
return status;
}

public void setStatus(int status) {
this.status = status;
}

public BulkResponseItem item(Object item) {
this.item = item;
return this;
}

@JsonProperty("item")
public Object getItem() {
return item;
}

public void setItem(Object item) {
this.item = item;
}

public BulkResponseItem error(String error) {
this.error = error;
return this;
}

@JsonProperty("error")
public String getError() {
return error;
}

public void setError(String error) {
this.error = error;
}

@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}

public BulkResponseItem error(String error) {
this.error = error;
return this;
}

@JsonProperty("error")
public String getError() {
return error;
if (o == null || getClass() != o.getClass()) {
return false;
}

public void setError(String error) {
this.error = error;
BulkResponseItem it = (BulkResponseItem) o;
return Objects.equals(status, it.status)
&& Objects.equals(error, it.error)
&& Objects.equals(item, it.item);
}

@Override
public int hashCode() {
return Objects.hash(status, error, item);
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class BulkResponseItem {\n");
sb.append(" status: ").append(toIndentedString(status)).append("\n");
sb.append(" error: ").append(toIndentedString(error)).append("\n");
sb.append(" item: ").append(toIndentedString(item)).append("\n");
sb.append("}");
return sb.toString();
}

/**
* Convert the given object to string with each line indented by 4 spaces (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}

@Override
public boolean equals(java.lang.Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
BulkResponseItem it = (BulkResponseItem) o;
return Objects.equals(status, it.status) && Objects.equals(error, it.error)
&& Objects.equals(item, it.item);
}

@Override
public int hashCode() {
return Objects.hash(status, error, item);
}

@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("class BulkResponseItem {\n");
sb.append(" status: ").append(toIndentedString(status)).append("\n");
sb.append(" error: ").append(toIndentedString(error)).append("\n");
sb.append(" item: ").append(toIndentedString(item)).append("\n");
sb.append("}");
return sb.toString();
}

/**
* Convert the given object to string with each line indented by 4 spaces (except the first line).
*/
private String toIndentedString(java.lang.Object o) {
if (o == null) {
return "null";
}
return o.toString().replace("\n", "\n ");
}

return o.toString().replace("\n", "\n ");
}
}
19 changes: 9 additions & 10 deletions src/main/java/io/phasetwo/service/resource/DomainsResource.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package io.phasetwo.service.resource;

import static io.phasetwo.service.resource.OrganizationResourceType.DOMAIN;

import com.google.common.base.Joiner;
import com.google.common.hash.Hashing;
import io.phasetwo.service.model.DomainModel;
Expand All @@ -14,6 +16,8 @@
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.nio.charset.StandardCharsets;
import java.util.stream.Stream;
import lombok.extern.jbosslog.JBossLog;
import org.keycloak.events.admin.OperationType;
import org.xbill.DNS.Lookup;
Expand All @@ -22,11 +26,6 @@
import org.xbill.DNS.TXTRecord;
import org.xbill.DNS.Type;

import java.nio.charset.StandardCharsets;
import java.util.stream.Stream;

import static io.phasetwo.service.resource.OrganizationResourceType.DOMAIN;

@JBossLog
public class DomainsResource extends OrganizationAdminResource {

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

adminEvent
.resource(DOMAIN.name())
.operation(OperationType.UPDATE)
.resourcePath(session.getContext().getUri())
.representation(domainName)
.success();
.resource(DOMAIN.name())
.operation(OperationType.UPDATE)
.resourcePath(session.getContext().getUri())
.representation(domainName)
.success();
return Response.accepted().entity(domain).build();
} else {
throw new NotAuthorizedException(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ public Response removeMember(@PathParam("userId") String userId) {
if (member != null && organization.hasMembership(member)) {

ActiveOrganization activeOrganizationUtil = new ActiveOrganization(session, realm, member);
if (activeOrganizationUtil.isValid() &&
activeOrganizationUtil.getActiveOrganization().getId().equals(organization.getId())) {
if (activeOrganizationUtil.isValid()
&& activeOrganizationUtil.getActiveOrganization().getId().equals(organization.getId())) {
member.removeAttribute(ACTIVE_ORGANIZATION);
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/phasetwo/service/resource/RoleResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import java.util.Arrays;
import java.util.Objects;
import java.util.concurrent.Callable;
import java.util.function.Consumer;
import java.util.stream.Stream;
import lombok.extern.jbosslog.JBossLog;
Expand All @@ -30,7 +28,9 @@ public class RoleResource extends OrganizationAdminResource {
private Consumer<String> deleteOrganizationRole;

public RoleResource(
OrganizationAdminResource parent, OrganizationModel organization, String name,
OrganizationAdminResource parent,
OrganizationModel organization,
String name,
Consumer<String> deleteOrganizationRole) {
super(parent);
this.organization = organization;
Expand Down
Loading

0 comments on commit 97b96ed

Please sign in to comment.