From d16f474ba75c6be825ed562e32875d1715feb178 Mon Sep 17 00:00:00 2001 From: Anup Nehe Date: Thu, 10 Oct 2024 11:15:16 +0530 Subject: [PATCH 1/3] MOSIP-35416 Signed-off-by: Anup Nehe --- .../ApproveMappingDeviceToSbi.hbs | 5 ++- .../ApproveMappingDeviceToSbi.yml | 1 + .../pms/DeactivateDevice/DeactivateDevice.hbs | 3 ++ .../pms/DeactivateDevice/DeactivateDevice.yml | 1 + .../DeactivateOIDCClient.yml | 22 ++++++------ .../DeactivateSBIWithAssociatedDevices.hbs | 5 ++- .../DeactivateSBIWithAssociatedDevices.yml | 1 + .../DeviceSubTypeFilter.hbs | 3 +- .../DeviceSubTypeFilter.yml | 17 +++------ .../DeviceTypeFilter/DeviceTypeFilter.hbs | 1 + .../DeviceTypeFilter/DeviceTypeFilter.yml | 35 +++++++------------ .../GetAllDeviceListMappedWithSbi.hbs | 2 +- .../pms/GetConfiguration/GetConfiguration.yml | 2 +- .../GetOriginalPartnerCertificates.hbs | 3 ++ .../GetOriginalPartnerCertificates.yml | 2 ++ .../pms/GetUserConsent/GetUserConsent.yml | 2 +- .../InactiveMappingDeviceToSbi.hbs | 4 +++ .../InactiveMappingDeviceToSbi.yml | 1 + .../resources/pms/OIDCClient/OIDCClient.yml | 22 ++++++------ .../pms/OIDCClient/UpdateOIDCClient.yml | 2 +- .../partnerPolicyMapping.yml | 10 +++--- 21 files changed, 75 insertions(+), 69 deletions(-) diff --git a/api-test/src/main/resources/pms/ApproveMappingDeviceToSbi/ApproveMappingDeviceToSbi.hbs b/api-test/src/main/resources/pms/ApproveMappingDeviceToSbi/ApproveMappingDeviceToSbi.hbs index aabf255f8e..2c1f4f29c6 100644 --- a/api-test/src/main/resources/pms/ApproveMappingDeviceToSbi/ApproveMappingDeviceToSbi.hbs +++ b/api-test/src/main/resources/pms/ApproveMappingDeviceToSbi/ApproveMappingDeviceToSbi.hbs @@ -1,4 +1,7 @@ -{ +{ +"id": "mosip.pms.approve.mapping.device.to.sbi.post", + "version": "1.0", + "requestTime": "{{requestTime}}", "request": { "partnerId": "{{partnerId}}", "sbiId": "{{sbiId}}", diff --git a/api-test/src/main/resources/pms/ApproveMappingDeviceToSbi/ApproveMappingDeviceToSbi.yml b/api-test/src/main/resources/pms/ApproveMappingDeviceToSbi/ApproveMappingDeviceToSbi.yml index 50cfc5fc2d..2bf24dcece 100644 --- a/api-test/src/main/resources/pms/ApproveMappingDeviceToSbi/ApproveMappingDeviceToSbi.yml +++ b/api-test/src/main/resources/pms/ApproveMappingDeviceToSbi/ApproveMappingDeviceToSbi.yml @@ -6,6 +6,7 @@ ApproveMappingDeviceToSbi: inputTemplate: pms/ApproveMappingDeviceToSbi/ApproveMappingDeviceToSbi outputTemplate: pms/ApproveMappingDeviceToSbi/ApproveMappingDeviceToSbiResult input: '{ + "requestTime": "$TIMESTAMP$", "partnerId": "111998", "sbiId": "$ID:SaveSecureBiometricInterfaceCreateDto_DeviceProvider_AllValid_Smoke_sid_id$", "deviceDetailId": "$ID:SaveDeviceDetails_DeviceProvider_AllValid_Smoke_sid_id$" diff --git a/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.hbs b/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.hbs index fe8df40087..8916c88bdd 100644 --- a/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.hbs +++ b/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.hbs @@ -1,4 +1,7 @@ { + "id": "mosip.pms.deactivate.device.post", + "version": "1.0", + "requesttime": "{{requesttime}}", "request": { "deviceId": "{{deviceId}}" } diff --git a/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.yml b/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.yml index 1769226b1f..73c4cdd923 100644 --- a/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.yml +++ b/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.yml @@ -7,6 +7,7 @@ DeactivateDevice: inputTemplate: pms/DeactivateDevice/DeactivateDevice outputTemplate: pms/DeactivateDevice/DeactivateDeviceResult input: '{ + "responseTime": "$TIMESTAMP$", "deviceId": "$ID:SaveDeviceDetails_DeviceProvider_AllValid_Smoke_sid_id$" }' output: '{ diff --git a/api-test/src/main/resources/pms/DeactivateOIDCClient/DeactivateOIDCClient.yml b/api-test/src/main/resources/pms/DeactivateOIDCClient/DeactivateOIDCClient.yml index a1421c32a2..69c24552a9 100644 --- a/api-test/src/main/resources/pms/DeactivateOIDCClient/DeactivateOIDCClient.yml +++ b/api-test/src/main/resources/pms/DeactivateOIDCClient/DeactivateOIDCClient.yml @@ -1,6 +1,6 @@ DeactivateOIDCClient: Pms_DeactivateOIDCClient_all_Valid_Smoke_sid: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -24,7 +24,7 @@ DeactivateOIDCClient: }' Pms_DeactivateOIDCClient_Retry_with_same_policy_Neg: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -51,7 +51,7 @@ DeactivateOIDCClient: }' Pms_DeactivateOIDCClient_Missing_Requesttime_Neg: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -77,7 +77,7 @@ DeactivateOIDCClient: }' Pms_DeactivateOIDCClient_Missing_client_id_Neg: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -103,7 +103,7 @@ DeactivateOIDCClient: }' Pms_DeactivateOIDCClient_Missing_clientName_Neg: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -129,7 +129,7 @@ DeactivateOIDCClient: }' Pms_DeactivateOIDCClient_Missing_status_Neg: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -155,7 +155,7 @@ DeactivateOIDCClient: }' Pms_DeactivateOIDCClient_Missing_logoUri_Neg: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -181,7 +181,7 @@ DeactivateOIDCClient: }' Pms_DeactivateOIDCClient_Missing_redirectUris_Neg: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -207,7 +207,7 @@ DeactivateOIDCClient: }' Pms_DeactivateOIDCClient_Missing_grantTypes_Neg: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -233,7 +233,7 @@ DeactivateOIDCClient: }' Pms_DeactivateOIDCClient_Missing_clientNameLangMap_Neg: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -259,7 +259,7 @@ DeactivateOIDCClient: }' Pms_DeactivateOIDCClient_Missing_clientAuthMethods_Neg: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} description: Deactivating The Oidc Client role: partnerrevamp checkErrorsOnlyInResponse: true diff --git a/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.hbs b/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.hbs index bcafd04b23..283cf84c91 100644 --- a/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.hbs +++ b/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.hbs @@ -1,4 +1,7 @@ -{ + + "id": "mosip.pms.deactivate.sbi.post", + "version": "1.0", + "requesttime": "{{requesttime}}", "request": { "sbiId": "{{sbiId}}" } diff --git a/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.yml b/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.yml index 4caa19d5ce..5b42dd29a1 100644 --- a/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.yml +++ b/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.yml @@ -7,6 +7,7 @@ DeactivateSBIWithAssociatedDevices: inputTemplate: pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices outputTemplate: pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevicesResult input: '{ + "requesttime": "$TIMESTAMP$", "sbiId": "$ID:SaveSecureBiometricInterfaceCreateDto_DeviceProvider_AllValid_Smoke_sid_id$" }' output: '{ diff --git a/api-test/src/main/resources/pms/FilterAPIs/DeviceSubTypeFilter/DeviceSubTypeFilter.hbs b/api-test/src/main/resources/pms/FilterAPIs/DeviceSubTypeFilter/DeviceSubTypeFilter.hbs index d6dfe13d48..4c80665ac6 100644 --- a/api-test/src/main/resources/pms/FilterAPIs/DeviceSubTypeFilter/DeviceSubTypeFilter.hbs +++ b/api-test/src/main/resources/pms/FilterAPIs/DeviceSubTypeFilter/DeviceSubTypeFilter.hbs @@ -12,8 +12,9 @@ {{#unless @last}},{{/unless}} {{/each}} ], + "optionalFilters": [], "purpose": "{{purpose}}" }, - "requesttime": "2018-12-10T06:12:52.994Z", + "requesttime": "{{requesttime}}", "version": "string" } \ No newline at end of file diff --git a/api-test/src/main/resources/pms/FilterAPIs/DeviceSubTypeFilter/DeviceSubTypeFilter.yml b/api-test/src/main/resources/pms/FilterAPIs/DeviceSubTypeFilter/DeviceSubTypeFilter.yml index bcb342ed86..99c7522eb2 100644 --- a/api-test/src/main/resources/pms/FilterAPIs/DeviceSubTypeFilter/DeviceSubTypeFilter.yml +++ b/api-test/src/main/resources/pms/FilterAPIs/DeviceSubTypeFilter/DeviceSubTypeFilter.yml @@ -7,8 +7,8 @@ DeviceSubTypeFilter: outputTemplate: pms/FilterAPIs/DeviceSubTypeFilter/DeviceSubTypeFilterResult input: '{ "filters": [{ - "columnName": "code", - "type": "all", + "columnName": "deviceType", + "type": "unique", "text": "Finger" }], "purpose": "REGISTRATION", @@ -17,18 +17,9 @@ DeviceSubTypeFilter: output: '{ "filters": [ { - "fieldID": "code", + "fieldID": "deviceType", "fieldValue": "Finger", - "fieldCode": "Finger" - } - ] - }' - output: ' { - "filters": [ - { - "fieldID": "code", - "fieldValue": "Finger", - "fieldCode": "Finger" + "fieldCode": "Single" } ] }' diff --git a/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.hbs b/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.hbs index dd2329e25c..4c80665ac6 100644 --- a/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.hbs +++ b/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.hbs @@ -12,6 +12,7 @@ {{#unless @last}},{{/unless}} {{/each}} ], + "optionalFilters": [], "purpose": "{{purpose}}" }, "requesttime": "{{requesttime}}", diff --git a/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.yml b/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.yml index 2c25f9f786..90150ae5dd 100644 --- a/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.yml +++ b/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.yml @@ -1,37 +1,26 @@ DeviceTypeFilter: Pms_DeviceTypeFilter_All_Valid_Smoke: - endPoint: /v1/partnermanager/devicedetail/deviceSubType/filtervalues + endPoint: /v1/partnermanager/devicedetail/deviceType/filtervalues role: partnerrevamp restMethod: post inputTemplate: pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter outputTemplate: pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilterResult input: '{ - "filters": [ - { - "columnName": "code", - "type": "all", - "text": "Finger" - } -], - "purpose": "REGISTRATION", - "requesttime": "$TIMESTAMP$" - }' + "filters": [{ + "columnName": "name", + "type": "unique", + "text": "" + }], + "purpose": "REGISTRATION", + "requesttime": "$TIMESTAMP$" +}' output: '{ "filters": [ { - "fieldID": "code", - "fieldValue": "Finger", - "fieldCode": "Finger" + "fieldID": "name", + "fieldValue": "Face", + "fieldCode": "Face" } ] }' - output: ' { - "filters": [ - { - "fieldID": "code", - "fieldValue": "Finger", - "fieldCode": "Finger" - } - ] - }' diff --git a/api-test/src/main/resources/pms/GetAllDeviceListMappedWithSbi/GetAllDeviceListMappedWithSbi.hbs b/api-test/src/main/resources/pms/GetAllDeviceListMappedWithSbi/GetAllDeviceListMappedWithSbi.hbs index a175e858b0..180bca59ef 100644 --- a/api-test/src/main/resources/pms/GetAllDeviceListMappedWithSbi/GetAllDeviceListMappedWithSbi.hbs +++ b/api-test/src/main/resources/pms/GetAllDeviceListMappedWithSbi/GetAllDeviceListMappedWithSbi.hbs @@ -1,3 +1,3 @@ { - "sbiId":"{{sbiId}}"; + "sbiId":"{{sbiId}}" } \ No newline at end of file diff --git a/api-test/src/main/resources/pms/GetConfiguration/GetConfiguration.yml b/api-test/src/main/resources/pms/GetConfiguration/GetConfiguration.yml index 3db698e8c6..d9329719b9 100644 --- a/api-test/src/main/resources/pms/GetConfiguration/GetConfiguration.yml +++ b/api-test/src/main/resources/pms/GetConfiguration/GetConfiguration.yml @@ -1,6 +1,6 @@ GetConfiguration: Partner_GetConfiguration_allValid_smoke: - endPoint: /v1/partnermanager/partners/configs + endPoint: /v1/partnermanager/users/configs role: partner checkErrorsOnlyInResponse: true restMethod: get diff --git a/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.hbs b/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.hbs index 1f008f805b..f3f6a953eb 100644 --- a/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.hbs +++ b/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.hbs @@ -1,3 +1,6 @@ { + "id": "mosip.pms.original.partner.certificate.get", + "version": "1.0", + "requesttime": "{{requesttime}}", "partnerId": "{{partnerId}}" } \ No newline at end of file diff --git a/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.yml b/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.yml index e175011128..ee63f3571e 100644 --- a/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.yml +++ b/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.yml @@ -7,6 +7,7 @@ GetOriginalPartnerCertificates: inputTemplate: pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates outputTemplate: pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificatesResult input: '{ + "requesttime": "$TIMESTAMP$", "partnerId": "111999" }' output: '{ @@ -21,6 +22,7 @@ GetOriginalPartnerCertificates: inputTemplate: pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates outputTemplate: pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificatesResult input: '{ + "requesttime": "$TIMESTAMP$", "partnerId": "111998" }' output: '{ diff --git a/api-test/src/main/resources/pms/GetUserConsent/GetUserConsent.yml b/api-test/src/main/resources/pms/GetUserConsent/GetUserConsent.yml index b4b12743c0..01cc994662 100644 --- a/api-test/src/main/resources/pms/GetUserConsent/GetUserConsent.yml +++ b/api-test/src/main/resources/pms/GetUserConsent/GetUserConsent.yml @@ -1,6 +1,6 @@ GetUserConsent: Pms_GetUserConsent_allValid_smoke: - endPoint: /v1/partnermanager/partners/isUserConsentGiven + endPoint: /v1/partnermanager/users/user-consent role: partnerrevamp checkErrorsOnlyInResponse: true restMethod: get diff --git a/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.hbs b/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.hbs index aabf255f8e..02e68b1d10 100644 --- a/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.hbs +++ b/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.hbs @@ -1,4 +1,8 @@ { +"id": "mosip.pms.add.inactive.mapping.device.to.sbi.id.post", + "version": "1.0", + "requestTime": "{{requestTime}}", + "metadata": {}, "request": { "partnerId": "{{partnerId}}", "sbiId": "{{sbiId}}", diff --git a/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.yml b/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.yml index 95bf023fb2..a432e18d93 100644 --- a/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.yml +++ b/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.yml @@ -6,6 +6,7 @@ InactiveMappingDeviceToSbi: inputTemplate: pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi outputTemplate: pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbiResult input: '{ + "requestTime": "$TIMESTAMP$", "partnerId": "111998", "sbiId": "$ID:SaveSecureBiometricInterfaceCreateDto_DeviceProvider_AllValid_Smoke_sid_id$", "deviceDetailId": "$ID:SaveDeviceDetails_DeviceProvider_AllValid_Smoke_sid_id$" diff --git a/api-test/src/main/resources/pms/OIDCClient/OIDCClient.yml b/api-test/src/main/resources/pms/OIDCClient/OIDCClient.yml index d15e498e0b..e81d8e2721 100644 --- a/api-test/src/main/resources/pms/OIDCClient/OIDCClient.yml +++ b/api-test/src/main/resources/pms/OIDCClient/OIDCClient.yml @@ -1,6 +1,6 @@ CreateOIDCClient: Pms_CreateOIDCClient_all_Valid_Smoke_sid: - endPoint: /v1/partnermanager/oauth/clients + endPoint: /v1/partnermanager/oauth/client description: Creating OAUTH Client role: partnerrevamp checkErrorsOnlyInResponse: true @@ -23,7 +23,7 @@ CreateOIDCClient: "status": "ACTIVE" }' Pms_CreateOIDCClient_invalid_policyID: - endPoint: /v1/partnermanager/oauth/clients + endPoint: /v1/partnermanager/oauth/client description: Creating OAUTH Client with invalid policyid role: partnerrevamp restMethod: post @@ -48,7 +48,7 @@ CreateOIDCClient: ] }' Pms_CreateOIDCClient_invalid_logoUri: - endPoint: /v1/partnermanager/oauth/clients + endPoint: /v1/partnermanager/oauth/client description: Creating OAUTH Client with invalid logoUri role: partnerrevamp checkErrorsOnlyInResponse: true @@ -74,7 +74,7 @@ CreateOIDCClient: ] }' Pms_CreateOIDCClient_invalid_RedirectUri: - endPoint: /v1/partnermanager/oauth/clients + endPoint: /v1/partnermanager/oauth/client description: Creating OAUTH Client with invalid redirectUri role: partnerrevamp checkErrorsOnlyInResponse: true @@ -100,7 +100,7 @@ CreateOIDCClient: ] }' Pms_CreateOIDCClient_invalid_auth: - endPoint: /v1/partnermanager/oauth/clients + endPoint: /v1/partnermanager/oauth/client description: Creating OAUTH Client without token role: regproc checkErrorsOnlyInResponse: true @@ -126,7 +126,7 @@ CreateOIDCClient: ] }' Pms_CreateOIDCClient_without_publickey: - endPoint: /v1/partnermanager/oauth/clients + endPoint: /v1/partnermanager/oauth/client description: Creating OAUTH Client without publickkey role: partnerrevamp checkErrorsOnlyInResponse: true @@ -147,12 +147,12 @@ CreateOIDCClient: output: '{ "errors": [ { - "errorCode": "PMS_COR_00" + "errorCode": "PMS_COR_001" } ] }' Pms_CreateOIDCClient_invalid_granttypes: - endPoint: /v1/partnermanager/oauth/clients + endPoint: /v1/partnermanager/oauth/client description: Creating OAUTH Client with invalid granttypes role: partnerrevamp checkErrorsOnlyInResponse: true @@ -178,7 +178,7 @@ CreateOIDCClient: ] }' Pms_CreateOIDCClient_without_granttypes: - endPoint: /v1/partnermanager/oauth/clients + endPoint: /v1/partnermanager/oauth/client description: Creating OAUTH Client without granttypes role: partnerrevamp checkErrorsOnlyInResponse: true @@ -204,7 +204,7 @@ CreateOIDCClient: ] }' Pms_CreateOIDCClient_without_name: - endPoint: /v1/partnermanager/oauth/clients + endPoint: /v1/partnermanager/oauth/client description: Creating OAUTH Client without name field role: partnerrevamp checkErrorsOnlyInResponse: true @@ -230,7 +230,7 @@ CreateOIDCClient: ] }' Pms_CreateOIDCClient_invalid_publickey: - endPoint: /v1/partnermanager/oauth/clients + endPoint: /v1/partnermanager/oauth/client description: Creating OAUTH Client with invalid publickkey role: partnerrevamp checkErrorsOnlyInResponse: true diff --git a/api-test/src/main/resources/pms/OIDCClient/UpdateOIDCClient.yml b/api-test/src/main/resources/pms/OIDCClient/UpdateOIDCClient.yml index 8d3cd5cd3c..17a207c1fa 100644 --- a/api-test/src/main/resources/pms/OIDCClient/UpdateOIDCClient.yml +++ b/api-test/src/main/resources/pms/OIDCClient/UpdateOIDCClient.yml @@ -1,6 +1,6 @@ UpdateOIDCClient: Pms_UpdateOIDCClient_all_Valid_Smoke_sid: - endPoint: /v1/partnermanager/oauth/clients/{client_id} + endPoint: /v1/partnermanager/oauth/client/{client_id} role: partnerrevamp checkErrorsOnlyInResponse: true restMethod: put diff --git a/api-test/src/main/resources/pms/partnerPolicyMapping/partnerPolicyMapping.yml b/api-test/src/main/resources/pms/partnerPolicyMapping/partnerPolicyMapping.yml index 7c01e617a2..7c4ee8f695 100644 --- a/api-test/src/main/resources/pms/partnerPolicyMapping/partnerPolicyMapping.yml +++ b/api-test/src/main/resources/pms/partnerPolicyMapping/partnerPolicyMapping.yml @@ -75,6 +75,7 @@ partnerPolicyMapping: } ] }' + Pms_partnerPolicyMapping_missing_useCaseDescription: endPoint: /v1/partnermanager/partners/111999/policy/map description: Mapping Partner & Policy when usecaseDescription is removed from request @@ -90,7 +91,8 @@ partnerPolicyMapping: }' output: '{ "errors": [ - { - "errorCode": "PMS_COR_001" - ] - }' \ No newline at end of file + { + "errorCode": "PMS_COR_001" + } + ] + }' \ No newline at end of file From 6c738e349d7b8ed96caf77b6875664c3bf588fa1 Mon Sep 17 00:00:00 2001 From: Anup Nehe Date: Thu, 10 Oct 2024 12:24:49 +0530 Subject: [PATCH 2/3] resolve conflicts Signed-off-by: Anup Nehe --- .../resources/pms/DeactivateDevice/DeactivateDevice.yml | 2 +- .../DeactivateSBIWithAssociatedDevices.yml | 2 +- .../pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.hbs | 4 ++-- .../GetOriginalPartnerCertificates.hbs | 2 +- .../InactiveMappingDeviceToSbi.hbs | 2 +- .../InactiveMappingDeviceToSbi.yml | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.yml b/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.yml index 73c4cdd923..5252c838ef 100644 --- a/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.yml +++ b/api-test/src/main/resources/pms/DeactivateDevice/DeactivateDevice.yml @@ -8,7 +8,7 @@ DeactivateDevice: outputTemplate: pms/DeactivateDevice/DeactivateDeviceResult input: '{ "responseTime": "$TIMESTAMP$", - "deviceId": "$ID:SaveDeviceDetails_DeviceProvider_AllValid_Smoke_sid_id$" + "deviceId": "$ID:SaveDeviceDetails_DeviceProvider_AllValid_Smoke_sid_id$" }' output: '{ diff --git a/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.yml b/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.yml index 5b42dd29a1..9804652903 100644 --- a/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.yml +++ b/api-test/src/main/resources/pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevices.yml @@ -8,7 +8,7 @@ DeactivateSBIWithAssociatedDevices: outputTemplate: pms/DeactivateSBIWithAssociatedDevices/DeactivateSBIWithAssociatedDevicesResult input: '{ "requesttime": "$TIMESTAMP$", - "sbiId": "$ID:SaveSecureBiometricInterfaceCreateDto_DeviceProvider_AllValid_Smoke_sid_id$" + "sbiId": "$ID:SaveSecureBiometricInterfaceCreateDto_DeviceProvider_AllValid_Smoke_sid_id$" }' output: '{ diff --git a/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.hbs b/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.hbs index 4c80665ac6..5505ae3da5 100644 --- a/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.hbs +++ b/api-test/src/main/resources/pms/FilterAPIs/DeviceTypeFilter/DeviceTypeFilter.hbs @@ -12,8 +12,8 @@ {{#unless @last}},{{/unless}} {{/each}} ], - "optionalFilters": [], - "purpose": "{{purpose}}" + "optionalFilters": [], + "purpose": "{{purpose}}" }, "requesttime": "{{requesttime}}", "version": "string" diff --git a/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.hbs b/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.hbs index f3f6a953eb..d68a9b5cfc 100644 --- a/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.hbs +++ b/api-test/src/main/resources/pms/GetOriginalPartnerCertificates/GetOriginalPartnerCertificates.hbs @@ -2,5 +2,5 @@ "id": "mosip.pms.original.partner.certificate.get", "version": "1.0", "requesttime": "{{requesttime}}", -"partnerId": "{{partnerId}}" + "partnerId": "{{partnerId}}" } \ No newline at end of file diff --git a/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.hbs b/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.hbs index 02e68b1d10..372a8d7b0a 100644 --- a/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.hbs +++ b/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.hbs @@ -1,5 +1,5 @@ { -"id": "mosip.pms.add.inactive.mapping.device.to.sbi.id.post", + "id": "mosip.pms.add.inactive.mapping.device.to.sbi.id.post", "version": "1.0", "requestTime": "{{requestTime}}", "metadata": {}, diff --git a/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.yml b/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.yml index a432e18d93..09748073e6 100644 --- a/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.yml +++ b/api-test/src/main/resources/pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbi.yml @@ -7,9 +7,9 @@ InactiveMappingDeviceToSbi: outputTemplate: pms/InactiveMappingDeviceToSbi/InactiveMappingDeviceToSbiResult input: '{ "requestTime": "$TIMESTAMP$", - "partnerId": "111998", - "sbiId": "$ID:SaveSecureBiometricInterfaceCreateDto_DeviceProvider_AllValid_Smoke_sid_id$", - "deviceDetailId": "$ID:SaveDeviceDetails_DeviceProvider_AllValid_Smoke_sid_id$" + "partnerId": "111998", + "sbiId": "$ID:SaveSecureBiometricInterfaceCreateDto_DeviceProvider_AllValid_Smoke_sid_id$", + "deviceDetailId": "$ID:SaveDeviceDetails_DeviceProvider_AllValid_Smoke_sid_id$" }' output: ' { From 7e1298b26fe8dd25eb96dfb5515b9e5a6a82db3a Mon Sep 17 00:00:00 2001 From: Anup Nehe Date: Thu, 10 Oct 2024 13:11:41 +0530 Subject: [PATCH 3/3] resolve conflicts Signed-off-by: Anup Nehe --- .../apirig/testrunner/MosipTestRunner.java | 36 +++++++++---------- api-test/testNgXmlFiles/pmsApi.xml | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java b/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java index ce9250eac3..d40bdbf141 100644 --- a/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java +++ b/api-test/src/main/java/io/mosip/testrig/apirig/testrunner/MosipTestRunner.java @@ -113,24 +113,24 @@ public static void suiteSetup(String runType) { if (!runType.equalsIgnoreCase("JAR")) { AuthTestsUtil.removeOldMosipTempTestResource(); } - if (BaseTestCase.listOfModules.contains(GlobalConstants.PARTNERNEW)) { - BaseTestCase.currentModule = GlobalConstants.PARTNERNEW; - DBManager.executeDBQueries(PMSRevampConfigManger.getPMSDbUrl(), PMSRevampConfigManger.getPMSDbUser(), - PMSRevampConfigManger.getPMSDbPass(), PMSRevampConfigManger.getPMSDbSchema(), - getGlobalResourcePath() + "/" + "config/partnerRevampDataDeleteQueries.txt"); - - DBManager.executeDBQueries(PMSRevampConfigManger.getKMDbUrl(), PMSRevampConfigManger.getKMDbUser(), - PMSRevampConfigManger.getKMDbPass(), PMSRevampConfigManger.getKMDbSchema(), - getGlobalResourcePath() + "/" + "config/partnerRevampDataDeleteQueriesForKeyMgr.txt"); - - DBManager.executeDBQueries(PMSRevampConfigManger.getIdaDbUrl(), PMSRevampConfigManger.getIdaDbUser(), - PMSRevampConfigManger.getPMSDbPass(), PMSRevampConfigManger.getIdaDbSchema(), - getGlobalResourcePath() + "/" + "config/partnerRevampDataDeleteQueriesForIDA.txt"); - - BaseTestCase.currentModule = GlobalConstants.PARTNERNEW; - BaseTestCase.setReportName(GlobalConstants.PARTNERNEW); - AdminTestUtil.copyPmsNewTestResource(); - } + + BaseTestCase.currentModule = GlobalConstants.PARTNERNEW; + DBManager.executeDBQueries(PMSRevampConfigManger.getPMSDbUrl(), PMSRevampConfigManger.getPMSDbUser(), + PMSRevampConfigManger.getPMSDbPass(), PMSRevampConfigManger.getPMSDbSchema(), + getGlobalResourcePath() + "/" + "config/partnerRevampDataDeleteQueries.txt"); + + DBManager.executeDBQueries(PMSRevampConfigManger.getKMDbUrl(), PMSRevampConfigManger.getKMDbUser(), + PMSRevampConfigManger.getKMDbPass(), PMSRevampConfigManger.getKMDbSchema(), + getGlobalResourcePath() + "/" + "config/partnerRevampDataDeleteQueriesForKeyMgr.txt"); + + DBManager.executeDBQueries(PMSRevampConfigManger.getIdaDbUrl(), PMSRevampConfigManger.getIdaDbUser(), + PMSRevampConfigManger.getPMSDbPass(), PMSRevampConfigManger.getIdaDbSchema(), + getGlobalResourcePath() + "/" + "config/partnerRevampDataDeleteQueriesForIDA.txt"); + + BaseTestCase.currentModule = GlobalConstants.PARTNERNEW; + BaseTestCase.setReportName(GlobalConstants.PARTNERNEW); + AdminTestUtil.copyPmsNewTestResource(); + BaseTestCase.otpListener = new OTPListener(); BaseTestCase.otpListener.run(); } diff --git a/api-test/testNgXmlFiles/pmsApi.xml b/api-test/testNgXmlFiles/pmsApi.xml index a7cf522f62..0173f578c2 100644 --- a/api-test/testNgXmlFiles/pmsApi.xml +++ b/api-test/testNgXmlFiles/pmsApi.xml @@ -152,7 +152,7 @@ + value="pms/ActivateDeactivatePartnerApiKey/ActivatePartnerApiKey.yml" />