File tree 2 files changed +2
-13
lines changed
module-code/app/securesocial
2 files changed +2
-13
lines changed Original file line number Diff line number Diff line change @@ -103,7 +103,7 @@ trait BaseProviderController extends SecureSocial with I18nSupport {
103
103
throw AuthenticationException ()
104
104
case flow : AuthenticationResult .NavigationFlow => Future .successful {
105
105
redirectTo.map { url =>
106
- flow.result.addToSession( SecureSocial .OriginalUrlKey -> url)
106
+ flow.result.withSession(flow.result.session + ( SecureSocial .OriginalUrlKey -> url) )
107
107
} getOrElse flow.result
108
108
}
109
109
case authenticated : AuthenticationResult .Authenticated =>
Original file line number Diff line number Diff line change @@ -33,16 +33,5 @@ object utils {
33
33
def startingAuthenticator [A ](authenticator : Authenticator [A ]) = authenticator.starting(r)
34
34
def discardingAuthenticator [A ](authenticator : Authenticator [A ]) = authenticator.discarding(r)
35
35
def touchingAuthenticator [A ](authenticator : Authenticator [A ]) = authenticator.touching(r)
36
- def addToSession (values : (String , String )* ) = {
37
- val cookies = Cookies .fromCookieHeader(r.header.headers.get(HeaderNames .SET_COOKIE ))
38
- val resultSession = Session .decodeFromCookie(cookies.get(Session .COOKIE_NAME ))
39
- def addValues (list : List [(String , String )], session : Session ): Session = {
40
- if (list.isEmpty) session else {
41
- val s = session + list.head
42
- addValues(list.tail, s)
43
- }
44
- }
45
- r.withSession(addValues(values.toList, resultSession))
46
- }
47
36
}
48
- }
37
+ }
You can’t perform that action at this time.
0 commit comments