artin/OBP-API
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-API.git synced 2026-02-06 17:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature/If OIDC is disabled don't show the OIDC text

Browse Source
This commit is contained in:
Marko Milić 2022-09-05 10:11:23 +02:00
parent c2954a02d2
commit 16d2756640
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
obp-api/src/main/scala/code/snippet/OpenIDConnectSnippet.scala
View File

@ -41,4 +41,17 @@ class OpenIDConnectSnippet extends MdcLoggable{
else
PassThru
def showText = {
val oidc1 = APIUtil.getPropsValue("openid_connect_1.client_id").isEmpty
val oidc2 = APIUtil.getPropsValue("openid_connect_2.client_id").isEmpty
if (oidc1 && oidc2)
"*" #> NodeSeq.Empty
// In case of a url ends with something like this: user_mgt/login?login_challenge=f587e7ac91044fe5aa138d6a1ab46250
// we know that we just Hydra OIDC button and Hydra ORA is using OBP-API for login request so hide the OIDC buttons
else if(S.param("login_challenge").isDefined)
"*" #> NodeSeq.Empty
else
PassThru
}
}

4
obp-api/src/main/webapp/oauth/authorize.html
View File

@ -43,8 +43,8 @@
<a href="/user_mgt/sign_up" id="authorise-signup" class="btn btn-default pull-right authorise-button" tabindex="0">Register</a>
</div>
<div class ="login-or"> or Login with OpenID : </div>
<hr>
<div data-lift="OpenIDConnectSnippet.showText" class ="login-or"> or Login with OpenID : </div>
<hr data-lift="OpenIDConnectSnippet.showText" >
<div data-lift="OpenIDConnectSnippet.showFirstButton">
<div data-lift="OpenidConnectInvoke.linkButtonFirstProvider">
<div class="authorise-button-oidc"><a id="open-id-connect-button-1" data-lift="OpenIDConnectSnippet.getFirstButtonText" class="btn btn-danger">OIDC 1</a>

4
obp-api/src/main/webapp/templates-hidden/_login.html
View File

@ -45,8 +45,8 @@
<a href="/user_mgt/sign_up" id="authorise-signup" class="btn btn-default pull-right authorise-button" tabindex="0"><lift:loc locid="register">Register</lift:loc></a>
</div>
<div class ="login-or"><lift:loc locid="or_login_with_openid"> or Login with OpenID :</lift:loc></div>
<hr>
<div data-lift="OpenIDConnectSnippet.showText" class ="login-or"><lift:loc locid="or_login_with_openid"> or Login with OpenID :</lift:loc></div>
<hr data-lift="OpenIDConnectSnippet.showText">
<div data-lift="OpenIDConnectSnippet.showFirstButton">
<div data-lift="OpenidConnectInvoke.linkButtonFirstProvider">
<div class="authorise-button-oidc"><a id="open-id-connect-button-1" data-lift="OpenIDConnectSnippet.getFirstButtonText" class="btn btn-danger">OIDC 1</a>