Fixed broken account linking

Author: jaliss

module-code/app/securesocial/controllers/ProviderController.scala

@@ -103,7 +103,7 @@ trait BaseProviderController extends SecureSocial with I18nSupport {
           throw AuthenticationException()
         case flow: AuthenticationResult.NavigationFlow => Future.successful {
           redirectTo.map { url =>
-            flow.result.addToSession(SecureSocial.OriginalUrlKey -> url)
+            flow.result.withSession(flow.result.session + (SecureSocial.OriginalUrlKey -> url))
           } getOrElse flow.result
         }
         case authenticated: AuthenticationResult.Authenticated =>

module-code/app/securesocial/core/utils.scala

@@ -33,16 +33,5 @@ object utils {
     def startingAuthenticator[A](authenticator: Authenticator[A]) = authenticator.starting(r)
     def discardingAuthenticator[A](authenticator: Authenticator[A]) = authenticator.discarding(r)
     def touchingAuthenticator[A](authenticator: Authenticator[A]) = authenticator.touching(r)
-    def addToSession(values: (String, String)*) = {
-      val cookies = Cookies.fromCookieHeader(r.header.headers.get(HeaderNames.SET_COOKIE))
-      val resultSession = Session.decodeFromCookie(cookies.get(Session.COOKIE_NAME))
-      def addValues(list: List[(String, String)], session: Session): Session = {
-        if (list.isEmpty) session else {
-          val s = session + list.head
-          addValues(list.tail, s)
-        }
-      }
-      r.withSession(addValues(values.toList, resultSession))
-    }
   }
-}
+}