diff --git a/obp-api/src/main/resources/props/sample.props.template b/obp-api/src/main/resources/props/sample.props.template index f9416680e8..8bc5aa02c1 100644 --- a/obp-api/src/main/resources/props/sample.props.template +++ b/obp-api/src/main/resources/props/sample.props.template @@ -569,15 +569,16 @@ webui_oauth_1_documentation_url = # Link to OAuth 2.0 glossary on api explorer webui_oauth_2_documentation_url = -# Link to Privacy Policy on signup page -#webui_signup_form_submit_button_value= -#webui_signup_form_title_text=Sign Up -#webui_signup_body_password_repeat_text=Repeat -#allow_pre_filled_password=true -#webui_agree_terms_html=
-webui_agree_privacy_policy_url = https://openbankproject.com/privacy-policy -webui_agree_privacy_policy_html_text =
-#webui_legal_notice_html_text= +# Sign up functionality removed - users are directed to OBP Portal for registration +# The following signup-related properties are no longer used: +# - webui_signup_form_submit_button_value (signup form submit button text) +# - webui_signup_form_title_text (signup form title) +# - webui_signup_body_password_repeat_text (password repeat field text) +# - allow_pre_filled_password (pre-filled password functionality) +# - webui_agree_terms_html (terms agreement checkbox HTML) +# - webui_agree_privacy_policy_url (privacy policy URL for signup) +# - webui_agree_privacy_policy_html_text (privacy policy agreement text) +# - webui_legal_notice_html_text (legal notice for signup forms) ## For partner logos and links webui_main_partners=[\ @@ -596,8 +597,8 @@ webui_main_style_sheet = /media/css/website.css # Override certain elements (with important styles) webui_override_style_sheet = -## Link to agree to Terms & Conditions, shown on signup page -webui_agree_terms_url = +## Link to agree to Terms & Conditions (no longer used - signup removed) +# webui_agree_terms_url = ## The Support Email, shown in the bottom page #webui_support_email=contact@openbankproject.com @@ -624,6 +625,17 @@ webui_agree_terms_url = #webui_post_consumer_registration_more_info_text = Please tell us more your Application and / or Startup using this link. #webui_post_consumer_registration_submit_button_value=Register consumer +# OBP Portal URL - base URL for the OBP Portal service +# Used for: +# - User registration: {webui_obp_portal_url}/register (all "Register" links redirect here) +# - Consumer registration: {webui_obp_portal_url}/consumer-registration (default) +webui_obp_portal_url = http://localhost:5174 + +# External Consumer Registration URL - used to redirect "Get API Key" links to an external service +# If not set, defaults to webui_obp_portal_url + "/consumer-registration" +# Set this to redirect to a custom URL for consumer registration +webui_external_consumer_registration_url = http://localhost:5174/consumer-registration + ## Display For Banks section webui_display_for_banks_section = true diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala index 93488b0a9a..bca13258fd 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/AccountsApi.scala @@ -1,5 +1,7 @@ package code.api.AUOpenBanking.v1_0_0 +import scala.language.reflectiveCalls +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala index 21a2776d5a..60a9aadf76 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/BankingApi.scala @@ -1,5 +1,6 @@ package code.api.AUOpenBanking.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil.{defaultBankId, _} import code.api.util.ApiTag._ diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala index d89052e675..4b39158e59 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CommonApi.scala @@ -1,5 +1,7 @@ package code.api.AUOpenBanking.v1_0_0 +import scala.language.reflectiveCalls +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala index 1f829ef995..3e648cab8c 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/CustomerApi.scala @@ -1,5 +1,7 @@ package code.api.AUOpenBanking.v1_0_0 +import scala.language.reflectiveCalls +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala index 4f3a82cac8..869e19fe9e 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DirectDebitsApi.scala @@ -1,5 +1,7 @@ package code.api.AUOpenBanking.v1_0_0 +import scala.language.reflectiveCalls +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala index ea53f9af55..b434d089c6 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/DiscoveryApi.scala @@ -1,5 +1,7 @@ package code.api.AUOpenBanking.v1_0_0 +import scala.language.reflectiveCalls +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala index 1e71822efe..386337d51a 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/PayeesApi.scala @@ -1,5 +1,7 @@ package code.api.AUOpenBanking.v1_0_0 +import scala.language.reflectiveCalls +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala index 12cbfe032b..646eed5d37 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ProductsApi.scala @@ -1,5 +1,6 @@ package code.api.AUOpenBanking.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala index 363dbb5b5f..289c43eff8 100644 --- a/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/AUOpenBanking/v1_0_0/ScheduledPaymentsApi.scala @@ -1,5 +1,7 @@ package code.api.AUOpenBanking.v1_0_0 +import scala.language.reflectiveCalls +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala index 6a5275caab..0bfaa75264 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountAccessConsentsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala index fbbe36828b..aca6e29c03 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/AccountsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala index f348050e2d..6dfe3ce89e 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BalancesApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala index 4a58944c59..c10d058b4c 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/BeneficiariesApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala index c956e1af7c..99e23cf40a 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DirectDebitsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala index 5f59bfe661..b529269150 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentConsentsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala index 157df8b116..97340d0a35 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticFutureDatedPaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala index 9e0c1a894e..3491ae02da 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala index 4db4c0b41e..8b03e9e4a7 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/DomesticPaymentsConsentsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala index 2d40272d5b..244088bda4 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/EventNotificationApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala index 965d1f09b3..8226770618 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentConsentsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala index 0dbd97d5b6..166234039d 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FilePaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala index 1a3353ac24..bd2958efba 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/FutureDatedPaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala index 684a13c20b..f5c2376895 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentConsentsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala index ef052b2611..a566e2bb14 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/InternationalPaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala index 107fec5c1c..1fb6ba9ee1 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/OffersApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala index 847fec053d..1e5ab3666f 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/PartiesApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala index 2d9b227e27..d3722d3955 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StandingOrdersApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala index d17d2afa0c..aaa6102cd6 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/StatementsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala index 0a26024cab..d4dec4f4de 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/SupplementaryAccountInfoApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala index 8528cd6908..12c2cf3d3d 100644 --- a/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala +++ b/obp-api/src/main/scala/code/api/BahrainOBF/v1_0_0/TransactionsApi.scala @@ -1,5 +1,6 @@ package code.api.BahrainOBF.v1_0_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala b/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala index 6ede06c1eb..65089ecf73 100644 --- a/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala +++ b/obp-api/src/main/scala/code/api/MxOF/APIMethods_AtmsApi.scala @@ -1,5 +1,7 @@ package code.api.MxOF +import scala.language.reflectiveCalls +import scala.language.implicitConversions import code.api.Constant import code.api.MxOF.JSONFactory_MXOF_0_0_1.createGetAtmsResponse import code.api.util.APIUtil._ diff --git a/obp-api/src/main/scala/code/api/OBPRestHelper.scala b/obp-api/src/main/scala/code/api/OBPRestHelper.scala index ea6adbdbb9..78dc3bde3c 100644 --- a/obp-api/src/main/scala/code/api/OBPRestHelper.scala +++ b/obp-api/src/main/scala/code/api/OBPRestHelper.scala @@ -27,6 +27,8 @@ TESOBE (http://www.tesobe.com/) package code.api +import scala.language.reflectiveCalls +import scala.language.implicitConversions import code.api.Constant._ import code.api.OAuthHandshake._ import code.api.util.APIUtil._ diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala index 1c4b6fa182..82b4965c04 100644 --- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala +++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/AISApi.scala @@ -1,5 +1,6 @@ package code.api.Polish.v2_1_1_1 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala index 40a4131f26..51c0488e0c 100644 --- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala +++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/ASApi.scala @@ -1,5 +1,6 @@ package code.api.Polish.v2_1_1_1 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala index ac460d9966..a23d8151a9 100644 --- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala +++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/CAFApi.scala @@ -1,5 +1,6 @@ package code.api.Polish.v2_1_1_1 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala index bc343808a3..079d300303 100644 --- a/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala +++ b/obp-api/src/main/scala/code/api/Polish/v2_1_1_1/PISApi.scala @@ -1,5 +1,6 @@ package code.api.Polish.v2_1_1_1 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala index 3845c33ea5..2a43e1d6ce 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocs140.scala @@ -1,5 +1,6 @@ package code.api.ResourceDocs1_4_0 +import scala.language.reflectiveCalls import code.api.Constant.HostName import code.api.OBPRestHelper import code.api.cache.Caching @@ -16,7 +17,7 @@ import net.liftweb.http.{GetRequest, InMemoryResponse, PlainTextResponse, Req, S object ResourceDocs140 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { val version = ApiVersion.v1_4_0 // "1.4.0" // We match other api versions so API explorer can easily use the path. val versionStatus = ApiVersionStatus.STABLE.toString - val routes = List( + val routes: Seq[OBPEndpoint] = List( ImplementationsResourceDocs.getResourceDocsObp, ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp, ImplementationsResourceDocs.getResourceDocsSwagger, @@ -31,7 +32,7 @@ object ResourceDocs140 extends OBPRestHelper with ResourceDocsAPIMethods with Md object ResourceDocs200 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { val version = ApiVersion.v2_0_0 // "2.0.0" // We match other api versions so API explorer can easily use the path. val versionStatus = ApiVersionStatus.STABLE.toString - val routes = List( + val routes: Seq[OBPEndpoint] = List( ImplementationsResourceDocs.getResourceDocsObp, ImplementationsResourceDocs.getResourceDocsSwagger, ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp, @@ -46,7 +47,7 @@ object ResourceDocs200 extends OBPRestHelper with ResourceDocsAPIMethods with Md object ResourceDocs210 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { val version: ApiVersion = ApiVersion.v2_1_0 // "2.1.0" // We match other api versions so API explorer can easily use the path. val versionStatus = ApiVersionStatus.STABLE.toString - val routes = List( + val routes: Seq[OBPEndpoint] = List( ImplementationsResourceDocs.getResourceDocsObp, ImplementationsResourceDocs.getResourceDocsSwagger, ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp, @@ -60,7 +61,7 @@ object ResourceDocs210 extends OBPRestHelper with ResourceDocsAPIMethods with Md object ResourceDocs220 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { val version: ApiVersion = ApiVersion.v2_2_0 // "2.2.0" // We match other api versions so API explorer can easily use the path. val versionStatus = ApiVersionStatus.STABLE.toString - val routes = List( + val routes: Seq[OBPEndpoint] = List( ImplementationsResourceDocs.getResourceDocsObp, ImplementationsResourceDocs.getResourceDocsSwagger, ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp, @@ -74,7 +75,7 @@ object ResourceDocs220 extends OBPRestHelper with ResourceDocsAPIMethods with Md object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { val version : ApiVersion = ApiVersion.v3_0_0 // = "3.0.0" // We match other api versions so API explorer can easily use the path. val versionStatus = ApiVersionStatus.STABLE.toString - val routes = List( + val routes: Seq[OBPEndpoint] = List( ImplementationsResourceDocs.getResourceDocsObp, ImplementationsResourceDocs.getResourceDocsSwagger, ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp, @@ -87,7 +88,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md object ResourceDocs310 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { val version: ApiVersion = ApiVersion.v3_1_0 // = "3.0.0" // We match other api versions so API explorer can easily use the path. val versionStatus = ApiVersionStatus.STABLE.toString - val routes = List( + val routes: Seq[OBPEndpoint] = List( ImplementationsResourceDocs.getResourceDocsObp, ImplementationsResourceDocs.getResourceDocsSwagger, ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp, @@ -102,7 +103,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md object ResourceDocs400 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { val version: ApiVersion = ApiVersion.v4_0_0 // = "4.0.0" // We match other api versions so API explorer can easily use the path. val versionStatus = ApiVersionStatus.STABLE.toString - val routes = List( + val routes: Seq[OBPEndpoint] = List( ImplementationsResourceDocs.getResourceDocsObpV400, ImplementationsResourceDocs.getResourceDocsSwagger, ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp, @@ -117,7 +118,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md object ResourceDocs500 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { val version: ApiVersion = ApiVersion.v5_0_0 val versionStatus = ApiVersionStatus.STABLE.toString - val routes = List( + val routes: Seq[OBPEndpoint] = List( ImplementationsResourceDocs.getResourceDocsObpV400, ImplementationsResourceDocs.getResourceDocsSwagger, ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp, @@ -132,7 +133,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md object ResourceDocs510 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { val version: ApiVersion = ApiVersion.v5_1_0 val versionStatus = ApiVersionStatus.BLEEDING_EDGE.toString - val routes = List( + val routes: Seq[OBPEndpoint] = List( ImplementationsResourceDocs.getResourceDocsObpV400, ImplementationsResourceDocs.getResourceDocsSwagger, ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp, @@ -148,7 +149,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md object ResourceDocs600 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable { val version: ApiVersion = ApiVersion.v6_0_0 val versionStatus = ApiVersionStatus.BLEEDING_EDGE.toString - val routes = List( + val routes: Seq[OBPEndpoint] = List( ImplementationsResourceDocs.getResourceDocsObpV400, ImplementationsResourceDocs.getResourceDocsSwagger, ImplementationsResourceDocs.getResourceDocsOpenAPI31, diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala index 9966ee298f..d83e025068 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala @@ -1,6 +1,7 @@ package code.api.ResourceDocs1_4_0 -import code.api.Constant.{GET_DYNAMIC_RESOURCE_DOCS_TTL, GET_STATIC_RESOURCE_DOCS_TTL, PARAM_LOCALE, HostName} +import scala.language.reflectiveCalls +import code.api.Constant.{GET_DYNAMIC_RESOURCE_DOCS_TTL, GET_STATIC_RESOURCE_DOCS_TTL, HostName, PARAM_LOCALE} import code.api.OBPRestHelper import code.api.cache.Caching import code.api.util.APIUtil._ @@ -39,6 +40,7 @@ import net.liftweb.json.JsonAST.{JField, JString, JValue} import net.liftweb.json._ import java.util.concurrent.ConcurrentHashMap +import scala.collection.immutable import scala.collection.immutable.{List, Nil} import scala.concurrent.Future @@ -117,7 +119,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth logger.debug(s"getResourceDocsList says requestedApiVersion is $requestedApiVersion") - val resourceDocs = requestedApiVersion match { + val resourceDocs: ArrayBuffer[ResourceDoc] = requestedApiVersion match { case ApiVersion.v6_0_0 => OBPAPI6_0_0.allResourceDocs case ApiVersion.v5_1_0 => OBPAPI5_1_0.allResourceDocs case ApiVersion.v5_0_0 => OBPAPI5_0_0.allResourceDocs @@ -138,7 +140,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth logger.debug(s"There are ${resourceDocs.length} resource docs available to $requestedApiVersion") - val versionRoutes = requestedApiVersion match { + val versionRoutes: immutable.Seq[OBPEndpoint] = requestedApiVersion match { case ApiVersion.v6_0_0 => OBPAPI6_0_0.routes case ApiVersion.v5_1_0 => OBPAPI5_1_0.routes case ApiVersion.v5_0_0 => OBPAPI5_0_0.routes @@ -466,7 +468,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth case true => authenticatedAccess(cc) // If set resource_docs_requires_role=true, we need check the authentication } _ <- resourceDocsRequireRole match { - case false => Future() + case false => Future(()) case true => // If set resource_docs_requires_role=true, we need check the roles as well NewStyle.function.hasAtLeastOneEntitlement(failMsg = UserHasMissingRoles + canReadResourceDoc.toString)("", u.map(_.userId).getOrElse(""), ApiRole.canReadResourceDoc :: Nil, cc.callContext) } @@ -590,7 +592,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth } (_, callContext) <- NewStyle.function.getBank(BankId(bankId), Option(cc)) _ <- resourceDocsRequireRole match { - case false => Future() + case false => Future(()) case true => // If set resource_docs_requires_role=true, we need check the the roles as well NewStyle.function.hasAtLeastOneEntitlement(failMsg = UserHasMissingRoles + ApiRole.canReadDynamicResourceDocsAtOneBank.toString)( bankId, u.map(_.userId).getOrElse(""), ApiRole.canReadDynamicResourceDocsAtOneBank::Nil, cc.callContext diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala index d6e9149ea2..a1e5223c01 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala @@ -1,5 +1,6 @@ package code.api.ResourceDocs1_4_0 +import scala.language.implicitConversions import code.api.Constant import code.api.Constant._ import code.api.UKOpenBanking.v2_0_0.JSONFactory_UKOpenBanking_200 diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala index 28f11e297f..2ac9c5782c 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerJSONFactory.scala @@ -889,7 +889,7 @@ object SwaggerJSONFactory extends MdcLoggable { * @return a list of include original list and nested objects */ private def getAllEntities(entities: List[AnyRef]) = { - val notNullEntities = entities.filter(null !=) + val notNullEntities = entities.filter(null.!=) val notSupportYetEntity = entities.filter(_.getClass.getSimpleName.equals(NotSupportedYet.getClass.getSimpleName.replace("$",""))) val existsEntityTypes: Set[universe.Type] = notNullEntities.map(ReflectUtils.getType).toSet @@ -919,10 +919,10 @@ object SwaggerJSONFactory extends MdcLoggable { val entityType = ReflectUtils.getType(obj) val constructorParamList = ReflectUtils.getPrimaryConstructor(entityType).paramLists.headOption.getOrElse(Nil) // if exclude current obj, the result list tail will be Nil - val resultTail = if(excludeTypes.exists(entityType =:=)) Nil else List(obj) + val resultTail = if(excludeTypes.exists(entityType.=:=)) Nil else List(obj) val refValues: List[Any] = constructorParamList - .filter(it => isSwaggerRefType(it.info) && !excludeTypes.exists(_ =:= it.info)) + .filter(it => isSwaggerRefType(it.info) && !excludeTypes.exists(_.=:=(it.info))) .map(it => { val paramName = it.name.toString val value = ReflectUtils.invokeMethod(obj, paramName) @@ -1009,7 +1009,7 @@ object SwaggerJSONFactory extends MdcLoggable { val errorMessages: Set[AnyRef] = resourceDocList.flatMap(_.error_response_bodies).toSet val errorDefinitions = ErrorMessages.allFields - .filterNot(null ==) + .filterNot(null.==) .filter(it => errorMessages.contains(it._2)) .toList .map(it => { diff --git a/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala b/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala index a2175d0b9c..7eeb835abe 100644 --- a/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala +++ b/obp-api/src/main/scala/code/api/STET/v1_4/AISPApi.scala @@ -1,5 +1,6 @@ package code.api.STET.v1_4 +import scala.language.implicitConversions import code.api.APIFailureNewStyle import code.api.STET.v1_4.JSONFactory_STET_1_4._ import code.api.berlin.group.v1_3.JvalueCaseClass diff --git a/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala b/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala index bd249bbc19..7c64f54ee9 100644 --- a/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala +++ b/obp-api/src/main/scala/code/api/STET/v1_4/CBPIIApi.scala @@ -1,5 +1,6 @@ package code.api.STET.v1_4 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala b/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala index 1a3b504bc1..8dde01b430 100644 --- a/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala +++ b/obp-api/src/main/scala/code/api/STET/v1_4/PISPApi.scala @@ -1,5 +1,6 @@ package code.api.STET.v1_4 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala index 1b99efeb1b..2221a08cb9 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountAccessApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.Constant import code.api.UKOpenBanking.v3_1_0.JSONFactory_UKOpenBanking_310.ConsentPostBodyUKV310 import code.api.berlin.group.v1_3.JvalueCaseClass diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala index d85e236eef..af76a559f0 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/AccountsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.Constant import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala index afa47da0df..7f5196a241 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BalancesApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.Constant import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala index 8b2a9202f8..a8bdf4a6fa 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/BeneficiariesApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala index 0fa62f8616..691d74797b 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DirectDebitsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala index a3eb5c672b..26c9f7441c 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticPaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala index 235d2e139f..8a9c8fdf4c 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticScheduledPaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala index ee21f7fc48..9af02bff7c 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/DomesticStandingOrdersApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala index 216d31cc7c..ff17971f8f 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FilePaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala index 3dce3f6b8f..61d110fb43 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/FundsConfirmationsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala index d5206696dc..4902fc0c8d 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalPaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala index e7f2ea6b04..7dd09f027e 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalScheduledPaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala index bb6b4f77f6..f35323886d 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/InternationalStandingOrdersApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala index eb7cfc90b4..953810052e 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/OffersApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala index cc066d556a..4a8c43e583 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/PartysApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala index a623afaa1f..4542578c98 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ProductsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala index 163759ba78..826fd9d8d1 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/ScheduledPaymentsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala index 48772074d5..f447695250 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StandingOrdersApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala index 69a893f0d6..66be44423a 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/StatementsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil._ import code.api.util.ApiTag diff --git a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala index 5a57181067..3b1f0e8b12 100644 --- a/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala +++ b/obp-api/src/main/scala/code/api/UKOpenBanking/v3_1_0/TransactionsApi.scala @@ -1,5 +1,6 @@ package code.api.UKOpenBanking.v3_1_0 +import scala.language.implicitConversions import code.api.berlin.group.v1_3.JvalueCaseClass import code.api.util.APIUtil.{defaultBankId, _} import code.api.util.ApiTag._ diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala index d3684b2681..df55fbfd01 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/AccountInformationServiceAISApi.scala @@ -1,5 +1,6 @@ package code.api.builder.AccountInformationServiceAISApi +import scala.language.implicitConversions import code.api.APIFailureNewStyle import code.api.Constant.{SYSTEM_READ_ACCOUNTS_BERLIN_GROUP_VIEW_ID, SYSTEM_READ_BALANCES_BERLIN_GROUP_VIEW_ID, SYSTEM_READ_TRANSACTIONS_BERLIN_GROUP_VIEW_ID} import code.api.berlin.group.ConstantsBG diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala index 34b0f54f6c..6a40112e93 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/CommonServicesApi.scala @@ -1,5 +1,6 @@ package code.api.builder.CommonServicesApi +import scala.language.implicitConversions import code.api.berlin.group.ConstantsBG import code.api.berlin.group.v1_3.{JvalueCaseClass, OBP_BERLIN_GROUP_1_3} import code.api.builder.AccountInformationServiceAISApi.APIMethods_AccountInformationServiceAISApi diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala index 7e5108aa7c..adde2f1fb6 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/ConfirmationOfFundsServicePIISApi.scala @@ -1,5 +1,6 @@ package code.api.builder.ConfirmationOfFundsServicePIISApi +import scala.language.implicitConversions import code.api.berlin.group.ConstantsBG import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3._ import code.api.berlin.group.v1_3.{JvalueCaseClass, OBP_BERLIN_GROUP_1_3} diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala index 0d39f7502c..ac26183268 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApi.scala @@ -1,5 +1,6 @@ package code.api.builder.PaymentInitiationServicePISApi +import scala.language.implicitConversions import code.api.berlin.group.ConstantsBG import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3.{CancelPaymentResponseJson, CancelPaymentResponseLinks, LinkHrefJson, UpdatePaymentPsuDataJson, checkAuthorisationConfirmation, checkSelectPsuAuthenticationMethod, checkTransactionAuthorisation, checkUpdatePsuAuthentication, createCancellationTransactionRequestJson} import code.api.berlin.group.v1_3.model.TransactionStatus.mapTransactionStatus diff --git a/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala b/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala index 8b1c05891d..664bcee8ef 100644 --- a/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala +++ b/obp-api/src/main/scala/code/api/berlin/group/v1_3/SigningBasketsApi.scala @@ -1,5 +1,6 @@ package code.api.builder.SigningBasketsApi +import scala.language.implicitConversions import code.api.berlin.group.ConstantsBG import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3.{PostSigningBasketJsonV13, UpdatePaymentPsuDataJson, createSigningBasketResponseJson, createStartSigningBasketAuthorisationJson, getSigningBasketResponseJson, getSigningBasketStatusResponseJson} import code.api.berlin.group.v1_3.{JSONFactory_BERLIN_GROUP_1_3, JvalueCaseClass} diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala index d052e21698..4022feacd9 100644 --- a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala +++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicCompileEndpoint.scala @@ -1,5 +1,6 @@ package code.api.dynamic.endpoint.helper +import scala.language.implicitConversions import code.api.util.APIUtil.{OBPEndpoint, OBPReturnType, futureToBoxedResponse, scalaFutureToLaFuture} import code.api.util.DynamicUtil.{Sandbox, Validation} import code.api.util.{CallContext, CustomJsonFormats, DynamicUtil} @@ -34,7 +35,7 @@ trait DynamicCompileEndpoint { } private def validateDependencies() = { - val dependencies = DynamicUtil.getDynamicCodeDependentMethods(this.getClass, "process" == ) + val dependencies = DynamicUtil.getDynamicCodeDependentMethods(this.getClass, "process".==) Validation.validateDependency(dependencies) } } diff --git a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala index 757ea0465a..bf423d647b 100644 --- a/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala +++ b/obp-api/src/main/scala/code/api/dynamic/endpoint/helper/DynamicEndpointHelper.scala @@ -1,5 +1,6 @@ package code.api.dynamic.endpoint.helper +import scala.language.existentials import org.apache.pekko.http.scaladsl.model.{HttpMethods, HttpMethod => PekkoHttpMethod} import code.DynamicData.{DynamicDataProvider, DynamicDataT} import code.DynamicEndpoint.{DynamicEndpointProvider, DynamicEndpointT} @@ -677,7 +678,7 @@ object DynamicEndpointHelper extends RestHelper { schemas += schema } // check whether this schema already recurse two times - if(schemas.count(schema ==) > 3) { + if(schemas.count(schema.==) > 3) { return JObject(Nil) } diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala index d6fb5dbb4f..9b27333a73 100644 --- a/obp-api/src/main/scala/code/api/util/APIUtil.scala +++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala @@ -26,6 +26,9 @@ TESOBE (http://www.tesobe.com/) */ package code.api.util + +import scala.language.implicitConversions +import scala.language.reflectiveCalls import bootstrap.liftweb.CustomDBVendor import code.accountholders.AccountHolders import code.api.Constant._ @@ -1764,9 +1767,9 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ private val reversedRequestUrl = requestUrlPartPath.reverse def getPathParams(url: List[String]): Map[String, String] = - reversedRequestUrl.zip(url.reverse) collect { + reversedRequestUrl.zip(url.reverse).collect { case pair @(k, _) if isPathVariable(k) => pair - } toMap + }.toMap /** * According errorResponseBodies whether contains UserNotLoggedIn and UserHasMissingRoles do validation. @@ -4022,7 +4025,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ def parseDate(date: String): Option[Date] = { val currentSupportFormats = List(DateWithDayFormat, DateWithSecondsFormat, DateWithMsFormat, DateWithMsRollbackFormat) val parsePosition = new ParsePosition(0) - currentSupportFormats.toStream.map(_.parse(date, parsePosition)).find(null !=) + currentSupportFormats.toStream.map(_.parse(date, parsePosition)).find(null.!=) } private def passesPsd2ServiceProviderCommon(cc: Option[CallContext], serviceProvider: String) = { @@ -4418,7 +4421,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ private def getClassPool(classLoader: ClassLoader) = { import scala.concurrent.duration._ - Caching.memoizeSyncWithImMemory(Some(classLoader.toString()))(DurationInt(30) days) { + Caching.memoizeSyncWithImMemory(Some(classLoader.toString()))(DurationInt(30).days) { val classPool: ClassPool = ClassPool.getDefault classPool.appendClassPath(new LoaderClassPath(classLoader)) classPool @@ -4519,7 +4522,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ */ def getObpTrace(clazzName: String, methodName: String, signature: String, exclude: List[(String, String, String)] = Nil): List[(String, String, String)] = { import scala.concurrent.duration._ - Caching.memoizeSyncWithImMemory(Some(clazzName + methodName + signature))(DurationInt(30) days) { + Caching.memoizeSyncWithImMemory(Some(clazzName + methodName + signature))(DurationInt(30).days) { // List:: className->methodName->signature, find all the dependent methods for one val methods = getDependentMethods(clazzName, methodName, signature) diff --git a/obp-api/src/main/scala/code/api/util/AfterApiAuth.scala b/obp-api/src/main/scala/code/api/util/AfterApiAuth.scala index 13eae4fc40..00ef0fa503 100644 --- a/obp-api/src/main/scala/code/api/util/AfterApiAuth.scala +++ b/obp-api/src/main/scala/code/api/util/AfterApiAuth.scala @@ -32,11 +32,12 @@ object AfterApiAuth extends MdcLoggable{ */ def innerLoginUserInitAction(authUser: Box[AuthUser]) = { authUser.map { u => // Init actions - logger.info("AfterApiAuth.innerLoginUserInitAction started successfully") + logger.debug("AfterApiAuth.innerLoginUserInitAction started successfully") sofitInitAction(u) } match { - case Full(_) => logger.warn("AfterApiAuth.innerLoginUserInitAction completed successfully") - case userInitActionFailure => logger.warn("AfterApiAuth.innerLoginUserInitAction: " + userInitActionFailure) + case Full(_) => logger.debug("AfterApiAuth.innerLoginUserInitAction completed successfully") + case Empty => // Init actions are not started at all + case userInitActionFailure => logger.error("AfterApiAuth.innerLoginUserInitAction: " + userInitActionFailure) } } /** diff --git a/obp-api/src/main/scala/code/api/util/Glossary.scala b/obp-api/src/main/scala/code/api/util/Glossary.scala index 79d3ff77c9..b0c0dc2ca8 100644 --- a/obp-api/src/main/scala/code/api/util/Glossary.scala +++ b/obp-api/src/main/scala/code/api/util/Glossary.scala @@ -1095,7 +1095,7 @@ object Glossary extends MdcLoggable { | |### 1) Get your App key | - |[Sign up]($getServerUrl/user_mgt/sign_up) or [login]($getServerUrl/user_mgt/login) as a developer. + |[Sign up](${APIUtil.getPropsValue("webui_obp_portal_url", "http://localhost:5174")}/register) or [login]($getServerUrl/user_mgt/login) as a developer. | |Register your App key [HERE](${getConsumerRegistrationUrl()}) | @@ -2151,7 +2151,7 @@ object Glossary extends MdcLoggable { | |### Step 1: Get your App key | - |[Sign up]($getServerUrl/user_mgt/sign_up) or [login]($getServerUrl/user_mgt/login) as a developer + |[Sign up](${APIUtil.getPropsValue("webui_obp_portal_url", "http://localhost:5174")}/register) or [login]($getServerUrl/user_mgt/login) as a developer | |Register your App key [HERE](${getConsumerRegistrationUrl()}) | @@ -2800,7 +2800,7 @@ object Glossary extends MdcLoggable { | |## In order to get an App / Consumer key | -|[Sign up]($getServerUrl/user_mgt/sign_up) or [login]($getServerUrl/user_mgt/login) as a developer. +|[Sign up](${APIUtil.getPropsValue("webui_obp_portal_url", "http://localhost:5174")}/register) or [login]($getServerUrl/user_mgt/login) as a developer. | |Register your App / Consumer [HERE](${getConsumerRegistrationUrl()}) | diff --git a/obp-api/src/main/scala/code/api/util/NewStyle.scala b/obp-api/src/main/scala/code/api/util/NewStyle.scala index 80394c0c5f..2a684e5164 100644 --- a/obp-api/src/main/scala/code/api/util/NewStyle.scala +++ b/obp-api/src/main/scala/code/api/util/NewStyle.scala @@ -3160,7 +3160,7 @@ object NewStyle extends MdcLoggable{ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(methodRoutingTTL second) { + Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(methodRoutingTTL.second) { MethodRoutingProvider.connectorMethodProvider.vend.getMethodRoutings(methodName, isBankIdExactMatch, bankIdPattern) } } @@ -3213,7 +3213,7 @@ object NewStyle extends MdcLoggable{ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(endpointMappingTTL second) { + Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(endpointMappingTTL.second) { {(EndpointMappingProvider.endpointMappingProvider.vend.getAllEndpointMappings(bankId), callContext)} } } @@ -3327,7 +3327,7 @@ object NewStyle extends MdcLoggable{ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL second) { + Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL.second) { DynamicEntityProvider.connectorMethodProvider.vend.getDynamicEntities(bankId, returnBothBankAndSystemLevel) } } @@ -3338,7 +3338,7 @@ object NewStyle extends MdcLoggable{ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL second) { + Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL.second) { DynamicEntityProvider.connectorMethodProvider.vend.getDynamicEntitiesByUserId(userId: String) } } diff --git a/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala b/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala index f55e488a2c..7a93c9e15c 100644 --- a/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala +++ b/obp-api/src/main/scala/code/api/v1_2_1/APIMethods121.scala @@ -76,7 +76,7 @@ trait APIMethods121 { def checkIfLocationPossible(lat:Double,lon:Double) : Box[Unit] = { if(scala.math.abs(lat) <= 90 & scala.math.abs(lon) <= 180) - Full() + Full(()) else Failure("Coordinates not possible") } @@ -132,7 +132,7 @@ trait APIMethods121 { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory.getApiInfoJSON(apiVersion,apiVersionStatus), HttpCode.`200`(cc.callContext)) } diff --git a/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala b/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala index 5c550e036b..113d684b1e 100644 --- a/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala +++ b/obp-api/src/main/scala/code/api/v1_2_1/OBPAPI1.2.1.scala @@ -26,6 +26,8 @@ TESOBE (http://www.tesobe.com/) */ package code.api.v1_2_1 +import scala.language.implicitConversions +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus} @@ -40,7 +42,7 @@ object OBPAPI1_2_1 extends OBPRestHelper with APIMethods121 with MdcLoggable wit val version : ApiVersion = ApiVersion.v1_2_1 // "1.2.1" val versionStatus = ApiVersionStatus.DEPRECATED.toString - lazy val endpointsOf1_2_1 = List( + lazy val endpointsOf1_2_1: Seq[OBPEndpoint] = List( Implementations1_2_1.root, Implementations1_2_1.getBanks, Implementations1_2_1.bankById, diff --git a/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala b/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala index da3ea41bfc..5cd2d75cc2 100644 --- a/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala +++ b/obp-api/src/main/scala/code/api/v1_3_0/APIMethods130.scala @@ -50,7 +50,7 @@ trait APIMethods130 { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory.getApiInfoJSON(OBPAPI1_3_0.version, OBPAPI1_3_0.versionStatus), HttpCode.`200`(cc.callContext)) } diff --git a/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala b/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala index 7dccdf33d3..d5b6ce0507 100644 --- a/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala +++ b/obp-api/src/main/scala/code/api/v1_3_0/OBPAPI1_3_0.scala @@ -1,5 +1,6 @@ package code.api.v1_3_0 +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus} diff --git a/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala b/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala index a8ac7072cb..b740080283 100644 --- a/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala +++ b/obp-api/src/main/scala/code/api/v1_4_0/APIMethods140.scala @@ -1,5 +1,6 @@ package code.api.v1_4_0 +import scala.language.reflectiveCalls import code.api.Constant._ import code.api.util.ApiRole._ import code.api.util.ApiTag._ @@ -84,7 +85,7 @@ trait APIMethods140 extends MdcLoggable with APIMethods130 with APIMethods121{ cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory.getApiInfoJSON(OBPAPI1_4_0.version, OBPAPI1_4_0.versionStatus), HttpCode.`200`(cc.callContext)) } diff --git a/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala b/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala index bc27013648..db6f7ee9f0 100644 --- a/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala +++ b/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala @@ -530,7 +530,7 @@ object JSONFactory1_4_0 extends MdcLoggable{ jsonResponseBodyFieldsI18n:String ): ResourceDocJson = { val cacheKey = LOCALISED_RESOURCE_DOC_PREFIX + s"operationId:${operationId}-locale:$locale- isVersion4OrHigher:$isVersion4OrHigher".intern() - Caching.memoizeSyncWithImMemory(Some(cacheKey))(CREATE_LOCALISED_RESOURCE_DOC_JSON_TTL seconds) { + Caching.memoizeSyncWithImMemory(Some(cacheKey))(CREATE_LOCALISED_RESOURCE_DOC_JSON_TTL.seconds) { val fieldsDescription = if (resourceDocUpdatedTags.tags.toString.contains("Dynamic-Entity") || resourceDocUpdatedTags.tags.toString.contains("Dynamic-Endpoint") diff --git a/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala b/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala index 57d6d21801..86c2827573 100644 --- a/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala +++ b/obp-api/src/main/scala/code/api/v1_4_0/OBPAPI1_4_0.scala @@ -1,5 +1,6 @@ package code.api.v1_4_0 +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus} diff --git a/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala b/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala index b496bee72b..894261e4c2 100644 --- a/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala +++ b/obp-api/src/main/scala/code/api/v2_0_0/APIMethods200.scala @@ -1,5 +1,6 @@ package code.api.v2_0_0 +import scala.language.reflectiveCalls import code.TransactionTypes.TransactionType import code.api.APIFailureNewStyle import code.api.Constant._ @@ -147,7 +148,7 @@ trait APIMethods200 { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory121.getApiInfoJSON(OBPAPI2_0_0.version, OBPAPI2_0_0.versionStatus), HttpCode.`200`(cc.callContext)) } diff --git a/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala b/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala index 6e037559c7..c642e154a2 100644 --- a/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala +++ b/obp-api/src/main/scala/code/api/v2_0_0/OBPAPI2_0_0.scala @@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/) */ package code.api.v2_0_0 +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus} diff --git a/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala b/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala index 5280a92673..1c83ad6de7 100644 --- a/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala +++ b/obp-api/src/main/scala/code/api/v2_1_0/APIMethods210.scala @@ -1,5 +1,6 @@ package code.api.v2_1_0 +import scala.language.reflectiveCalls import code.TransactionTypes.TransactionType import code.api.Constant.CAN_SEE_TRANSACTION_REQUESTS import code.api.util.ApiTag._ @@ -91,7 +92,7 @@ trait APIMethods210 { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory.getApiInfoJSON(OBPAPI2_1_0.version, OBPAPI2_1_0.versionStatus), HttpCode.`200`(cc.callContext)) } diff --git a/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala b/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala index e796bbee58..eaab7b2d05 100644 --- a/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala +++ b/obp-api/src/main/scala/code/api/v2_1_0/OBPAPI2_1_0.scala @@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/) */ package code.api.v2_1_0 +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import code.api.util.{APIUtil, VersionedOBPApis} diff --git a/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala b/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala index e6af9eba38..0cc651df42 100644 --- a/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala +++ b/obp-api/src/main/scala/code/api/v2_2_0/APIMethods220.scala @@ -1,5 +1,6 @@ package code.api.v2_2_0 +import scala.language.reflectiveCalls import code.api.Constant._ import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._ import code.api.util.APIUtil._ @@ -79,7 +80,7 @@ trait APIMethods220 { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory.getApiInfoJSON(OBPAPI2_2_0.version, OBPAPI2_2_0.versionStatus), HttpCode.`200`(cc.callContext)) } @@ -535,14 +536,14 @@ trait APIMethods220 { _ <- entitlementsByBank.filter(_.roleName == CanCreateEntitlementAtOneBank.toString()).size > 0 match { case true => // Already has entitlement - Full() + Full(()) case false => Full(Entitlement.entitlement.vend.addEntitlement(bank.id, u.userId, CanCreateEntitlementAtOneBank.toString())) } _ <- entitlementsByBank.filter(_.roleName == CanReadDynamicResourceDocsAtOneBank.toString()).size > 0 match { case true => // Already has entitlement - Full() + Full(()) case false => Full(Entitlement.entitlement.vend.addEntitlement(bank.id, u.userId, CanReadDynamicResourceDocsAtOneBank.toString())) } @@ -1246,7 +1247,7 @@ trait APIMethods220 { (account, callContext) } }else - Future{(Full(), Some(cc))} + Future{(Full(()), Some(cc))} otherAccountRoutingSchemeOBPFormat = if(postJson.other_account_routing_scheme.equalsIgnoreCase("AccountNo")) "ACCOUNT_NUMBER" else StringHelpers.snakify(postJson.other_account_routing_scheme).toUpperCase diff --git a/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala b/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala index d618322c20..eef3885781 100644 --- a/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala +++ b/obp-api/src/main/scala/code/api/v2_2_0/OBPAPI2_2_0.scala @@ -1,6 +1,7 @@ package code.api.v2_2_0 +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import code.api.util.{APIUtil, VersionedOBPApis} diff --git a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala index 400da0234f..e556b67ea3 100644 --- a/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala +++ b/obp-api/src/main/scala/code/api/v3_0_0/APIMethods300.scala @@ -1,5 +1,6 @@ package code.api.v3_0_0 +import scala.language.reflectiveCalls import code.accountattribute.AccountAttributeX import code.api.Constant._ import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON @@ -84,7 +85,7 @@ trait APIMethods300 { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory.getApiInfoJSON(OBPAPI3_0_0.version, OBPAPI3_0_0.versionStatus), HttpCode.`200`(cc.callContext)) } @@ -2118,7 +2119,7 @@ trait APIMethods300 { hasCanReadGlossaryRole } } else { - Future{Full()} + Future{Full(())} } json = JSONFactory300.createGlossaryItemsJsonV300(getGlossaryItems) } yield { diff --git a/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala b/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala index fad91faae6..d8bd8f86c9 100644 --- a/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala +++ b/obp-api/src/main/scala/code/api/v3_0_0/OBPAPI3_0_0.scala @@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/) */ package code.api.v3_0_0 +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus} diff --git a/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala b/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala index b88d88b49b..0141b3d58e 100644 --- a/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala +++ b/obp-api/src/main/scala/code/api/v3_1_0/APIMethods310.scala @@ -1,5 +1,6 @@ package code.api.v3_1_0 +import scala.language.reflectiveCalls import code.api.Constant import code.api.Constant._ import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._ @@ -101,7 +102,7 @@ trait APIMethods310 { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory.getApiInfoJSON(OBPAPI3_1_0.version, OBPAPI3_1_0.versionStatus), HttpCode.`200`(cc.callContext)) } diff --git a/obp-api/src/main/scala/code/api/v3_1_0/JSONFactory3.1.0.scala b/obp-api/src/main/scala/code/api/v3_1_0/JSONFactory3.1.0.scala index fba8889ad4..7cfba99436 100644 --- a/obp-api/src/main/scala/code/api/v3_1_0/JSONFactory3.1.0.scala +++ b/obp-api/src/main/scala/code/api/v3_1_0/JSONFactory3.1.0.scala @@ -1074,7 +1074,7 @@ object JSONFactory310{ def createEntitlementJsonsV310(tr: List[Entitlement]) = { val idToUser: Map[String, Box[String]] = tr.map(_.userId).distinct.map { userId => (userId, UserX.findByUserId(userId).map(_.name)) - } toMap; + }.toMap; EntitlementJSonsV310( tr.map(e => diff --git a/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala b/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala index b581773be2..fe1b432498 100644 --- a/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala +++ b/obp-api/src/main/scala/code/api/v3_1_0/OBPAPI3_1_0.scala @@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/) */ package code.api.v3_1_0 +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus} diff --git a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala index 78228ef5fa..fa4a35a628 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala @@ -1,5 +1,6 @@ package code.api.v4_0_0 +import scala.language.reflectiveCalls import code.DynamicData.DynamicData import code.DynamicEndpoint.DynamicEndpointSwagger import code.accountattribute.AccountAttributeX @@ -1546,7 +1547,7 @@ trait APIMethods400 extends MdcLoggable { value = rejectReasonCode, callContext = callContext ) - } else Future.successful() + } else Future.successful(()) rejectAdditionalInformation = challengeAnswerJson.additional_information.getOrElse("") _ <- @@ -1562,7 +1563,7 @@ trait APIMethods400 extends MdcLoggable { value = rejectAdditionalInformation, callContext = callContext ) - } else Future.successful() + } else Future.successful(()) _ <- NewStyle.function.notifyTransactionRequest( fromAccount, toAccount, @@ -3371,7 +3372,7 @@ trait APIMethods400 extends MdcLoggable { case (Nil | "root" :: Nil) JsonGet _ => { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { ( JSONFactory400.getApiInfoJSON( @@ -3405,7 +3406,7 @@ trait APIMethods400 extends MdcLoggable { case "development" :: "call_context" :: Nil JsonGet _ => { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (cc.callContext, HttpCode.`200`(cc.callContext)) } @@ -3434,7 +3435,7 @@ trait APIMethods400 extends MdcLoggable { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (cc.callContext, HttpCode.`200`(cc.callContext)) } @@ -10457,7 +10458,7 @@ trait APIMethods400 extends MdcLoggable { (account, callContext) } } else - Future { (Full(), Some(cc)) } + Future { (Full(()), Some(cc)) } otherAccountRoutingSchemeOBPFormat = if ( @@ -10810,7 +10811,7 @@ trait APIMethods400 extends MdcLoggable { (account, callContext) } } else - Future { (Full(), Some(cc)) } + Future { (Full(()), Some(cc)) } otherAccountRoutingSchemeOBPFormat = if ( @@ -12872,7 +12873,7 @@ trait APIMethods400 extends MdcLoggable { // auth type validation related endpoints private val allowedAuthTypes = - AuthenticationType.values.filterNot(AuthenticationType.Anonymous ==) + AuthenticationType.values.filterNot(AuthenticationType.Anonymous.==) staticResourceDocs += ResourceDoc( createAuthenticationTypeValidation, implementedInApiVersion, @@ -16724,7 +16725,7 @@ trait APIMethods400 extends MdcLoggable { s"$EntitlementAlreadyExists user_id($userId) ${duplicatedRoles.mkString(",")}" Helper.booleanToFuture(errorMessages, cc = callContext) { false } } else - Future.successful(Full()) + Future.successful(Full(())) } /** This method will check all the roles the loggedIn user already has and the @@ -16758,7 +16759,7 @@ trait APIMethods400 extends MdcLoggable { .mkString(",")}" Helper.booleanToFuture(errorMessages, cc = callContext) { false } } else - Future.successful(Full()) + Future.successful(Full(())) } private def checkRoleBankIdMapping( diff --git a/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala b/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala index 0d8c671fab..089a7bc14e 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/OBPAPI4_0_0.scala @@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/) */ package code.api.v4_0_0 +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import code.api.util.VersionedOBPApis diff --git a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala index 129d217c34..77790a0305 100644 --- a/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala +++ b/obp-api/src/main/scala/code/api/v5_0_0/APIMethods500.scala @@ -1,5 +1,6 @@ package code.api.v5_0_0 +import scala.language.reflectiveCalls import code.accountattribute.AccountAttributeX import code.api.Constant._ import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._ @@ -104,7 +105,7 @@ trait APIMethods500 { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory400.getApiInfoJSON(OBPAPI5_0_0.version,OBPAPI5_0_0.versionStatus), HttpCode.`200`(cc.callContext)) } @@ -220,14 +221,14 @@ trait APIMethods500 { _ <- entitlementsByBank.filter(_.roleName == CanCreateEntitlementAtOneBank.toString()).size > 0 match { case true => // Already has entitlement - Future() + Future(()) case false => Future(Entitlement.entitlement.vend.addEntitlement(postJson.id.getOrElse(""), cc.userId, CanCreateEntitlementAtOneBank.toString())) } _ <- entitlementsByBank.filter(_.roleName == CanReadDynamicResourceDocsAtOneBank.toString()).size > 0 match { case true => // Already has entitlement - Future() + Future(()) case false => Future(Entitlement.entitlement.vend.addEntitlement(postJson.id.getOrElse(""), cc.userId, CanReadDynamicResourceDocsAtOneBank.toString())) } diff --git a/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala b/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala index 24110ea73c..ac3528d8d6 100644 --- a/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala +++ b/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala @@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/) */ package code.api.v5_0_0 +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import code.api.util.{APIUtil, VersionedOBPApis} diff --git a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala index 6b5c0e4790..761edf843e 100644 --- a/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala +++ b/obp-api/src/main/scala/code/api/v5_1_0/APIMethods510.scala @@ -1,6 +1,7 @@ package code.api.v5_1_0 +import scala.language.reflectiveCalls import code.api.Constant import code.api.Constant._ import code.api.OAuth2Login.{Keycloak, OBPOIDC} @@ -107,7 +108,7 @@ trait APIMethods510 { case (Nil | "root" :: Nil) JsonGet _ => { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory510.getApiInfoJSON(OBPAPI5_1_0.version,OBPAPI5_1_0.versionStatus), HttpCode.`200`(cc.callContext)) } @@ -4285,7 +4286,7 @@ trait APIMethods510 { case "tags" :: Nil JsonGet _ => cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future.successful() // Just start async call + _ <- Future.successful(()) // Just start async call } yield { (APITags(ApiTag.allDisplayTagNames.toList), HttpCode.`200`(cc.callContext)) } diff --git a/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala b/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala index 804e2eb5e5..3a7f94e390 100644 --- a/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala +++ b/obp-api/src/main/scala/code/api/v5_1_0/OBPAPI5_1_0.scala @@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/) */ package code.api.v5_1_0 +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import code.api.util.{APIUtil, VersionedOBPApis} diff --git a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala index d761635784..a37b92f8cc 100644 --- a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala +++ b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala @@ -1,5 +1,6 @@ package code.api.v6_0_0 +import scala.language.reflectiveCalls import code.accountattribute.AccountAttributeX import code.api.Constant import code.api.{DirectLogin, ObpApiFailure} @@ -111,7 +112,7 @@ trait APIMethods600 { case (Nil | "root" :: Nil) JsonGet _ => { cc => implicit val ec = EndpointContext(Some(cc)) for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { (JSONFactory510.getApiInfoJSON(OBPAPI6_0_0.version, OBPAPI6_0_0.versionStatus), HttpCode.`200`(cc.callContext)) } @@ -1102,14 +1103,14 @@ trait APIMethods600 { _ <- entitlementsByBank.exists(_.roleName == CanCreateEntitlementAtOneBank.toString()) match { case true => // Already has entitlement - Future() + Future(()) case false => Future(Entitlement.entitlement.vend.addEntitlement(postJson.bank_id, cc.userId, CanCreateEntitlementAtOneBank.toString())) } _ <- entitlementsByBank.exists(_.roleName == CanReadDynamicResourceDocsAtOneBank.toString()) match { case true => // Already has entitlement - Future() + Future(()) case false => Future(Entitlement.entitlement.vend.addEntitlement(postJson.bank_id, cc.userId, CanReadDynamicResourceDocsAtOneBank.toString())) } @@ -1238,7 +1239,7 @@ trait APIMethods600 { */ val cacheKey = "getConnectorMethodNames" val cacheTTL = APIUtil.getPropsAsIntValue("getConnectorMethodNames.cache.ttl.seconds", 3600) - Caching.memoizeSyncWithProvider(Some(cacheKey))(cacheTTL seconds) { + Caching.memoizeSyncWithProvider(Some(cacheKey))(cacheTTL.seconds) { val connectorName = APIUtil.getPropsValue("connector", "mapped") val connector = code.bankconnectors.Connector.getConnectorInstance(connectorName) connector.callableMethods.keys.toList diff --git a/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala b/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala index 6b1868e7dc..b6a30baf51 100644 --- a/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala +++ b/obp-api/src/main/scala/code/api/v6_0_0/OBPAPI6_0_0.scala @@ -26,6 +26,8 @@ TESOBE (http://www.tesobe.com/) */ package code.api.v6_0_0 + +import scala.language.reflectiveCalls import code.api.OBPRestHelper import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints} import code.api.util.VersionedOBPApis diff --git a/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala b/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala index 877b91b72d..8269843e95 100644 --- a/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala +++ b/obp-api/src/main/scala/code/api/v7_0_0/Http4s700.scala @@ -48,7 +48,7 @@ object Http4s700 { val callContext = req.attributes.lookup(callContextKey).get.asInstanceOf[CallContext] Ok(IO.fromFuture(IO( for { - _ <- Future() // Just start async call + _ <- Future(()) // Just start async call } yield { convertAnyToJsonString( JSONFactory700.getApiInfoJSON(apiVersion, s"Hello, ${callContext.userId}! Your request ID is ${callContext.requestId}.") diff --git a/obp-api/src/main/scala/code/authtypevalidation/MappedAuthTypeValidationProvider.scala b/obp-api/src/main/scala/code/authtypevalidation/MappedAuthTypeValidationProvider.scala index 19e7cffd65..6f7d122198 100644 --- a/obp-api/src/main/scala/code/authtypevalidation/MappedAuthTypeValidationProvider.scala +++ b/obp-api/src/main/scala/code/authtypevalidation/MappedAuthTypeValidationProvider.scala @@ -22,7 +22,7 @@ object MappedAuthTypeValidationProvider extends AuthenticationTypeValidationProv override def getByOperationId(operationId: String): Box[JsonAuthTypeValidation] = { var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getValidationByOperationIdTTL second) { + Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getValidationByOperationIdTTL.second) { AuthenticationTypeValidation.find(By(AuthenticationTypeValidation.OperationId, operationId)) .map(it => JsonAuthTypeValidation(it.operationId, it.allowedAuthTypes)) }} diff --git a/obp-api/src/main/scala/code/bankconnectors/Connector.scala b/obp-api/src/main/scala/code/bankconnectors/Connector.scala index 4fe2e3b84f..8ef5483e37 100644 --- a/obp-api/src/main/scala/code/bankconnectors/Connector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/Connector.scala @@ -1,5 +1,6 @@ package code.bankconnectors +import scala.language.implicitConversions import org.apache.pekko.http.scaladsl.model.HttpMethod import code.api.attributedefinition.AttributeDefinition import code.api.util.APIUtil.{OBPReturnType, _} @@ -220,7 +221,7 @@ trait Connector extends MdcLoggable { protected implicit def OBPReturnTypeToFutureReturnType[T](value: OBPReturnType[Box[T]]): Future[Box[(T, Option[CallContext])]] = value map tupleToBoxTuple - private val futureTimeOut: Duration = 20 seconds + private val futureTimeOut: Duration = 20.seconds /** * convert OBPReturnType return type to Tuple type * @@ -240,7 +241,7 @@ trait Connector extends MdcLoggable { */ protected implicit def OBPReturnTypeToBoxTuple[T](value: OBPReturnType[Box[T]]): Box[(T, Option[CallContext])] = Await.result( - OBPReturnTypeToFutureReturnType(value), 30 seconds + OBPReturnTypeToFutureReturnType(value), 30.seconds ) /** @@ -253,7 +254,7 @@ trait Connector extends MdcLoggable { protected implicit def OBPReturnTypeToBox[T](value: OBPReturnType[Box[T]]): Box[T] = Await.result( value.map(_._1), - 30 seconds + 30.seconds ) protected def convertToTuple[T](callContext: Option[CallContext])(inbound: Box[InBoundTrait[T]]): (Box[T], Option[CallContext]) = { diff --git a/obp-api/src/main/scala/code/bankconnectors/InternalConnector.scala b/obp-api/src/main/scala/code/bankconnectors/InternalConnector.scala index b9d1464a4c..d5fac02b56 100644 --- a/obp-api/src/main/scala/code/bankconnectors/InternalConnector.scala +++ b/obp-api/src/main/scala/code/bankconnectors/InternalConnector.scala @@ -241,19 +241,19 @@ object InternalConnector { val dynamicMethods: Map[String, MethodSymbol] = ConnectorMethodProvider.provider.vend.getAll().map { case JsonConnectorMethod(_, methodName, _, _) => methodName -> Box(methodNameToSymbols.get(methodName)).openOrThrowException(s"method name $methodName does not exist in the Connector") - } toMap + }.toMap dynamicMethods } - private lazy val methodNameToSymbols: Map[String, MethodSymbol] = typeOf[Connector].decls collect { + private lazy val methodNameToSymbols: Map[String, MethodSymbol] = typeOf[Connector].decls.collect { case t: TermSymbol if t.isMethod && t.isPublic && !t.isConstructor && !t.isVal && !t.isVar => val methodName = t.name.decodedName.toString.trim val method = t.asMethod methodName -> method - } toMap + }.toMap - lazy val methodNameToSignature: Map[String, String] = methodNameToSymbols map { + lazy val methodNameToSignature: Map[String, String] = methodNameToSymbols.map { case (methodName, methodSymbol) => val signature = methodSymbol.typeSignature.toString val returnType = methodSymbol.returnType.toString diff --git a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnectorInternal.scala b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnectorInternal.scala index 25e48a15fd..5313b89263 100644 --- a/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnectorInternal.scala +++ b/obp-api/src/main/scala/code/bankconnectors/LocalMappedConnectorInternal.scala @@ -947,7 +947,7 @@ object LocalMappedConnectorInternal extends MdcLoggable { attributeType = TransactionRequestAttributeType.withName("STRING"), value = refundReasonCode, callContext = callContext) - } else Future.successful() + } else Future.successful(()) (newTransactionRequestStatus, callContext) <- NewStyle.function.notifyTransactionRequest(refundFromAccount, refundToAccount, createdTransactionRequest, callContext) _ <- NewStyle.function.saveTransactionRequestStatusImpl(createdTransactionRequest.id, newTransactionRequestStatus.toString, callContext) diff --git a/obp-api/src/main/scala/code/bankconnectors/akka/actor/AkkaConnectorActorInit.scala b/obp-api/src/main/scala/code/bankconnectors/akka/actor/AkkaConnectorActorInit.scala index 2170bf6225..ec718d31d2 100644 --- a/obp-api/src/main/scala/code/bankconnectors/akka/actor/AkkaConnectorActorInit.scala +++ b/obp-api/src/main/scala/code/bankconnectors/akka/actor/AkkaConnectorActorInit.scala @@ -9,5 +9,5 @@ import scala.concurrent.duration._ trait AkkaConnectorActorInit extends MdcLoggable{ // Default is 3 seconds, which should be more than enough for slower systems val ACTOR_TIMEOUT: Long = APIUtil.getPropsAsLongValue("akka_connector.timeout").openOr(3) - implicit val timeout = Timeout(ACTOR_TIMEOUT * (1000 milliseconds)) + implicit val timeout = Timeout(ACTOR_TIMEOUT * (1000.milliseconds)) } \ No newline at end of file diff --git a/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala b/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala index 26304d01fa..c5bd84c1bd 100644 --- a/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala +++ b/obp-api/src/main/scala/code/bankconnectors/rest/RestConnector_vMar2019.scala @@ -23,6 +23,7 @@ Osloerstrasse 16/17 Berlin 13359, Germany */ +import scala.language.implicitConversions import _root_.org.apache.pekko.stream.StreamTcpException import org.apache.pekko.http.scaladsl.model._ import org.apache.pekko.http.scaladsl.model.headers.RawHeader diff --git a/obp-api/src/main/scala/code/connectormethod/MappedConnectorMethodProvider.scala b/obp-api/src/main/scala/code/connectormethod/MappedConnectorMethodProvider.scala index caf7cfa0ea..426f9b047a 100644 --- a/obp-api/src/main/scala/code/connectormethod/MappedConnectorMethodProvider.scala +++ b/obp-api/src/main/scala/code/connectormethod/MappedConnectorMethodProvider.scala @@ -31,14 +31,14 @@ object MappedConnectorMethodProvider extends ConnectorMethodProvider { override def getByMethodNameWithCache(methodName: String): Box[JsonConnectorMethod] = { var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getConnectorMethodTTL second) { + Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getConnectorMethodTTL.second) { getByMethodNameWithoutCache(methodName) }} } override def getAll(): List[JsonConnectorMethod] = { var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getConnectorMethodTTL second) { + Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getConnectorMethodTTL.second) { ConnectorMethod.findAll() .map(it => JsonConnectorMethod(Some(it.ConnectorMethodId.get), it.MethodName.get, it.MethodBody.get, getLang(it))) }} diff --git a/obp-api/src/main/scala/code/dynamicEndpoint/MapppedDynamicEndpointProvider.scala b/obp-api/src/main/scala/code/dynamicEndpoint/MapppedDynamicEndpointProvider.scala index 3ae9f9cc01..d4660d7b55 100644 --- a/obp-api/src/main/scala/code/dynamicEndpoint/MapppedDynamicEndpointProvider.scala +++ b/obp-api/src/main/scala/code/dynamicEndpoint/MapppedDynamicEndpointProvider.scala @@ -71,7 +71,7 @@ object MappedDynamicEndpointProvider extends DynamicEndpointProvider with Custom override def getAll(bankId: Option[String]): List[DynamicEndpointT] = { var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (dynamicEndpointTTL second) { + Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (dynamicEndpointTTL.second) { if (bankId.isEmpty) DynamicEndpoint.findAll() else diff --git a/obp-api/src/main/scala/code/dynamicMessageDoc/MappedDynamicMessageDocProvider.scala b/obp-api/src/main/scala/code/dynamicMessageDoc/MappedDynamicMessageDocProvider.scala index 81b420b270..81240419f1 100644 --- a/obp-api/src/main/scala/code/dynamicMessageDoc/MappedDynamicMessageDocProvider.scala +++ b/obp-api/src/main/scala/code/dynamicMessageDoc/MappedDynamicMessageDocProvider.scala @@ -44,7 +44,7 @@ object MappedDynamicMessageDocProvider extends DynamicMessageDocProvider { override def getAll(bankId: Option[String]): List[JsonDynamicMessageDoc] = { var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getDynamicMessageDocTTL second) { + Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getDynamicMessageDocTTL.second) { if(bankId.isEmpty){ DynamicMessageDoc.findAll().map(DynamicMessageDoc.getJsonDynamicMessageDoc) } else { diff --git a/obp-api/src/main/scala/code/dynamicResourceDoc/MappedDynamicResourceDocProvider.scala b/obp-api/src/main/scala/code/dynamicResourceDoc/MappedDynamicResourceDocProvider.scala index 2b545f336d..142e64b2e9 100644 --- a/obp-api/src/main/scala/code/dynamicResourceDoc/MappedDynamicResourceDocProvider.scala +++ b/obp-api/src/main/scala/code/dynamicResourceDoc/MappedDynamicResourceDocProvider.scala @@ -50,7 +50,7 @@ object MappedDynamicResourceDocProvider extends DynamicResourceDocProvider { override def getAllAndConvert[T: Manifest](bankId: Option[String], transform: JsonDynamicResourceDoc => T): List[T] = { val cacheKey = (bankId.toString+transform.toString()).intern() - Caching.memoizeSyncWithImMemory(Some(cacheKey))(getDynamicResourceDocTTL seconds){ + Caching.memoizeSyncWithImMemory(Some(cacheKey))(getDynamicResourceDocTTL.seconds){ if(bankId.isEmpty){ DynamicResourceDoc.findAll() .map(doc => transform(DynamicResourceDoc.getJsonDynamicResourceDoc(doc))) diff --git a/obp-api/src/main/scala/code/fx/fx.scala b/obp-api/src/main/scala/code/fx/fx.scala index f5a6ec9485..9abf2e2f9d 100644 --- a/obp-api/src/main/scala/code/fx/fx.scala +++ b/obp-api/src/main/scala/code/fx/fx.scala @@ -66,7 +66,7 @@ object fx extends MdcLoggable { */ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(TTL seconds) { + Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(TTL.seconds) { getFallbackExchangeRate(fromCurrency, toCurrency) } } diff --git a/obp-api/src/main/scala/code/management/ImporterAPI.scala b/obp-api/src/main/scala/code/management/ImporterAPI.scala index 3a0fa9e283..0a65a03e01 100644 --- a/obp-api/src/main/scala/code/management/ImporterAPI.scala +++ b/obp-api/src/main/scala/code/management/ImporterAPI.scala @@ -160,7 +160,7 @@ object ImporterAPI extends RestHelper with MdcLoggable { * per "Account". */ // TODO: this duration limit should be fixed - val createdEnvelopes = TransactionInserter !? (3 minutes, toInsert) + val createdEnvelopes = TransactionInserter !? (3.minutes, toInsert) createdEnvelopes match { case Full(inserted : InsertedTransactions) => diff --git a/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala b/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala index 08c244a225..44d6b5cf41 100644 --- a/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala +++ b/obp-api/src/main/scala/code/metadata/counterparties/MapperCounterparties.scala @@ -35,7 +35,7 @@ object MapperCounterparties extends Counterparties with MdcLoggable { */ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(MetadataTTL second) { + Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(MetadataTTL.second) { /** * Generates a new alias name that is guaranteed not to collide with any existing public alias names diff --git a/obp-api/src/main/scala/code/metrics/ConnectorMetrics.scala b/obp-api/src/main/scala/code/metrics/ConnectorMetrics.scala index edc8a1de19..9267e18c6a 100644 --- a/obp-api/src/main/scala/code/metrics/ConnectorMetrics.scala +++ b/obp-api/src/main/scala/code/metrics/ConnectorMetrics.scala @@ -33,7 +33,7 @@ object ConnectorMetrics extends ConnectorMetricsProvider { */ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cachedAllConnectorMetrics days){ + Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cachedAllConnectorMetrics.days){ val limit = queryParams.collect { case OBPLimit(value) => MaxRows[MappedConnectorMetric](value) }.headOption val offset = queryParams.collect { case OBPOffset(value) => StartAt[MappedConnectorMetric](value) }.headOption val fromDate = queryParams.collect { case OBPFromDate(date) => By_>=(MappedConnectorMetric.date, date) }.headOption diff --git a/obp-api/src/main/scala/code/metrics/MappedMetrics.scala b/obp-api/src/main/scala/code/metrics/MappedMetrics.scala index c62a4dc6e6..6ccdefb8a1 100644 --- a/obp-api/src/main/scala/code/metrics/MappedMetrics.scala +++ b/obp-api/src/main/scala/code/metrics/MappedMetrics.scala @@ -284,7 +284,7 @@ object MappedMetrics extends APIMetrics with MdcLoggable{ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) val cacheTTL = determineMetricsCacheTTL(queryParams) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL seconds){ + Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL.seconds){ val optionalParams = getQueryParams(queryParams) MappedMetric.findAll(optionalParams: _*) } @@ -339,7 +339,7 @@ object MappedMetrics extends APIMetrics with MdcLoggable{ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) val cacheTTL = determineMetricsCacheTTL(queryParams) logger.debug(s"getAllAggregateMetricsBox cache key: $cacheKey, TTL: $cacheTTL seconds") - CacheKeyFromArguments.buildCacheKey { Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL seconds){ + CacheKeyFromArguments.buildCacheKey { Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL.seconds){ logger.info(s"getAllAggregateMetricsBox - CACHE MISS - Executing database query for aggregate metrics") val startTime = System.currentTimeMillis() val fromDate = queryParams.collect { case OBPFromDate(value) => value }.headOption @@ -457,7 +457,7 @@ object MappedMetrics extends APIMetrics with MdcLoggable{ */ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) val cacheTTL = determineMetricsCacheTTL(queryParams) - CacheKeyFromArguments.buildCacheKey {Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL seconds){ + CacheKeyFromArguments.buildCacheKey {Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL.seconds){ { val fromDate = queryParams.collect { case OBPFromDate(value) => value }.headOption val toDate = queryParams.collect { case OBPToDate(value) => value }.headOption @@ -540,7 +540,7 @@ object MappedMetrics extends APIMetrics with MdcLoggable{ */ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) val cacheTTL = determineMetricsCacheTTL(queryParams) - CacheKeyFromArguments.buildCacheKey {Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL seconds){ + CacheKeyFromArguments.buildCacheKey {Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL.seconds){ val fromDate = queryParams.collect { case OBPFromDate(value) => value }.headOption val toDate = queryParams.collect { case OBPToDate(value) => value }.headOption diff --git a/obp-api/src/main/scala/code/model/ModeratedBankingData.scala b/obp-api/src/main/scala/code/model/ModeratedBankingData.scala index 569b48f997..d1623e060d 100644 --- a/obp-api/src/main/scala/code/model/ModeratedBankingData.scala +++ b/obp-api/src/main/scala/code/model/ModeratedBankingData.scala @@ -26,6 +26,8 @@ TESOBE (http://www.tesobe.com/) */ package code.model + +import scala.language.implicitConversions import code.api.Constant._ import code.api.util.ErrorMessages._ import code.api.util.{APIUtil, CallContext} @@ -182,6 +184,7 @@ class ModeratedTransactionMetadata( object ModeratedTransactionMetadata { + import scala.language.implicitConversions @deprecated(Helper.deprecatedJsonGenerationMessage) implicit def moderatedTransactionMetadata2Json(mTransactionMeta: ModeratedTransactionMetadata) : JObject = { JObject(JField("blah", JString("test")) :: Nil) @@ -256,6 +259,7 @@ object ModeratedBankAccount { ("name" -> bankName)) } + import scala.language.implicitConversions @deprecated(Helper.deprecatedJsonGenerationMessage) implicit def moderatedBankAccount2Json(mBankAccount: ModeratedBankAccount) : JObject = { val holderName = mBankAccount.owners match{ @@ -318,6 +322,7 @@ case class ModeratedOtherBankAccountCore( } object ModeratedOtherBankAccount { + import scala.language.implicitConversions @deprecated(Helper.deprecatedJsonGenerationMessage) implicit def moderatedOtherBankAccount2Json(mOtherBank: ModeratedOtherBankAccount) : JObject = { val holderName = mOtherBank.label.display @@ -353,6 +358,7 @@ class ModeratedOtherBankAccountMetadata( ) object ModeratedOtherBankAccountMetadata { + import scala.language.implicitConversions @deprecated(Helper.deprecatedJsonGenerationMessage) implicit def moderatedOtherBankAccountMetadata2Json(mOtherBankMeta: ModeratedOtherBankAccountMetadata) : JObject = { JObject(JField("blah", JString("test")) :: Nil) diff --git a/obp-api/src/main/scala/code/model/OAuth.scala b/obp-api/src/main/scala/code/model/OAuth.scala index f5b1b8c654..25d0f30462 100644 --- a/obp-api/src/main/scala/code/model/OAuth.scala +++ b/obp-api/src/main/scala/code/model/OAuth.scala @@ -299,7 +299,7 @@ object MappedConsumersProvider extends ConsumersProvider with MdcLoggable { if(integrateWithHydra && isActive.isDefined) { val clientId = c.key.get val existsOAuth2Client = Box.tryo(hydraAdmin.getOAuth2Client(clientId)) - .filter(null !=) + .filter(null.!=) // TODO Involve Hydra ORY version with working update mechanism if (isActive == Some(false) && existsOAuth2Client.isDefined) { existsOAuth2Client @@ -955,7 +955,7 @@ class Token extends LongKeyedMapper[Token]{ } def generateThirdPartyApplicationSecret: String = { - if(thirdPartyApplicationSecret.get isEmpty){ + if(thirdPartyApplicationSecret.get.isEmpty){ def r() = randomInt(9).toString //from zero to 9 val generatedSecret = (1 to 10).map(x => r()).foldLeft("")(_ + _) thirdPartyApplicationSecret(generatedSecret).save diff --git a/obp-api/src/main/scala/code/model/View.scala b/obp-api/src/main/scala/code/model/View.scala index b7d9d4ebd6..bbb44d32a2 100644 --- a/obp-api/src/main/scala/code/model/View.scala +++ b/obp-api/src/main/scala/code/model/View.scala @@ -505,6 +505,7 @@ case class ViewExtended(val view: View) extends MdcLoggable { None } + import scala.language.implicitConversions implicit def optionStringToString(x : Option[String]) : String = x.getOrElse("") val otherAccountNationalIdentifier = if(viewPermissions.exists(_ == CAN_SEE_OTHER_ACCOUNT_NATIONAL_IDENTIFIER)) Some(otherBankAccount.nationalIdentifier) else None val otherAccountSWIFT_BIC = if(viewPermissions.exists(_ == CAN_SEE_OTHER_ACCOUNT_SWIFT_BIC)) otherBankAccount.otherBankRoutingAddress else None @@ -607,6 +608,7 @@ case class ViewExtended(val view: View) extends MdcLoggable { None } + import scala.language.implicitConversions implicit def optionStringToString(x : Option[String]) : String = x.getOrElse("") val otherAccountSWIFT_BIC = if(viewPermissions.exists(_ == CAN_SEE_OTHER_ACCOUNT_SWIFT_BIC)) counterpartyCore.otherBankRoutingAddress else None val otherAccountIBAN = if(viewPermissions.exists(_ == CAN_SEE_OTHER_ACCOUNT_IBAN)) counterpartyCore.otherAccountRoutingAddress else None diff --git a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala index 0d8a462f9d..11efcde0de 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/AuthUser.scala @@ -229,7 +229,7 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga override lazy val password = new MyPasswordNew - lazy val signupPasswordRepeatText = getWebUiPropsValue("webui_signup_body_password_repeat_text", S.?("repeat")) + // Removed signup password repeat text - not needed with OBP Portal redirect class MyPasswordNew extends MappedPassword(this) { lazy val preFilledPassword = if (APIUtil.getPropsAsBoolValue("allow_pre_filled_password", true)) {get.toString} else "" @@ -238,14 +238,9 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga Full( {appendFieldId( ) } -
+
-
{signupPasswordRepeatText}
- -
- -
) } } @@ -352,7 +347,7 @@ class AuthUser extends MegaProtoUser[AuthUser] with CreatedUpdated with MdcLogga } override def save(): Boolean = { - if(! (user defined_?)){ + if(! (user.defined_?)){ logger.info("user reference is null. We will create a ResourceUser") val resourceUser = createUnsavedResourceUser() val savedUser = Users.users.vend.saveResourceUser(resourceUser) @@ -429,7 +424,6 @@ import net.liftweb.util.Helpers._ override def screenWrap = Full() // define the order fields will appear in forms and output override def fieldOrder = List(id, firstName, lastName, email, username, password, provider) - override def signupFields = List(firstName, lastName, email, username, password) // To force validation of email addresses set this to false (default as of 29 June 2021) override def skipEmailValidation = APIUtil.getPropsAsBoolValue("authUser.skipEmailValidation", false) @@ -698,28 +692,7 @@ import net.liftweb.util.Helpers._ case _ => S.error(S.?("invalid.validation.link")); S.redirectTo(homePage) } - override def actionsAfterSignup(theUser: TheUserType, func: () => Nothing): Nothing = { - theUser.setValidated(skipEmailValidation).resetUniqueId() - theUser.save - val privacyPolicyValue: String = getWebUiPropsValue("webui_privacy_policy", "") - val termsAndConditionsValue: String = getWebUiPropsValue("webui_terms_and_conditions", "") - // User Agreement table - UserAgreementProvider.userAgreementProvider.vend.createUserAgreement( - theUser.user.foreign.map(_.userId).getOrElse(""), "privacy_conditions", privacyPolicyValue) - UserAgreementProvider.userAgreementProvider.vend.createUserAgreement( - theUser.user.foreign.map(_.userId).getOrElse(""), "terms_and_conditions", termsAndConditionsValue) - if (!skipEmailValidation) { - sendValidationEmail(theUser) - S.notice(S.?("sign.up.message")) - func() - } else { - grantDefaultEntitlementsToAuthUser(theUser) - logUserIn(theUser, () => { - S.notice(S.?("welcome")) - func() - }) - } - } + /** * Set this to redirect to a certain page after a failed login */ @@ -728,87 +701,9 @@ import net.liftweb.util.Helpers._ } - def agreeTermsDiv = { - val webUi = new WebUI - val webUiPropsValue = getWebUiPropsValue("webui_terms_and_conditions", "") - val termsAndConditionsCheckboxTitle = Helper.i18n("terms_and_conditions_checkbox_text", Some("I agree to the above Terms and Conditions")) - val termsAndConditionsCheckboxLabel = Helper.i18n("terms_and_conditions_checkbox_label", Some("Terms and Conditions")) - val agreeTermsHtml = s"""
- |
- |
- | $termsAndConditionsCheckboxLabel - |
${webUi.makeHtml(webUiPropsValue)}
- |
- | - | - |
- | """.stripMargin - - scala.xml.Unparsed(agreeTermsHtml) - } - - def legalNoticeDiv = { - val agreeTermsHtml = getWebUiPropsValue("webui_legal_notice_html_text", "") - if(agreeTermsHtml.isEmpty){ - s"" - } else{ - scala.xml.Unparsed(s"""$agreeTermsHtml""") - } - } - - def agreePrivacyPolicy = { - val webUi = new WebUI - val privacyPolicyCheckboxText = Helper.i18n("privacy_policy_checkbox_text", Some("I agree to the above Privacy Policy")) - val privacyPolicyCheckboxLabel = Helper.i18n("privacy_policy_checkbox_label", Some("Privacy Policy")) - val webUiPropsValue = getWebUiPropsValue("webui_privacy_policy", "") - val agreePrivacyPolicy = s"""
- |
- |
- | $privacyPolicyCheckboxLabel - |
${webUi.makeHtml(webUiPropsValue)}
- |
- | - | - |
- |
""".stripMargin - - scala.xml.Unparsed(agreePrivacyPolicy) - } - def enableDisableSignUpButton = { - val javaScriptCode = """""".stripMargin - - scala.xml.Unparsed(javaScriptCode) - } - - def signupFormTitle = getWebUiPropsValue("webui_signup_form_title_text", S.?("sign.up")) - - override def signupXhtml (user:AuthUser) = { -
-
-

{signupFormTitle}

- {legalNoticeDiv} -
- {localForm(user, false, signupFields)} - {agreeTermsDiv} - {agreePrivacyPolicy} -
- -
- {enableDisableSignUpButton} -
-
- } + // Removed signup-related methods: agreeTermsDiv, legalNoticeDiv, agreePrivacyPolicy + // These were only used in signup forms which now redirect to OBP Portal + // Signup functionality removed - users are directed to OBP Portal for registration override def localForm(user: TheUserType, ignorePassword: Boolean, fields: List[FieldPointerType]): NodeSeq = { @@ -818,18 +713,11 @@ import net.liftweb.util.Helpers._ if field.show_? && (!ignorePassword || !pointer.isPasswordField_?) form <- field.toForm.toList } yield { - if(field.uniqueFieldId.getOrElse("") == "authuser_password") { -
- - {form} -
- } else { -
- - {form} -
-
- } +
+ + {form} +
+
} } @@ -1610,67 +1498,8 @@ def restoreSomeSessions(): Unit = { val usernames: List[String] = this.getResourceUsersByEmail(email).map(_.user.name) findAll(ByList(this.username, usernames)) } - def signupSubmitButtonValue() = getWebUiPropsValue("webui_signup_form_submit_button_value", S.?("sign.up")) - - //overridden to allow redirect to loginRedirect after signup. This is mostly to allow - // loginFirst menu items to work if the user doesn't have an account. Without this, - // if a user tries to access a logged-in only page, and then signs up, they don't get redirected - // back to the proper page. - override def signup = { - val theUser: TheUserType = mutateUserOnSignup(createNewUserInstance()) - val theName = signUpPath.mkString("") - - //Check the internal redirect, in case for open redirect issue. - // variable redir is from loginRedirect, it is set-up in OAuthAuthorisation.scala as following code: - // val currentUrl = ObpS.uriAndQueryString.getOrElse("/") - // AuthUser.loginRedirect.set(Full(Helpers.appendParams(currentUrl, List((LogUserOutParam, "false"))))) - val loginRedirectSave = loginRedirect.is - - def testSignup() { - validateSignup(theUser) match { - case Nil => - //here we check loginRedirectSave (different from implementation in super class) - val redir = loginRedirectSave match { - case Full(url) => - loginRedirect(Empty) - url - case _ => - //if the register page url (user_mgt/sign_up?after-signup=link-to-customer) contains the parameter - //after-signup=link-to-customer,then it will redirect to the on boarding customer page. - ObpS.param("after-signup") match { - case url if (url.equals("link-to-customer")) => - "/add-user-auth-context-update-request" - case _ => - homePage - } - } - if (Helper.isValidInternalRedirectUrl(redir.toString)) { - actionsAfterSignup(theUser, () => { - S.redirectTo(redir) - }) - } else { - S.error(S.?(ErrorMessages.InvalidInternalRedirectUrl)) - logger.info(ErrorMessages.InvalidInternalRedirectUrl + loginRedirect.get) - } - case xs => - xs.foreach{ - e => S.error(e.field.uniqueFieldId.openOrThrowException("There is no uniqueFieldId."), e.msg) - } - signupFunc(Full(innerSignup _)) - } - } - def innerSignup = { - val bind = "type=submit" #> signupSubmitButton(signupSubmitButtonValue(), testSignup _) - bind(signupXhtml(theUser)) - } - - if(APIUtil.getPropsAsBoolValue("user_invitation.mandatory", false)) - S.redirectTo("/user-invitation-info") - else - innerSignup - } def scrambleAuthUser(userPrimaryKey: UserPrimaryKey): Box[Boolean] = tryo { AuthUser.find(By(AuthUser.user, userPrimaryKey.value)) match { diff --git a/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala b/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala index 5b0174c21d..810d1bc6c0 100644 --- a/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala +++ b/obp-api/src/main/scala/code/model/dataAccess/ResourceUser.scala @@ -139,7 +139,7 @@ object ResourceUser extends ResourceUser with LongKeyedMetaMapper[ResourceUser]{ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) val cacheTTL = APIUtil.getPropsAsIntValue("getDistinctProviders.cache.ttl.seconds", 3600) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL seconds) { + Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(cacheTTL.seconds) { val sql = "SELECT DISTINCT provider_ FROM resourceuser ORDER BY provider_" val (_, rows) = DB.runQuery(sql, List()) rows.flatten diff --git a/obp-api/src/main/scala/code/model/package.scala b/obp-api/src/main/scala/code/model/package.scala index 2f79aed105..4f2626c131 100644 --- a/obp-api/src/main/scala/code/model/package.scala +++ b/obp-api/src/main/scala/code/model/package.scala @@ -1,5 +1,6 @@ package code +import scala.language.implicitConversions import code.metadata.comments.Comments import code.metadata.counterparties.Counterparties import code.metadata.narrative.Narrative @@ -16,6 +17,7 @@ import com.openbankproject.commons.model._ * Bank -> Bank + BankEx */ package object model { + import scala.language.implicitConversions implicit def toBankExtended(bank: Bank) = BankExtended(bank) diff --git a/obp-api/src/main/scala/code/obp/grpc/Client.scala b/obp-api/src/main/scala/code/obp/grpc/Client.scala index 9d81a57bd6..c8209f6c16 100644 --- a/obp-api/src/main/scala/code/obp/grpc/Client.scala +++ b/obp-api/src/main/scala/code/obp/grpc/Client.scala @@ -1,5 +1,6 @@ package code.obp.grpc +import scala.language.existentials import code.obp.grpc.api._ import com.google.protobuf.empty.Empty import io.grpc.{ManagedChannel, ManagedChannelBuilder} diff --git a/obp-api/src/main/scala/code/obp/grpc/HelloWorldServer.scala b/obp-api/src/main/scala/code/obp/grpc/HelloWorldServer.scala index 773b60f60f..c77752fc56 100644 --- a/obp-api/src/main/scala/code/obp/grpc/HelloWorldServer.scala +++ b/obp-api/src/main/scala/code/obp/grpc/HelloWorldServer.scala @@ -1,5 +1,7 @@ package code.obp.grpc +import scala.language.existentials +import scala.language.reflectiveCalls import code.api.util.newstyle.ViewNewStyle import code.api.util.{APIUtil, CallContext, NewStyle} import code.api.v3_0_0.{CoreTransactionsJsonV300, ModeratedTransactionCoreWithAttributes} diff --git a/obp-api/src/main/scala/code/search/search.scala b/obp-api/src/main/scala/code/search/search.scala index 5c37eeaa97..e99dddf3d7 100644 --- a/obp-api/src/main/scala/code/search/search.scala +++ b/obp-api/src/main/scala/code/search/search.scala @@ -185,13 +185,13 @@ class elasticsearch extends MdcLoggable { } private def getParameters(queryString: String): Map[String, String] = { - val res = queryString.split('&') map { str => + val res = queryString.split('&').map { str => val pair = str.split('=') if (pair.length > 1) (pair(0) -> pair(1)) else (pair(0) -> "") - } toMap + }.toMap res } diff --git a/obp-api/src/main/scala/code/snippet/GetHtmlFromUrl.scala b/obp-api/src/main/scala/code/snippet/GetHtmlFromUrl.scala index b1016ffa1f..2d4b82f5e4 100644 --- a/obp-api/src/main/scala/code/snippet/GetHtmlFromUrl.scala +++ b/obp-api/src/main/scala/code/snippet/GetHtmlFromUrl.scala @@ -55,7 +55,7 @@ object GetHtmlFromUrl extends MdcLoggable { logger.debug("jsVendorSupportHtml: " + jsVendorSupportHtml) // sleep for up to 5 seconds at development environment - if (Props.mode == Props.RunModes.Development) Thread.sleep(randomLong(3 seconds)) + if (Props.mode == Props.RunModes.Development) Thread.sleep(randomLong(3.seconds)) jsVendorSupportHtml } diff --git a/obp-api/src/main/scala/code/snippet/Login.scala b/obp-api/src/main/scala/code/snippet/Login.scala index a7c6a36c34..1ae8ce83b3 100644 --- a/obp-api/src/main/scala/code/snippet/Login.scala +++ b/obp-api/src/main/scala/code/snippet/Login.scala @@ -70,8 +70,11 @@ class Login { href getOrElse "#" } & { ".signup [href]" #> { - AuthUser.signUpPath.foldLeft("")(_ + "/" + _) - } + val portalUrl = getWebUiPropsValue("webui_obp_portal_url", "http://localhost:5174") + s"$portalUrl/register" + } & + ".signup [target]" #> "_blank" & + ".signup [rel]" #> "noopener" } } } diff --git a/obp-api/src/main/scala/code/snippet/OAuthAuthorisation.scala b/obp-api/src/main/scala/code/snippet/OAuthAuthorisation.scala index 66a5986277..be038b035a 100644 --- a/obp-api/src/main/scala/code/snippet/OAuthAuthorisation.scala +++ b/obp-api/src/main/scala/code/snippet/OAuthAuthorisation.scala @@ -46,6 +46,7 @@ import net.liftweb.http.S import net.liftweb.util.Helpers._ import net.liftweb.util.{CssSel, Helpers, Props} import code.api.oauth1a.OauthParams._ +import code.webuiprops.MappedWebUiPropsProvider.getWebUiPropsValue import scala.xml.NodeSeq @@ -150,8 +151,12 @@ object OAuthAuthorisation { href getOrElse "#" } & - ".signup [href]" #> - AuthUser.signUpPath.foldLeft("")(_ + "/" + _) + ".signup [href]" #> { + val portalUrl = getWebUiPropsValue("webui_obp_portal_url", "http://localhost:5174") + s"$portalUrl/register" + } & + ".signup [target]" #> "_blank" & + ".signup [rel]" #> "noopener" } } case _ => error("Application not found") diff --git a/obp-api/src/main/scala/code/snippet/WebUI.scala b/obp-api/src/main/scala/code/snippet/WebUI.scala index 63214fa925..c8861688b4 100644 --- a/obp-api/src/main/scala/code/snippet/WebUI.scala +++ b/obp-api/src/main/scala/code/snippet/WebUI.scala @@ -312,11 +312,11 @@ class WebUI extends MdcLoggable{ // External Consumer Registration Link // This replaces the internal Lift-based consumer registration functionality // with a link to an external consumer registration service. - // Uses webui_api_explorer_url + /consumers/register as default. + // Uses OBP-Portal (webui_obp_portal_url) for consumer registration by default. // Configure webui_external_consumer_registration_url to override with a custom URL. def externalConsumerRegistrationLink: CssSel = { - val apiExplorerUrl = getWebUiPropsValue("webui_api_explorer_url", "http://localhost:5174") - val defaultConsumerRegisterUrl = s"$apiExplorerUrl/consumers/register" + val portalUrl = getWebUiPropsValue("webui_obp_portal_url", "http://localhost:5174") + val defaultConsumerRegisterUrl = s"$portalUrl/consumer-registration" val externalUrl = getWebUiPropsValue("webui_external_consumer_registration_url", defaultConsumerRegisterUrl) ".get-api-key-link a [href]" #> scala.xml.Unparsed(externalUrl) & ".get-api-key-link a [target]" #> "_blank" & @@ -550,8 +550,21 @@ class WebUI extends MdcLoggable{ def userIsLoggedIn: CssSel = { if(AuthUser.loggedIn_?) "#register-link [href]" #> scala.xml.Unparsed(s"/already-logged-in") - else - "#register-link [href]" #> scala.xml.Unparsed(s"/user_mgt/sign_up") + else { + val portalUrl = getWebUiPropsValue("webui_obp_portal_url", "http://localhost:5174") + val registerUrl = s"$portalUrl/register" + "#register-link [href]" #> scala.xml.Unparsed(registerUrl) & + "#register-link [target]" #> "_blank" & + "#register-link [rel]" #> "noopener" + } + } + + def portalRegisterLink: CssSel = { + val portalUrl = getWebUiPropsValue("webui_obp_portal_url", "http://localhost:5174") + val registerUrl = s"$portalUrl/register" + "a [href]" #> scala.xml.Unparsed(registerUrl) & + "a [target]" #> "_blank" & + "a [rel]" #> "noopener" } def alreadyLoggedIn: CssSel = { @@ -641,7 +654,7 @@ class WebUI extends MdcLoggable{ val html = XML.loadString(htmlString) // Sleep if in development environment so can see the effects of content loading slowly - if (Props.mode == Props.RunModes.Development) Thread.sleep(10 seconds) + if (Props.mode == Props.RunModes.Development) Thread.sleep(10.seconds) // Return the HTML html diff --git a/obp-api/src/main/scala/code/util/AkkaHttpClient.scala b/obp-api/src/main/scala/code/util/AkkaHttpClient.scala index 946c1a92bb..46d229784c 100644 --- a/obp-api/src/main/scala/code/util/AkkaHttpClient.scala +++ b/obp-api/src/main/scala/code/util/AkkaHttpClient.scala @@ -52,7 +52,7 @@ object AkkaHttpClient extends MdcLoggable with CustomJsonFormats { private lazy val connectionPoolSettings: ConnectionPoolSettings = { val systemConfig = ConnectionPoolSettings(system.settings.config) //Note: get the timeout setting from here: https://github.com/akka/akka-http/issues/742 - val clientSettings = systemConfig.connectionSettings.withIdleTimeout(httpRequestTimeout seconds) + val clientSettings = systemConfig.connectionSettings.withIdleTimeout(httpRequestTimeout.seconds) // reset some settings value systemConfig.copy( /* diff --git a/obp-api/src/main/scala/code/util/Helper.scala b/obp-api/src/main/scala/code/util/Helper.scala index e2dd615629..51802a0ac4 100644 --- a/obp-api/src/main/scala/code/util/Helper.scala +++ b/obp-api/src/main/scala/code/util/Helper.scala @@ -89,14 +89,14 @@ object Helper extends Loggable { */ def booleanToBox(statement: => Boolean, msg: String): Box[Unit] = { if(statement) - Full() + Full(()) else Failure(msg) } def booleanToBox(statement: => Boolean): Box[Unit] = { if(statement) - Full() + Full(()) else Empty } @@ -450,7 +450,7 @@ object Helper extends Loggable { def getRequiredFieldInfo(tpe: Type): RequiredInfo = { var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - code.api.cache.Caching.memoizeSyncWithImMemory (Some(cacheKey.toString())) (100000 days) { + code.api.cache.Caching.memoizeSyncWithImMemory (Some(cacheKey.toString())) (100000.days) { RequiredFieldValidation.getRequiredInfo(tpe) diff --git a/obp-api/src/main/scala/code/validation/MappedJsonSchemaValidationProvider.scala b/obp-api/src/main/scala/code/validation/MappedJsonSchemaValidationProvider.scala index 53538d1527..17f7a663e7 100644 --- a/obp-api/src/main/scala/code/validation/MappedJsonSchemaValidationProvider.scala +++ b/obp-api/src/main/scala/code/validation/MappedJsonSchemaValidationProvider.scala @@ -20,7 +20,7 @@ object MappedJsonSchemaValidationProvider extends JsonSchemaValidationProvider { override def getByOperationId(operationId: String): Box[JsonValidation] = { var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getValidationByOperationIdTTL second) { + Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getValidationByOperationIdTTL.second) { JsonSchemaValidation.find(By(JsonSchemaValidation.OperationId, operationId)) .map(it => JsonValidation(it.operationId, it.jsonSchema)) }} diff --git a/obp-api/src/main/scala/code/views/MapperViews.scala b/obp-api/src/main/scala/code/views/MapperViews.scala index 19e7d1c4ec..01cacb7d69 100644 --- a/obp-api/src/main/scala/code/views/MapperViews.scala +++ b/obp-api/src/main/scala/code/views/MapperViews.scala @@ -469,7 +469,7 @@ object MapperViews extends Views with MdcLoggable { viewId ).length > 0 match { case true => Failure("Account Access record uses this View.") // We want to prevent account access orphans - case false => Full() + case false => Full(()) } } yield { customView.deleteViewPermissions @@ -481,7 +481,7 @@ object MapperViews extends Views with MdcLoggable { view <- ViewDefinition.findSystemView(viewId.value) _ <- AccountAccess.findAllBySystemViewId(viewId).length > 0 match { case true => Failure("Account Access record uses this View.") // We want to prevent account access orphans - case false => Full() + case false => Full(()) } } yield { view.deleteViewPermissions diff --git a/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala b/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala index cec35e7c0c..93b7516beb 100644 --- a/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala +++ b/obp-api/src/main/scala/code/webuiprops/MappedWebUiPropsProvider.scala @@ -42,7 +42,7 @@ object MappedWebUiPropsProvider extends WebUiPropsProvider { import scala.concurrent.duration._ var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString) CacheKeyFromArguments.buildCacheKey { - Caching.memoizeSyncWithImMemory(Some(cacheKey.toString()))(webUiPropsTTL second) { + Caching.memoizeSyncWithImMemory(Some(cacheKey.toString()))(webUiPropsTTL.second) { // If we have an active brand, construct a target property name to look for. val brandSpecificPropertyName = activeBrand() match { case Some(brand) => s"${requestedPropertyName}_FOR_BRAND_${brand}" diff --git a/obp-api/src/main/webapp/index-en.html b/obp-api/src/main/webapp/index-en.html index a0dd0210ca..32075b8b4a 100644 --- a/obp-api/src/main/webapp/index-en.html +++ b/obp-api/src/main/webapp/index-en.html @@ -59,7 +59,7 @@

Get started

-

+

.

diff --git a/obp-api/src/main/webapp/index.html b/obp-api/src/main/webapp/index.html index 54b4d75a3f..92fabd6ba3 100644 --- a/obp-api/src/main/webapp/index.html +++ b/obp-api/src/main/webapp/index.html @@ -59,7 +59,7 @@

Get started

Create an account

-

First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage. Register for an account +

First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage. Register for an account .

diff --git a/obp-api/src/main/webapp/oauth/authorize.html b/obp-api/src/main/webapp/oauth/authorize.html index b4d7678a03..a71babac72 100644 --- a/obp-api/src/main/webapp/oauth/authorize.html +++ b/obp-api/src/main/webapp/oauth/authorize.html @@ -40,7 +40,7 @@

The application app is asking for access t
Don't have an account? - Register + Register
diff --git a/obp-api/src/main/webapp/templates-hidden/_login.html b/obp-api/src/main/webapp/templates-hidden/_login.html index c96de62e20..0b91a507c6 100644 --- a/obp-api/src/main/webapp/templates-hidden/_login.html +++ b/obp-api/src/main/webapp/templates-hidden/_login.html @@ -42,7 +42,7 @@

Log on to the Open
Don't have an account? - Register + Register
diff --git a/obp-api/src/main/webapp/templates-hidden/default-en.html b/obp-api/src/main/webapp/templates-hidden/default-en.html index 2b2e4f8313..9da6dba6d4 100644 --- a/obp-api/src/main/webapp/templates-hidden/default-en.html +++ b/obp-api/src/main/webapp/templates-hidden/default-en.html @@ -143,7 +143,7 @@

  • - Register + Register

    • @@ -198,7 +198,7 @@
    • @@ -235,7 +235,7 @@ Sofit
  • - + On Board
  • diff --git a/obp-api/src/main/webapp/templates-hidden/default-footer.html b/obp-api/src/main/webapp/templates-hidden/default-footer.html index 74a60838bb..819ba810cc 100644 --- a/obp-api/src/main/webapp/templates-hidden/default-footer.html +++ b/obp-api/src/main/webapp/templates-hidden/default-footer.html @@ -148,7 +148,7 @@

  • - Register + Register

    • @@ -208,7 +208,7 @@
    • @@ -248,7 +248,7 @@ Sofit
  • - + On Board
  • diff --git a/obp-api/src/main/webapp/templates-hidden/default-header.html b/obp-api/src/main/webapp/templates-hidden/default-header.html index fba6bbb16d..c5079d3d9c 100644 --- a/obp-api/src/main/webapp/templates-hidden/default-header.html +++ b/obp-api/src/main/webapp/templates-hidden/default-header.html @@ -143,7 +143,7 @@

  • - Register + Register

    • @@ -198,7 +198,7 @@
    • @@ -236,7 +236,7 @@ Sofit
  • - + On Board
  • diff --git a/obp-api/src/main/webapp/templates-hidden/default.html b/obp-api/src/main/webapp/templates-hidden/default.html index 4eb5915caa..c2ec26e45e 100644 --- a/obp-api/src/main/webapp/templates-hidden/default.html +++ b/obp-api/src/main/webapp/templates-hidden/default.html @@ -143,7 +143,7 @@

  • - Register + Register

    • @@ -198,7 +198,7 @@
    • @@ -235,7 +235,7 @@ Sofit
  • - + On Board
  • diff --git a/obp-api/src/test/scala/code/util/OAuthClient.scala b/obp-api/src/test/scala/code/util/OAuthClient.scala index d930f85ee1..4f81b1ad48 100644 --- a/obp-api/src/test/scala/code/util/OAuthClient.scala +++ b/obp-api/src/test/scala/code/util/OAuthClient.scala @@ -67,7 +67,7 @@ trait DefaultProvider extends Provider { val requestTokenUrl = baseUrl + "/oauth/initiate" val accessTokenUrl = baseUrl + "/oauth/token" val authorizeUrl = baseUrl + "/oauth/authorize" - val signupUrl = Some(baseUrl + "/user_mgt/sign_up") + val signupUrl = Some(APIUtil.getPropsValue("webui_obp_portal_url", "http://localhost:5174") + "/register") lazy val oAuthProvider : OAuthProvider = new DefaultOAuthProvider(requestTokenUrl, accessTokenUrl, authorizeUrl)