account-lookup-service 17.4.1-csi-1300.1 → 17.4.1-csi-1300.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/src/domain/parties/getPartiesByTypeAndID.js +3 -2
- package/src/domain/parties/partiesUtils.js +8 -1
- package/src/domain/parties/putParties.js +31 -77
- package/src/domain/parties/services/BasePartiesService.js +88 -0
- package/src/domain/parties/services/GetPartiesService.js +49 -64
- package/src/domain/parties/services/PutPartiesErrorService.js +81 -0
- package/src/domain/parties/services/index.js +3 -1
package/package.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"name": "account-lookup-service",
|
3
3
|
"description": "Account Lookup Service is used to validate Party and Participant lookups.",
|
4
|
-
"version": "17.4.1-csi-1300.
|
4
|
+
"version": "17.4.1-csi-1300.2",
|
5
5
|
"license": "Apache-2.0",
|
6
6
|
"author": "ModusBox",
|
7
7
|
"contributors": [
|
@@ -97,7 +97,7 @@
|
|
97
97
|
"@mojaloop/central-services-metrics": "12.4.5",
|
98
98
|
"@mojaloop/central-services-shared": "18.22.4-snapshot.0",
|
99
99
|
"@mojaloop/central-services-stream": "11.5.1",
|
100
|
-
"@mojaloop/database-lib": "11.1.
|
100
|
+
"@mojaloop/database-lib": "11.1.4",
|
101
101
|
"@mojaloop/event-sdk": "14.3.2",
|
102
102
|
"@mojaloop/inter-scheme-proxy-cache-lib": "2.3.7",
|
103
103
|
"@mojaloop/ml-schema-transformer-lib": "2.5.8",
|
@@ -61,8 +61,9 @@ const getPartiesByTypeAndID = async (headers, params, method, query, span, cache
|
|
61
61
|
await service.handleRequest({ headers, params, query, results })
|
62
62
|
log.info('getPartiesByTypeAndID is done')
|
63
63
|
histTimerEnd({ success: true })
|
64
|
-
} catch (
|
65
|
-
|
64
|
+
} catch (error) {
|
65
|
+
const { requester } = results
|
66
|
+
results.fspiopError = await service.handleError({ error, requester, headers, params })
|
66
67
|
histTimerEnd({ success: false })
|
67
68
|
if (results.fspiopError) {
|
68
69
|
libUtil.countFspiopError(results.fspiopError, { operation: component, step: stepState.step })
|
@@ -26,6 +26,8 @@
|
|
26
26
|
******/
|
27
27
|
|
28
28
|
const { Enum, Util: { Hapi } } = require('@mojaloop/central-services-shared')
|
29
|
+
const { MojaloopApiErrorCodes } = require('@mojaloop/sdk-standard-components').Errors
|
30
|
+
// todo: check why do we need sdk-standard-components deps here !!!
|
29
31
|
const ErrorHandler = require('@mojaloop/central-services-error-handling')
|
30
32
|
|
31
33
|
const participant = require('../../models/participantEndpoint/facade')
|
@@ -99,6 +101,10 @@ const createErrorHandlerOnSendingCallback = (config, logger) => async (err, head
|
|
99
101
|
}
|
100
102
|
}
|
101
103
|
|
104
|
+
function isNotValidPayeeCase (payload) {
|
105
|
+
return payload?.errorInformation?.errorCode === MojaloopApiErrorCodes.PAYEE_IDENTIFIER_NOT_VALID.code
|
106
|
+
}
|
107
|
+
|
102
108
|
module.exports = {
|
103
109
|
getPartyCbType,
|
104
110
|
putPartyCbType,
|
@@ -107,5 +113,6 @@ module.exports = {
|
|
107
113
|
createErrorHandlerOnSendingCallback,
|
108
114
|
alsRequestDto,
|
109
115
|
partiesRequestOptionsDto,
|
110
|
-
swapSourceDestinationHeaders
|
116
|
+
swapSourceDestinationHeaders,
|
117
|
+
isNotValidPayeeCase
|
111
118
|
}
|
@@ -31,7 +31,6 @@
|
|
31
31
|
|
32
32
|
const { Headers, RestMethods } = require('@mojaloop/central-services-shared').Enum.Http
|
33
33
|
const { decodePayload } = require('@mojaloop/central-services-shared').Util.StreamingProtocol
|
34
|
-
const { MojaloopApiErrorCodes } = require('@mojaloop/sdk-standard-components').Errors
|
35
34
|
const ErrorHandler = require('@mojaloop/central-services-error-handling')
|
36
35
|
const Metrics = require('@mojaloop/central-services-metrics')
|
37
36
|
|
@@ -43,7 +42,8 @@ const { logger } = require('../../lib')
|
|
43
42
|
const { ERROR_MESSAGES } = require('../../constants')
|
44
43
|
|
45
44
|
const partiesUtils = require('./partiesUtils')
|
46
|
-
const
|
45
|
+
const services = require('./services')
|
46
|
+
const { createDeps } = require('./deps')
|
47
47
|
|
48
48
|
/**
|
49
49
|
* @function putPartiesByTypeAndID
|
@@ -158,103 +158,57 @@ const putPartiesErrorByTypeAndID = async (headers, params, payload, dataUri, spa
|
|
158
158
|
'Put parties error by type and id',
|
159
159
|
['success']
|
160
160
|
).startTimer()
|
161
|
-
const
|
161
|
+
const childSpan = span ? span.getChild(component) : undefined
|
162
|
+
const log = logger.child({ component, params })
|
163
|
+
const stepState = libUtil.initStepState()
|
164
|
+
|
165
|
+
const deps = createDeps({ cache, proxyCache, childSpan, log, stepState })
|
166
|
+
const service = new services.PutPartiesErrorService(deps)
|
167
|
+
const results = {}
|
168
|
+
|
162
169
|
const destination = headers[Headers.FSPIOP.DESTINATION]
|
163
170
|
const proxyEnabled = !!(Config.PROXY_CACHE_CONFIG.enabled && proxyCache)
|
164
171
|
const proxy = proxyEnabled && headers[Headers.FSPIOP.PROXY]
|
165
|
-
|
166
|
-
const childSpan = span ? span.getChild(component) : undefined
|
167
|
-
const stepState = libUtil.initStepState()
|
168
172
|
log.info('parties::putPartiesErrorByTypeAndID start', { destination, proxy })
|
169
173
|
|
170
|
-
let sendTo
|
171
|
-
let fspiopError
|
172
|
-
|
173
174
|
try {
|
174
175
|
if (proxy) {
|
175
|
-
const
|
176
|
-
|
177
|
-
|
178
|
-
|
176
|
+
const notValid = await service.checkPayee({ headers, params, payload, proxy })
|
177
|
+
if (notValid) {
|
178
|
+
const getPartiesService = new services.GetPartiesService(deps)
|
179
|
+
// todo: think, if we need to remove destination header before starting new discovery
|
180
|
+
await getPartiesService.handleRequest({ headers, params, results })
|
181
|
+
log.info('putPartiesErrorByTypeAndID triggered new discovery flow')
|
182
|
+
histTimerEnd({ success: true })
|
183
|
+
return
|
184
|
+
}
|
185
|
+
|
186
|
+
const isLast = await service.checkLastProxyCallback({ destination, proxy, params })
|
187
|
+
if (!isLast) {
|
179
188
|
log.info('putPartiesErrorByTypeAndID proxy callback was processed', { proxy })
|
180
189
|
histTimerEnd({ success: true })
|
181
190
|
return
|
182
191
|
}
|
183
192
|
}
|
184
193
|
|
185
|
-
sendTo = await identifyDestinationForErrorCallback(
|
186
|
-
|
187
|
-
})
|
188
|
-
|
189
|
-
await sendErrorCallbackToParticipant({
|
190
|
-
sendTo, headers, params, dataUri, childSpan, stepState
|
191
|
-
})
|
194
|
+
const sendTo = await service.identifyDestinationForErrorCallback(destination)
|
195
|
+
results.requester = sendTo
|
196
|
+
await service.sendErrorCallbackToParticipant({ sendTo, headers, params, dataUri })
|
192
197
|
|
193
198
|
log.info('putPartiesErrorByTypeAndID callback was sent', { sendTo })
|
194
199
|
histTimerEnd({ success: true })
|
195
|
-
} catch (
|
196
|
-
|
197
|
-
|
198
|
-
|
200
|
+
} catch (error) {
|
201
|
+
const { requester } = results
|
202
|
+
results.fspiopError = await service.handleError({ error, requester, headers, params })
|
203
|
+
if (results.fspiopError) {
|
204
|
+
libUtil.countFspiopError(results.fspiopError, { operation: component, step: stepState.step })
|
199
205
|
}
|
200
206
|
histTimerEnd({ success: false })
|
201
207
|
} finally {
|
202
|
-
await libUtil.finishSpanWithError(childSpan, fspiopError)
|
208
|
+
await libUtil.finishSpanWithError(childSpan, results.fspiopError)
|
203
209
|
}
|
204
210
|
}
|
205
211
|
|
206
|
-
const processProxyErrorCallback = async ({
|
207
|
-
headers, params, payload, childSpan, cache, proxyCache, log, proxy, destination, stepState
|
208
|
-
}) => {
|
209
|
-
log.verbose('processProxyErrorCallback...')
|
210
|
-
let isDone // whether or not to continue putPartiesErrorByTypeAndID
|
211
|
-
|
212
|
-
if (isNotValidPayeeCase(payload)) {
|
213
|
-
stepState.inProgress('notValidPayeeCase-1')
|
214
|
-
log.info('notValidPayee case - deleted Participants and run getPartiesByTypeAndID', { proxy, payload })
|
215
|
-
const swappedHeaders = partiesUtils.swapSourceDestinationHeaders(headers)
|
216
|
-
await oracle.oracleRequest(swappedHeaders, RestMethods.DELETE, params, null, null, cache)
|
217
|
-
getPartiesByTypeAndID(swappedHeaders, params, RestMethods.GET, {}, childSpan, cache, proxyCache)
|
218
|
-
isDone = true
|
219
|
-
} else {
|
220
|
-
stepState.inProgress('receivedErrorResponse-2')
|
221
|
-
const alsReq = partiesUtils.alsRequestDto(destination, params) // or source?
|
222
|
-
const isLast = await proxyCache.receivedErrorResponse(alsReq, proxy)
|
223
|
-
log.info(`got${isLast ? '' : 'NOT'} last error callback from proxy`, { proxy, alsReq, isLast })
|
224
|
-
isDone = !isLast
|
225
|
-
}
|
226
|
-
return isDone
|
227
|
-
}
|
228
|
-
|
229
|
-
const identifyDestinationForErrorCallback = async ({
|
230
|
-
destination, proxyCache, proxyEnabled, log, stepState
|
231
|
-
}) => {
|
232
|
-
stepState.inProgress('validateParticipant-3')
|
233
|
-
const destinationParticipant = await participant.validateParticipant(destination)
|
234
|
-
if (destinationParticipant) return destination
|
235
|
-
|
236
|
-
stepState.inProgress('lookupProxyDestination-4')
|
237
|
-
const proxyName = proxyEnabled && await proxyCache.lookupProxyByDfspId(destination)
|
238
|
-
if (proxyName) return proxyName
|
239
|
-
|
240
|
-
const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
|
241
|
-
log.warn(errMessage)
|
242
|
-
throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR, errMessage)
|
243
|
-
}
|
244
|
-
|
245
|
-
const sendErrorCallbackToParticipant = async ({
|
246
|
-
sendTo, headers, params, dataUri, childSpan, stepState
|
247
|
-
}) => {
|
248
|
-
stepState.inProgress('sendErrorToParticipant-5')
|
249
|
-
const decodedPayload = decodePayload(dataUri, { asParsed: false })
|
250
|
-
const callbackEndpointType = partiesUtils.errorPartyCbType(params.SubId)
|
251
|
-
await participant.sendErrorToParticipant(sendTo, callbackEndpointType, decodedPayload.body.toString(), headers, params, childSpan)
|
252
|
-
}
|
253
|
-
|
254
|
-
function isNotValidPayeeCase (payload) {
|
255
|
-
return payload?.errorInformation?.errorCode === MojaloopApiErrorCodes.PAYEE_IDENTIFIER_NOT_VALID.code
|
256
|
-
}
|
257
|
-
|
258
212
|
module.exports = {
|
259
213
|
putPartiesByTypeAndID,
|
260
214
|
putPartiesErrorByTypeAndID
|
@@ -0,0 +1,88 @@
|
|
1
|
+
/*****
|
2
|
+
License
|
3
|
+
--------------
|
4
|
+
Copyright © 2020-2025 Mojaloop Foundation
|
5
|
+
The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
|
6
|
+
|
7
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
8
|
+
|
9
|
+
Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
|
10
|
+
|
11
|
+
Contributors
|
12
|
+
--------------
|
13
|
+
This is the official list of the Mojaloop project contributors for this file.
|
14
|
+
Names of the original copyright holders (individuals or organizations)
|
15
|
+
should be listed with a '*' in the first column. People who have
|
16
|
+
contributed from an organization can be listed under the organization
|
17
|
+
that actually holds the copyright for their contributions (see the
|
18
|
+
Mojaloop Foundation for an example). Those individuals should have
|
19
|
+
their names indented and be marked with a '-'. Email address can be added
|
20
|
+
optionally within square brackets <email>.
|
21
|
+
|
22
|
+
* Mojaloop Foundation
|
23
|
+
* Eugen Klymniuk <eugen.klymniuk@infitx.com>
|
24
|
+
|
25
|
+
--------------
|
26
|
+
******/
|
27
|
+
|
28
|
+
const ErrorHandler = require('@mojaloop/central-services-error-handling')
|
29
|
+
const { Enum } = require('@mojaloop/central-services-shared')
|
30
|
+
|
31
|
+
const { FspEndpointTypes, FspEndpointTemplates } = Enum.EndPoints
|
32
|
+
const { Headers, RestMethods } = Enum.Http
|
33
|
+
|
34
|
+
class BasePartiesService {
|
35
|
+
constructor (deps) {
|
36
|
+
this.deps = deps
|
37
|
+
this.log = this.deps.log.child({ component: this.constructor.name })
|
38
|
+
this.proxyEnabled = !!(deps.config.PROXY_CACHE_CONFIG?.enabled && deps.proxyCache)
|
39
|
+
}
|
40
|
+
|
41
|
+
async handleRequest () {
|
42
|
+
throw new Error('handleRequest must be implemented by subclass')
|
43
|
+
}
|
44
|
+
|
45
|
+
async handleError ({ error, requester, headers, params }) {
|
46
|
+
const log = this.log.child({ method: 'handleError' })
|
47
|
+
try {
|
48
|
+
log.error('error in processing parties request: ', error)
|
49
|
+
const sendTo = requester || headers[Headers.FSPIOP.SOURCE]
|
50
|
+
const fspiopError = ErrorHandler.Factory.reformatFSPIOPError(error)
|
51
|
+
const errorInfo = await this.deps.partiesUtils.makePutPartiesErrorPayload(this.deps.config, fspiopError, headers, params)
|
52
|
+
|
53
|
+
await this.sendErrorCallback({ sendTo, errorInfo, headers, params })
|
54
|
+
log.info('handleError in done', { sendTo, errorInfo })
|
55
|
+
return fspiopError
|
56
|
+
} catch (exc) {
|
57
|
+
// We can't do anything else here- we _must_ handle all errors _within_ this function because
|
58
|
+
// we've already sent a sync response- we cannot throw.
|
59
|
+
log.error('failed to handleError. No further processing! ', exc)
|
60
|
+
}
|
61
|
+
}
|
62
|
+
|
63
|
+
async validateParticipant (participantId) {
|
64
|
+
return this.deps.participant.validateParticipant(participantId)
|
65
|
+
}
|
66
|
+
|
67
|
+
async sendErrorCallback ({ sendTo, errorInfo, headers, params, payload = undefined }) {
|
68
|
+
const endpointType = this.deps.partiesUtils.errorPartyCbType(params.SubId)
|
69
|
+
return this.deps.participant.sendErrorToParticipant(
|
70
|
+
sendTo, endpointType, errorInfo, headers, params, payload, this.deps.childSpan
|
71
|
+
)
|
72
|
+
}
|
73
|
+
|
74
|
+
async sendDeleteOracleRequest (headers, params) {
|
75
|
+
return this.deps.oracle.oracleRequest(headers, RestMethods.DELETE, params, null, null, this.deps.cache)
|
76
|
+
}
|
77
|
+
|
78
|
+
static enums () {
|
79
|
+
return {
|
80
|
+
FspEndpointTypes,
|
81
|
+
FspEndpointTemplates,
|
82
|
+
Headers,
|
83
|
+
RestMethods
|
84
|
+
}
|
85
|
+
}
|
86
|
+
}
|
87
|
+
|
88
|
+
module.exports = BasePartiesService
|
@@ -26,24 +26,18 @@
|
|
26
26
|
******/
|
27
27
|
|
28
28
|
const ErrorHandler = require('@mojaloop/central-services-error-handling')
|
29
|
-
const { Enum } = require('@mojaloop/central-services-shared')
|
30
29
|
const { ERROR_MESSAGES } = require('../../../constants')
|
31
30
|
const { createCallbackHeaders } = require('../../../lib/headers')
|
31
|
+
const BasePartiesService = require('./BasePartiesService')
|
32
32
|
|
33
|
-
const {
|
34
|
-
|
33
|
+
const {
|
34
|
+
FspEndpointTypes, FspEndpointTemplates,
|
35
|
+
Headers, RestMethods
|
36
|
+
} = BasePartiesService.enums()
|
35
37
|
|
36
38
|
const proxyCacheTtlSec = 40 // todo: make configurable
|
37
39
|
|
38
|
-
class GetPartiesService {
|
39
|
-
#deps
|
40
|
-
|
41
|
-
constructor (deps) {
|
42
|
-
this.#deps = deps
|
43
|
-
this.log = this.#deps.log.child({ component: this.constructor.name })
|
44
|
-
this.proxyEnabled = !!(deps.config.PROXY_CACHE_CONFIG?.enabled && deps.proxyCache)
|
45
|
-
}
|
46
|
-
|
40
|
+
class GetPartiesService extends BasePartiesService {
|
47
41
|
async handleRequest ({ headers, params, query, results }) {
|
48
42
|
const source = headers[Headers.FSPIOP.SOURCE]
|
49
43
|
const proxy = headers[Headers.FSPIOP.PROXY]
|
@@ -72,17 +66,18 @@ class GetPartiesService {
|
|
72
66
|
const proxyNames = await this.getFilteredProxyList(proxy)
|
73
67
|
|
74
68
|
if (proxyNames.length) {
|
75
|
-
|
69
|
+
await this.triggerSendToProxiesFlow({ proxyNames, headers, params, source })
|
70
|
+
return
|
76
71
|
}
|
77
72
|
|
78
|
-
results.fspiopError = await this.
|
73
|
+
results.fspiopError = await this.sendPartyNotFoundErrorCallback({ requester, headers, params })
|
79
74
|
}
|
80
75
|
|
81
76
|
async validateRequester ({ source, proxy }) {
|
82
|
-
this
|
77
|
+
this.deps.stepState.inProgress('validateRequester-0')
|
83
78
|
const log = this.log.child({ source, method: 'validateRequester' })
|
84
79
|
|
85
|
-
const sourceParticipant = await this
|
80
|
+
const sourceParticipant = await this.validateParticipant(source)
|
86
81
|
if (sourceParticipant) {
|
87
82
|
log.debug('source is in scheme')
|
88
83
|
return source
|
@@ -94,28 +89,28 @@ class GetPartiesService {
|
|
94
89
|
throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
|
95
90
|
}
|
96
91
|
|
97
|
-
const proxyParticipant = await this
|
92
|
+
const proxyParticipant = await this.validateParticipant(proxy)
|
98
93
|
if (!proxyParticipant) {
|
99
94
|
const errMessage = ERROR_MESSAGES.partyProxyNotFound
|
100
95
|
log.warn(errMessage, { proxy })
|
101
96
|
throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
|
102
97
|
}
|
103
98
|
|
104
|
-
const isCached = await this
|
99
|
+
const isCached = await this.deps.proxyCache.addDfspIdToProxyMapping(source, proxy)
|
105
100
|
// think, what if isCached !== true?
|
106
101
|
log.info('source is added to proxyMapping cache:', { proxy, isCached })
|
107
102
|
return proxy
|
108
103
|
}
|
109
104
|
|
110
105
|
async forwardRequestToDestination ({ destination, headers, params }) {
|
111
|
-
this
|
106
|
+
this.deps.stepState.inProgress('validateDestination-1')
|
112
107
|
const log = this.log.child({ method: 'forwardRequestToDestination' })
|
113
108
|
let sendTo = destination
|
114
109
|
|
115
|
-
const destParticipantModel = await this
|
110
|
+
const destParticipantModel = await this.validateParticipant(destination)
|
116
111
|
if (!destParticipantModel) {
|
117
|
-
this
|
118
|
-
const proxyId = this.proxyEnabled && await this
|
112
|
+
this.deps.stepState.inProgress('lookupProxyDestination-2')
|
113
|
+
const proxyId = this.proxyEnabled && await this.deps.proxyCache.lookupProxyByDfspId(destination)
|
119
114
|
|
120
115
|
if (!proxyId) {
|
121
116
|
log.warn('no destination participant, and no dfsp-to-proxy mapping', { destination })
|
@@ -131,8 +126,8 @@ class GetPartiesService {
|
|
131
126
|
|
132
127
|
filterOraclePartyList ({ response, params }) {
|
133
128
|
// Oracle's API is a standard rest-style end-point Thus a GET /party on the oracle will return all participant-party records. We must filter the results based on the callbackEndpointType to make sure we remove records containing partySubIdOrType when we are in FSPIOP_CALLBACK_URL_PARTIES_GET mode:
|
134
|
-
this
|
135
|
-
const callbackEndpointType = this
|
129
|
+
this.deps.stepState.inProgress('filterOraclePartyList-5')
|
130
|
+
const callbackEndpointType = this.deps.partiesUtils.getPartyCbType(params.SubId)
|
136
131
|
let filteredResponsePartyList
|
137
132
|
|
138
133
|
switch (callbackEndpointType) {
|
@@ -148,7 +143,7 @@ class GetPartiesService {
|
|
148
143
|
|
149
144
|
if (!Array.isArray(filteredResponsePartyList) || !filteredResponsePartyList.length) {
|
150
145
|
const errMessage = 'Requested FSP/Party not found'
|
151
|
-
this
|
146
|
+
this.log.warn(errMessage)
|
152
147
|
throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, errMessage)
|
153
148
|
}
|
154
149
|
|
@@ -165,8 +160,8 @@ class GetPartiesService {
|
|
165
160
|
if (!destination) {
|
166
161
|
clonedHeaders[Headers.FSPIOP.DESTINATION] = fspId
|
167
162
|
}
|
168
|
-
this
|
169
|
-
const schemeParticipant = await this
|
163
|
+
this.deps.stepState.inProgress('validateParticipant-6')
|
164
|
+
const schemeParticipant = await this.validateParticipant(fspId)
|
170
165
|
if (schemeParticipant) {
|
171
166
|
sentCount++
|
172
167
|
log.info('participant is in scheme', { fspId })
|
@@ -180,8 +175,8 @@ class GetPartiesService {
|
|
180
175
|
// If the participant is not in the scheme and proxy routing is enabled,
|
181
176
|
// we should check if there is a proxy for it and send the request to the proxy
|
182
177
|
if (this.proxyEnabled) {
|
183
|
-
this
|
184
|
-
const proxyName = await this
|
178
|
+
this.deps.stepState.inProgress('lookupProxyByDfspId-7')
|
179
|
+
const proxyName = await this.deps.proxyCache.lookupProxyByDfspId(fspId)
|
185
180
|
if (!proxyName) {
|
186
181
|
log.warn('no proxyMapping for participant! TODO: Delete reference in oracle...', { fspId })
|
187
182
|
// todo: delete reference in oracle
|
@@ -202,30 +197,30 @@ class GetPartiesService {
|
|
202
197
|
}
|
203
198
|
|
204
199
|
async getFilteredProxyList (proxy) {
|
205
|
-
this
|
200
|
+
this.deps.stepState.inProgress('getAllProxies-8')
|
206
201
|
if (!this.proxyEnabled) {
|
207
202
|
this.log.warn('proxyCache is not enabled')
|
208
203
|
return []
|
209
204
|
}
|
210
205
|
|
211
|
-
const proxyNames = await this
|
206
|
+
const proxyNames = await this.deps.proxies.getAllProxiesNames(this.deps.config.SWITCH_ENDPOINT)
|
212
207
|
this.log.debug('getAllProxiesNames is done', { proxyNames })
|
213
208
|
return proxyNames.filter(name => name !== proxy)
|
214
209
|
}
|
215
210
|
|
216
211
|
async triggerSendToProxiesFlow ({ proxyNames, headers, params, source }) {
|
217
212
|
const log = this.log.child({ method: 'triggerSendToProxiesFlow' })
|
218
|
-
this
|
219
|
-
const alsReq = this
|
213
|
+
this.deps.stepState.inProgress('setSendToProxiesList-10')
|
214
|
+
const alsReq = this.deps.partiesUtils.alsRequestDto(source, params)
|
220
215
|
log.info('starting setSendToProxiesList flow: ', { proxyNames, alsReq, proxyCacheTtlSec })
|
221
216
|
|
222
|
-
const isCached = await this
|
217
|
+
const isCached = await this.deps.proxyCache.setSendToProxiesList(alsReq, proxyNames, proxyCacheTtlSec)
|
223
218
|
if (!isCached) {
|
224
219
|
log.warn('failed to setSendToProxiesList')
|
225
220
|
throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.failedToCacheSendToProxiesList)
|
226
221
|
}
|
227
222
|
|
228
|
-
this
|
223
|
+
this.deps.stepState.inProgress('sendingProxyRequests-11')
|
229
224
|
const sending = proxyNames.map(
|
230
225
|
sendTo => this.#forwardGetPartiesRequest({ sendTo, headers, params })
|
231
226
|
.then(({ status, data } = {}) => ({ status, data }))
|
@@ -236,31 +231,15 @@ class GetPartiesService {
|
|
236
231
|
// Failed requests should be handled by TTL expired/timeout handler
|
237
232
|
// todo: - think, if we should handle failed requests here (e.g., by calling receivedErrorResponse)
|
238
233
|
log.info('triggerSendToProxiesFlow is done:', { isOk, results, proxyNames, alsReq })
|
239
|
-
this
|
234
|
+
this.deps.stepState.inProgress('allSent-12')
|
240
235
|
if (!isOk) {
|
241
236
|
log.warn('no successful requests sent to proxies')
|
242
237
|
throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.ID_NOT_FOUND, ERROR_MESSAGES.proxyConnectionError)
|
243
238
|
}
|
244
239
|
}
|
245
240
|
|
246
|
-
async
|
247
|
-
|
248
|
-
}
|
249
|
-
|
250
|
-
async #forwardGetPartiesRequest ({ sendTo, headers, params }) {
|
251
|
-
this.#deps.stepState.inProgress('forwardRequest-3')
|
252
|
-
const callbackEndpointType = this.#deps.partiesUtils.getPartyCbType(params.SubId)
|
253
|
-
const options = this.#deps.partiesUtils.partiesRequestOptionsDto(params)
|
254
|
-
|
255
|
-
return this.#deps.participant.sendRequest(headers, sendTo, callbackEndpointType, RestMethods.GET, undefined, options, this.#deps.childSpan)
|
256
|
-
}
|
257
|
-
|
258
|
-
// async sendSuccessCallback ({ headers, sendTo }) {
|
259
|
-
// return this.#deps.participant.sendRequest(headers, sendTo,)
|
260
|
-
// }
|
261
|
-
|
262
|
-
async sendErrorCallback ({ requester, headers, params }) {
|
263
|
-
this.#deps.stepState.inProgress('sendErrorCallback-9')
|
241
|
+
async sendPartyNotFoundErrorCallback ({ requester, headers, params }) {
|
242
|
+
this.deps.stepState.inProgress('sendErrorCallback-9')
|
264
243
|
const callbackHeaders = createCallbackHeaders({
|
265
244
|
requestHeaders: headers,
|
266
245
|
partyIdType: params.Type,
|
@@ -271,20 +250,26 @@ class GetPartiesService {
|
|
271
250
|
})
|
272
251
|
const fspiopError = ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.PARTY_NOT_FOUND)
|
273
252
|
|
274
|
-
await this
|
275
|
-
requester,
|
276
|
-
this
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
this.#deps.childSpan
|
281
|
-
)
|
253
|
+
await this.sendErrorCallback({
|
254
|
+
sendTo: requester,
|
255
|
+
errorInfo: fspiopError.toApiErrorObject(this.deps.config.ERROR_HANDLING),
|
256
|
+
headers: callbackHeaders,
|
257
|
+
params
|
258
|
+
})
|
282
259
|
return fspiopError
|
283
260
|
}
|
284
261
|
|
285
262
|
async sendOracleDiscoveryRequest ({ headers, params, query }) {
|
286
|
-
this
|
287
|
-
return this
|
263
|
+
this.deps.stepState.inProgress('oracleRequest-4')
|
264
|
+
return this.deps.oracle.oracleRequest(headers, RestMethods.GET, params, query, undefined, this.deps.cache)
|
265
|
+
}
|
266
|
+
|
267
|
+
async #forwardGetPartiesRequest ({ sendTo, headers, params }) {
|
268
|
+
this.deps.stepState.inProgress('forwardRequest-3')
|
269
|
+
const callbackEndpointType = this.deps.partiesUtils.getPartyCbType(params.SubId)
|
270
|
+
const options = this.deps.partiesUtils.partiesRequestOptionsDto(params)
|
271
|
+
|
272
|
+
return this.deps.participant.sendRequest(headers, sendTo, callbackEndpointType, RestMethods.GET, undefined, options, this.deps.childSpan)
|
288
273
|
}
|
289
274
|
}
|
290
275
|
|
@@ -0,0 +1,81 @@
|
|
1
|
+
/*****
|
2
|
+
License
|
3
|
+
--------------
|
4
|
+
Copyright © 2020-2025 Mojaloop Foundation
|
5
|
+
The Mojaloop files are made available by the Mojaloop Foundation under the Apache License, Version 2.0 (the "License") and you may not use these files except in compliance with the License. You may obtain a copy of the License at
|
6
|
+
|
7
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
8
|
+
|
9
|
+
Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
|
10
|
+
|
11
|
+
Contributors
|
12
|
+
--------------
|
13
|
+
This is the official list of the Mojaloop project contributors for this file.
|
14
|
+
Names of the original copyright holders (individuals or organizations)
|
15
|
+
should be listed with a '*' in the first column. People who have
|
16
|
+
contributed from an organization can be listed under the organization
|
17
|
+
that actually holds the copyright for their contributions (see the
|
18
|
+
Mojaloop Foundation for an example). Those individuals should have
|
19
|
+
their names indented and be marked with a '-'. Email address can be added
|
20
|
+
optionally within square brackets <email>.
|
21
|
+
|
22
|
+
* Mojaloop Foundation
|
23
|
+
* Eugen Klymniuk <eugen.klymniuk@infitx.com>
|
24
|
+
|
25
|
+
--------------
|
26
|
+
******/
|
27
|
+
|
28
|
+
const ErrorHandler = require('@mojaloop/central-services-error-handling')
|
29
|
+
const { decodePayload } = require('@mojaloop/central-services-shared').Util.StreamingProtocol
|
30
|
+
const { ERROR_MESSAGES } = require('../../../constants')
|
31
|
+
const BasePartiesService = require('./BasePartiesService')
|
32
|
+
|
33
|
+
class PutPartiesErrorService extends BasePartiesService {
|
34
|
+
async handleRequest () {
|
35
|
+
// todo: add impl.
|
36
|
+
}
|
37
|
+
|
38
|
+
async checkPayee ({ headers, params, payload, proxy }) {
|
39
|
+
const notValid = this.deps.partiesUtils.isNotValidPayeeCase(payload)
|
40
|
+
if (notValid) {
|
41
|
+
this.deps.stepState.inProgress('notValidPayeeCase-1')
|
42
|
+
this.log.warn('notValidPayee case - deleting Participants and run getPartiesByTypeAndID', { proxy, payload })
|
43
|
+
const swappedHeaders = this.deps.partiesUtils.swapSourceDestinationHeaders(headers)
|
44
|
+
await super.sendDeleteOracleRequest(swappedHeaders, params)
|
45
|
+
}
|
46
|
+
return notValid
|
47
|
+
}
|
48
|
+
|
49
|
+
async checkLastProxyCallback ({ destination, proxy, params }) {
|
50
|
+
this.deps.stepState.inProgress('checkLastProxyCallback-2')
|
51
|
+
const alsReq = this.deps.partiesUtils.alsRequestDto(destination, params) // or source?
|
52
|
+
const isLast = await this.deps.proxyCache.receivedErrorResponse(alsReq, proxy)
|
53
|
+
this.log.info(`got${isLast ? '' : 'NOT'} last error callback from proxy`, { proxy, alsReq, isLast })
|
54
|
+
return isLast
|
55
|
+
}
|
56
|
+
|
57
|
+
async identifyDestinationForErrorCallback (destination) {
|
58
|
+
this.deps.stepState.inProgress('validateParticipant-3')
|
59
|
+
const destinationParticipant = await super.validateParticipant(destination)
|
60
|
+
if (destinationParticipant) return destination
|
61
|
+
|
62
|
+
this.deps.stepState.inProgress('lookupProxyDestination-4')
|
63
|
+
const proxyName = this.proxyEnabled && await this.deps.proxyCache.lookupProxyByDfspId(destination)
|
64
|
+
if (proxyName) return proxyName
|
65
|
+
|
66
|
+
const errMessage = ERROR_MESSAGES.partyDestinationFspNotFound
|
67
|
+
this.log.warn(errMessage, { destination })
|
68
|
+
throw ErrorHandler.Factory.createFSPIOPError(ErrorHandler.Enums.FSPIOPErrorCodes.DESTINATION_FSP_ERROR, errMessage)
|
69
|
+
}
|
70
|
+
|
71
|
+
async sendErrorCallbackToParticipant ({ sendTo, headers, params, dataUri }) {
|
72
|
+
this.deps.stepState.inProgress('sendErrorToParticipant-5')
|
73
|
+
const decodedPayload = decodePayload(dataUri, { asParsed: false })
|
74
|
+
const errorInfo = decodedPayload.body.toString()
|
75
|
+
return super.sendErrorCallback({
|
76
|
+
sendTo, errorInfo, headers, params
|
77
|
+
})
|
78
|
+
}
|
79
|
+
}
|
80
|
+
|
81
|
+
module.exports = PutPartiesErrorService
|