diff --git a/build.gradle b/build.gradle index 7420216..316d5a3 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ plugins { } group = 'uk.gov.hmcts' -version = '0.3.0' +version = '0.3.1' java { toolchain { diff --git a/src/main/java/uk/gov/hmcts/opal/common/user/authorisation/client/dto/DomainDto.java b/src/main/java/uk/gov/hmcts/opal/common/user/authorisation/client/dto/DomainDto.java new file mode 100644 index 0000000..fc5b818 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/opal/common/user/authorisation/client/dto/DomainDto.java @@ -0,0 +1,19 @@ +package uk.gov.hmcts.opal.common.user.authorisation.client.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class DomainDto { + + @JsonProperty("business_unit_users") + private List businessUnitUsers; +} diff --git a/src/main/java/uk/gov/hmcts/opal/common/user/authorisation/client/dto/UserStateDto.java b/src/main/java/uk/gov/hmcts/opal/common/user/authorisation/client/dto/UserStateDto.java index 383e775..d837e8e 100644 --- a/src/main/java/uk/gov/hmcts/opal/common/user/authorisation/client/dto/UserStateDto.java +++ b/src/main/java/uk/gov/hmcts/opal/common/user/authorisation/client/dto/UserStateDto.java @@ -25,8 +25,6 @@ public class UserStateDto implements Versioned, ToJsonString { @JsonProperty("username") private String username; - //Obtained from the Access Token (via Spring Security) until stored in the Database under - // TDIA: User Service - Matching Key and JIT Provisioning, and only applies when id is 0 (zero) until then. @JsonProperty("name") private String name; diff --git a/src/main/java/uk/gov/hmcts/opal/common/user/authorisation/client/dto/UserStateV2Dto.java b/src/main/java/uk/gov/hmcts/opal/common/user/authorisation/client/dto/UserStateV2Dto.java new file mode 100644 index 0000000..baf19de --- /dev/null +++ b/src/main/java/uk/gov/hmcts/opal/common/user/authorisation/client/dto/UserStateV2Dto.java @@ -0,0 +1,47 @@ +package uk.gov.hmcts.opal.common.user.authorisation.client.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import uk.gov.hmcts.opal.common.dto.ToJsonString; +import uk.gov.hmcts.opal.common.dto.Versioned; + +import java.math.BigInteger; +import java.util.Map; +import java.util.Optional; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class UserStateV2Dto implements Versioned, ToJsonString { + + @JsonProperty("user_id") + private Long userId; + + //users.username + @JsonProperty("username") + private String username; + + @JsonProperty("name") + private String name; + + @JsonProperty("status") + private String status; + + @JsonProperty("version") + private Long version; + + @JsonProperty("cache_name") + private String cacheName; + + @JsonProperty("domains") + private Map domains; + + @Override + public BigInteger getVersion() { + return Optional.ofNullable(version).map(BigInteger::valueOf).orElse(null); + } +}