From e36ee85798829b2a03051943c124cfd12b9d2ecb Mon Sep 17 00:00:00 2001 From: pavels Date: Thu, 28 Apr 2016 06:53:49 +0200 Subject: [PATCH] Issue #405 - organized imports --- .../auth/shibb/impl/ProviderUsersUtils.java | 133 ------------------ .../client/AuthenticationServlet.java | 8 +- 2 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 authfilters/src/main/java/cz/incad/kramerius/auth/shibb/impl/ProviderUsersUtils.java diff --git a/authfilters/src/main/java/cz/incad/kramerius/auth/shibb/impl/ProviderUsersUtils.java b/authfilters/src/main/java/cz/incad/kramerius/auth/shibb/impl/ProviderUsersUtils.java deleted file mode 100644 index 8c06c43d9d..0000000000 --- a/authfilters/src/main/java/cz/incad/kramerius/auth/shibb/impl/ProviderUsersUtils.java +++ /dev/null @@ -1,133 +0,0 @@ -package cz.incad.kramerius.auth.shibb.impl; - -import java.util.logging.Level; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.MediaType; - -import org.apache.commons.configuration.ConfigurationException; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import com.sun.jersey.api.client.Client; -import com.sun.jersey.api.client.ClientHandlerException; -import com.sun.jersey.api.client.UniformInterfaceException; -import com.sun.jersey.api.client.WebResource; - -import cz.incad.kramerius.auth.UsersWrapper; -import cz.incad.kramerius.utils.BasicAuthenticationFilter; -import cz.incad.kramerius.utils.conf.KConfiguration; - -public class ProviderUsersUtils { - -// static JSONArray getUser(HttpServletRequest req, UsersWrapper w) -// throws ConfigurationException, JSONException { -// Client c = Client.create(); -// String url = KConfiguration.getInstance().getConfiguration() -// .getString("api.point") -// + "/admin/users?lname=" -// + w.getCalculatedName(); -// -// CallUserController callUserController = (cz.incad.kramerius.client.kapi.auth.CallUserController) req -// .getSession(true).getAttribute(CallUserController.KEY); -// AdminUser adminCaller = callUserController.getAdminCaller(); -// -// WebResource r = c.resource(url); -// r.addFilter(new BasicAuthenticationFilter(adminCaller.getUserName(), -// adminCaller.getPassword())); -// String t = r.accept(MediaType.APPLICATION_JSON) -// .type(MediaType.APPLICATION_JSON).get(String.class); -// JSONArray jsonArr = new JSONArray(t); -// return jsonArr; -// } -// -// -// // create user -// public static String createUser(HttpServletRequest req, UsersWrapper w, -// String password) throws JSONException, ConfigurationException { -// String url = KConfiguration.getInstance().getConfiguration() -// .getString("api.point") + "/admin/users"; -// -// Client c = Client.create(); -// WebResource r = c.resource(url); -// -// CallUserController callUserController = (cz.incad.kramerius.client.kapi.auth.CallUserController) req -// .getSession(true).getAttribute(CallUserController.KEY); -// AdminUser adminCaller = callUserController.getAdminCaller(); -// -// JSONObject object = new JSONObject(); -// object.put("lname", w.getCalculatedName()); -// object.put("firstname", w.getProperty(UsersWrapper.FIRST_NAME_KEY)); -// object.put("surname", w.getProperty(UsersWrapper.LAST_NAME_KEY)); -// object.put("password", password); -// -// r.addFilter(new BasicAuthenticationFilter(adminCaller.getUserName(), -// adminCaller.getPassword())); -// String t = r.accept(MediaType.APPLICATION_JSON) -// .type(MediaType.APPLICATION_JSON) -// .entity(object.toString(), MediaType.APPLICATION_JSON) -// .post(String.class); -// return t; -// } -// -// public static void newPasswordUser(HttpServletRequest req, String userId, -// String pswd) { -// try { -// Client c = Client.create(); -// String url = KConfiguration.getInstance().getConfiguration() -// .getString("api.point") -// + "/admin/users/" -// + userId -// + "/password"; -// -// CallUserController callUserController = (cz.incad.kramerius.client.kapi.auth.CallUserController) req -// .getSession(true).getAttribute(CallUserController.KEY); -// AdminUser adminCaller = callUserController.getAdminCaller(); -// -// WebResource r = c.resource(url); -// r.addFilter(new BasicAuthenticationFilter( -// adminCaller.getUserName(), adminCaller.getPassword())); -// JSONObject object = new JSONObject(); -// object.put("password", pswd); -// -// String t = r.accept(MediaType.APPLICATION_JSON) -// .type(MediaType.APPLICATION_JSON) -// .entity(object.toString(), MediaType.APPLICATION_JSON) -// .put(String.class); -// } catch (UniformInterfaceException e) { -// OpenIDSupport.LOGGER.log(Level.SEVERE, e.getMessage(), e); -// } catch (ClientHandlerException e) { -// OpenIDSupport.LOGGER.log(Level.SEVERE, e.getMessage(), e); -// } catch (JSONException e) { -// OpenIDSupport.LOGGER.log(Level.SEVERE, e.getMessage(), e); -// } -// } -// -// public static void deleteUser(HttpServletRequest req, String userId) { -// try { -// String url = KConfiguration.getInstance().getConfiguration() -// .getString("api.point") + "/admin/users/" + userId; -// -// Client c = Client.create(); -// -// CallUserController callUserController = (cz.incad.kramerius.client.kapi.auth.CallUserController) req -// .getSession(true).getAttribute(CallUserController.KEY); -// AdminUser adminCaller = callUserController.getAdminCaller(); -// -// WebResource r = c.resource(url); -// -// r.addFilter(new BasicAuthenticationFilter( -// adminCaller.getUserName(), adminCaller.getPassword())); -// -// String t = r.accept(MediaType.APPLICATION_JSON) -// .type(MediaType.APPLICATION_JSON).delete(String.class); -// -// } catch (ClientHandlerException e) { -// OpenIDSupport.LOGGER.log(Level.SEVERE, e.getMessage(), e); -// } catch (UniformInterfaceException e) { -// OpenIDSupport.LOGGER.log(Level.SEVERE, e.getMessage(), e); -// } -// } - -} diff --git a/client/src/main/java/cz/incad/kramerius/client/AuthenticationServlet.java b/client/src/main/java/cz/incad/kramerius/client/AuthenticationServlet.java index 0e1dc03584..9126c90a35 100644 --- a/client/src/main/java/cz/incad/kramerius/client/AuthenticationServlet.java +++ b/client/src/main/java/cz/incad/kramerius/client/AuthenticationServlet.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; -import java.util.HashMap; import java.util.logging.Level; import java.util.logging.Logger; @@ -34,23 +33,18 @@ import org.json.JSONException; import org.json.JSONObject; -import biz.sourcecode.base64Coder.Base64Coder; - import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.WebResource.Builder; -import com.sun.jersey.api.client.config.ClientConfig; +import biz.sourcecode.base64Coder.Base64Coder; import cz.incad.kramerius.client.kapi.auth.AdminUser; import cz.incad.kramerius.client.kapi.auth.CallUserController; import cz.incad.kramerius.client.kapi.auth.ClientUser; import cz.incad.kramerius.client.kapi.auth.ProfileDelegator; -import cz.incad.kramerius.client.kapi.auth.User; import cz.incad.kramerius.client.kapi.auth.User.UserProvider; import cz.incad.kramerius.client.kapi.auth.impl.CallUserControllerImpl; import cz.incad.kramerius.client.socialauth.OpenIDSupport; -import cz.incad.kramerius.shib.utils.ShibbolethSupport; -import cz.incad.kramerius.users.UserProfile; import cz.incad.kramerius.utils.conf.KConfiguration; import cz.incad.kramerius.utils.jersey.BasicAuthenticationFilter;