diff --git a/app/com/yetu/oauth2provider/controllers/setup/SetupPage.scala b/app/com/yetu/oauth2provider/controllers/setup/SetupPage.scala index 1a5868a..d378096 100644 --- a/app/com/yetu/oauth2provider/controllers/setup/SetupPage.scala +++ b/app/com/yetu/oauth2provider/controllers/setup/SetupPage.scala @@ -12,4 +12,13 @@ object SetupPage extends Controller { val registration = Action { Ok(views.html.registration.render()) } + + val confirmmail = Action { + Ok(views.html.confirmmail.render()) + } + + val confirmedmail = Action { + Ok(views.html.confirmedmail.render()) + } + } \ No newline at end of file diff --git a/app/com/yetu/oauth2provider/views/confirmedmail.scala.html b/app/com/yetu/oauth2provider/views/confirmedmail.scala.html new file mode 100644 index 0000000..e7f81f1 --- /dev/null +++ b/app/com/yetu/oauth2provider/views/confirmedmail.scala.html @@ -0,0 +1,44 @@ + + + + + Successfully confirmed mail + + + + + + +
+

@Messages("setup.headline")

+

@Messages("setup.subheadline")

+
+
+ +
+
+
+
+ +
+

@Messages("setup.confirmedmail.headline")

+

@Messages("setup.confirmedmail.description")

+
+
+ + @Html(Messages("setup.next")) + +
+
+ + + diff --git a/app/com/yetu/oauth2provider/views/confirmmail.scala.html b/app/com/yetu/oauth2provider/views/confirmmail.scala.html new file mode 100644 index 0000000..69c8ecf --- /dev/null +++ b/app/com/yetu/oauth2provider/views/confirmmail.scala.html @@ -0,0 +1,40 @@ + + + + + Confirm Mail + + + + + + +
+

@Messages("setup.headline")

+

@Messages("setup.subheadline")

+
+
+ +
+
+
+ E-Mail content +
+
+

@Messages("setup.confirmmail.headline")

+

@Messages("setup.confirmmail.description")

+
+
+
+ + + diff --git a/app/com/yetu/oauth2provider/views/registration.scala.html b/app/com/yetu/oauth2provider/views/registration.scala.html index 54cb990..0cb737f 100644 --- a/app/com/yetu/oauth2provider/views/registration.scala.html +++ b/app/com/yetu/oauth2provider/views/registration.scala.html @@ -2,7 +2,7 @@ - Download + Registration @@ -50,8 +50,7 @@

@Messages("setup.registration.repeatpassword") - @Messages("setup.registration.error" + - ".passwordnotsame") + @Messages("setup.registration.error.passwordnotsame")
@@ -69,7 +68,7 @@

diff --git a/conf/messages b/conf/messages index 429ca5c..0506c06 100644 --- a/conf/messages +++ b/conf/messages @@ -98,6 +98,7 @@ setup.footer.copyright=© 2015 yetu AG setup.footer.privacy=Privacy Policy setup.footer.imprint=Imprint setup.footer.terms=Terms & conditions +setup.next=next > #setup registration page setup.registration.register=Register at yetu @@ -114,7 +115,6 @@ setup.registration.repeatpasswordplaceholder=repeat new password for yetu login setup.registration.terms=I accept the setup.registration.termslink=terms & conditions setup.registration.ifalreadyregistered=If you already have your e-mail and password registered at yetu, you can go to step 3 directly. Just click "next". -setup.registration.next=next setup.registration.error.firstname=Please use only characters for your first name. setup.registration.error.lastname=Please use only characters for your last name. @@ -124,6 +124,15 @@ setup.registration.error.password=Your password has to have at least 8 character setup.registration.error.passwordnotsame=Your password and the repeated password are not the same. setup.registration.error.terms=Please read the terms & conditions and mark, that you have done this. +#setup mail confirm page +setup.confirmmail.headline=Check yout email inbox and click in the registration link to proceed. +setup.confirmmail.description=We just sent you an email to the email address you provided. Please check it, and click\ + in the link provided in the email to verify your email address and allow the creation of your yetu account. + +#setup mail confirmed page +setup.confirmedmail.headline=Your e-mail has been verified and your yetu account is created +setup.confirmedmail.description=You can proceed to next step now. + #setup download page setup.download.headline=Download Gateway Setup App diff --git a/conf/routes b/conf/routes index 7521b6b..7cf6ede 100644 --- a/conf/routes +++ b/conf/routes @@ -2,40 +2,40 @@ # This file defines all application routes (Higher priority routes first) # ~~~~ -GET /oauth2/authorize @com.yetu.oauth2provider.controllers.OAuth2Auth.authorizeUser -POST /oauth2/access_token @com.yetu.oauth2provider.controllers.OAuth2Auth.accessToken -GET /oauth2/info @com.yetu.oauth2provider.controllers.OAuth2ResourceServer.info -GET /oauth2/validate @com.yetu.oauth2provider.controllers.OAuth2Validation.validate -GET /oauth2/access_token_implicit @com.yetu.oauth2provider.controllers.OAuth2Auth.accessTokenImplicit -GET /oauth2/certs com.yetu.oauth2provider.controllers.Certificates.certificates +GET /oauth2/authorize @com.yetu.oauth2provider.controllers.OAuth2Auth.authorizeUser +POST /oauth2/access_token @com.yetu.oauth2provider.controllers.OAuth2Auth.accessToken +GET /oauth2/info @com.yetu.oauth2provider.controllers.OAuth2ResourceServer.info +GET /oauth2/validate @com.yetu.oauth2provider.controllers.OAuth2Validation.validate +GET /oauth2/access_token_implicit @com.yetu.oauth2provider.controllers.OAuth2Auth.accessTokenImplicit +GET /oauth2/certs com.yetu.oauth2provider.controllers.Certificates.certificates ## Cors Access-Control-Allow-Headers -OPTIONS /*all com.yetu.oauth2resource.controllers.CrossOrigin.preflight(all: String) +OPTIONS /*all com.yetu.oauth2resource.controllers.CrossOrigin.preflight(all: String) -POST /profile @com.yetu.oauth2provider.controllers.OAuth2ResourceServer.updateUserProfile +POST /profile @com.yetu.oauth2provider.controllers.OAuth2ResourceServer.updateUserProfile -POST /keys @com.yetu.oauth2provider.controllers.OAuth2ResourceServer.updateKey -GET /keys @com.yetu.oauth2provider.controllers.OAuth2ResourceServer.viewKeys +POST /keys @com.yetu.oauth2provider.controllers.OAuth2ResourceServer.updateKey +GET /keys @com.yetu.oauth2provider.controllers.OAuth2ResourceServer.viewKeys #### permissions #### -POST /permissions @com.yetu.oauth2provider.controllers.OAuth2Auth.permissionsPost +POST /permissions @com.yetu.oauth2provider.controllers.OAuth2Auth.permissionsPost #### # Home page -GET / @com.yetu.oauth2provider.controllers.OAuth2ResourceServer.index +GET / @com.yetu.oauth2provider.controllers.OAuth2ResourceServer.index # Map static resources from the /public folder to the /assets URL path -GET /assets/*file controllers.Assets.at(path="/public", file) +GET /assets/*file controllers.Assets.at(path="/public", file) # Health Check -GET /health com.yetu.oauth2provider.controllers.HealthCheck.check +GET /health com.yetu.oauth2provider.controllers.HealthCheck.check -GET /trustedEntity/profile @com.yetu.oauth2provider.controllers.OAuth2TrustedServer.getUserProfile +GET /trustedEntity/profile @com.yetu.oauth2provider.controllers.OAuth2TrustedServer.getUserProfile @@ -45,40 +45,45 @@ GET /trustedEntity/profile @com.yetu.oauth2provider.contr # Login page -GET /login @com.yetu.oauth2provider.controllers.authentication.LoginPage.login -GET /logout @com.yetu.oauth2provider.controllers.authentication.LoginPage.logout +GET /login @com.yetu.oauth2provider.controllers.authentication.LoginPage.login +GET /logout @com.yetu.oauth2provider.controllers.authentication.LoginPage.logout # Registration routes -GET /signup @com.yetu.oauth2provider.controllers.authentication.Registration.startSignUp -POST /signup @com.yetu.oauth2provider.controllers.authentication.Registration.handleStartSignUp -GET /signup/:mailToken @com.yetu.oauth2provider.controllers.authentication.Registration.signUp(mailToken) -POST /signup/:mailToken @com.yetu.oauth2provider.controllers.authentication.Registration.handleSignUp(mailToken) +GET /signup @com.yetu.oauth2provider.controllers.authentication.Registration.startSignUp +POST /signup @com.yetu.oauth2provider.controllers.authentication.Registration.handleStartSignUp +GET /signup/:mailToken @com.yetu.oauth2provider.controllers.authentication.Registration.signUp(mailToken) +POST /signup/:mailToken @com.yetu.oauth2provider.controllers.authentication.Registration.handleSignUp(mailToken) # Reset password -GET /reset @com.yetu.oauth2provider.controllers.authentication.PasswordReset.startResetPassword -POST /reset @com.yetu.oauth2provider.controllers.authentication.PasswordReset.handleStartResetPassword -GET /reset/:mailToken @com.yetu.oauth2provider.controllers.authentication.PasswordReset.resetPassword(mailToken) -POST /reset/:mailToken @com.yetu.oauth2provider.controllers.authentication.PasswordReset.handleResetPassword(mailToken) +GET /reset @com.yetu.oauth2provider.controllers.authentication.PasswordReset.startResetPassword +POST /reset @com.yetu.oauth2provider.controllers.authentication.PasswordReset.handleStartResetPassword +GET /reset/:mailToken @com.yetu.oauth2provider.controllers.authentication.PasswordReset.resetPassword(mailToken) +POST /reset/:mailToken @com.yetu.oauth2provider.controllers.authentication.PasswordReset.handleResetPassword(mailToken) # Change Password -GET /password @com.yetu.oauth2provider.controllers.authentication.PasswordChange.page -POST /password @com.yetu.oauth2provider.controllers.authentication.PasswordChange.handlePasswordChange +GET /password @com.yetu.oauth2provider.controllers.authentication.PasswordChange.page +POST /password @com.yetu.oauth2provider.controllers.authentication.PasswordChange.handlePasswordChange # Authentication entry points for all providers -GET /authenticate/:provider @com.yetu.oauth2provider.controllers.authentication.ProviderController.authenticate(provider, redirectTo: Option[String]) -POST /authenticate/:provider @com.yetu.oauth2provider.controllers.authentication.ProviderController.authenticateByPost(provider, redirectTo: Option[String]) +GET /authenticate/:provider @com.yetu.oauth2provider.controllers.authentication.ProviderController.authenticate(provider, redirectTo: Option[String]) +POST /authenticate/:provider @com.yetu.oauth2provider.controllers.authentication.ProviderController.authenticateByPost(provider, redirectTo: Option[String]) -POST /api/authenticate/:provider @com.yetu.oauth2provider.controllers.authentication.LoginApi.authenticate(provider, builder = "token") +POST /api/authenticate/:provider @com.yetu.oauth2provider.controllers.authentication.LoginApi.authenticate(provider, builder = "token") ##################### ## setup #### ##################### - # New registration page -GET /setup/registration com.yetu.oauth2provider.controllers.setup.SetupPage.registration +GET /setup/registration com.yetu.oauth2provider.controllers.setup.SetupPage.registration + +# New confirm mail page +GET /setup/confirmmail com.yetu.oauth2provider.controllers.setup.SetupPage.confirmmail + +# New confirm mail page +GET /setup/confirmedmail com.yetu.oauth2provider.controllers.setup.SetupPage.confirmedmail # Download setup app -GET /setup/download com.yetu.oauth2provider.controllers.setup.SetupPage.download +GET /setup/download com.yetu.oauth2provider.controllers.setup.SetupPage.download diff --git a/public/stylesheets/confirmedmail.css b/public/stylesheets/confirmedmail.css new file mode 100644 index 0000000..f4c8b72 --- /dev/null +++ b/public/stylesheets/confirmedmail.css @@ -0,0 +1,23 @@ + +.full{ + display: block; + padding: 10% 0; +} +.full__container{ + margin: 0 25%; + width: 50%; +} +.full__icon{ + width: 15%; + height: 60px; + float:left; +} +.full__content{ + width: 80%; + margin-left: 20%; +} +.full__button{ + margin: 10% 40%; + width: 5%; + clear: both; +} \ No newline at end of file diff --git a/public/stylesheets/confirmmail.css b/public/stylesheets/confirmmail.css new file mode 100644 index 0000000..5b77893 --- /dev/null +++ b/public/stylesheets/confirmmail.css @@ -0,0 +1,13 @@ +.left{ + width: 35%; + padding: 5%; +} +.left__img{ + width: 100%; + height: 300px; +} +.right{ + padding: 5% 0 5% 5%; + margin-left: 40%; + width: 55%; +} \ No newline at end of file