This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 3d74249f authored by Eduard Frankford's avatar Eduard Frankford
Browse files

fix pmd

parent a8d8a731
Branches
3 merge requests!1772023 März Release,!171Fixed #369 und added automatic user registration in gitlab,!146Put the sonar-analyze job into a separate stage
......@@ -2,7 +2,6 @@ package at.ac.uibk.gitsearch.security.oauth2;
import at.ac.uibk.gitsearch.domain.Authority;
import at.ac.uibk.gitsearch.service.dto.AdminUserDTO;
import java.time.Instant;
import java.util.ArrayList;
import java.util.Date;
......@@ -12,7 +11,6 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.function.Consumer;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
......@@ -97,21 +95,21 @@ public class UserDetailsFetcher {
String email = (String) oidcUser.getAttribute("email");
User gitUser = gitLabApi.getUserApi().getUserByEmail(email);
if (gitUser == null) {
// try to create the user
gitUser = setUpNewGitLabUserFor(oidcUser);
gitUser = createNewGitLabUserFor(oidcUser);
String generatedPassword = generatePassword();
gitLabApi.getUserApi().createUser(gitUser, generatedPassword, true);
gitUser = gitLabApi.getUserApi().getUserByEmail(email);
if (gitUser == null) {
// gitUser still null. Something went wrong?
u.setLastModifiedDate(Instant.now());
modified = true;
return new UserDetailsInfo(userToken, modified);
u.setLastModifiedDate(Instant.now());
modified = true;
return new UserDetailsInfo(userToken, modified);
}
}
}
userToken = requestGitLabUserToken(gitUser, gitLabApi);
List<Membership> memberships = gitLabApi.getUserApi().getMemberships(gitUser.getId());
......@@ -139,11 +137,10 @@ public class UserDetailsFetcher {
}
private String generatePassword() {
return RandomStringUtils.random(8,
"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz=%$-.");
return RandomStringUtils.random(8, "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz=%$-.");
}
private User setUpNewGitLabUserFor(final OidcUser oidcUser) {
private User createNewGitLabUserFor(final OidcUser oidcUser) {
User gitUser = new User();
String email = oidcUser.getEmail();
gitUser.setEmail(email);
......@@ -155,7 +152,6 @@ public class UserDetailsFetcher {
gitUser.setUsername(userName);
return gitUser;
}
Optional<ImpersonationToken> requestGitLabUserToken(final User gitUser, final GitLabApi gitLabApi) throws GitLabApiException {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment