Skip to content

Commit 43e65c3

Browse files
simonredfernsimonredfern
authored
Merge pull request #2705 from simonredfern/develop
Has Account Access / Signals / Account Directory
2 parents 346cbab + a3551b9 commit 43e65c3

File tree

11 files changed

+364
-41
lines changed

11 files changed

+364
-41
lines changed

‎obp-api/src/main/scala/code/api/cache/RedisMessaging.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object RedisMessaging extends MdcLoggable {
1212
val channelTtlSeconds: Int = APIUtil.getPropsAsIntValue("messaging.channel.ttl.seconds", 3600)
1313
val channelMaxMessages: Int = APIUtil.getPropsAsIntValue("messaging.channel.max.messages", 1000)
1414

15-
private def keyPrefix: String = s"${Constant.getGlobalCacheNamespacePrefix}msg_channel_"
15+
private def keyPrefix: String = s"${Constant.getGlobalCacheNamespacePrefix}signal_channel_"
1616

1717
private def channelKey(channelName: String): String = s"${keyPrefix}${channelName}"
1818

‎obp-api/src/main/scala/code/api/constant/constant.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import net.liftweb.util.Props
1111
object Constant extends MdcLoggable {
1212
logger.info("Instantiating Constants")
1313

14-
final val directLoginHeaderName = "directlogin"
14+
final val directLoginHeaderName = "DirectLogin"
1515

1616
object Pagination {
1717
final val offset = 0

‎obp-api/src/main/scala/code/api/util/ApiRole.scala‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1298,6 +1298,9 @@ object ApiRole extends MdcLoggable{
12981298
case class CanUpdateAccountAccessRequestAtOneBank(requiresBankId: Boolean = true) extends ApiRole
12991299
lazy val canUpdateAccountAccessRequestAtOneBank = CanUpdateAccountAccessRequestAtOneBank()
13001300

1301+
case class CanGetAccountDirectoryAtOneBank(requiresBankId: Boolean = true) extends ApiRole
1302+
lazy val canGetAccountDirectoryAtOneBank = CanGetAccountDirectoryAtOneBank()
1303+
13011304
private val dynamicApiRoles = new ConcurrentHashMap[String, ApiRole]
13021305

13031306
private case class DynamicApiRole(role: String, requiresBankId: Boolean = false) extends ApiRole{

‎obp-api/src/main/scala/code/api/util/ErrorMessages.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,7 @@ object ErrorMessages {
795795
val InvalidConnectorResponseForGetPaymentLimit = "OBP-50220: Connector did not return the payment limit we requested."
796796
val InvalidConnectorResponseForCreateTransactionRequestBGV1 = "OBP-50221: CreateTransactionRequestBGV1 Connector did not return the data we requested."
797797
val InvalidConnectorResponseForGetStatus = "OBP-50222: Connector method getStatus did not return the data we requested."
798+
val InvalidConnectorResponseForGetAccountDirectory = "OBP-50223: Connector did not return the account directory we requested."
798799

799800
// Adapter Exceptions (OBP-6XXXX)
800801
// Also used for connector == mapped, and show it as the Internal errors.

‎obp-api/src/main/scala/code/api/util/Glossary.scala‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ object Glossary extends MdcLoggable {
15011501
|
15021502
| Content-Type: application/json
15031503
|
1504-
| Authorization: DirectLogin token="your-token-from-direct-login"
1504+
| $directLoginHeaderName: token="your-token-from-direct-login"
15051505
|
15061506
|Please note the user_id
15071507
|
@@ -1521,7 +1521,7 @@ object Glossary extends MdcLoggable {
15211521
|
15221522
| Content-Type: application/json
15231523
|
1524-
| Authorization: $directLoginHeaderName token="your-token-from-direct-login"
1524+
| $directLoginHeaderName: token="your-token-from-direct-login"
15251525
|
15261526
|### 3) List customers for the user
15271527
|
@@ -1537,7 +1537,7 @@ object Glossary extends MdcLoggable {
15371537
|
15381538
| Content-Type: application/json
15391539
|
1540-
| Authorization: DirectLogin token="your-token-from-direct-login"
1540+
| $directLoginHeaderName: token="your-token-from-direct-login"
15411541
|
15421542
|### 4) Create user customer link
15431543
|
@@ -1555,7 +1555,7 @@ object Glossary extends MdcLoggable {
15551555
|
15561556
| Content-Type: application/json
15571557
|
1558-
| Authorization: DirectLogin token="your-token-from-direct-login"
1558+
| $directLoginHeaderName: token="your-token-from-direct-login"
15591559
|
15601560
|### 5) Create account
15611561
|
@@ -1573,7 +1573,7 @@ object Glossary extends MdcLoggable {
15731573
|
15741574
| Content-Type: application/json
15751575
|
1576-
| Authorization: DirectLogin token="your-token-from-direct-login"
1576+
| $directLoginHeaderName: token="your-token-from-direct-login"
15771577
|
15781578
|### 6) List accounts
15791579
|
@@ -1589,7 +1589,7 @@ object Glossary extends MdcLoggable {
15891589
|
15901590
| Content-Type: application/json
15911591
|
1592-
| Authorization: DirectLogin token="your-token-from-direct-login"
1592+
| $directLoginHeaderName: token="your-token-from-direct-login"
15931593
|
15941594
|### 7) Create card
15951595
|
@@ -1607,7 +1607,7 @@ object Glossary extends MdcLoggable {
16071607
|
16081608
| Content-Type: application/json
16091609
|
1610-
| Authorization: DirectLogin token="your-token-from-direct0login"
1610+
| $directLoginHeaderName: token="your-token-from-direct-login"
16111611
|
16121612
|### 8) List cards
16131613
|
@@ -1623,7 +1623,7 @@ object Glossary extends MdcLoggable {
16231623
|
16241624
| Content-Type: application/json
16251625
|
1626-
| Authorization: DirectLogin token="your-token-from-direct0login"
1626+
| $directLoginHeaderName: token="your-token-from-direct-login"
16271627
|
16281628
""")
16291629

@@ -1648,7 +1648,7 @@ object Glossary extends MdcLoggable {
16481648
|
16491649
| Content-Type: application/json
16501650
|
1651-
| Authorization: DirectLogin token="your-token"
1651+
| $directLoginHeaderName: token="your-token"
16521652
|
16531653
|### 3) Grant user access to view
16541654
|
@@ -1664,7 +1664,7 @@ object Glossary extends MdcLoggable {
16641664
|
16651665
| Content-Type: application/json
16661666
|
1667-
| Authorization: DirectLogin token="your-token"
1667+
| $directLoginHeaderName: token="your-token"
16681668
|
16691669
""")
16701670

@@ -1685,7 +1685,7 @@ object Glossary extends MdcLoggable {
16851685
|
16861686
| Content-Type: application/json
16871687
|
1688-
| Authorization: DirectLogin token="your-token"
1688+
| $directLoginHeaderName: token="your-token"
16891689
|
16901690
|### 2) Make payment by SEPA
16911691
|
@@ -1701,7 +1701,7 @@ object Glossary extends MdcLoggable {
17011701
|
17021702
| Content-Type: application/json
17031703
|
1704-
| Authorization: DirectLogin token="your-token" |
1704+
| $directLoginHeaderName: token="your-token"
17051705
|
17061706
|
17071707
|### 3) Make payment by COUNTERPARTY
@@ -1718,7 +1718,7 @@ object Glossary extends MdcLoggable {
17181718
|
17191719
| Content-Type: application/json
17201720
|
1721-
| Authorization: DirectLogin token="your-token"
1721+
| $directLoginHeaderName: token="your-token"
17221722
|
17231723
|
17241724
""")
@@ -1745,7 +1745,7 @@ object Glossary extends MdcLoggable {
17451745
|
17461746
| Content-Type: application/json
17471747
|
1748-
| Authorization: DirectLogin token="your-token"
1748+
| $directLoginHeaderName: token="your-token"
17491749
|
17501750
|### 3) Get User (Current)
17511751
|
@@ -1758,7 +1758,7 @@ object Glossary extends MdcLoggable {
17581758
|
17591759
| Content-Type: application/json
17601760
|
1761-
| Authorization: DirectLogin token="your-token"
1761+
| $directLoginHeaderName: token="your-token"
17621762
|
17631763
|### 4) Grant user access to himself
17641764
|
@@ -1774,7 +1774,7 @@ object Glossary extends MdcLoggable {
17741774
|
17751775
| Content-Type: application/json
17761776
|
1777-
| Authorization: DirectLogin token="your-token"
1777+
| $directLoginHeaderName: token="your-token"
17781778
|
17791779
|### 5) Grant user access to view to another user
17801780
|
@@ -1790,7 +1790,7 @@ object Glossary extends MdcLoggable {
17901790
|
17911791
| Content-Type: application/json
17921792
|
1793-
| Authorization: DirectLogin token="your-token"
1793+
| $directLoginHeaderName: token="your-token"
17941794
|
17951795
|
17961796
""")
@@ -1813,7 +1813,7 @@ object Glossary extends MdcLoggable {
18131813
|
18141814
| Content-Type: application/json
18151815
|
1816-
| Authorization: DirectLogin token="your-token-from-direct-login"
1816+
| $directLoginHeaderName: token="your-token-from-direct-login"
18171817
|
18181818
|Please note the user_id
18191819
|
@@ -1834,7 +1834,7 @@ object Glossary extends MdcLoggable {
18341834
|
18351835
| Content-Type: application/json
18361836
|
1837-
| Authorization: DirectLogin token="your-token-from-direct-login"
1837+
| $directLoginHeaderName: token="your-token-from-direct-login"
18381838
|
18391839
|### 3) Create customer
18401840
|
@@ -1852,7 +1852,7 @@ object Glossary extends MdcLoggable {
18521852
|
18531853
| Content-Type: application/json
18541854
|
1855-
| Authorization: DirectLogin token="your-token-from-direct-login"
1855+
| $directLoginHeaderName: token="your-token-from-direct-login"
18561856
|
18571857
|### 4) Get Customers for Current User
18581858
|
@@ -1868,7 +1868,7 @@ object Glossary extends MdcLoggable {
18681868
|
18691869
| Content-Type: application/json
18701870
|
1871-
| Authorization: DirectLogin token="your-token-from-direct-login"
1871+
| $directLoginHeaderName: token="your-token-from-direct-login"
18721872
|
18731873

18741874
""")
@@ -4540,7 +4540,7 @@ object Glossary extends MdcLoggable {
45404540
|```bash
45414541
|curl -X POST \\
45424542
| '$getObpApiRoot/v6.0.0/management/abac-rules/admin-only-rule/execute' \\
4543-
| -H 'Authorization: DirectLogin token=eyJhbGciOiJIUzI1...' \\
4543+
| -H '$directLoginHeaderName: token=eyJhbGciOiJIUzI1...' \\
45444544
| -H 'Content-Type: application/json' \\
45454545
| -d '{
45464546
| "bank_id": "gh.29.uk",
@@ -4864,7 +4864,7 @@ object Glossary extends MdcLoggable {
48644864
|```bash
48654865
|curl -X POST \\
48664866
| '$getObpApiRoot/v6.0.0/management/abac-rules/admin-only-rule/execute' \\
4867-
| -H 'Authorization: DirectLogin token=YOUR_TOKEN' \\
4867+
| -H '$directLoginHeaderName: token=YOUR_TOKEN' \\
48684868
| -H 'Content-Type: application/json' \\
48694869
| -d '{}'
48704870
|```
@@ -4886,7 +4886,7 @@ object Glossary extends MdcLoggable {
48864886
|```bash
48874887
|curl -X POST \\
48884888
| '$getObpApiRoot/v6.0.0/management/abac-rules/account-owner-only/execute' \\
4889-
| -H 'Authorization: DirectLogin token=YOUR_TOKEN' \\
4889+
| -H '$directLoginHeaderName: token=YOUR_TOKEN' \\
48904890
| -H 'Content-Type: application/json' \\
48914891
| -d '{
48924892
| "user_id": "alice@example.com",
@@ -4906,7 +4906,7 @@ object Glossary extends MdcLoggable {
49064906
|```bash
49074907
|curl -X POST \\
49084908
| '$getObpApiRoot/v6.0.0/management/abac-rules/high-balance-only/execute' \\
4909-
| -H 'Authorization: DirectLogin token=YOUR_TOKEN' \\
4909+
| -H '$directLoginHeaderName: token=YOUR_TOKEN' \\
49104910
| -H 'Content-Type: application/json' \\
49114911
| -d '{
49124912
| "bank_id": "gh.29.uk",
@@ -4925,7 +4925,7 @@ object Glossary extends MdcLoggable {
49254925
|```bash
49264926
|curl -X POST \\
49274927
| '$getObpApiRoot/v6.0.0/management/abac-rules/small-transactions/execute' \\
4928-
| -H 'Authorization: DirectLogin token=YOUR_TOKEN' \\
4928+
| -H '$directLoginHeaderName: token=YOUR_TOKEN' \\
49294929
| -H 'Content-Type: application/json' \\
49304930
| -d '{
49314931
| "bank_id": "gh.29.uk",
@@ -4970,7 +4970,7 @@ object Glossary extends MdcLoggable {
49704970
|
49714971
|```bash
49724972
|curl -X POST '$getObpApiRoot/v6.0.0/management/abac-rules/nonexistent-rule/execute' \\
4973-
| -H 'Authorization: DirectLogin token=YOUR_TOKEN' \\
4973+
| -H '$directLoginHeaderName: token=YOUR_TOKEN' \\
49744974
| -d '{}'
49754975
|```
49764976
|

‎obp-api/src/main/scala/code/api/util/NewStyle.scala‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,12 @@ object NewStyle extends MdcLoggable{
380380
}
381381
}
382382

383+
def getAccountDirectory(bankId: BankId, queryParams: List[OBPQueryParam], callContext: Option[CallContext]): OBPReturnType[List[AccountDirectoryItem]] = {
384+
Connector.connector.vend.getAccountDirectory(bankId, queryParams, callContext) map { i =>
385+
(unboxFullOrFail(i._1, callContext, s"$InvalidConnectorResponseForGetAccountDirectory", 400), i._2)
386+
}
387+
}
388+
383389
def getAccountRouting(bankId: Option[BankId], scheme: String, address: String, callContext: Option[CallContext]) : OBPReturnType[BankAccountRouting] = {
384390
Future(Connector.connector.vend.getAccountRouting(bankId: Option[BankId], scheme: String, address : String, callContext: Option[CallContext])) map { i =>
385391
unboxFullOrFail(i, callContext,s"$AccountRoutingNotFound Current scheme is $scheme, current address is $address, current bankId is $bankId", 404 )

0 commit comments

Comments
 (0)