Skip to content

[DM-31056] Stop attempting to get user's full name #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[DM-31056] Stop attempting to get user's full name #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/suit/java/edu/caltech/ipac/lsst/security/LsstSsoAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ public class LsstSsoAdapter implements SsoAdapter {

private static final String GROUPS_HEADER = "X-Auth-Request-Groups";
private static final String EMAIL_HEADER = "X-Auth-Request-Email";
private static final String NAME_HEADER = "X-Auth-Request-Name";
private static final String TOKEN_HEADER = "X-Auth-Request-Token";
private static final String USERNAME_HEADER = "X-Auth-Request-Username";

// the keywords are listed in https://confluence.lsstcorp.org/display/LAAIM/Web+SSO
private static final String USER_NAME = "sub"; // ex.value "http://cilogon.org/serverT/users/123456'
private static final String UID = "uid"; // ex.value "username"
private static final String NAME = "name";
private static final String EMAIL = "email";
private static final String EXPIRES = "exp";
private static final String ID_TOKEN = "X-Auth-Request-Token";
Expand All @@ -59,7 +57,6 @@ public Token getAuthToken() {
token = new Token(String.valueOf(claims.get(USER_NAME)));
token.setExpiresOn(StringUtils.getInt(claims.get(EXPIRES), 0));
token.set(EMAIL, String.valueOf(claims.get(EMAIL)));
token.set(NAME, String.valueOf(claims.get(NAME)));
token.set(UID, String.valueOf(claims.get(UID)));
token.set(ID_TOKEN, id_token);

Expand All @@ -70,7 +67,6 @@ public Token getAuthToken() {
token = new Token(username);
token.setExpiresOn(0);
token.set(EMAIL, getString(ra, EMAIL_HEADER, null));
token.set(NAME, getString(ra, NAME_HEADER, null));
token.set(UID, username);
token.set(ID_TOKEN, id_token);

Expand All @@ -90,12 +86,6 @@ public UserInfo getUserInfo() {
//user.setLoginName(token.getId());
user.setLoginName(token.get(UID));
user.setEmail(token.get(EMAIL));
String name = token.get(NAME) == null ? "" : token.get(NAME);
String[] parts = name.split(" ");
String firstName = parts.length > 0 ? parts[0] : "";
String lastName = parts.length > 1 ? parts[1] : firstName;
user.setFirstName(firstName);
user.setLastName(lastName);
return user;
}
return null;
Expand Down