Skip to content

Commit a4044e0

Browse files
committed
Fix endless loop on logout
1 parent 5446e48 commit a4044e0

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

webskin/gudLogin/displayLogin.cfm

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@ START WEBSKIN
5050

5151
<cfif application.security.userdirectories.gud.isEnabled()>
5252
<!--- run authenticate function? --->
53-
<cfif isdefined("url.code") and not isdefined("arguments.stParam.message")>
53+
<cfif isdefined("url.logout")>
54+
<cfoutput><p class="error">You are logged out. <a href="http://#cgi.http_host#/index.cfm?type=gudLogin&view=displayLogin">Login again</a></p></cfoutput>
55+
<cfelseif isdefined("url.code") and not isdefined("arguments.stParam.message")>
5456
<cfset arguments.stParam = application.security.processLogin() />
5557
<cfif arguments.stParam.authenticated and not request.mode.profile>
5658
<cflocation url="#URLDecode(arguments.stParam.loginReturnURL)#" addtoken="false" />
5759
<cfelse>
58-
<cfoutput><p class="error">#arguments.stParam.message#</p></cfoutput>
60+
<cfoutput><p class="error">#arguments.stParam.message# <a href="http://#cgi.http_host#/index.cfm?type=gudLogin&view=displayLogin">Retry</a></p></cfoutput>
5961
</cfif>
6062
<cfelse>
6163
<cflocation url="#application.security.userdirectories.gud.getAuthorisationURL(clientID=application.config.GUD.clientid,redirectURL='http://#cgi.http_host#/index.cfm?type=gudLogin&view=displayLogin',scope='https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email',state='')#" addtoken="false" />

0 commit comments

Comments
 (0)