DefaultSocialStateHandler does not encode cookies correctly

Fixes #511
mohiva · Jun 4, 2017 · e0dadf8 · e0dadf8
1 parent dd28c35
commit e0dadf8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/silhouette/app/com/mohiva/play/silhouette/impl/providers/SocialStateProvider.scala b/silhouette/app/com/mohiva/play/silhouette/impl/providers/SocialStateProvider.scala
@@ -246,7 +246,7 @@ class DefaultSocialStateHandler(val handlers: Set[SocialStateItemHandler], cooki
    * @return The serialized state as string.
    */
   override def serialize(state: SocialState): String = {
-    cookieSigner.sign(state.items.flatMap(i => handlers.flatMap(h => h.canHandle(i).map(h.serialize))).mkString("."))
+    cookieSigner.sign(state.items.flatMap(i => handlers.flatMap(h => h.canHandle(i).map(h.serialize)).map(_.asString)).mkString("."))
   }
 
   /**

diff --git a/...ouette/test/com/mohiva/play/silhouette/impl/providers/DefaultSocialStateHandlerSpec.scala b/...ouette/test/com/mohiva/play/silhouette/impl/providers/DefaultSocialStateHandlerSpec.scala
@@ -64,7 +64,7 @@ class DefaultSocialStateHandlerSpec extends PlaySpecification with Mockito with
       Publishable.itemHandler.canHandle(Publishable.item) returns Some(Publishable.item)
       Publishable.itemHandler.serialize(Publishable.item) returns Publishable.structure
 
-      stateHandler.serialize(state) must be equalTo s"${Default.structure}.${Publishable.structure}"
+      stateHandler.serialize(state) must be equalTo s"${Default.structure.asString}.${Publishable.structure.asString}"
     }
   }