From b4c7f49f98d85c1656f54c14fcf532403b948e7a Mon Sep 17 00:00:00 2001 From: gmartins Date: Thu, 25 Jun 2015 11:29:37 -0400 Subject: [PATCH 1/5] pom update --- client/pom.xml | 14 +++++++++++++- client/src/main/resources/client.properties | 4 ++-- fastbuild.sh | 6 ++++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100755 fastbuild.sh diff --git a/client/pom.xml b/client/pom.xml index 9e3222f..8c74ed7 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -14,7 +14,7 @@ 3.1.0.RELEASE 3.1.0.RELEASE - 1.6.2-SNAPSHOT + 1.6.1-SNAPSHOT @@ -189,6 +189,18 @@ + + org.apache.velocity + velocity + 1.7 + + + + com.ohadr + common-crypto + 1.6.0-RELEASE + + diff --git a/client/src/main/resources/client.properties b/client/src/main/resources/client.properties index 5f10961..9ca7e57 100644 --- a/client/src/main/resources/client.properties +++ b/client/src/main/resources/client.properties @@ -7,7 +7,7 @@ com.ohadr.oauth2.db.port=3306 com.ohadr.oauth2.db.schema=auth-flows - +com.ohadr.auth-flows.endpoints.accountActivatedEndpointUrl=/login-success-url com.ohadr.auth-flows.linksExpirationMinutes=60 com.ohadr.auth-flows.mail.username=ohadr.developer@gmail.com com.ohadr.auth-flows.mail.password=***** @@ -15,7 +15,7 @@ com.ohadr.auth-flows.isREST=false com.ohadr.auth-flows.email.fromField=ohadr.com Admin # Crypto settings -com.ohadr.crypto.keystore=C:/Ohad/Dev/Tools/ohad.ks +com.ohadr.crypto.keystore=/path/to/ohad.ks com.ohadr.crypto.password=kspass com.ohadr.crypto.keyAlias=ohadr com.ohadr.crypto.createKeystoreFileIfNotExist=false diff --git a/fastbuild.sh b/fastbuild.sh new file mode 100755 index 0000000..e153014 --- /dev/null +++ b/fastbuild.sh @@ -0,0 +1,6 @@ +echo "Running Maven Build WITHOUT tests... For development purposes only !" +export MAVEN_OPTS=-Xmx2048m -XX:MaxPermSize=512M + +# mvn clean install eclipse:clean eclipse:eclipse -DskipTests -DdownloadSources=true + +mvn clean install -DskipTests -DdownloadSources=true From 8bd967833024e25ec1960cfedf3aec2af7e69bf4 Mon Sep 17 00:00:00 2001 From: gmartins Date: Thu, 25 Jun 2015 17:20:47 -0400 Subject: [PATCH 2/5] more pom updates --- client/pom.xml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 8c74ed7..6a759b3 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -14,13 +14,14 @@ 3.1.0.RELEASE 3.1.0.RELEASE - 1.6.1-SNAPSHOT + + 1.6.2-SNAPSHOT - + + central + http://repo1.maven.org/maven2/ - + @@ -202,6 +207,18 @@ + + com.jamonapi + jamon + 2.81 + + + + com.ohadr + auth-parent + 1.6.1-RELEASE + pom + From 6cb32629d5d54a3b63e1732fe18ab705ee4851f1 Mon Sep 17 00:00:00 2001 From: gmartins Date: Tue, 30 Jun 2015 10:34:22 -0400 Subject: [PATCH 3/5] more and more pom updates --- client/pom.xml | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 6a759b3..8c74ed7 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -14,14 +14,13 @@ 3.1.0.RELEASE 3.1.0.RELEASE - - 1.6.2-SNAPSHOT + 1.6.1-SNAPSHOT - - - - central - http://repo1.maven.org/maven2/ - + @@ -207,18 +202,6 @@ - - com.jamonapi - jamon - 2.81 - - - - com.ohadr - auth-parent - 1.6.1-RELEASE - pom - From 23e4b51d2a6a659a5ee82ccabbcf873f11f5be7b Mon Sep 17 00:00:00 2001 From: gmartins Date: Thu, 9 Jul 2015 17:23:56 -0400 Subject: [PATCH 4/5] logout + userPrincipal + routes fix --- client/pom.xml | 31 ++++++++++++++++--- .../oauth/examples/impl/DemoServiceImpl.java | 2 +- client/src/main/resources/client.properties | 3 +- .../src/main/webapp/WEB-INF/pages/hello.jsp | 7 +++++ .../main/webapp/WEB-INF/spring-servlet.xml | 12 +++++-- client/src/main/webapp/WEB-INF/web.xml | 4 +++ fastbuild.sh | 4 +-- 7 files changed, 52 insertions(+), 11 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 8c74ed7..bac585a 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -14,13 +14,14 @@ 3.1.0.RELEASE 3.1.0.RELEASE - 1.6.1-SNAPSHOT + + 1.6.2-SNAPSHOT - + + central + http://repo1.maven.org/maven2/ - + @@ -139,6 +144,12 @@ 1.2 + + javax.servlet.jsp + jsp-api + 2.1 + provided + log4j @@ -202,6 +213,18 @@ + + com.jamonapi + jamon + 2.81 + + + + com.ohadr + auth-parent + 1.6.1-RELEASE + pom + diff --git a/client/src/main/java/com/ohadr/security/oauth/examples/impl/DemoServiceImpl.java b/client/src/main/java/com/ohadr/security/oauth/examples/impl/DemoServiceImpl.java index a55686f..06e14aa 100644 --- a/client/src/main/java/com/ohadr/security/oauth/examples/impl/DemoServiceImpl.java +++ b/client/src/main/java/com/ohadr/security/oauth/examples/impl/DemoServiceImpl.java @@ -8,7 +8,7 @@ public class DemoServiceImpl implements DemoService public String getTrustedMessage() { - String demo = "say hi bitch"; + String demo = "It works!"; return demo; } } diff --git a/client/src/main/resources/client.properties b/client/src/main/resources/client.properties index 9ca7e57..dbacea1 100644 --- a/client/src/main/resources/client.properties +++ b/client/src/main/resources/client.properties @@ -7,7 +7,8 @@ com.ohadr.oauth2.db.port=3306 com.ohadr.oauth2.db.schema=auth-flows -com.ohadr.auth-flows.endpoints.accountActivatedEndpointUrl=/login-success-url +com.ohadr.auth-flows.endpoints.accountActivatedEndpointUrl=secure/hello +com.ohadr.auth-flows.endpoints.loginSuccessEndpointUrl=secure/hello com.ohadr.auth-flows.linksExpirationMinutes=60 com.ohadr.auth-flows.mail.username=ohadr.developer@gmail.com com.ohadr.auth-flows.mail.password=***** diff --git a/client/src/main/webapp/WEB-INF/pages/hello.jsp b/client/src/main/webapp/WEB-INF/pages/hello.jsp index 4ef6366..7d7e083 100644 --- a/client/src/main/webapp/WEB-INF/pages/hello.jsp +++ b/client/src/main/webapp/WEB-INF/pages/hello.jsp @@ -1,5 +1,12 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + Logout

Message : ${message}

+User: + + + + \ No newline at end of file diff --git a/client/src/main/webapp/WEB-INF/spring-servlet.xml b/client/src/main/webapp/WEB-INF/spring-servlet.xml index a8857cc..ce5bae0 100644 --- a/client/src/main/webapp/WEB-INF/spring-servlet.xml +++ b/client/src/main/webapp/WEB-INF/spring-servlet.xml @@ -41,15 +41,18 @@ - + + + + - + + - + + + diff --git a/client/src/main/webapp/login/passwordRestoreEmailSent.jsp b/client/src/main/webapp/login/passwordRestoreEmailSent.jsp index 3aaf4e2..6e200dd 100644 --- a/client/src/main/webapp/login/passwordRestoreEmailSent.jsp +++ b/client/src/main/webapp/login/passwordRestoreEmailSent.jsp @@ -6,8 +6,8 @@

Restore Message was sent

- A restore message was sent to <%= request.getParameter("email") %>
- Please follow the instructions in the message in order to set a new password. + A restore message was sent to ${param.email}
+ Please follow the instructions in the message in order to set a new password.
diff --git a/client/src/main/webapp/login/passwordSetSuccess.jsp b/client/src/main/webapp/login/passwordSetSuccess.jsp index 57aa6e6..8473193 100644 --- a/client/src/main/webapp/login/passwordSetSuccess.jsp +++ b/client/src/main/webapp/login/passwordSetSuccess.jsp @@ -6,8 +6,8 @@

Password Set Successfully

- Password was set successfully to user <%= request.getParameter("email") %>
- Try to login again with the new password. + Password was set successfully to user ${param.email}
+ Click here to proceed.
diff --git a/client/src/main/webapp/login/changePassword.jsp b/client/src/main/webapp/secure/changePassword.jsp similarity index 71% rename from client/src/main/webapp/login/changePassword.jsp rename to client/src/main/webapp/secure/changePassword.jsp index af78a59..3164dcd 100644 --- a/client/src/main/webapp/login/changePassword.jsp +++ b/client/src/main/webapp/secure/changePassword.jsp @@ -5,8 +5,9 @@ Set New Password Page - -

Set New Password

+ + +

Change Password

<% if ( null != request.getParameter("err_msg") ) { @@ -17,15 +18,19 @@ <% } %>
- - + + + + + +
Password:Current password:
New Password:
Confirm Password: