Skip to content

Commit 3828a38

Browse files
committed
feat: removed rule that does not allow username to be user password
1 parent 894b821 commit 3828a38

File tree

4 files changed

+9
-16
lines changed

4 files changed

+9
-16
lines changed

agate-core/src/main/java/org/obiba/agate/domain/User.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -377,13 +377,13 @@ private Builder() {
377377
private Builder(String username) {
378378
this();
379379
if (!Strings.isNullOrEmpty(username)) {
380+
name(username);
381+
email(username);
380382
String uname = username;
381383
if (username.contains("@")) {
382-
uname = username.replace("@", "_");
384+
uname = username.split("@")[0];
383385
}
384-
name(uname);
385-
email(username);
386-
String[] parts = uname.split("_")[0].split("\\.");
386+
String[] parts = uname.split("\\.");
387387
if (parts.length>0)
388388
firstName(CaseFormat.LOWER_HYPHEN.to(CaseFormat.UPPER_CAMEL, parts[0].toLowerCase()));
389389
else

agate-core/src/test/java/org/obiba/agate/domain/UserTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ public void testBuilderFromEmail() {
8080
String email = "[email protected]";
8181
User user = User.newBuilder(email).build();
8282
assertEquals(email, user.getEmail());
83-
assertEquals("andy.warhol_factory.org", user.getName());
83+
assertEquals("andy.warhol@factory.org", user.getName());
8484
assertEquals("Andy", user.getFirstName());
8585
assertEquals("Warhol", user.getLastName());
8686

8787
email = "[email protected]";
8888
user = User.newBuilder(email).build();
8989
assertEquals(email, user.getEmail());
90-
assertEquals("andy_factory.org", user.getName());
90+
assertEquals("andy@factory.org", user.getName());
9191
assertEquals("Andy", user.getFirstName());
9292
assertEquals("", user.getLastName());
9393
}

agate-rest/src/main/java/org/obiba/agate/web/rest/user/UsersPublicResource.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,10 @@ public Response create(@Context HttpServletRequest request, MultivaluedMap<Strin
200200

201201
String name = username == null ? null : username.trim().replaceAll(" ", "");
202202

203-
if (Strings.isNullOrEmpty(username)) {
203+
if (Strings.isNullOrEmpty(name)) {
204204
if (config.isJoinWithUsername())
205205
throw new BadRequestException("User name cannot be empty");
206-
207-
try {
208-
name = email.replace("@", "_");
209-
} catch (Exception e) {
210-
name = new ObjectId().toString();
211-
}
206+
name = email;
212207
}
213208

214209
if (!reCaptchaService.verify(Strings.isNullOrEmpty(reCaptchaResponse) ? reCaptchaResponse2 : reCaptchaResponse))

agate-rest/src/main/java/org/obiba/agate/web/rest/user/UsersResource.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ public Agate.UserDto getUserId(@QueryParam("q") String searchTerm) {
8787
public Response create(Agate.UserCreateFormDto userCreateFormDto) {
8888
Agate.UserDto userDto = userCreateFormDto.getUser();
8989
String username = userDto.getName().trim();
90-
91-
if (new EmailValidator().isValid(username, null)) throw new BadRequestException("username can not be an email address.");
92-
90+
9391
User user = userService.findUser(username);
9492

9593
if(user != null) throw new BadRequestException("User already exists: " + username);

0 commit comments

Comments
 (0)