artin/OBP-Hydra-Identity-Provider
1
0
Fork 0
mirror of https://github.com/OpenBankProject/OBP-Hydra-Identity-Provider.git synced 2026-02-06 10:48:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

feature/Identitiy Proivider; Tweak usage of the bank specific logo from an OBP-API instance

Browse Source
This commit is contained in:
Marko Milić 2021-06-08 14:30:26 +02:00
parent 104a8b83cc
commit a38af247cf
9 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/openbankproject/oauth2/controller/ConsentController.java
View File

@ -71,6 +71,8 @@ public class ConsentController {
@Value("${logo.bank.enabled:false}")
private String showBankLogo;
@Value("${logo.bank.url:#}")
private String bankLogoUrl;
@Value("${obp.base_url:#}")
private String obpBaseUrl;
@ -154,6 +156,7 @@ public class ConsentController {
model.addAttribute("consents", consents);
model.addAttribute("showBankLogo", showBankLogo);
model.addAttribute("obpBaseUrl", obpBaseUrl);
model.addAttribute("bankLogoUrl", bankLogoUrl);
return "accounts";
} catch (Exception unhandledException) {
@ -173,6 +176,7 @@ public class ConsentController {
try {
model.addAttribute("showBankLogo", showBankLogo);
model.addAttribute("obpBaseUrl", obpBaseUrl);
model.addAttribute("bankLogoUrl", bankLogoUrl);
HttpHeaders headers = buildDirectLoginHeader(session);
String consentId = (String) session.getAttribute("consent_id");
String authorizationId = (String) session.getAttribute("authorizationId");
@ -241,6 +245,7 @@ public class ConsentController {
try{
model.addAttribute("showBankLogo", showBankLogo);
model.addAttribute("obpBaseUrl", obpBaseUrl);
model.addAttribute("bankLogoUrl", bankLogoUrl);
if(StringUtils.isNotBlank(deny)) {
final RejectRequest rejectRequest = new RejectRequest().error("access_denied").errorDescription("The resource owner denied the request");
final CompletedRequest completedRequest = adminApi.rejectConsentRequest(consent_challenge, rejectRequest);

3
src/main/java/com/openbankproject/oauth2/controller/LoginController.java
View File

@ -66,6 +66,8 @@ public class LoginController implements ServletContextAware {
@Value("${logo.bank.enabled:false}")
private String showBankLogo;
@Value("${logo.bank.url:#}")
private String bankLogoUrl;
/**
* initiate global variable
@ -85,6 +87,7 @@ public class LoginController implements ServletContextAware {
model.addAttribute("buttonHoverBackgroundColor", buttonHoverBackgroundColor);
model.addAttribute("showBankLogo", showBankLogo);
model.addAttribute("obpBaseUrl", obpBaseUrl);
model.addAttribute("bankLogoUrl", bankLogoUrl);
try {
LoginRequest loginRequest = hydraAdmin.getLoginRequest(login_challenge);

3
src/main/resources/application.properties
View File

@ -43,4 +43,5 @@ force_jws=BGv1.3
#show_unhandled_errors=false
### Show Bank Logo
#logo.bank.enabled=false
#logo.bank.enabled=false
#logo.bank.url=https://static.openbankproject.com/bank/img/bank-logo.png

2
src/main/resources/templates/accounts.html
View File

@ -17,7 +17,7 @@
<body>
<nav class="navbar navbar-light bg-light">
<a class="navbar-brand" th:href="@{${application.obp_url}}">
<img th:if="${showBankLogo == 'true'}" th:src="@{${obpBaseUrl} + '/media/images/logo.png'}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:if="${showBankLogo == 'true'}" th:src="@{${bankLogoUrl}}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:unless="${showBankLogo == 'true'}" th:src="@{/images/logo.png}" height="55" class="d-inline-block align-top" alt=""></img>
</a>
</nav>

2
src/main/resources/templates/consent.html
View File

@ -18,7 +18,7 @@
<body>
<nav class="navbar navbar-light bg-light">
<a class="navbar-brand" th:href="@{${application.obp_url}}">
<img th:if="${showBankLogo == 'true'}" th:src="@{${obpBaseUrl} + '/media/images/logo.png'}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:if="${showBankLogo == 'true'}" th:src="@{${bankLogoUrl}}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:unless="${showBankLogo == 'true'}" th:src="@{/images/logo.png}" height="55" class="d-inline-block align-top" alt=""></img>
</a>
</nav>

2
src/main/resources/templates/consents.html
View File

@ -17,7 +17,7 @@
<body>
<nav class="navbar navbar-light bg-light">
<a class="navbar-brand" th:href="@{${application.obp_url}}">
<img th:if="${showBankLogo == 'true'}" th:src="@{${obpBaseUrl} + '/media/images/logo.png'}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:if="${showBankLogo == 'true'}" th:src="@{${bankLogoUrl}}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:unless="${showBankLogo == 'true'}" th:src="@{/images/logo.png}" height="55" class="d-inline-block align-top" alt=""></img>
</a>
</nav>

2
src/main/resources/templates/error.html
View File

@ -18,7 +18,7 @@
<body>
<nav class="navbar navbar-light bg-light">
<a class="navbar-brand" th:href="@{${application.obp_url}}">
<img th:if="${showBankLogo == 'true'}" th:src="@{${obpBaseUrl} + '/media/images/logo.png'}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:if="${showBankLogo == 'true'}" th:src="@{${bankLogoUrl}}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:unless="${showBankLogo == 'true'}" th:src="@{/images/logo.png}" height="55" class="d-inline-block align-top" alt=""></img>
</a>
</nav>

2
src/main/resources/templates/login.html
View File

@ -21,7 +21,7 @@
<body>
<nav class="navbar navbar-light bg-light">
<a class="navbar-brand" th:href="@{${application.obp_url}}">
<img th:if="${showBankLogo == 'true'}" th:src="@{${obpBaseUrl} + '/media/images/logo.png'}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:if="${showBankLogo == 'true'}" th:src="@{${bankLogoUrl}}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:unless="${showBankLogo == 'true'}" th:src="@{/images/logo.png}" height="55" class="d-inline-block align-top" alt=""></img>
</a>
</nav>

2
src/main/resources/templates/sca_modal.html
View File

@ -18,7 +18,7 @@
<body>
<nav class="navbar navbar-light bg-light">
<a class="navbar-brand" th:href="@{${application.obp_url}}">
<img th:if="${showBankLogo == 'true'}" th:src="@{${obpBaseUrl} + '/media/images/logo.png'}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:if="${showBankLogo == 'true'}" th:src="@{${bankLogoUrl}}" height="55" class="d-inline-block align-top" alt=""></img>
<img th:unless="${showBankLogo == 'true'}" th:src="@{/images/logo.png}" height="55" class="d-inline-block align-top" alt=""></img>
</a>
</nav>