Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package fr.insalyon.creatis.vip.core.models;

import com.fasterxml.jackson.annotation.JsonView;
import com.google.gwt.user.client.rpc.IsSerializable;
import fr.insalyon.creatis.vip.core.server.inter.DataViews;

import com.fasterxml.jackson.annotation.JsonCreator;

@JsonView(DataViews.User.class)
public class ActivationForm implements IsSerializable {

private String code;

public ActivationForm() {
}

public ActivationForm(String code) {
this.code = code;
}

public String getCode() {
return code;
}

public void setCode(String code) {
this.code = code;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public Session getSession(User user) {
session.id = user.getSession();
session.email = user.getEmail();
session.userlevel = user.getLevel();
session.confirmed = user.isConfirmed();
return session;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import fr.insalyon.creatis.vip.core.client.DefaultError;
import fr.insalyon.creatis.vip.core.client.VipException;
import fr.insalyon.creatis.vip.core.models.ActivationForm;
import fr.insalyon.creatis.vip.core.models.User;
import fr.insalyon.creatis.vip.core.models.UserAndPassword;
import fr.insalyon.creatis.vip.core.server.business.AuthenticationBusiness;
Expand Down Expand Up @@ -97,4 +98,9 @@ public User create(@RequestBody @Valid UserAndPassword form) throws VipException
logger.info("Signup completed: email='{}', generatedId='{}'", createdUser.getEmail(), createdUser.getId());
return createdUser;
}
}

@PutMapping(value = "{id}/activate")
public void activate(@PathVariable String id, @RequestBody @Valid ActivationForm form) throws VipException {
authenticationBusiness.activate(id, form.getCode());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ public class Session {
public String email;
public String password;
public UserLevel userlevel;
public Boolean confirmed;
}
Loading