Skip to content

Commit 88c5be4

Browse files
ase-101ase-101
authored
Version correction and removed unused config and fields (mosip#141)
* Version correction and removed unused config and fields Signed-off-by: ase-101 <[email protected]> * Version correction and removed unused config and fields Signed-off-by: ase-101 <[email protected]> --------- Signed-off-by: ase-101 <[email protected]>
1 parent 431b375 commit 88c5be4

File tree

10 files changed

+30
-25
lines changed

10 files changed

+30
-25
lines changed

‎mock-plugin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
<spring.boot.version>2.3.6.RELEASE</spring.boot.version>
8787

8888
<kernel-keymanager-service.version>1.2.2.0-SNAPSHOT</kernel-keymanager-service.version>
89-
<esignet.version>1.6.1-SNAPSHOT</esignet.version>
90-
<esignet-signup.version>1.2.1-SNAPSHOT</esignet-signup.version>
89+
<esignet.version>1.6.2-SNAPSHOT</esignet.version>
90+
<esignet-signup.version>1.2.2-SNAPSHOT</esignet-signup.version>
9191

9292
<sonar.exclusions>**/dto/**,**/entity/**,**/exception/**,**/spi/**,**/advice/**,**/config/**</sonar.exclusions>
9393
<sonar.cpd.exclusions>**/dto/**,**/entity/**,**/config/**</sonar.cpd.exclusions>

‎mock-plugin/src/main/resources/application.properties‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ mosip.signup.mock.identity-verification.story-name=mock-idv-user-story.json
2626
mosip.signup.mock.config-server-url=classpath:
2727
mosip.signup.mock.get-schema.endpoint=${mosip.esignet.mock.domain.url}/v1/mock-identity-system/identity/ui-spec
2828

29-
mosip.signup.mock.mandatory-attributes.CREATE=fullName,phone,email,gender,password,preferredLang
29+
mosip.signup.mock.mandatory-attributes.CREATE=fullName,phone,password,preferredLang
3030
mosip.signup.mock.mandatory-attributes.UPDATE=
31-
mosip.signup.mock.lang-based-attributes=fullName
32-
mosip.signup.mock.username.field=individualId
31+
mosip.signup.mock.username.field=phone
3332

3433
mosip.signup.mock.identity.endpoint=${mosip.esignet.mock.domain.url}/v1/mock-identity-system/identity
3534
mosip.signup.mock.get-identity.endpoint=${mosip.esignet.mock.domain.url}/v1/mock-identity-system/identity/

‎mock-plugin/src/test/java/io/mosip/signup/plugin/mock/service/MockIdentityVerifierPluginImplTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public class MockIdentityVerifierPluginImplTest {
4545
public void before(){
4646
objectMapper = new ObjectMapper();
4747
ReflectionTestUtils.setField(mockIdentityVerifierPlugin, "objectMapper",objectMapper);
48+
ReflectionTestUtils.setField(mockIdentityVerifierPlugin, "resultTopic","ANALYZE_FRAMES_RESULT");
4849
}
4950

5051

‎mosip-identity-plugin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@
8686
<spring.boot.version>2.3.6.RELEASE</spring.boot.version>
8787

8888
<kernel-keymanager-service.version>1.2.2.0-SNAPSHOT</kernel-keymanager-service.version>
89-
<esignet.version>1.6.1-SNAPSHOT</esignet.version>
90-
<esignet-signup.version>1.2.1-SNAPSHOT</esignet-signup.version>
89+
<esignet.version>1.6.2-SNAPSHOT</esignet.version>
90+
<esignet-signup.version>1.2.2-SNAPSHOT</esignet-signup.version>
9191

9292
<sonar.exclusions>**/dto/**,**/entity/**,**/exception/**,**/spi/**,**/advice/**,**/config/**</sonar.exclusions>
9393
<sonar.cpd.exclusions>**/dto/**,**/entity/**,**/config/**</sonar.cpd.exclusions>

‎mosip-identity-plugin/src/main/java/io/mosip/signup/plugin/mosipid/dto/IdentityResponse.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,18 @@
55
*/
66
package io.mosip.signup.plugin.mosipid.dto;
77

8+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
89
import com.fasterxml.jackson.databind.JsonNode;
910
import lombok.Data;
1011

1112
import java.util.List;
1213

1314
@Data
15+
@JsonIgnoreProperties(ignoreUnknown = true)
1416
public class IdentityResponse {
1517

1618
private String status;
1719
private JsonNode identity;
18-
private List<String> documents;
19-
private List<String> verifiedAttributes;
20+
//private List<String> documents;
21+
//private List<String> verifiedAttributes;
2022
}

‎mosip-identity-plugin/src/main/resources/application.properties‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@ mosip.esignet.authenticator.ida-send-otp-id=mosip.identity.otp
1212
mosip.esignet.authenticator.ida-version=1.0
1313
mosip.esignet.authenticator.ida.misp-license-key=${mosip.esignet.misp.key}
1414
mosip.esignet.authenticator.ida-domainUri=${mosip.esignet.domain.url}
15+
mosip.ida.auth.url=http://ida-auth.ida
16+
mosip.ida.otp.url=http://ida-otp.ida
17+
mosip.ida.internal.url=http://ida-internal.ida
1518
mosip.esignet.authenticator.ida.cert-url=http://mosip-file-server.mosip-file-server/mosip-certs/ida-partner.cer
16-
mosip.esignet.authenticator.ida.kyc-auth-url=http://ida-auth.ida/idauthentication/v1/kyc-auth/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
17-
mosip.esignet.authenticator.ida.kyc-auth-url-v2=http://ida-auth.ida/idauthentication/v1/kyc-auth/v2/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
18-
mosip.esignet.authenticator.ida.kyc-exchange-url=http://ida-auth.ida/idauthentication/v1/kyc-exchange/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
19-
mosip.esignet.authenticator.ida.kyc-exchange-url-v2=http://ida-auth.ida/idauthentication/v1/kyc-exchange/v2/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
20-
mosip.esignet.authenticator.ida.send-otp-url=http://ida-otp.ida/idauthentication/v1/otp/${mosip.esignet.authenticator.ida.misp-license-key}/
21-
mosip.esignet.binder.ida.key-binding-url=http://ida-auth.ida/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
22-
mosip.esignet.authenticator.ida.get-certificates-url=http://ida-internal.ida/idauthentication/v1/internal/getAllCertificates
19+
mosip.esignet.authenticator.ida.kyc-auth-url=${mosip.ida.auth.url}/idauthentication/v1/kyc-auth/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
20+
mosip.esignet.authenticator.ida.kyc-auth-url-v2=${mosip.ida.auth.url}/idauthentication/v1/kyc-auth/v2/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
21+
mosip.esignet.authenticator.ida.kyc-exchange-url=${mosip.ida.auth.url}/idauthentication/v1/kyc-exchange/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
22+
mosip.esignet.authenticator.ida.kyc-exchange-url-v2=${mosip.ida.auth.url}/idauthentication/v1/kyc-exchange/v2/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
23+
mosip.esignet.authenticator.ida.send-otp-url=${mosip.ida.otp.url}/idauthentication/v1/otp/${mosip.esignet.authenticator.ida.misp-license-key}/
24+
mosip.esignet.binder.ida.key-binding-url=${mosip.ida.auth.url}/idauthentication/v1/identity-key-binding/delegated/${mosip.esignet.authenticator.ida.misp-license-key}/
25+
mosip.esignet.authenticator.ida.get-certificates-url=${mosip.ida.internal.url}/idauthentication/v1/internal/getAllCertificates
2326
mosip.esignet.authenticator.ida.auth-token-url=http://authmanager.kernel/v1/authmanager/authenticate/clientidsecretkey
2427
mosip.esignet.authenticator.ida.audit-manager-url=http://auditmanager.kernel/v1/auditmanager/audits
2528
mosip.esignet.authenticator.ida.client-id=mosip-ida-client

‎mosip-identity-plugin/src/main/resources/mock-idv-user-story.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
],
88
"verificationResult": {
99
"status": "COMPLETED",
10-
"verifiedClaims" : { "fullName" : { "trust_framework":"eidas", "verification_process":"manual_verification", "assurance_level": "Gold" },
11-
"phone" : { "trust_framework":"eidas", "verification_process":"manual_verification", "assurance_level": "Silver" }},
10+
"verifiedClaims" : {
11+
"fullName" : { "trust_framework":"eidas", "verification_process":"manual_verification", "assurance_level": "Gold" },
12+
"phone" : { "trust_framework":"eidas", "verification_process":"manual_verification", "assurance_level": "Silver" }
13+
},
1214
"errorCode": null
1315
}
1416
}

‎mosip-identity-plugin/src/test/java/io/mosip/signup/plugin/mosipid/service/IdrepoProfileRegistryPluginImplTest.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,6 @@ public void createProfile_withValidProfileDetails_thenPass() {
195195
ResponseWrapper<IdentityResponse> responseWrapper3 = new ResponseWrapper<>();
196196
IdentityResponse identityResponse = new IdentityResponse();
197197
identityResponse.setStatus("SUCCESS");
198-
identityResponse.setDocuments(List.of("Document1"));
199198
responseWrapper3.setResponse(identityResponse);
200199
ResponseEntity<ResponseWrapper<IdentityResponse>> responseEntity3=new ResponseEntity<>(responseWrapper3, HttpStatus.OK);
201200

@@ -251,7 +250,6 @@ public void createProfile_withInValidProfileDetails_thenFail() {
251250
ResponseWrapper<IdentityResponse> responseWrapper3 = new ResponseWrapper<>();
252251
IdentityResponse identityResponse = new IdentityResponse();
253252
identityResponse.setStatus("SUCCESS");
254-
identityResponse.setDocuments(List.of("Document1"));
255253
responseWrapper3.setResponse(identityResponse);
256254
ResponseEntity<ResponseWrapper<IdentityResponse>> responseEntity3=new ResponseEntity<>(null, HttpStatus.BAD_REQUEST);
257255

@@ -316,7 +314,6 @@ public void updateProfile_withValidProfileDetails_thenPass() {
316314
ResponseWrapper<IdentityResponse> responseWrapper3 = new ResponseWrapper<>();
317315
IdentityResponse identityResponse = new IdentityResponse();
318316
identityResponse.setStatus("SUCCESS");
319-
identityResponse.setDocuments(List.of("Document1"));
320317
responseWrapper3.setResponse(identityResponse);
321318
ResponseEntity<ResponseWrapper<IdentityResponse>> responseEntity3=new ResponseEntity<>(responseWrapper3, HttpStatus.OK);
322319

@@ -345,7 +342,6 @@ public void getProfile_withValidDetails_thenPass() {
345342
ResponseWrapper<IdentityResponse> responseWrapper = new ResponseWrapper<>();
346343
IdentityResponse identityResponse = new IdentityResponse();
347344
identityResponse.setStatus("SUCCESS");
348-
identityResponse.setDocuments(List.of("Document1"));
349345
identityResponse.setIdentity(mockIdentity);
350346

351347
responseWrapper.setResponse(identityResponse);
@@ -382,7 +378,6 @@ public void getProfile_withErrorCodeAsIdentityFail_thenFail() {
382378
ResponseWrapper<IdentityResponse> responseWrapper = new ResponseWrapper<>();
383379
IdentityResponse identityResponse = new IdentityResponse();
384380
identityResponse.setStatus("SUCCESS");
385-
identityResponse.setDocuments(List.of("Document1"));
386381
identityResponse.setIdentity(mockIdentity);
387382

388383
responseWrapper.setResponse(null);

‎sunbird-rc-plugin/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
<git-commit-id-plugin.version>3.0.1</git-commit-id-plugin.version>
8181
<maven.jacoco.version>0.8.5</maven.jacoco.version>
8282
<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
83-
<esignet.version>1.6.1-SNAPSHOT</esignet.version>
83+
<esignet.version>1.6.2-SNAPSHOT</esignet.version>
84+
<kernel-keymanager-service.version>1.2.2.0-SNAPSHOT</kernel-keymanager-service.version>
8485
</properties>
8586
<dependencies>
8687

@@ -108,7 +109,7 @@
108109
<dependency>
109110
<groupId>io.mosip.kernel</groupId>
110111
<artifactId>kernel-keymanager-service</artifactId>
111-
<version>1.2.1.0</version>
112+
<version>${kernel-keymanager-service.version}</version>
112113
<scope>provided</scope>
113114
<classifier>lib</classifier>
114115
<exclusions>

‎sunbird-rc-plugin/src/main/resources/application.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
## eSignet sunbird plugin configuration
22
mosip.esignet.integration.scan-base-package=io.mosip.esignet.plugin.sunbirdrc
33
mosip.esignet.integration.authenticator=SunbirdRCAuthenticationService
4+
mosip.esignet.integration.audit-plugin=LoggerAuditService
5+
mosip.esignet.integration.key-binder=NoOpKeyBinder
46

57
##---------------------------------Sunbird-RC Plugin Configurations------------------------------------------------------
68

0 commit comments

Comments
 (0)