Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove application.secret and play.crypto.secret support #9061

Merged
merged 2 commits into from
Feb 24, 2019

Conversation

chipz
Copy link
Contributor

@chipz chipz commented Feb 22, 2019

Fixes

Fixes #8981

Purpose

Removed play.crypto.secret & application.secret leaving play.http.secret.key as the only way to set secret key

Fixed playframework#8981 playframework#8981

Removed `play.crypto.secret` & `application.secret` leaving `play.http.secret.key` as the only way to set secret key
@marcospereira marcospereira changed the title ### Fixes Remove application.secret and play.crypto.secret support Feb 22, 2019
Copy link
Member

@marcospereira marcospereira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot, @chipz.

See my comment. After that, I think this will be good to merge. :-)

}

}

trait SecretConfigurationParserSpec extends Specification {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can change this trait to be a class and use play.http.secret.key as the secretKey value. And then remove ActualKeySecretConfigurationParserSpec as well. :-)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the review. done.

@@ -285,7 +285,7 @@ object HttpConfiguration {
val Blank = """\s*""".r

val secret =
config.getDeprecated[Option[String]]("play.http.secret.key", "play.crypto.secret", "application.secret") match {
config.getDeprecated[Option[String]]("play.http.secret.key") match {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can just use get here now instead of getDeprecated

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point

…nfigurationParserSpec from trait to class

- Changed getDeprecated to get as we removed deprecated code
Copy link
Member

@marcospereira marcospereira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

Thank you, @chipz.

@marcospereira marcospereira merged commit 60c0de7 into playframework:master Feb 24, 2019
@dwijnand dwijnand added this to the Play 2.8.0-M1 milestone May 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove support for play.crypto.secret & application.secret in 2.7.x
4 participants