Skip to content

Commit ca10cad

Browse files
chore/275-remove-switch-user-from-registry (#7404)
Co-authored-by: Angel Montenegro <[email protected]>
1 parent eba472a commit ca10cad

File tree

4 files changed

+0
-76
lines changed

4 files changed

+0
-76
lines changed

orcid-web/src/main/java/org/orcid/frontend/web/controllers/AdminController.java

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -738,30 +738,6 @@ public Map<String, String> findIdByEmailHelper(String csvEmails) {
738738
return form;
739739
}
740740

741-
/**
742-
* Admin switch user
743-
*
744-
* @throws IllegalAccessException
745-
* @throws UnsupportedEncodingException
746-
*/
747-
@RequestMapping(value = "/admin-switch-user", method = RequestMethod.GET)
748-
public @ResponseBody Map<String, String> adminSwitchUser(HttpServletRequest serverRequest, HttpServletResponse response,
749-
@ModelAttribute("orcidOrEmail") String orcidOrEmail) throws IllegalAccessException, UnsupportedEncodingException {
750-
isAdmin(serverRequest, response);
751-
Map<String, String> result = new HashMap<String, String>();
752-
String orcidId = getOrcidFromParam(orcidOrEmail);
753-
if (orcidId == null) {
754-
result.put("errorMessg", "Invalid id " + orcidOrEmail);
755-
} else {
756-
if (StringUtils.isEmpty(orcidId) || !profileEntityManager.orcidExists(orcidId)) {
757-
result.put("errorMessg", "Invalid id " + orcidOrEmail);
758-
} else {
759-
result.put("id", orcidId);
760-
}
761-
}
762-
return result;
763-
}
764-
765741
/**
766742
* Admin verify email
767743
*

orcid-web/src/main/resources/freemarker/admin/admin_actions.ftl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,5 @@
55
<#include "/includes/ng2_templates/id-banner-ng2-template.ftl"/>
66
<id-banner-ng2> </id-banner-ng2>
77
</div>
8-
<!-- Right menu bar -->
9-
<div class="col-md-9 col-sm-12 col-xs-12 admin-options">
10-
<#include "../includes/ng2_templates/admin-actions-ng2-template.ftl">
11-
<admin-actions-ng2></admin-actions-ng2>
12-
</div>
138
</div>
149
</@public>

orcid-web/src/main/resources/freemarker/includes/ng2_templates/user-menu-template.ftl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,6 @@
5555
<img src="{{assetsPath + '/img/svg/baseline-build-24px.svg'}}">
5656
{{'${springMacroRequestContext.getMessage("workspace.self_service")?replace("<br />", " ")?replace("'", "\\'")}' }}
5757
</a>
58-
<#-- ADMIN ACTIONS -->
59-
<a class="top-menu-item" *ngIf="userInfo['ADMIN_MENU']" href="{{getBaseUri()}}/admin-actions">
60-
<img src="{{assetsPath + '/img/svg/baseline-verified_user-24px.svg'}}">
61-
{{'${springMacroRequestContext.getMessage("admin.workspace_link")?replace("<br />", " ")?replace("'", "\\'")}'}}
62-
</a>
6358
<#-- SIGN OUT -->
6459
<a class="top-menu-item" href="{{getBaseUri()}}/signout">
6560
<img src="{{assetsPath + '/img/svg/baseline-exit_to_app-24px.svg'}}">

orcid-web/src/test/java/org/orcid/frontend/web/controllers/AdminControllerLegacyTest.java

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,48 +1139,6 @@ public ProfileEntity answer(InvocationOnMock invocation) throws Throwable {
11391139
assertEquals(1, results.getTrusted().getErrors().size());
11401140
}
11411141

1142-
@Test
1143-
public void adminSwitchUser() throws Exception {
1144-
ProfileEntityCacheManager profileEntityCacheManager = Mockito.mock(ProfileEntityCacheManager.class);
1145-
ProfileEntityManager profileEntityManager = Mockito.mock(ProfileEntityManager.class);
1146-
EmailManager emailManager = Mockito.mock(EmailManager.class);
1147-
OrcidSecurityManager orcidSecurityManager = Mockito.mock(OrcidSecurityManager.class);
1148-
1149-
AdminController adminController = new AdminController();
1150-
1151-
ReflectionTestUtils.setField(adminController, "orcidSecurityManager", orcidSecurityManager);
1152-
ReflectionTestUtils.setField(adminController, "profileEntityManager", profileEntityManager);
1153-
ReflectionTestUtils.setField(adminController, "emailManager", emailManager);
1154-
ReflectionTestUtils.setField(adminController, "profileEntityCacheManager", profileEntityCacheManager);
1155-
1156-
Mockito.when(orcidSecurityManager.isAdmin()).thenReturn(true);
1157-
1158-
Mockito.when(emailManager.emailExists(Mockito.anyString())).thenReturn(true);
1159-
Mockito.when(emailManager.emailExists(Mockito.eq("[email protected]"))).thenReturn(false);
1160-
Mockito.when(emailManager.emailExists(Mockito.eq("[email protected]"))).thenReturn(false);
1161-
1162-
Mockito.when(profileEntityManager.orcidExists(Mockito.anyString())).thenReturn(true);
1163-
Mockito.when(profileEntityManager.orcidExists(Mockito.eq("[email protected]"))).thenReturn(false);
1164-
Mockito.when(profileEntityManager.orcidExists(Mockito.eq("[email protected]"))).thenReturn(false);
1165-
1166-
Map<String, String> results = adminController.adminSwitchUser(mockRequest, mockResponse, "[email protected]");
1167-
1168-
assertEquals("Invalid id [email protected]", results.get("errorMessg"));
1169-
1170-
results = adminController.adminSwitchUser(mockRequest, mockResponse, "[email protected]");
1171-
1172-
assertEquals("Invalid id [email protected]", results.get("errorMessg"));
1173-
1174-
results = adminController.adminSwitchUser(mockRequest, mockResponse, "0000-0000-0000-0001");
1175-
1176-
assertEquals("0000-0000-0000-0001", results.get("id"));
1177-
1178-
results = adminController.adminSwitchUser(mockRequest, mockResponse, "https://orcid.org/0000-0000-0000-0002");
1179-
1180-
assertEquals("0000-0000-0000-0002", results.get("id"));
1181-
1182-
}
1183-
11841142
@Test
11851143
public void resetPasswordValidateId() throws Exception {
11861144
ProfileEntityCacheManager profileEntityCacheManager = Mockito.mock(ProfileEntityCacheManager.class);

0 commit comments

Comments
 (0)