-
Notifications
You must be signed in to change notification settings - Fork 174
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added the resetLink function for admin portal
- Loading branch information
1 parent
4d396f2
commit bca6e50
Showing
6 changed files
with
190 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
orcid-core/src/main/java/org/orcid/pojo/AdminResetPasswordLink.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| package org.orcid.pojo; | ||
|
|
||
| import java.util.Date; | ||
|
|
||
| public class AdminResetPasswordLink { | ||
| private String resetLink; | ||
|
|
||
| private String email; | ||
|
|
||
| private String error; | ||
|
|
||
| private Date issueDate; | ||
|
|
||
| private int durationInHours = 4; | ||
|
|
||
| public String getResetLink() { | ||
| return resetLink; | ||
| } | ||
|
|
||
| public void setResetLink(String resetLink) { | ||
| this.resetLink = resetLink; | ||
| } | ||
|
|
||
| public String getEmail() { | ||
| return email; | ||
| } | ||
|
|
||
| public void setEmail(String email) { | ||
| this.email = email; | ||
| } | ||
|
|
||
| public String getError() { | ||
| return error; | ||
| } | ||
|
|
||
| public void setError(String error) { | ||
| this.error = error; | ||
| } | ||
|
|
||
| public Date getIssueDate() { | ||
| return issueDate; | ||
| } | ||
|
|
||
| public void setIssueDate(Date issueDate) { | ||
| this.issueDate = issueDate; | ||
| } | ||
|
|
||
| public int getDurationInHours() { | ||
| return durationInHours; | ||
| } | ||
|
|
||
| public void setDurationInHours(int durationInHours) { | ||
| this.durationInHours = durationInHours; | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,7 +26,10 @@ | |
| import javax.servlet.http.HttpServletRequest; | ||
| import javax.servlet.http.HttpServletResponse; | ||
| import javax.servlet.http.HttpSession; | ||
| import javax.xml.datatype.DatatypeFactory; | ||
| import javax.xml.datatype.XMLGregorianCalendar; | ||
|
|
||
| import org.apache.commons.codec.binary.Base64; | ||
| import org.junit.After; | ||
| import org.junit.AfterClass; | ||
| import org.junit.Before; | ||
|
|
@@ -44,7 +47,9 @@ | |
| import org.orcid.core.common.manager.EmailFrequencyManager; | ||
| import org.orcid.core.locale.LocaleManager; | ||
| import org.orcid.core.manager.AdminManager; | ||
| import org.orcid.core.manager.EncryptionManager; | ||
| import org.orcid.core.manager.ProfileEntityCacheManager; | ||
| import org.orcid.core.manager.impl.OrcidUrlManager; | ||
| import org.orcid.core.manager.v3.ClientDetailsManager; | ||
| import org.orcid.core.manager.v3.EmailManager; | ||
| import org.orcid.core.manager.v3.NotificationManager; | ||
|
|
@@ -58,6 +63,8 @@ | |
| import org.orcid.core.profile.history.ProfileHistoryEventType; | ||
| import org.orcid.core.security.OrcidUserDetailsService; | ||
| import org.orcid.core.security.OrcidWebRole; | ||
| import org.orcid.core.utils.PasswordResetToken; | ||
| import org.orcid.core.utils.VerifyEmailUtils; | ||
| import org.orcid.frontend.email.RecordEmailSender; | ||
| import org.orcid.frontend.web.util.BaseControllerTest; | ||
| import org.orcid.jaxb.model.clientgroup.ClientType; | ||
|
|
@@ -73,13 +80,15 @@ | |
| import org.orcid.persistence.jpa.entities.RecordNameEntity; | ||
| import org.orcid.pojo.AdminChangePassword; | ||
| import org.orcid.pojo.AdminDelegatesRequest; | ||
| import org.orcid.pojo.AdminResetPasswordLink; | ||
| import org.orcid.pojo.ConvertClient; | ||
| import org.orcid.pojo.LockAccounts; | ||
| import org.orcid.pojo.ProfileDeprecationRequest; | ||
| import org.orcid.pojo.ProfileDetails; | ||
| import org.orcid.pojo.ajaxForm.Text; | ||
| import org.orcid.test.OrcidJUnit4ClassRunner; | ||
| import org.orcid.test.TargetProxyHelper; | ||
| import org.orcid.utils.DateUtils; | ||
| import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; | ||
| import org.springframework.security.core.Authentication; | ||
| import org.springframework.security.core.context.SecurityContextHolder; | ||
|
|
@@ -148,6 +157,17 @@ public class AdminControllerTest extends BaseControllerTest { | |
|
|
||
| HttpServletResponse mockResponse = mock(HttpServletResponse.class); | ||
|
|
||
| @Mock | ||
| private OrcidUrlManager mockOrcidUrlManager; | ||
|
|
||
| @Mock | ||
| private VerifyEmailUtils mockVerifyEmailUtils; | ||
|
|
||
| @Mock | ||
| private EncryptionManager mockEncryptionManager; | ||
|
|
||
|
|
||
|
|
||
| @Captor | ||
| private ArgumentCaptor<String> adminUser; | ||
|
|
||
|
|
@@ -1403,4 +1423,48 @@ public void testConvertClient() throws IllegalAccessException, UnsupportedEncodi | |
| Mockito.verify(clientDetailsManager).convertPublicClientToMember(Mockito.eq("public-client"), Mockito.eq("legal-group")); | ||
| } | ||
|
|
||
| @Test | ||
| public void resetPasswordLink() throws Exception { | ||
| VerifyEmailUtils verifyEmailUtils = Mockito.mock(VerifyEmailUtils.class); | ||
| EncryptionManager encryptionManager= Mockito.mock(EncryptionManager.class); | ||
| OrcidSecurityManager orcidSecurityManager = Mockito.mock(OrcidSecurityManager.class); | ||
| AdminController adminController = new AdminController(); | ||
| EmailManager emailManager = Mockito.mock(EmailManager.class); | ||
| LocaleManager localeManager = Mockito.mock(LocaleManager.class); | ||
|
|
||
|
|
||
| ReflectionTestUtils.setField(adminController, "verifyEmailUtils", verifyEmailUtils); | ||
| ReflectionTestUtils.setField(adminController, "encryptionManager", encryptionManager); | ||
| ReflectionTestUtils.setField(adminController, "emailManager", emailManager); | ||
| ReflectionTestUtils.setField(adminController, "localeManager", localeManager); | ||
| ReflectionTestUtils.setField(adminController, "orcidSecurityManager", orcidSecurityManager); | ||
|
|
||
| Mockito.when(orcidSecurityManager.isAdmin()).thenReturn(true); | ||
|
|
||
| Mockito.when(emailManager.emailExists(Mockito.anyString())).thenReturn(true); | ||
| Mockito.when(emailManager.emailExists(Mockito.eq("[email protected]"))).thenReturn(false); | ||
| Mockito.when(emailManager.emailExists(Mockito.eq("[email protected]"))).thenReturn(false); | ||
|
|
||
| Mockito.when(localeManager.resolveMessage(Mockito.anyString(), Mockito.any())).thenReturn("That email address is not on our records"); | ||
| Mockito.when(verifyEmailUtils.createResetLinkForAdmin(Mockito.anyString(), Mockito.any())).thenReturn("xyz"); | ||
|
|
||
|
|
||
|
|
||
| AdminResetPasswordLink adminResetPasswordLink = new AdminResetPasswordLink(); | ||
| adminResetPasswordLink.setEmail("[email protected]"); | ||
|
|
||
| adminResetPasswordLink = adminController.resetPasswordLink(mockRequest, mockResponse, adminResetPasswordLink); | ||
|
|
||
| assertEquals("That email address is not on our records", adminResetPasswordLink.getError()); | ||
|
|
||
| adminResetPasswordLink = new AdminResetPasswordLink(); | ||
| adminResetPasswordLink.setEmail("[email protected]"); | ||
| XMLGregorianCalendar date = DateUtils.convertToXMLGregorianCalendarNoTimeZoneNoMillis(new Date()); | ||
| Mockito.when(encryptionManager.decryptForExternalUse(Mockito.anyString())).thenReturn("[email protected]&issueDate="+ date.toXMLFormat()+ "&h=24"); | ||
| adminResetPasswordLink = adminController.resetPasswordLink(mockRequest, mockResponse, adminResetPasswordLink); | ||
| assertNotNull(adminResetPasswordLink.getResetLink()); | ||
| assertEquals(24,adminResetPasswordLink.getDurationInHours()); | ||
|
|
||
| } | ||
|
|
||
| } | ||