Skip to content

Commit 88e6a7c

Browse files
committed
Fixed jaliss#500: Add redirect-setting in case user cancels authorization
1 parent 53455c5 commit 88e6a7c

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

ChangeLog

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
master -
2+
- Fixed #500: Add redirect-setting in case user cancels authorization
23
- Pull request #571: Fixed GoogleProvider (thanks @dstrupl)
34
- Pull request #540: Fixed: case sensitive email, when restoring password (thanks @n0tel)
45
- Pull request #522: enable use of referer if user is already authenticated (thanks @anfuerer)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ trait BaseProviderController extends SecureSocial {
9797
env.providers.get(provider).map {
9898
_.authenticate().flatMap {
9999
case denied: AuthenticationResult.AccessDenied =>
100-
Future.successful(Redirect(env.routes.loginPageUrl).flashing("error" -> Messages("securesocial.login.accessDenied")))
100+
Future.successful(Redirect(env.routes.accessDeniedUrl).flashing("error" -> Messages("securesocial.login.accessDenied")))
101101
case failed: AuthenticationResult.Failed =>
102102
logger.error(s"[securesocial] authentication failed, reason: ${failed.error}")
103103
throw new AuthenticationException()

module-code/app/securesocial/core/services/RoutesService.scala

+10
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ trait RoutesService {
2828
*/
2929
def loginPageUrl(implicit req: RequestHeader): String
3030

31+
/**
32+
* The page where users get redirected when they deny access to their accounts using
33+
* oauth logins
34+
*/
35+
def accessDeniedUrl(implicit req: RequestHeader): String
36+
3137
/**
3238
* The page that starts the sign up flow
3339
*/
@@ -110,6 +116,10 @@ object RoutesService {
110116
absoluteUrl(securesocial.controllers.routes.LoginPage.login())
111117
}
112118

119+
override def accessDeniedUrl(implicit req: RequestHeader): String = {
120+
loginPageUrl
121+
}
122+
113123
override def startSignUpUrl(implicit req: RequestHeader): String = {
114124
absoluteUrl(securesocial.controllers.routes.Registration.startSignUp())
115125
}

0 commit comments

Comments
 (0)