From db5449730f0f774b43a72a5d553bef34ade30e91 Mon Sep 17 00:00:00 2001 From: INOPIAE Date: Sun, 31 Jul 2016 12:08:19 +0200 Subject: [PATCH 1/1] upd: rename file to match the function FindUserBy Email/Domain Change-Id: Ic24d3e24e5ae7634ac59b02dd26a93314773a475 --- src/org/cacert/gigi/Gigi.java | 8 ++++---- ...ndDomainForm.java => FindUserByDomainForm.java} | 6 +++--- ...DomainForm.templ => FindUserByDomainForm.templ} | 0 ...ndDomainPage.java => FindUserByDomainPage.java} | 8 ++++---- ...{FindUserForm.java => FindUserByEmailForm.java} | 6 +++--- ...indUserForm.templ => FindUserByEmailForm.templ} | 2 +- ...{FindUserPage.java => FindUserByEmailPage.java} | 12 ++++++------ .../admin/support/SupportUserDetailsForm.java | 2 +- .../admin/TestSEAdminPageUserDomainSearch.java | 10 +++++----- .../pages/admin/TestSEAdminPageUserMailSearch.java | 14 +++++++------- .../gigi/pages/admin/TestSEAdminTicketSetting.java | 12 ++++++------ 11 files changed, 40 insertions(+), 40 deletions(-) rename src/org/cacert/gigi/pages/admin/support/{FindDomainForm.java => FindUserByDomainForm.java} (87%) rename src/org/cacert/gigi/pages/admin/support/{FindDomainForm.templ => FindUserByDomainForm.templ} (100%) rename src/org/cacert/gigi/pages/admin/support/{FindDomainPage.java => FindUserByDomainPage.java} (79%) rename src/org/cacert/gigi/pages/admin/support/{FindUserForm.java => FindUserByEmailForm.java} (83%) rename src/org/cacert/gigi/pages/admin/support/{FindUserForm.templ => FindUserByEmailForm.templ} (93%) rename src/org/cacert/gigi/pages/admin/support/{FindUserPage.java => FindUserByEmailPage.java} (86%) diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java index 812f61fb..9e111ae7 100644 --- a/src/org/cacert/gigi/Gigi.java +++ b/src/org/cacert/gigi/Gigi.java @@ -58,8 +58,8 @@ import org.cacert.gigi.pages.account.certs.Certificates; import org.cacert.gigi.pages.account.domain.DomainOverview; import org.cacert.gigi.pages.account.mail.MailOverview; import org.cacert.gigi.pages.admin.TTPAdminPage; -import org.cacert.gigi.pages.admin.support.FindDomainPage; -import org.cacert.gigi.pages.admin.support.FindUserPage; +import org.cacert.gigi.pages.admin.support.FindUserByDomainPage; +import org.cacert.gigi.pages.admin.support.FindUserByEmailPage; import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage; import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; import org.cacert.gigi.pages.error.AccessDenied; @@ -153,8 +153,8 @@ public final class Gigi extends HttpServlet { putPage(ViewOrgPage.DEFAULT_PATH + "/*", new ViewOrgPage(), "Organisation Admin"); putPage(SupportEnterTicketPage.PATH, new SupportEnterTicketPage(), "Support Console"); - putPage(FindUserPage.PATH, new FindUserPage(), "Support Console"); - putPage(FindDomainPage.PATH, new FindDomainPage(), "Support Console"); + putPage(FindUserByEmailPage.PATH, new FindUserByEmailPage(), "Support Console"); + putPage(FindUserByDomainPage.PATH, new FindUserByDomainPage(), "Support Console"); putPage(SupportUserDetailsPage.PATH + "*", new SupportUserDetailsPage(), null); putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account"); diff --git a/src/org/cacert/gigi/pages/admin/support/FindDomainForm.java b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java similarity index 87% rename from src/org/cacert/gigi/pages/admin/support/FindDomainForm.java rename to src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java index 93c4b0c1..779b0026 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindDomainForm.java +++ b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java @@ -13,13 +13,13 @@ import org.cacert.gigi.output.template.Form; import org.cacert.gigi.output.template.SprintfCommand; import org.cacert.gigi.output.template.Template; -public class FindDomainForm extends Form { +public class FindUserByDomainForm extends Form { private CertificateOwner res = null; - private static final Template t = new Template(FindDomainForm.class.getResource("FindDomainForm.templ")); + private static final Template t = new Template(FindUserByDomainForm.class.getResource("FindUserByDomainForm.templ")); - public FindDomainForm(HttpServletRequest hsr) { + public FindUserByDomainForm(HttpServletRequest hsr) { super(hsr); } diff --git a/src/org/cacert/gigi/pages/admin/support/FindDomainForm.templ b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ similarity index 100% rename from src/org/cacert/gigi/pages/admin/support/FindDomainForm.templ rename to src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.templ diff --git a/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainPage.java similarity index 79% rename from src/org/cacert/gigi/pages/admin/support/FindDomainPage.java rename to src/org/cacert/gigi/pages/admin/support/FindUserByDomainPage.java index 06d41621..ee5192b0 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindDomainPage.java +++ b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainPage.java @@ -7,17 +7,17 @@ import org.cacert.gigi.output.template.Form; import org.cacert.gigi.pages.OneFormPage; import org.cacert.gigi.util.AuthorizationContext; -public class FindDomainPage extends OneFormPage { +public class FindUserByDomainPage extends OneFormPage { public static final String PATH = "/support/find/domain"; - public FindDomainPage() { - super("Find Domain", FindDomainForm.class); + public FindUserByDomainPage() { + super("Find Domain", FindUserByDomainForm.class); } @Override public String getSuccessPath(Form f) { - CertificateOwner res = ((FindDomainForm) f).getRes(); + CertificateOwner res = ((FindUserByDomainForm) f).getRes(); if (res instanceof User) { return SupportUserDetailsPage.PATH + res.getId(); } else if (res instanceof Organisation) { diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserForm.java b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java similarity index 83% rename from src/org/cacert/gigi/pages/admin/support/FindUserForm.java rename to src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java index 025e28a8..12c33e97 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindUserForm.java +++ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.java @@ -12,13 +12,13 @@ import org.cacert.gigi.output.template.Form; import org.cacert.gigi.output.template.SprintfCommand; import org.cacert.gigi.output.template.Template; -public class FindUserForm extends Form { +public class FindUserByEmailForm extends Form { private EmailAddress emails[]; - private static final Template t = new Template(FindDomainForm.class.getResource("FindUserForm.templ")); + private static final Template t = new Template(FindUserByDomainForm.class.getResource("FindUserByEmailForm.templ")); - public FindUserForm(HttpServletRequest hsr) { + public FindUserByEmailForm(HttpServletRequest hsr) { super(hsr); } diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserForm.templ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ similarity index 93% rename from src/org/cacert/gigi/pages/admin/support/FindUserForm.templ rename to src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ index 01682243..0461bc39 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindUserForm.templ +++ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailForm.templ @@ -11,7 +11,7 @@ - + diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserPage.java b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java similarity index 86% rename from src/org/cacert/gigi/pages/admin/support/FindUserPage.java rename to src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java index 02e2889b..42d9e8d0 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindUserPage.java +++ b/src/org/cacert/gigi/pages/admin/support/FindUserByEmailPage.java @@ -15,24 +15,24 @@ import org.cacert.gigi.output.template.IterableDataset; import org.cacert.gigi.pages.Page; import org.cacert.gigi.util.AuthorizationContext; -public class FindUserPage extends Page { +public class FindUserByEmailPage extends Page { - public static final String PATH = "/support/find/user"; + public static final String PATH = "/support/find/email"; - public FindUserPage() { - super("Find User"); + public FindUserByEmailPage() { + super("Find Email"); } @Override public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { HashMap vars = new HashMap(); vars.put("first", true); - new FindUserForm(req).output(resp.getWriter(), Page.getLanguage(req), vars); + new FindUserByEmailForm(req).output(resp.getWriter(), Page.getLanguage(req), vars); } @Override public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException { - FindUserForm form = Form.getForm(req, FindUserForm.class); + FindUserByEmailForm form = Form.getForm(req, FindUserByEmailForm.class); try { form.submit(resp.getWriter(), req); final EmailAddress[] emails = form.getEmails(); diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java index bf6f1488..f97b2c44 100644 --- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java +++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java @@ -26,7 +26,7 @@ import org.cacert.gigi.pages.PasswordResetPage; public class SupportUserDetailsForm extends Form { - private static final Template t = new Template(FindDomainForm.class.getResource("SupportUserDetailsForm.templ")); + private static final Template t = new Template(FindUserByDomainForm.class.getResource("SupportUserDetailsForm.templ")); private SupportedUser user; diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java index 5c0f1e0b..a4fb4b43 100644 --- a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java +++ b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserDomainSearch.java @@ -13,7 +13,7 @@ import org.cacert.gigi.GigiApiException; import org.cacert.gigi.dbObjects.Domain; import org.cacert.gigi.dbObjects.Group; import org.cacert.gigi.dbObjects.User; -import org.cacert.gigi.pages.admin.support.FindDomainPage; +import org.cacert.gigi.pages.admin.support.FindUserByDomainPage; import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage; import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; import org.cacert.gigi.testUtils.ClientTest; @@ -45,20 +45,20 @@ public class TestSEAdminPageUserDomainSearch extends ClientTest { @Test public void testDomainSearch() throws MalformedURLException, UnsupportedEncodingException, IOException, GigiApiException { - URLConnection uc = post(FindDomainPage.PATH, "process&domain=" + URLEncoder.encode(domainName, "UTF-8")); + URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=" + URLEncoder.encode(domainName, "UTF-8")); assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + tid, uc.getHeaderField("Location")); } @Test public void testDomainSearchById() throws MalformedURLException, UnsupportedEncodingException, IOException, GigiApiException { - URLConnection uc = post(FindDomainPage.PATH, "process&domain=#" + d.getId()); + URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=#" + d.getId()); assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + tid, uc.getHeaderField("Location")); } @Test public void testDomainSearchNonExist() throws MalformedURLException, UnsupportedEncodingException, IOException, GigiApiException { - URLConnection uc = post(FindDomainPage.PATH, "process&domain=" + URLEncoder.encode(createUniqueName() + ".de", "UTF-8")); + URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=" + URLEncoder.encode(createUniqueName() + ".de", "UTF-8")); assertNotNull(fetchStartErrorMessage(IOUtils.readURL(uc))); } @@ -76,7 +76,7 @@ public class TestSEAdminPageUserDomainSearch extends ClientTest { found = true; } assumeTrue(found); - URLConnection uc = post(FindDomainPage.PATH, "process&domain=#" + id); + URLConnection uc = post(FindUserByDomainPage.PATH, "process&domain=#" + id); assertNotNull(fetchStartErrorMessage(IOUtils.readURL(uc))); } } diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserMailSearch.java b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserMailSearch.java index 70e5bd4f..593d9e9c 100644 --- a/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserMailSearch.java +++ b/tests/org/cacert/gigi/pages/admin/TestSEAdminPageUserMailSearch.java @@ -10,7 +10,7 @@ import java.net.URLConnection; import java.net.URLEncoder; import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.pages.admin.support.FindUserPage; +import org.cacert.gigi.pages.admin.support.FindUserByEmailPage; import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage; import org.cacert.gigi.pages.admin.support.SupportUserDetailsPage; import org.cacert.gigi.testUtils.ClientTest; @@ -30,7 +30,7 @@ public class TestSEAdminPageUserMailSearch extends ClientTest { String mail = createUniqueName() + "@example.com"; int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD); - URLConnection uc = post(cookie, FindUserPage.PATH, "process&email=" + URLEncoder.encode(mail, "UTF-8"), 0); + URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode(mail, "UTF-8"), 0); assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location")); } @@ -39,7 +39,7 @@ public class TestSEAdminPageUserMailSearch extends ClientTest { String mail = createUniqueName() + "@example.tld"; int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD); - URLConnection uc = post(cookie, FindUserPage.PATH, "process&email=" + URLEncoder.encode("%@example.tld", "UTF-8"), 0); + URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@example.tld", "UTF-8"), 0); assertEquals("https://" + ServerConstants.getWwwHostNamePortSecure() + SupportUserDetailsPage.PATH + id, uc.getHeaderField("Location")); } @@ -49,7 +49,7 @@ public class TestSEAdminPageUserMailSearch extends ClientTest { int id = createVerifiedUser("Först", "Secönd", mail, TEST_PASSWORD); String mail2 = createUniqueName() + "@example.org"; int id2 = createVerifiedUser("Först", "Secönd", mail2, TEST_PASSWORD); - URLConnection uc = post(cookie, FindUserPage.PATH, "process&email=" + URLEncoder.encode("%@example.org", "UTF-8"), 0); + URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@example.org", "UTF-8"), 0); String res = IOUtils.readURL(uc); assertThat(res, containsString(SupportUserDetailsPage.PATH + id)); @@ -63,7 +63,7 @@ public class TestSEAdminPageUserMailSearch extends ClientTest { String mail2 = createUniqueName() + "@fxample.org"; int id2 = createVerifiedUser("Först", "Secönd", mail2, TEST_PASSWORD); - URLConnection uc = post(cookie, FindUserPage.PATH, "process&email=" + URLEncoder.encode("%@_xample.org", "UTF-8"), 0); + URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@_xample.org", "UTF-8"), 0); String res = IOUtils.readURL(uc); assertThat(res, containsString(SupportUserDetailsPage.PATH + id)); @@ -72,13 +72,13 @@ public class TestSEAdminPageUserMailSearch extends ClientTest { @Test public void testWildcardMailSearchNoRes() throws MalformedURLException, UnsupportedEncodingException, IOException { - URLConnection uc = post(FindUserPage.PATH, "process&email=" + URLEncoder.encode("%@_humpfelkumpf.org", "UTF-8")); + URLConnection uc = post(FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode("%@_humpfelkumpf.org", "UTF-8")); assertNotNull(fetchStartErrorMessage(IOUtils.readURL(uc))); } @Test public void testFulltextMailSearchNoRes() throws MalformedURLException, UnsupportedEncodingException, IOException { - URLConnection uc = post(cookie, FindUserPage.PATH, "process&email=" + URLEncoder.encode(createUniqueName() + "@example.org", "UTF-8"), 0); + URLConnection uc = post(cookie, FindUserByEmailPage.PATH, "process&email=" + URLEncoder.encode(createUniqueName() + "@example.org", "UTF-8"), 0); assertNotNull(fetchStartErrorMessage(IOUtils.readURL(uc))); } diff --git a/tests/org/cacert/gigi/pages/admin/TestSEAdminTicketSetting.java b/tests/org/cacert/gigi/pages/admin/TestSEAdminTicketSetting.java index c4c1a305..62d89de2 100644 --- a/tests/org/cacert/gigi/pages/admin/TestSEAdminTicketSetting.java +++ b/tests/org/cacert/gigi/pages/admin/TestSEAdminTicketSetting.java @@ -7,8 +7,8 @@ import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; import org.cacert.gigi.dbObjects.Group; -import org.cacert.gigi.pages.admin.support.FindDomainPage; -import org.cacert.gigi.pages.admin.support.FindUserPage; +import org.cacert.gigi.pages.admin.support.FindUserByDomainPage; +import org.cacert.gigi.pages.admin.support.FindUserByEmailPage; import org.cacert.gigi.pages.admin.support.SupportEnterTicketPage; import org.cacert.gigi.testUtils.ClientTest; import org.junit.Test; @@ -21,12 +21,12 @@ public class TestSEAdminTicketSetting extends ClientTest { @Test public void testFulltextMailSearch() throws MalformedURLException, UnsupportedEncodingException, IOException { - assertEquals(403, get(FindUserPage.PATH).getResponseCode()); + assertEquals(403, get(FindUserByEmailPage.PATH).getResponseCode()); assertEquals(302, post(cookie, SupportEnterTicketPage.PATH, "ticketno=a20140808.8&setTicket=action", 0).getResponseCode()); - assertEquals(200, get(FindUserPage.PATH).getResponseCode()); - assertEquals(200, get(FindDomainPage.PATH).getResponseCode()); + assertEquals(200, get(FindUserByEmailPage.PATH).getResponseCode()); + assertEquals(200, get(FindUserByDomainPage.PATH).getResponseCode()); assertEquals(302, post(cookie, SupportEnterTicketPage.PATH, "ticketno=a20140808.8&deleteTicket=action", 0).getResponseCode()); - assertEquals(403, get(FindUserPage.PATH).getResponseCode()); + assertEquals(403, get(FindUserByEmailPage.PATH).getResponseCode()); } } -- 2.39.2
: