Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ES-177] #278

Merged
merged 6 commits into from
Jul 24, 2023
Merged

[ES-177] #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fffaac7
[ES-177]
jainhitesh9998 Jul 19, 2023
1fd45a2
Merge branch 'bugfix-ES-177' of https://github.com/Infosys/esignet in…
jainhitesh9998 Jul 19, 2023
28f8359
[MOIFIED] github actions
jainhitesh9998 Jul 19, 2023
07c6d5a
[CHANGES] review comment changes
jainhitesh9998 Jul 19, 2023
d0c997e
Updated test cases and added audit logs
jainhitesh9998 Jul 24, 2023
8d3d1a2
Merge branch 'bugfix-ES-177' of https://github.com/Infosys/esignet in…
jainhitesh9998 Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion esignet-integration-api/src/main/java/io/mosip/esignet/api/util/Action.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ public enum Action {
LINK_SEND_OTP,
LINK_AUTH_CODE,
GET_USER_CONSENT,
SAVE_USER_CONSENT
SAVE_USER_CONSENT,
UPDATE_USER_CONSENT
}
9 changes: 9 additions & 0 deletions oidc-service-impl/src/main/java/io/mosip/esignet/services/ConsentHelperService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import io.mosip.esignet.api.dto.ClaimDetail;
import io.mosip.esignet.api.dto.Claims;
import io.mosip.esignet.api.spi.AuditPlugin;
import io.mosip.esignet.api.util.Action;
import io.mosip.esignet.api.util.ActionStatus;
import io.mosip.esignet.api.util.ConsentAction;
import io.mosip.esignet.core.constants.ErrorConstants;
import io.mosip.esignet.core.dto.ConsentDetail;
Expand All @@ -16,6 +19,7 @@
import io.mosip.esignet.core.dto.UserConsentRequest;
import io.mosip.esignet.core.exception.EsignetException;
import io.mosip.esignet.core.spi.ConsentService;
import io.mosip.esignet.core.util.AuditHelper;
import io.mosip.esignet.core.util.IdentityProviderUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -34,6 +38,9 @@ public class ConsentHelperService {
@Autowired
private ConsentService consentService;

@Autowired
private AuditPlugin auditWrapper;

public void processConsent(OIDCTransaction transaction, boolean linked) {
UserConsentRequest userConsentRequest = new UserConsentRequest();
userConsentRequest.setClientId(transaction.getClientId());
Expand Down Expand Up @@ -67,6 +74,7 @@ public void updateUserConsent(OIDCTransaction transaction, boolean linked, Strin
){
//delete old consent if it exists since this scenario doesn't require capture of consent.
consentService.deleteUserConsent(transaction.getClientId(),transaction.getPartnerSpecificUserToken());
auditWrapper.logAudit(Action.UPDATE_USER_CONSENT, ActionStatus.SUCCESS, AuditHelper.buildAuditDto(transaction.getAuthTransactionId(),transaction),null);
}
if(ConsentAction.CAPTURE.equals(transaction.getConsentAction())){
UserConsent userConsent = new UserConsent();
Expand All @@ -93,6 +101,7 @@ public void updateUserConsent(OIDCTransaction transaction, boolean linked, Strin
throw new EsignetException(ErrorConstants.INVALID_CLAIM);
}
consentService.saveUserConsent(userConsent);
auditWrapper.logAudit(Action.UPDATE_USER_CONSENT, ActionStatus.SUCCESS, AuditHelper.buildAuditDto(transaction.getAuthTransactionId(),transaction),null);
}
}

Expand Down
43 changes: 40 additions & 3 deletions oidc-service-impl/src/test/java/io/mosip/esignet/services/ConsentHelperServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import io.mosip.esignet.api.dto.ClaimDetail;
import io.mosip.esignet.api.dto.Claims;
import io.mosip.esignet.api.spi.AuditPlugin;
import io.mosip.esignet.api.util.ConsentAction;
import io.mosip.esignet.core.dto.ConsentDetail;
import io.mosip.esignet.core.dto.OIDCTransaction;
import io.mosip.esignet.core.dto.UserConsent;
import io.mosip.esignet.core.dto.UserConsentRequest;
import io.mosip.esignet.core.spi.ConsentService;
import io.mosip.esignet.core.util.KafkaHelperService;
Expand Down Expand Up @@ -50,13 +52,16 @@ public class ConsentHelperServiceTest {
@Autowired
ObjectMapper objectMapper;

@Mock
AuditPlugin auditHelper;


@Test
public void addUserConsent_withValidLinkedTransaction_thenPass()
{
OIDCTransaction oidcTransaction = new OIDCTransaction();
oidcTransaction.setAuthTransactionId("123");
oidcTransaction.setAcceptedClaims(List.of("name","email"));
oidcTransaction.setAcceptedClaims(List.of("name"));
oidcTransaction.setPermittedScopes(null);
oidcTransaction.setConsentAction(ConsentAction.CAPTURE);

Expand All @@ -66,13 +71,18 @@ public void addUserConsent_withValidLinkedTransaction_thenPass()
ClaimDetail userinfoNameClaimDetail = new ClaimDetail("name", new String[]{"value1a", "value1b"}, true);
ClaimDetail idTokenClaimDetail = new ClaimDetail("token", new String[]{"value2a", "value2b"}, false);
userinfo.put("name", userinfoNameClaimDetail);
userinfo.put("email",null);
id_token.put("idTokenKey", idTokenClaimDetail);
claims.setUserinfo(userinfo);
claims.setId_token(id_token);

oidcTransaction.setRequestedClaims(claims);
consentHelperService.updateUserConsent(oidcTransaction, true, null);
UserConsent userConsent = new UserConsent();
userConsent.setHash("PxQIckCdFC5TPmL7_G7NH0Zs4UmHC74rGpOkyldqRpg");
userConsent.setClaims(claims);
userConsent.setAuthorizationScopes(Map.of());
userConsent.setAcceptedClaims(List.of("name"));
Mockito.verify(consentService).saveUserConsent(userConsent);

}

Expand All @@ -81,7 +91,7 @@ public void addUserConsent_withValidWebTransaction_thenPass()
{
OIDCTransaction oidcTransaction = new OIDCTransaction();
oidcTransaction.setAuthTransactionId("123");
oidcTransaction.setAcceptedClaims(List.of("name","email"));
oidcTransaction.setAcceptedClaims(List.of("value1"));
oidcTransaction.setPermittedScopes(null);
oidcTransaction.setConsentAction(ConsentAction.CAPTURE);

Expand All @@ -100,6 +110,33 @@ public void addUserConsent_withValidWebTransaction_thenPass()
Mockito.when(consentService.saveUserConsent(Mockito.any())).thenReturn(new ConsentDetail());

consentHelperService.updateUserConsent(oidcTransaction, false, "");
UserConsent userConsent = new UserConsent();
userConsent.setHash("Cgh8oWpNM84WPYQVvluGj616_kd4z60elVXtc7R_lXw");
userConsent.setClaims(claims);
userConsent.setAuthorizationScopes(Map.of());
userConsent.setAcceptedClaims(List.of("value1"));
userConsent.setSignature("");
Mockito.verify(consentService).saveUserConsent(userConsent);
}

@Test
public void addUserConsent_withValidWebTransactionNoClaimsAndScopes_thenPass()
{
String clientId = "clientId";
String psuToken = "psuToken";
OIDCTransaction oidcTransaction = new OIDCTransaction();
oidcTransaction.setAuthTransactionId("123");
oidcTransaction.setAcceptedClaims(List.of());
oidcTransaction.setRequestedAuthorizeScopes(List.of());
oidcTransaction.setConsentAction(ConsentAction.NOCAPTURE);
oidcTransaction.setVoluntaryClaims(List.of());
oidcTransaction.setEssentialClaims(List.of());
oidcTransaction.setAcceptedClaims(List.of());
oidcTransaction.setPermittedScopes(List.of());
oidcTransaction.setClientId(clientId);
oidcTransaction.setPartnerSpecificUserToken(psuToken);
consentHelperService.updateUserConsent(oidcTransaction, false, "");
Mockito.verify(consentService).deleteUserConsent(clientId, psuToken);
}

@Test
Expand Down