From 1207a1e24ee103e832601e9e90981ec849041fd7 Mon Sep 17 00:00:00 2001 From: Gasmyr Date: Tue, 26 Jun 2018 18:13:37 +0100 Subject: [PATCH] Add default strategy fields #1020 --- .../ManagePersonAuthenticationAction.java | 35 ++++++++++++++----- server/src/main/resources/oxtrust.properties | 2 ++ .../src/main/resources/oxtrust_en.properties | 2 ++ .../ox/simpleCustomPropertiesList.xhtml | 4 +-- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/server/src/main/java/org/gluu/oxtrust/action/ManagePersonAuthenticationAction.java b/server/src/main/java/org/gluu/oxtrust/action/ManagePersonAuthenticationAction.java index f06ea742b..8faa9ef45 100644 --- a/server/src/main/java/org/gluu/oxtrust/action/ManagePersonAuthenticationAction.java +++ b/server/src/main/java/org/gluu/oxtrust/action/ManagePersonAuthenticationAction.java @@ -66,6 +66,10 @@ public class ManagePersonAuthenticationAction implements SimplePropertiesListModel, SimpleCustomPropertiesListModel, LdapConfigurationModel, Serializable { + private static final String CLIENT_SECRET = "clientSecret"; + + private static final String CLIENT_ID = "clientID"; + private static final long serialVersionUID = -4470460481895022468L; @Inject @@ -130,8 +134,8 @@ public String modify() { String outcome = modifyImpl(); if (OxTrustConstants.RESULT_FAILURE.equals(outcome)) { - facesMessages.add(FacesMessage.SEVERITY_ERROR, - facesMessages.evalResourceAsString("#{msg['configuration.manageAuthentication.failToPrepareUpdate']}")); + facesMessages.add(FacesMessage.SEVERITY_ERROR, facesMessages + .evalResourceAsString("#{msg['configuration.manageAuthentication.failToPrepareUpdate']}")); conversationService.endConversation(); } @@ -227,8 +231,9 @@ public String save() throws JsonParseException, JsonMappingException, IOExceptio reset(); - facesMessages.add(FacesMessage.SEVERITY_INFO, facesMessages.evalResourceAsString("#{msg['configuration.manageAuthentication.updateSucceed']}")); - + facesMessages.add(FacesMessage.SEVERITY_INFO, + facesMessages.evalResourceAsString("#{msg['configuration.manageAuthentication.updateSucceed']}")); + conversationService.endConversation(); return OxTrustConstants.RESULT_SUCCESS; @@ -252,7 +257,8 @@ private GluuLdapConfiguration mapLdapConfig(String config) } public String cancel() { - facesMessages.add(FacesMessage.SEVERITY_INFO, facesMessages.evalResourceAsString("#{msg['configuration.manageAuthentication.updateFailed']}")); + facesMessages.add(FacesMessage.SEVERITY_INFO, + facesMessages.evalResourceAsString("#{msg['configuration.manageAuthentication.updateFailed']}")); conversationService.endConversation(); return OxTrustConstants.RESULT_SUCCESS; @@ -352,7 +358,8 @@ public String testLdapConnection(GluuLdapConfiguration ldapConfig) { if (connectionProvider.isConnected()) { connectionProvider.closeConnectionPool(); - facesMessages.add(FacesMessage.SEVERITY_INFO, facesMessages.evalResourceAsString("#{msg['configuration.manageAuthentication.ldap.testSucceed']}")); + facesMessages.add(FacesMessage.SEVERITY_INFO, facesMessages + .evalResourceAsString("#{msg['configuration.manageAuthentication.ldap.testSucceed']}")); return OxTrustConstants.RESULT_SUCCESS; @@ -364,7 +371,8 @@ public String testLdapConnection(GluuLdapConfiguration ldapConfig) { log.error("Could not connect to LDAP", ex); } - facesMessages.add(FacesMessage.SEVERITY_ERROR, facesMessages.evalResourceAsString("#{msg['configuration.manageAuthentication.ldap.testFailed']}")); + facesMessages.add(FacesMessage.SEVERITY_ERROR, + facesMessages.evalResourceAsString("#{msg['configuration.manageAuthentication.ldap.testFailed']}")); return OxTrustConstants.RESULT_FAILURE; } @@ -461,10 +469,21 @@ public String getId(Object obj) { } public void addStrategy() { - PassportConfiguration passportConfiguration = new PassportConfiguration(); if (ldapPassportConfigurations == null) { ldapPassportConfigurations = new ArrayList(); } + SimpleExtendedCustomProperty clientIDField = new SimpleExtendedCustomProperty(); + clientIDField.setValue1(CLIENT_ID); + clientIDField.setValue2(facesMessages + .evalResourceAsString("#{msg['manageAuthentication.passport.strategy.clientIDFieldHint']}")); + SimpleExtendedCustomProperty clientSecretField = new SimpleExtendedCustomProperty(); + clientSecretField.setValue1(CLIENT_SECRET); + clientSecretField.setValue2(facesMessages + .evalResourceAsString("#{msg['manageAuthentication.passport.strategy.clientSecretFieldHint']}")); + PassportConfiguration passportConfiguration = new PassportConfiguration(); + passportConfiguration.setFieldset(new ArrayList()); + passportConfiguration.getFieldset().add(clientIDField); + passportConfiguration.getFieldset().add(clientSecretField); this.ldapPassportConfigurations.add(passportConfiguration); } diff --git a/server/src/main/resources/oxtrust.properties b/server/src/main/resources/oxtrust.properties index 532310a86..cd83a2c6e 100644 --- a/server/src/main/resources/oxtrust.properties +++ b/server/src/main/resources/oxtrust.properties @@ -149,6 +149,8 @@ manageAuthentication.testLDAPConnection = Test LDAP Connection manageAuthentication.passport.strategy.addProperty = Add new property manageAuthentication.passport.strategy.deleteStrategy = Delete Strategy +manageAuthentication.passport.strategy.clientIDFieldHint = Enter your client id here +manageAuthentication.passport.strategy.clientSecretFieldHint = Enter your client secret here ldapConfig.name = Name ldapConfig.useAnonymousBind = Use Anonymous Bind diff --git a/server/src/main/resources/oxtrust_en.properties b/server/src/main/resources/oxtrust_en.properties index 3505689d6..b5fcdf2b2 100644 --- a/server/src/main/resources/oxtrust_en.properties +++ b/server/src/main/resources/oxtrust_en.properties @@ -149,6 +149,8 @@ manageAuthentication.testLDAPConnection = Test LDAP Connection manageAuthentication.passport.strategy.addProperty = Add new property manageAuthentication.passport.strategy.deleteStrategy = Delete Strategy +manageAuthentication.passport.strategy.clientIDFieldHint = Enter your client id here +manageAuthentication.passport.strategy.clientSecretFieldHint = Enter your client secret here ldapConfig.name = Name ldapConfig.useAnonymousBind = Use Anonymous Bind diff --git a/server/src/main/webapp/resources/ox/simpleCustomPropertiesList.xhtml b/server/src/main/webapp/resources/ox/simpleCustomPropertiesList.xhtml index 6d3e614b3..2b6571172 100644 --- a/server/src/main/webapp/resources/ox/simpleCustomPropertiesList.xhtml +++ b/server/src/main/webapp/resources/ox/simpleCustomPropertiesList.xhtml @@ -61,7 +61,7 @@
- + @@ -79,7 +79,7 @@ -