From d6a2e8181c8470ff9b602878e9320803d00e8b46 Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Mon, 27 Mar 2017 12:02:45 -0700 Subject: [PATCH 01/15] Updated documentation from smtp -> play.mailer --- docs/src/manual/source/guide/configuration.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/src/manual/source/guide/configuration.md b/docs/src/manual/source/guide/configuration.md index 23626b877..8bae285dd 100644 --- a/docs/src/manual/source/guide/configuration.md +++ b/docs/src/manual/source/guide/configuration.md @@ -12,16 +12,20 @@ Create a `securesocial.conf` file within your app's conf directory and include i If you plan to use the `UsernamePasswordProvider` you need to configure your mail service. SecureSocial uses the [mailer plugin](https://github.com/typesafehub/play-plugins/tree/master/mailer) from Typesafe. -These settings go in the `smtp` section of the `securesocial.conf` file: +These settings go in the `play.mailer` section of the `application.conf` file: :::bash - smtp { - host=smtp.gmail.com + play.mailer { + host="smtp.gmail.com" #port=25 ssl=true + tls=yes user="your_user" - password=your_password + password="your_password" from="your_from_address" + debug=no + timeout=60 + connectiontimeout=60 } ## Global Settings From 3c4ff98d9f3819bed78c8b011e8ceb6738f4f379 Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Sat, 2 Feb 2019 12:11:43 -0800 Subject: [PATCH 02/15] Updated login form with newer bootstrap styling --- module-code/app/securesocial/views/main.scala.html | 4 ++++ module-code/app/securesocial/views/provider.scala.html | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/module-code/app/securesocial/views/main.scala.html b/module-code/app/securesocial/views/main.scala.html index 60573d3be..999a87fb1 100644 --- a/module-code/app/securesocial/views/main.scala.html +++ b/module-code/app/securesocial/views/main.scala.html @@ -5,6 +5,10 @@ @title + + + + @env.routes.customCssPath.map { customPath => diff --git a/module-code/app/securesocial/views/provider.scala.html b/module-code/app/securesocial/views/provider.scala.html index 501491943..94f7ef107 100644 --- a/module-code/app/securesocial/views/provider.scala.html +++ b/module-code/app/securesocial/views/provider.scala.html @@ -23,20 +23,20 @@ @helper.inputText( loginForm.get("username"), '_label -> Messages("securesocial.signup.username"), - 'class -> "input-xlarge" + 'class -> "form-control" ) } else { @helper.inputText( loginForm.get("username"), '_label -> Messages("securesocial.signup.email1"), - 'class -> "input-xlarge" + 'class -> "form-control" ) } @helper.inputPassword( loginForm.get("password"), '_label -> Messages("securesocial.signup.password1"), - 'class -> "input-xlarge" + 'class -> "form-control" )
From 0de44c9fa68d8b9aff2f5a769e256862d4375c39 Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Sat, 2 Feb 2019 13:55:02 -0800 Subject: [PATCH 03/15] Updated styling of templates, enable autocomplete on all forms --- .../views/Registration/resetPasswordPage.scala.html | 5 ++--- .../views/Registration/signUp.scala.html | 11 +++++------ .../views/Registration/startResetPassword.scala.html | 3 +-- .../views/Registration/startSignUp.scala.html | 4 ++-- .../app/securesocial/views/passwordChange.scala.html | 4 +--- .../app/securesocial/views/provider.scala.html | 12 +++++------- 6 files changed, 16 insertions(+), 23 deletions(-) diff --git a/module-code/app/securesocial/views/Registration/resetPasswordPage.scala.html b/module-code/app/securesocial/views/Registration/resetPasswordPage.scala.html index b4c6ecb9d..e06d7f4da 100644 --- a/module-code/app/securesocial/views/Registration/resetPasswordPage.scala.html +++ b/module-code/app/securesocial/views/Registration/resetPasswordPage.scala.html @@ -16,7 +16,6 @@

@Messages("securesocial.password.title")

@@ -24,14 +23,14 @@

@Messages("securesocial.password.title")

@helper.inputPassword( resetForm("password.password1"), '_label -> Messages("securesocial.signup.password1"), - 'class -> "input-xlarge" + 'class -> "form-control" ) @helper.inputPassword( resetForm("password.password2"), '_label -> Messages("securesocial.signup.password2"), '_error -> resetForm.error("password"), - 'class -> "input-xlarge" + 'class -> "form-control" )
diff --git a/module-code/app/securesocial/views/Registration/signUp.scala.html b/module-code/app/securesocial/views/Registration/signUp.scala.html index 1993c9566..5d91a7304 100644 --- a/module-code/app/securesocial/views/Registration/signUp.scala.html +++ b/module-code/app/securesocial/views/Registration/signUp.scala.html @@ -15,7 +15,6 @@

@Messages("securesocial.signup.title")

@@ -24,33 +23,33 @@

@Messages("securesocial.signup.title")

@helper.inputText( signUpForm("userName"), '_label -> Messages("securesocial.signup.username"), - 'class -> "input-xlarge" + 'class -> "form-control" ) } @helper.inputText( signUpForm("firstName"), '_label -> Messages("securesocial.signup.firstName"), - 'class -> "input-xlarge" + 'class -> "form-control" ) @helper.inputText( signUpForm("lastName"), '_label -> Messages("securesocial.signup.lastName"), - 'class -> "input-xlarge" + 'class -> "form-control" ) @helper.inputPassword( signUpForm("password.password1"), '_label -> Messages("securesocial.signup.password1"), - 'class -> "input-xlarge" + 'class -> "form-control" ) @helper.inputPassword( signUpForm("password.password2"), '_label -> Messages("securesocial.signup.password2"), '_error -> signUpForm.error("password"), - 'class -> "input-xlarge" + 'class -> "form-control" )
diff --git a/module-code/app/securesocial/views/Registration/startResetPassword.scala.html b/module-code/app/securesocial/views/Registration/startResetPassword.scala.html index a6b2b5c93..4710ae3ae 100644 --- a/module-code/app/securesocial/views/Registration/startResetPassword.scala.html +++ b/module-code/app/securesocial/views/Registration/startResetPassword.scala.html @@ -16,7 +16,6 @@

@Messages("securesocial.password.title")

@@ -24,7 +23,7 @@

@Messages("securesocial.password.title")

@helper.inputText( startForm("email"), '_label -> Messages("securesocial.signup.email1"), - 'class -> "input-xlarge" + 'class -> "form-control" )
diff --git a/module-code/app/securesocial/views/Registration/startSignUp.scala.html b/module-code/app/securesocial/views/Registration/startSignUp.scala.html index f7ddefa1d..386199510 100644 --- a/module-code/app/securesocial/views/Registration/startSignUp.scala.html +++ b/module-code/app/securesocial/views/Registration/startSignUp.scala.html @@ -15,14 +15,14 @@

@Messages("securesocial.signup.title")

@CSRF.formField @helper.inputText( startForm("email"), '_label -> Messages("securesocial.signup.email1"), - 'class -> "input-xlarge" + 'class -> "form-control" )
diff --git a/module-code/app/securesocial/views/passwordChange.scala.html b/module-code/app/securesocial/views/passwordChange.scala.html index d9bd79f05..cefb374fe 100644 --- a/module-code/app/securesocial/views/passwordChange.scala.html +++ b/module-code/app/securesocial/views/passwordChange.scala.html @@ -25,9 +25,7 @@

@Messages("securesocial.passwordChange.title")

} else { + method="POST">
@CSRF.formField @helper.inputPassword( diff --git a/module-code/app/securesocial/views/provider.scala.html b/module-code/app/securesocial/views/provider.scala.html index 94f7ef107..dc24b1375 100644 --- a/module-code/app/securesocial/views/provider.scala.html +++ b/module-code/app/securesocial/views/provider.scala.html @@ -15,7 +15,7 @@ @if( provider.authMethod == UserPassword ) { + class="form-horizontal" method="POST">
@CSRF.formField @@ -42,14 +42,12 @@
-
-

@Messages("securesocial.login.forgotPassword")

-
+
+ @Messages("securesocial.login.forgotPassword") @if(env.registrationEnabled.value){ -
-

@Messages("securesocial.login.signUp") @Messages("securesocial.login.here")

-
+ @Messages("securesocial.login.signUp") @Messages("securesocial.login.here") } +
} From 792c89e7d328ba6f5389a49ae00f6b773c9d82de Mon Sep 17 00:00:00 2001 From: Wilton Date: Mon, 30 Sep 2019 15:36:01 -0700 Subject: [PATCH 04/15] Update build.properties --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 31334bbd3..c0bab0494 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.1 +sbt.version=1.2.8 From 7471a2e507d11367be5c72489801e2390787e93d Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Sat, 18 Jul 2020 22:20:56 -0700 Subject: [PATCH 05/15] Removed javac 1.8 constraint --- module-code/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-code/build.sbt b/module-code/build.sbt index b128dad09..6594ad50e 100644 --- a/module-code/build.sbt +++ b/module-code/build.sbt @@ -67,7 +67,7 @@ pomExtra := ( scalacOptions := Seq("-encoding", "UTF-8", "-Xlint", "-deprecation", "-unchecked", "-feature", "-Xmax-classfile-name","78") -javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-encoding", "UTF-8", "-Xlint:-options", "-Xlint:unchecked", "-Xlint:deprecation" ) +javacOptions ++= Seq("-encoding", "UTF-8" ) // packagedArtifacts += ((artifact in playPackageAssets).value -> playPackageAssets.value) From e9037773f7bbfe0932cb8136e0056c019382c2f7 Mon Sep 17 00:00:00 2001 From: Wilton Date: Sat, 18 Jul 2020 22:22:10 -0700 Subject: [PATCH 06/15] Update build.sbt --- module-code/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-code/build.sbt b/module-code/build.sbt index b128dad09..6594ad50e 100644 --- a/module-code/build.sbt +++ b/module-code/build.sbt @@ -67,7 +67,7 @@ pomExtra := ( scalacOptions := Seq("-encoding", "UTF-8", "-Xlint", "-deprecation", "-unchecked", "-feature", "-Xmax-classfile-name","78") -javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-encoding", "UTF-8", "-Xlint:-options", "-Xlint:unchecked", "-Xlint:deprecation" ) +javacOptions ++= Seq("-encoding", "UTF-8" ) // packagedArtifacts += ((artifact in playPackageAssets).value -> playPackageAssets.value) From 6eb4522b7ac902457b434d7d58942c08b4594fba Mon Sep 17 00:00:00 2001 From: Wilton Date: Wed, 2 Sep 2020 12:24:15 -0700 Subject: [PATCH 07/15] Disable javadoc --- build.sbt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.sbt b/build.sbt index 77fee01f5..798b76e44 100644 --- a/build.sbt +++ b/build.sbt @@ -14,3 +14,9 @@ lazy val javaDemo = project.in( file("samples/java/demo") ).enablePlugins(PlayJa lazy val root = project.in( file(".") ).aggregate(core, scalaDemo, javaDemo) .settings( aggregate in update := false ) + +// skip javadoc +// https://www.scala-sbt.org/sbt-native-packager/formats/universal.html +mappings in (Compile, packageDoc) := Seq() +sources in (Compile, doc) := Seq() +publishArtifact in (Compile, packageDoc) := false From f3a01d4f74ae2dc1e6f1992bd5e7aa36192d9163 Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Thu, 8 Oct 2020 12:01:35 -0700 Subject: [PATCH 08/15] Specify java version --- module-code/build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/module-code/build.sbt b/module-code/build.sbt index 6594ad50e..9c716a469 100644 --- a/module-code/build.sbt +++ b/module-code/build.sbt @@ -67,6 +67,7 @@ pomExtra := ( scalacOptions := Seq("-encoding", "UTF-8", "-Xlint", "-deprecation", "-unchecked", "-feature", "-Xmax-classfile-name","78") +javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-encoding", "UTF-8", "-Xlint:-options", "-Xlint:unchecked", "-Xlint:deprecation" ) javacOptions ++= Seq("-encoding", "UTF-8" ) // packagedArtifacts += ((artifact in playPackageAssets).value -> playPackageAssets.value) From eea7f81589bc7a79a70d8e2837a0d066102a9556 Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Thu, 8 Oct 2020 12:07:24 -0700 Subject: [PATCH 09/15] Fix javac options --- module-code/build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/module-code/build.sbt b/module-code/build.sbt index 9c716a469..b128dad09 100644 --- a/module-code/build.sbt +++ b/module-code/build.sbt @@ -68,7 +68,6 @@ pomExtra := ( scalacOptions := Seq("-encoding", "UTF-8", "-Xlint", "-deprecation", "-unchecked", "-feature", "-Xmax-classfile-name","78") javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-encoding", "UTF-8", "-Xlint:-options", "-Xlint:unchecked", "-Xlint:deprecation" ) -javacOptions ++= Seq("-encoding", "UTF-8" ) // packagedArtifacts += ((artifact in playPackageAssets).value -> playPackageAssets.value) From 3ceb191b0fcd481de205feb857e1aecf2bdab679 Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Thu, 8 Oct 2020 12:17:17 -0700 Subject: [PATCH 10/15] Bump sbt version --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c0bab0494..ea6d47b2e 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.3.1 From 662b7a9ca59b2a3b703dd763b06007a7b06edb80 Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Thu, 8 Oct 2020 12:18:37 -0700 Subject: [PATCH 11/15] bump sbt version --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index ea6d47b2e..0837f7a13 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.1 +sbt.version=1.3.13 From 77c7dcddd5b7839da2bc3cf96ed4ecc61c6122d3 Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Thu, 8 Oct 2020 12:19:33 -0700 Subject: [PATCH 12/15] Bump sbt version --- module-code/project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-code/project/build.properties b/module-code/project/build.properties index 31334bbd3..0837f7a13 100644 --- a/module-code/project/build.properties +++ b/module-code/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.1 +sbt.version=1.3.13 From e42e98a1267995236032da92c6b888599d15a465 Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Thu, 8 Oct 2020 12:46:08 -0700 Subject: [PATCH 13/15] Fixed versions --- module-code/project/build.properties | 2 +- project/Common.scala | 4 ++-- project/build.properties | 2 +- samples/java/demo/project/build.properties | 2 +- samples/scala/demo/project/build.properties | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module-code/project/build.properties b/module-code/project/build.properties index 0837f7a13..6db984250 100644 --- a/module-code/project/build.properties +++ b/module-code/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.4.0 diff --git a/project/Common.scala b/project/Common.scala index 6d1c80fbc..b137bb514 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -2,7 +2,7 @@ object Common { def version = "master-SNAPSHOT" - def playVersion = System.getProperty("play.version", "2.6.12") - def scalaVersion = System.getProperty("scala.version", "2.12.6") + def playVersion = System.getProperty("play.version", "2.6.25") + def scalaVersion = System.getProperty("scala.version", "2.12.2") def crossScalaVersions = Seq(scalaVersion, "2.11.12") } diff --git a/project/build.properties b/project/build.properties index 0837f7a13..6db984250 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.13 +sbt.version=1.4.0 diff --git a/samples/java/demo/project/build.properties b/samples/java/demo/project/build.properties index 31334bbd3..6db984250 100644 --- a/samples/java/demo/project/build.properties +++ b/samples/java/demo/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.1 +sbt.version=1.4.0 diff --git a/samples/scala/demo/project/build.properties b/samples/scala/demo/project/build.properties index 9f782f704..6db984250 100644 --- a/samples/scala/demo/project/build.properties +++ b/samples/scala/demo/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.1 \ No newline at end of file +sbt.version=1.4.0 From 61e1603a1fbc40b934e37a1f78883dec7a71c47f Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Fri, 9 Oct 2020 14:52:14 -0700 Subject: [PATCH 14/15] Fix versions --- module-code/project/build.properties | 2 +- project/Common.scala | 2 +- project/build.properties | 2 +- project/plugins.sbt | 2 +- samples/java/demo/project/build.properties | 2 +- samples/scala/demo/project/build.properties | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module-code/project/build.properties b/module-code/project/build.properties index 6db984250..0837f7a13 100644 --- a/module-code/project/build.properties +++ b/module-code/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.0 +sbt.version=1.3.13 diff --git a/project/Common.scala b/project/Common.scala index b137bb514..271298f72 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -4,5 +4,5 @@ object Common { def version = "master-SNAPSHOT" def playVersion = System.getProperty("play.version", "2.6.25") def scalaVersion = System.getProperty("scala.version", "2.12.2") - def crossScalaVersions = Seq(scalaVersion, "2.11.12") + def crossScalaVersions = Nil } diff --git a/project/build.properties b/project/build.properties index 6db984250..d7ec7acfa 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.0 +sbt.version=1.3.13 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 939f233a0..d34e778ee 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ logLevel := Level.Warn resolvers += Resolver.typesafeRepo("releases") // Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % System.getProperty("play.version", "2.6.11")) +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % System.getProperty("play.version", "2.6.25")) // Add Scalariform addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2") diff --git a/samples/java/demo/project/build.properties b/samples/java/demo/project/build.properties index 6db984250..0837f7a13 100644 --- a/samples/java/demo/project/build.properties +++ b/samples/java/demo/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.0 +sbt.version=1.3.13 diff --git a/samples/scala/demo/project/build.properties b/samples/scala/demo/project/build.properties index 6db984250..0837f7a13 100644 --- a/samples/scala/demo/project/build.properties +++ b/samples/scala/demo/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.0 +sbt.version=1.3.13 From 8d07914e3e9695ead7ca19ca63301c66ad94f6fd Mon Sep 17 00:00:00 2001 From: Wilton Risenhoover Date: Fri, 9 Oct 2020 14:56:42 -0700 Subject: [PATCH 15/15] Bump scala version --- project/Common.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Common.scala b/project/Common.scala index 271298f72..c76942ff8 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -3,6 +3,6 @@ object Common { def version = "master-SNAPSHOT" def playVersion = System.getProperty("play.version", "2.6.25") - def scalaVersion = System.getProperty("scala.version", "2.12.2") + def scalaVersion = System.getProperty("scala.version", "2.12.12") def crossScalaVersions = Nil }