Skip to content

Commit

Permalink
Merge branch 'main' into proxy-headers
Browse files Browse the repository at this point in the history
  • Loading branch information
@mabartos
mabartos authored Dec 13, 2023
2 parents ffe8a0c + 8a50cb0 commit 67330ab
Show file tree
Hide file tree
Showing 87 changed files with 1,297 additions and 1,298 deletions.
121 changes: 2 additions & 119 deletions core/src/main/java/org/keycloak/representations/account/UserRepresentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,128 +17,11 @@

package org.keycloak.representations.account;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.keycloak.json.StringListMapDeserializer;
import org.keycloak.representations.idm.UserProfileMetadata;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.keycloak.representations.idm.AbstractUserRepresentation;

/**
* @author <a href="mailto:[email protected]">Stian Thorgersen</a>
*/
public class UserRepresentation {

private String id;
private String username;
private String firstName;
private String lastName;
private String email;
private boolean emailVerified;
private UserProfileMetadata userProfileMetadata;

@JsonDeserialize(using = StringListMapDeserializer.class)
private Map<String, List<String>> attributes;

public String getId() {
return id;
}

public void setId(String id) {
this.id = id;
}

public String getUsername() {
return username;
}

public void setUsername(String username) {
this.username = username;
}

public String getFirstName() {
return firstName;
}

public void setFirstName(String firstName) {
this.firstName = firstName;
}

public String getLastName() {
return lastName;
}

public void setLastName(String lastName) {
this.lastName = lastName;
}

public String getEmail() {
return email;
}

public void setEmail(String email) {
this.email = email;
}

public boolean isEmailVerified() {
return emailVerified;
}

public void setEmailVerified(boolean emailVerified) {
this.emailVerified = emailVerified;
}

public Map<String, List<String>> getAttributes() {
return attributes;
}

public void setAttributes(Map<String, List<String>> attributes) {
this.attributes = attributes;
}

public void singleAttribute(String name, String value) {
if (this.attributes == null) this.attributes=new HashMap<>();
attributes.put(name, (value == null ? new ArrayList<String>() : Arrays.asList(value)));
}

public String firstAttribute(String key) {
return this.attributes == null ? null : this.attributes.containsKey(key) ? this.attributes.get(key).get(0) : null;
}

public Map<String, List<String>> toAttributes() {
Map<String, List<String>> attrs = new HashMap<>();

if (getAttributes() != null) attrs.putAll(getAttributes());

if (getUsername() != null)
attrs.put("username", Collections.singletonList(getUsername()));
else
attrs.remove("username");

if (getEmail() != null)
attrs.put("email", Collections.singletonList(getEmail()));
else
attrs.remove("email");

if (getLastName() != null)
attrs.put("lastName", Collections.singletonList(getLastName()));

if (getFirstName() != null)
attrs.put("firstName", Collections.singletonList(getFirstName()));


return attrs;
}

public UserProfileMetadata getUserProfileMetadata() {
return userProfileMetadata;
}
public class UserRepresentation extends AbstractUserRepresentation {

public void setUserProfileMetadata(UserProfileMetadata userProfileMetadata) {
this.userProfileMetadata = userProfileMetadata;
}
}
157 changes: 157 additions & 0 deletions core/src/main/java/org/keycloak/representations/idm/AbstractUserRepresentation.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
/*
* Copyright 2023 Red Hat, Inc. and/or its affiliates
* and other contributors as indicated by the @author tags.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.keycloak.representations.idm;

import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.keycloak.json.StringListMapDeserializer;

public abstract class AbstractUserRepresentation {

public static String USERNAME = "username";
public static String FIRST_NAME = "firstName";
public static String LAST_NAME = "lastName";
public static String EMAIL = "email";
public static String LOCALE = "locale";

protected String id;
protected String username;
protected String firstName;
protected String lastName;
protected String email;
protected Boolean emailVerified;
@JsonDeserialize(using = StringListMapDeserializer.class)
protected Map<String, List<String>> attributes;
private UserProfileMetadata userProfileMetadata;


public String getId() {
return id;
}

public void setId(String id) {
this.id = id;
}

public String getFirstName() {
return firstName;
}

public void setFirstName(String firstName) {
this.firstName = firstName;
}

public String getLastName() {
return lastName;
}

public void setLastName(String lastName) {
this.lastName = lastName;
}

public String getEmail() {
return email;
}

public void setEmail(String email) {
this.email = email;
}

public Boolean isEmailVerified() {
return emailVerified;
}

public void setEmailVerified(Boolean emailVerified) {
this.emailVerified = emailVerified;
}

public String getUsername() {
return username;
}

public void setUsername(String username) {
this.username = username;
}

/**
* Returns all the attributes set to this user except the root attributes.
*
* @return the user attributes.
*/
public Map<String, List<String>> getAttributes() {
return attributes;
}

/**
* Returns all the user attributes including the root attributes.
*
* @return all the user attributes.
*/
@JsonIgnore
public Map<String, List<String>> getRawAttributes() {
Map<String, List<String>> attrs = new HashMap<>(Optional.ofNullable(attributes).orElse(new HashMap<>()));

if (username != null)
attrs.put(USERNAME, Collections.singletonList(getUsername()));
else
attrs.remove(USERNAME);

if (email != null)
attrs.put(EMAIL, Collections.singletonList(getEmail()));
else
attrs.remove(EMAIL);

if (lastName != null)
attrs.put(LAST_NAME, Collections.singletonList(getLastName()));

if (firstName != null)
attrs.put(FIRST_NAME, Collections.singletonList(getFirstName()));

return attrs;
}

public void setAttributes(Map<String, List<String>> attributes) {
this.attributes = attributes;
}

@SuppressWarnings("unchecked")
public <R extends AbstractUserRepresentation> R singleAttribute(String name, String value) {
if (this.attributes == null) this.attributes=new HashMap<>();
attributes.put(name, (value == null ? Collections.emptyList() : Arrays.asList(value)));
return (R) this;
}

public String firstAttribute(String key) {
return this.attributes == null ? null : this.attributes.get(key) == null ? null : this.attributes.get(key).isEmpty()? null : this.attributes.get(key).get(0);
}

public void setUserProfileMetadata(UserProfileMetadata userProfileMetadata) {
this.userProfileMetadata = userProfileMetadata;
}

public UserProfileMetadata getUserProfileMetadata() {
return userProfileMetadata;
}
}
Loading

0 comments on commit 67330ab

Please sign in to comment.