Merge pull request #409 from akkie/master

Fixes #406
mohiva · Sep 20, 2015 · f838746 · f838746
2 parents 5b88c8c + 452ab60
commit f838746
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -32,7 +32,7 @@ object BasicSettings extends AutoPlugin {
 
   override def projectSettings = Seq(
     organization := "com.mohiva",
-    version := "3.0.2",
+    version := "3.0.3",
     resolvers ++= Dependencies.resolvers,
     scalaVersion := Dependencies.Versions.scalaVersion,
     crossScalaVersions := Dependencies.Versions.crossScala,

diff --git a/silhouette/app/com/mohiva/play/silhouette/api/Silhouette.scala b/silhouette/app/com/mohiva/play/silhouette/api/Silhouette.scala
@@ -513,7 +513,7 @@ trait Silhouette[I <: Identity, A <: Authenticator] extends Controller with Logg
         case (Some(authenticator), identity) if !authenticator.extract.isValid =>
           block(UserAwareRequest(None, None, request)).flatMap {
             case hr @ HandlerResult(pr, d) =>
-              env.authenticatorService.discard(authenticator.extract, pr).map(r => hr.copy(pr))
+              env.authenticatorService.discard(authenticator.extract, pr).map(r => hr.copy(r))
           }
         // No authenticator and no user was found
         case _ =>