Hello " + name + ",
" + + String message = "Hello" + ((name != null)?(" " + name):"") + ",
" + "You have been invited to manage " + details.get("name").getAsString() + ". " + "Use the verification code below to accept the invitation." + "
" + @@ -142,6 +142,52 @@ public class RegistryService { } } + /** + * Invite user with email to be a member of a type(Community, etc.) with id(ee, egi, etc.) + * Auto generated link and code will be sent as response. + */ + @Path("/invite/{type}/{id}/member/{email}") + @POST + @Produces(MediaType.APPLICATION_JSON) + @PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.USER_ADMIN, @AuthorizationService.PORTAL_ADMIN, " + + "@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))") + public Response inviteMember(@PathParam("type") String type, @PathParam("id") String id, @PathParam("email") String email, @RequestBody String body) { + Integer couId = calls.getCouId(type, id); + if (couId != null) { + Integer coPersonId = calls.getCoPersonIdByEmail(email); + if (coPersonId == null || calls.getRoleId(coPersonId, couId) == null) { + JsonObject invitation = verificationUtils.createMemberInvitation(email, type, id); + String name = (coPersonId != null)?calls.getUserNames(coPersonId):null; + JsonObject details = new JsonParser().parse(body).getAsJsonObject(); + String link = details.get("link").getAsString() + invitation.get("link").getAsString(); + String subject = "Invite to be a member of " + details.get("name").getAsString(); + String message = "Hello" + ((name != null)?(" " + name):"") + ",
" + + "You have been invited to be a member of " + details.get("name").getAsString() + ". " + + "Use the verification code below to accept the invitation." + + "
" + + "" + + "The verification code is " + invitation.get("code").getAsString() + + "
" + + "Click the URL below and proceed with the process." + + "" + + "Thank you,
" + + "OpenAIRE technical team
"; + try { + emailSender.sendEmail(email, subject, message); + return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(invitation).toString()).type(MediaType.APPLICATION_JSON).build(); + } catch (MessagingException e) { + logger.error(e.getMessage()); + verificationUtils.deleteVerification(invitation.get("link").getAsString()); + return Response.status(HttpStatus.BAD_REQUEST.value()).entity(jsonUtils.createResponse("Email sent failed").toString()).type(MediaType.APPLICATION_JSON).build(); + } + } else { + return Response.status(HttpStatus.CONFLICT.value()).entity(jsonUtils.createResponse("User has been already member of this " + type).toString()).type(MediaType.APPLICATION_JSON).build(); + } + } else { + return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build(); + } + } + /** * Cancel invitation to user with email for managing a type(Community, etc.) with id(ee, egi, etc.) */ @@ -150,10 +196,28 @@ public class RegistryService { @Produces(MediaType.APPLICATION_JSON) @PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.USER_ADMIN, @AuthorizationService.PORTAL_ADMIN, " + "@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))") - public Response cancelUserInvitations(@PathParam("type") String type, @PathParam("id") String id, @PathParam("email") String email) { + public Response cancelManagerInvitations(@PathParam("type") String type, @PathParam("id") String id, @PathParam("email") String email) { Integer couId = calls.getCouId(type, id); if (couId != null) { - verificationUtils.deleteUserVerifications(email, type, id); + verificationUtils.deleteManagerVerifications(email, type, id); + return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse("Invitations have been deleted").toString()).type(MediaType.APPLICATION_JSON).build(); + } else { + return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build(); + } + } + + /** + * Cancel invitation to user with email for being member of a type(Community, etc.) with id(ee, egi, etc.) + */ + @Path("/invite/{type}/{id}/member/{email}") + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.USER_ADMIN, @AuthorizationService.PORTAL_ADMIN, " + + "@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))") + public Response cancelMemberInvitations(@PathParam("type") String type, @PathParam("id") String id, @PathParam("email") String email) { + Integer couId = calls.getCouId(type, id); + if (couId != null) { + verificationUtils.deleteMemberVerifications(email, type, id); return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse("Invitations have been deleted").toString()).type(MediaType.APPLICATION_JSON).build(); } else { return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build(); @@ -169,7 +233,20 @@ public class RegistryService { @PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.USER_ADMIN, @AuthorizationService.PORTAL_ADMIN, " + "@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))") public Response getInvitedManagers(@PathParam("type") String type, @PathParam("id") String id) { - JsonArray invited = verificationUtils.getInvitedUsers(type, id); + JsonArray invited = verificationUtils.getInvitedManagers(type, id); + return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(invited).toString()).type(MediaType.APPLICATION_JSON).build(); + } + + /** + * Get the invited members for a type(Community, etc.) with id(ee, egi, etc.) + */ + @Path("/invite/{type}/{id}/members/") + @GET + @Produces(MediaType.APPLICATION_JSON) + @PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.USER_ADMIN, @AuthorizationService.PORTAL_ADMIN, " + + "@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))") + public Response getInviteMembers(@PathParam("type") String type, @PathParam("id") String id) { + JsonArray invited = verificationUtils.getInvitedMembers(type, id); return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(invited).toString()).type(MediaType.APPLICATION_JSON).build(); } @@ -181,10 +258,10 @@ public class RegistryService { @Produces(MediaType.APPLICATION_JSON) @PreAuthorize("isAuthenticated()") public Response getVerification(@PathParam("id") String id) { - ManagerVerification managerVerification = verificationUtils.getVerification(id); - if (managerVerification != null) { - if (calls.getCoPersonIdByEmail(managerVerification.getEmail()).equals(calls.getCoPersonIdByIdentifier())) { - return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(jsonUtils.createVerification(managerVerification)).toString()).type(MediaType.APPLICATION_JSON).build(); + RoleVerification verification = verificationUtils.getVerification(id); + if (verification != null) { + if (calls.getCoPersonIdByEmail(verification.getEmail()).equals(calls.getCoPersonIdByIdentifier())) { + return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(jsonUtils.createVerification(verification)).toString()).type(MediaType.APPLICATION_JSON).build(); } else { return Response.status(HttpStatus.FORBIDDEN.value()).entity(jsonUtils.createResponse("Forbidden verification").toString()).type(MediaType.APPLICATION_JSON).build(); } @@ -213,23 +290,24 @@ public class RegistryService { * Verify the verification with the specific id, if the code is correct and it refers to the logged in user. * Manager role is assigned to this user, along with the member role. */ - @Path("verification/{id}") + @Path("verification/manager/{id}") @POST @Produces(MediaType.APPLICATION_JSON) @PreAuthorize("isAuthenticated()") - public Response verify(@PathParam("id") String id, @RequestBody String code) { - ManagerVerification managerVerification = verificationUtils.getVerification(id); - if (managerVerification != null) { - Integer coPersonId = calls.getCoPersonIdByEmail(managerVerification.getEmail()); + public Response verifyManager(@PathParam("id") String id, @RequestBody String code) { + RoleVerification verification = verificationUtils.getVerification(id); + if (verification != null && verification.getVerificationType().equals("manager")) { + Integer coPersonId = calls.getCoPersonIdByEmail(verification.getEmail()); if (coPersonId != null) { if (coPersonId.equals(calls.getCoPersonIdByIdentifier())) { - if (managerVerification.getVerificationCode().equals(code)) { - verificationUtils.deleteRelatedVerifications(managerVerification); - Integer couId = calls.getCouId(managerVerification.getType(), managerVerification.getEntity()); + if (verification.getVerificationCode().equals(code)) { + Integer couId = calls.getCouId(verification.getType(), verification.getEntity()); if (couId != null) { Integer role = calls.getRoleId(coPersonId, couId); calls.assignMemberRole(coPersonId, couId, role); + verificationUtils.deleteMemberVerifications(verification.getEmail(), verification.getType(), verification.getEntity()); if (calls.getUserAdminGroup(coPersonId, couId) == null) { + verificationUtils.deleteManagerVerifications(verification.getEmail(), verification.getType(), verification.getEntity()); calls.assignAdminRole(coPersonId, couId); return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse("Admin role has been assigned").toString()).type(MediaType.APPLICATION_JSON).build(); } else { @@ -252,6 +330,44 @@ public class RegistryService { } } + /** + * Verify the verification with the specific id, if the code is correct and it refers to the logged in user. + * Member role is assigned to this user, along with the member role. + */ + @Path("verification/member/{id}") + @POST + @Produces(MediaType.APPLICATION_JSON) + @PreAuthorize("isAuthenticated()") + public Response verifyMember(@PathParam("id") String id, @RequestBody String code) { + RoleVerification verification = verificationUtils.getVerification(id); + if (verification != null && verification.getVerificationType().equals("member")) { + Integer coPersonId = calls.getCoPersonIdByEmail(verification.getEmail()); + if (coPersonId != null) { + if (coPersonId.equals(calls.getCoPersonIdByIdentifier())) { + if (verification.getVerificationCode().equals(code)) { + Integer couId = calls.getCouId(verification.getType(), verification.getEntity()); + if (couId != null) { + Integer role = calls.getRoleId(coPersonId, couId); + calls.assignMemberRole(coPersonId, couId, role); + verificationUtils.deleteMemberVerifications(verification.getEmail(), verification.getType(), verification.getEntity()); + return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse("Member role has been assigned").toString()).type(MediaType.APPLICATION_JSON).build(); + } else { + return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build(); + } + } else { + return Response.status(HttpStatus.FORBIDDEN.value()).entity(jsonUtils.createResponse("Verification code is wrong").toString()).type(MediaType.APPLICATION_JSON).build(); + } + } else { + return Response.status(HttpStatus.FORBIDDEN.value()).entity(jsonUtils.createResponse("Forbidden verification").toString()).type(MediaType.APPLICATION_JSON).build(); + } + } else { + return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("User has not been found").toString()).type(MediaType.APPLICATION_JSON).build(); + } + } else { + return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Verification has not been found").toString()).type(MediaType.APPLICATION_JSON).build(); + } + } + /** * Remove the manager role from user with email for a type(Community, etc.) with id(ee, egi, etc.) */ @@ -278,40 +394,67 @@ public class RegistryService { } /** - * Get the names of the subscribers of a type(Community, etc.) with id(ee, egi, etc.) + * Remove the member role from user with email for a type(Community, etc.) with id(ee, egi, etc.) */ - @Path("/{type}/{id}/subscribers") + @Path("/{type}/{id}/member/{email}") + @DELETE + @Produces(MediaType.APPLICATION_JSON) + @Consumes(MediaType.APPLICATION_JSON) + @PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.USER_ADMIN," + + "@AuthorizationService.PORTAL_ADMIN, @AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))") + public Response removeMemberRole(@PathParam("type") String type, @PathParam("id") String + id, @PathParam("email") String email) { + Integer coPersonId = calls.getCoPersonIdByEmail(email); + if (coPersonId != null) { + Integer couId = calls.getCouId(type, id); + Integer role = calls.getRoleId(coPersonId, couId); + if (couId != null && role != null) { + calls.removeAdminRole(coPersonId, couId); + calls.removeMemberRole(coPersonId, couId, role); + return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse("Role has been removed").toString()).type(MediaType.APPLICATION_JSON).build(); + } else { + return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("Role has not been found").toString()).type(MediaType.APPLICATION_JSON).build(); + } + } else { + return Response.status(HttpStatus.NOT_FOUND.value()).entity(jsonUtils.createResponse("User has not been found").toString()).type(MediaType.APPLICATION_JSON).build(); + } + } + + /** + * Get the names of the members of a type(Community, etc.) with id(ee, egi, etc.) + */ + @Path("/{type}/{id}/members") @GET @Produces(MediaType.APPLICATION_JSON) @PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.PORTAL_ADMIN," + "@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))") - public Response getSubscribers(@PathParam("type") String type, @PathParam("id") String id) { + public Response getMembers(@PathParam("type") String type, @PathParam("id") String id) { Integer couId = calls.getCouId(type, id); JsonArray subscribers = calls.getUserNamesByCouId(couId, false); return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(subscribers).toString()).type(MediaType.APPLICATION_JSON).build(); } /** - * Get the emails of the subscribers of a type(Community, etc.) with id(ee, egi, etc.) + * Get the emails of the members of a type(Community, etc.) with id(ee, egi, etc.) */ - @Path("/{type}/{id}/subscribers/email") + @Path("/{type}/{id}/members/email") @GET @Produces(MediaType.APPLICATION_JSON) @PreAuthorize("hasAnyAuthority(@AuthorizationService.SUPER_ADMIN, @AuthorizationService.PORTAL_ADMIN," + "@AuthorizationService.curator(#type), @AuthorizationService.manager(#type, #id))") - public Response getSubscribersEmail(@PathParam("type") String type, @PathParam("id") String id) { + public Response getMembersEmail(@PathParam("type") String type, @PathParam("id") String id) { Integer couId = calls.getCouId(type, id); JsonArray subscribers = calls.getUserEmailByCouId(couId, false); return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(subscribers).toString()).type(MediaType.APPLICATION_JSON).build(); } /** - * Get the number of the subscribers of a type(Community, etc.) with id(ee, egi, etc.) + * Get the number of the members of a type(Community, etc.) with id(ee, egi, etc.) */ - @Path("/{type}/{id}/subscribers/count") + @Path("/{type}/{id}/members/count") @GET @Produces(MediaType.APPLICATION_JSON) - public Response getSubscribersCount(@PathParam("type") String type, @PathParam("id") String id) { + public Response getMembersCount(@PathParam("type") String type, @PathParam("id") String id) { Integer couId = calls.getCouId(type, id); int count = calls.getUserNamesByCouId(couId, false).size(); return Response.status(HttpStatus.OK.value()).entity(jsonUtils.createResponse(count).toString()).type(MediaType.APPLICATION_JSON).build(); diff --git a/src/main/java/eu/dnetlib/openaire/usermanagement/utils/AuthorizationService.java b/src/main/java/eu/dnetlib/openaire/usermanagement/utils/AuthorizationService.java index 7a7b29b..8f3e607 100644 --- a/src/main/java/eu/dnetlib/openaire/usermanagement/utils/AuthorizationService.java +++ b/src/main/java/eu/dnetlib/openaire/usermanagement/utils/AuthorizationService.java @@ -34,4 +34,8 @@ public class AuthorizationService { public String member(String type, String id) { return type.toUpperCase() + "_" + id.toUpperCase(); } + + public boolean isCommunity(String type) { + return type.equals("community"); + } } diff --git a/src/main/java/eu/dnetlib/openaire/usermanagement/utils/JsonUtils.java b/src/main/java/eu/dnetlib/openaire/usermanagement/utils/JsonUtils.java index 3ff4cc2..fe5eefd 100644 --- a/src/main/java/eu/dnetlib/openaire/usermanagement/utils/JsonUtils.java +++ b/src/main/java/eu/dnetlib/openaire/usermanagement/utils/JsonUtils.java @@ -3,14 +3,11 @@ package eu.dnetlib.openaire.usermanagement.utils; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import eu.dnetlib.openaire.user.pojos.ManagerVerification; +import eu.dnetlib.openaire.user.pojos.RoleVerification; import eu.dnetlib.openaire.usermanagement.dto.Role; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import java.sql.Timestamp; -import java.util.Date; - @Component public class JsonUtils { @@ -79,13 +76,14 @@ public class JsonUtils { return cou; } - public JsonObject createVerification(ManagerVerification managerVerification) { + public JsonObject createVerification(RoleVerification roleVerification) { JsonObject verification = new JsonObject(); - verification.addProperty("id", managerVerification.getId()); - verification.addProperty("email", managerVerification.getEmail()); - verification.addProperty("type", managerVerification.getType()); - verification.addProperty("entity", managerVerification.getEntity()); - verification.addProperty("date", managerVerification.getDate().getTime()); + verification.addProperty("id", roleVerification.getId()); + verification.addProperty("email", roleVerification.getEmail()); + verification.addProperty("type", roleVerification.getType()); + verification.addProperty("entity", roleVerification.getEntity()); + verification.addProperty("verificationType", roleVerification.getVerificationType()); + verification.addProperty("date", roleVerification.getDate().getTime()); return verification; } diff --git a/src/main/java/eu/dnetlib/openaire/usermanagement/utils/RegistryCalls.java b/src/main/java/eu/dnetlib/openaire/usermanagement/utils/RegistryCalls.java index c92640f..0549d8a 100644 --- a/src/main/java/eu/dnetlib/openaire/usermanagement/utils/RegistryCalls.java +++ b/src/main/java/eu/dnetlib/openaire/usermanagement/utils/RegistryCalls.java @@ -125,7 +125,7 @@ public class RegistryCalls { JsonArray roles = getRoles(coPersonId); for (JsonElement role : roles) { JsonObject object = role.getAsJsonObject(); - if (object.get("CouId").getAsInt() == couId) { + if (object.get("CouId").getAsInt() == couId && !object.get("Status").getAsString().equals("Deleted")) { return object.get("Id").getAsInt(); } } diff --git a/src/main/java/eu/dnetlib/openaire/usermanagement/utils/VerificationUtils.java b/src/main/java/eu/dnetlib/openaire/usermanagement/utils/VerificationUtils.java index 6d7128c..c675421 100644 --- a/src/main/java/eu/dnetlib/openaire/usermanagement/utils/VerificationUtils.java +++ b/src/main/java/eu/dnetlib/openaire/usermanagement/utils/VerificationUtils.java @@ -2,18 +2,18 @@ package eu.dnetlib.openaire.usermanagement.utils; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import eu.dnetlib.openaire.user.pojos.ManagerVerification; +import eu.dnetlib.openaire.user.pojos.RoleVerification; import eu.dnetlib.openaire.user.utils.ManagerVerificationActions; import org.apache.log4j.Logger; import org.mitre.openid.connect.model.OIDCAuthenticationToken; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Component; import java.sql.Timestamp; -import java.util.*; +import java.util.Date; +import java.util.List; +import java.util.Random; @Component("VerificationUtils") @@ -25,56 +25,78 @@ public class VerificationUtils { @Autowired private ManagerVerificationActions actions; - public JsonObject createInvitation(String email, String type, String entity) { + public JsonObject createManagerInvitation(String email, String type, String entity) { + RoleVerification roleVerification = actions.getManagerVerification(email, type, entity); + if(roleVerification == null) { + String id; + do { + id = createId(); + } while (exists(id)); + roleVerification = actions.addManagerVerification(id, email, type, entity, createVerificationCode(), new Timestamp(new Date().getTime())); + } + JsonObject invitation = new JsonObject(); + invitation.addProperty("link", roleVerification.getId()); + invitation.addProperty("code", roleVerification.getVerificationCode()); + return invitation; + } + + public JsonObject createMemberInvitation(String email, String type, String entity) { String id; do { id = createId(); } while (exists(id)); - ManagerVerification managerVerification = actions.addVerificationEntry(id, email, type, entity, createVerificationCode(), new Timestamp(new Date().getTime())); - JsonObject invitation = new JsonObject(); - invitation.addProperty("link", managerVerification.getId()); - invitation.addProperty("code", managerVerification.getVerificationCode()); + RoleVerification roleVerification = actions.getMemberVerification(email, type, entity); + if(roleVerification == null) { + roleVerification = actions.addMemberVerification(id, email, type, entity, createVerificationCode(), new Timestamp(new Date().getTime())); + } JsonObject invitation = new JsonObject(); + invitation.addProperty("link", roleVerification.getId()); + invitation.addProperty("code", roleVerification.getVerificationCode()); return invitation; } - public void deleteRelatedVerifications(ManagerVerification managerVerification) { - List