Merge pull request #1487 from bcgov/stories/ecer-5513

Stories/ecer 5513: Portal invitation changes

Author: farzadnadiri

src/ECER.Clients.Api/InviteLinks/InviteLinksEndpoints.cs

@@ -15,7 +15,7 @@ public void Register(IEndpointRouteBuilder endpointRouteBuilder)
       IMediator messageBus,
       CancellationToken ct) =>
     {
-      var referenceLinkResponse = await messageBus.Send(new GenerateInviteLinkCommand(request.portalInvitation, request.inviteType, request.validDays), ct);
+      var referenceLinkResponse = await messageBus.Send(new GenerateInviteLinkCommand(request.portalInvitation, request.validDays), ct);
 
       return TypedResults.Ok(new GenerateInviteLinkResponse(referenceLinkResponse.PortalInvitation, referenceLinkResponse.VerificationLink));
     })
@@ -26,5 +26,5 @@ public void Register(IEndpointRouteBuilder endpointRouteBuilder)
   }
 }
 
-public record GenerateInviteLinkRequest(Guid portalInvitation, InviteType inviteType, int validDays);
+public record GenerateInviteLinkRequest(Guid portalInvitation, int validDays);
 public record GenerateInviteLinkResponse(Guid portalInvitation, string inviteLink);

src/ECER.Engines.Transformation/Contract.cs

@@ -5,8 +5,8 @@ namespace ECER.Engines.Transformation;
 public abstract record TransformRequest();
 public abstract record TransformResponse();
 
-public record EncryptInviteTokenRequest(Guid PortalInvitation, InviteType InviteType, int ValidDays) : TransformRequest;
+public record EncryptInviteTokenRequest(Guid PortalInvitation, int ValidDays) : TransformRequest;
 public record EncryptInviteTokenResponse(Guid PortalInvitation, string VerificationToken) : TransformResponse;
 
 public record DecryptInviteTokenRequest(string VerificationToken) : TransformRequest;
-public record DecryptInviteTokenResponse(Guid PortalInvitation, InviteType InviteType) : TransformResponse;
+public record DecryptInviteTokenResponse(Guid PortalInvitation) : TransformResponse;

src/ECER.Engines.Transformation/PortalInvitations/PortalInvitationTransformationEngine.cs

@@ -20,12 +20,10 @@ private async Task<EncryptInviteTokenResponse> EncryptInviteToken(EncryptInviteT
   {
     await Task.CompletedTask;
 
-    var expiryDate = DateTime.UtcNow.AddDays(request.ValidDays); // Example expiry date
+    var expiryDate = DateTime.UtcNow.AddDays(request.ValidDays);
     var protector = dataProtectionProvider.CreateProtector(nameof(PortalInvitationTransformationEngine)).ToTimeLimitedDataProtector();
 
-    // Combine referenceType and portalInvitation into a single string
-    var combinedData = $"{request.InviteType}:{request.PortalInvitation}";
-    var encryptedData = protector.Protect(combinedData, expiryDate);
+    var encryptedData = protector.Protect(request.PortalInvitation.ToString(), expiryDate);
 
     var referenceLink = WebUtility.UrlEncode(encryptedData);
     return new EncryptInviteTokenResponse(request.PortalInvitation, referenceLink);
@@ -40,22 +38,8 @@ private async Task<DecryptInviteTokenResponse> DecryptInviteToken(DecryptInviteT
     var protector = dataProtectionProvider.CreateProtector(nameof(PortalInvitationTransformationEngine)).ToTimeLimitedDataProtector();
     var decryptedData = protector.Unprotect(encryptedData);
 
-    // Split the decrypted data back into ReferenceType and PortalInvitation
-    var splitIndex = decryptedData.IndexOf(':');
-    if (splitIndex == -1)
-    {
-      throw new InvalidOperationException($"Invalid reference link format. decryptedData should be ReferenceType:PortalInvitation => '{decryptedData}'");
-    }
-
-    var referenceTypeString = decryptedData.Substring(0, splitIndex);
-    var inviteIdString = decryptedData.Substring(splitIndex + 1);
-    var portalInvitation = Guid.Parse(inviteIdString);
-
-    if (!Enum.TryParse<InviteType>(referenceTypeString, out var referenceType))
-    {
-      throw new InvalidOperationException($"Invalid reference type.");
-    }
+    var portalInvitation = Guid.Parse(decryptedData);
 
-    return new DecryptInviteTokenResponse(portalInvitation, referenceType);
+    return new DecryptInviteTokenResponse(portalInvitation);
   }
 }

src/ECER.Managers.Admin.Contract/PortalInvitations/Contract.cs

@@ -2,11 +2,5 @@
 
 namespace ECER.Managers.Admin.Contract.PortalInvitations;
 
-public record GenerateInviteLinkCommand(Guid PortalInvitation, InviteType InviteType, int ValidDays) : IRequest<GenerateInviteLinkCommandResponse>;
+public record GenerateInviteLinkCommand(Guid PortalInvitation, int ValidDays) : IRequest<GenerateInviteLinkCommandResponse>;
 public record GenerateInviteLinkCommandResponse(Guid PortalInvitation, string VerificationLink);
-
-public enum InviteType
-{
-  CharacterReference,
-  WorkExperienceReference
-}

src/ECER.Managers.Admin/InviteLinkHandlers.cs

@@ -13,7 +13,7 @@ public async Task<GenerateInviteLinkCommandResponse> Handle(GenerateInviteLinkCo
   {
     ArgumentNullException.ThrowIfNull(request);
 
-    var response = await transformationEngine.Transform(new EncryptInviteTokenRequest(request.PortalInvitation, request.InviteType, request.ValidDays))! as EncryptInviteTokenResponse ?? throw new InvalidCastException("Invalid response type");
+    var response = await transformationEngine.Transform(new EncryptInviteTokenRequest(request.PortalInvitation, request.ValidDays))! as EncryptInviteTokenResponse ?? throw new InvalidCastException("Invalid response type");
     string verificationLink = $"{portalAppSettings.Value.BaseUrl}/{portalAppSettings.Value.ReferenceVerificationRoute}/{response.VerificationToken}";
     return new GenerateInviteLinkCommandResponse(response.PortalInvitation, verificationLink);
   }

src/ECER.Managers.Registry.Contract/PortalInvitations/Contract.cs

@@ -36,7 +36,9 @@ public record PortalInvitation(string? Id, string Name, string ReferenceFirstNam
 public enum InviteType
 {
   CharacterReference,
-  WorkExperienceReference
+  PSIProgramRepresentative,
+  WorkExperienceReferenceforApplication,
+  WorkExperienceReferenceforICRA
 }
 
 public enum PortalInvitationStatusCode

src/ECER.Managers.Registry/ApplicationHandlers.cs

@@ -204,7 +204,7 @@ public async Task<ReferenceSubmissionResult> Handle(SubmitReferenceCommand reque
 
     var transformationResponse = await transformationEngine.Transform(new DecryptInviteTokenRequest(request.Token))! as DecryptInviteTokenResponse ?? throw new InvalidCastException("Invalid response type");
     if (transformationResponse.PortalInvitation == Guid.Empty) return ReferenceSubmissionResult.Failure("Invalid Token");
-
+    
     var portalInvitation = await portalInvitationRepository.Query(new PortalInvitationQuery(transformationResponse.PortalInvitation), cancellationToken);
     if (portalInvitation.StatusCode != PortalInvitationStatusCode.Sent) return ReferenceSubmissionResult.Failure("Portal Invitation is not valid or expired");
 
@@ -217,7 +217,7 @@ public async Task<ReferenceSubmissionResult> Handle(SubmitReferenceCommand reque
         submitReferenceRequest = mapper.Map<Resources.Documents.Applications.CharacterReferenceSubmissionRequest>(request.CharacterReferenceSubmissionRequest);
         break;
 
-      case InviteType.WorkExperienceReference:
+      case InviteType.WorkExperienceReferenceforApplication:
         submitReferenceRequest = mapper.Map<Resources.Documents.Applications.WorkExperienceReferenceSubmissionRequest>(request.WorkExperienceReferenceSubmissionRequest);
         break;
     }

src/ECER.Managers.Registry/PortalInvitationHandlers.cs

@@ -70,7 +70,7 @@ public async Task<PortalInvitationVerificationQueryResult> Handle(PortalInvitati
         return PortalInvitationVerificationQueryResult.Failure("Reference has failed.");
     }
 
-    if (result.InviteType == Contract.PortalInvitations.InviteType.WorkExperienceReference)
+    if (result.InviteType == Contract.PortalInvitations.InviteType.WorkExperienceReferenceforApplication)
     {
       var workExRef =
         application.WorkExperienceReferences.SingleOrDefault(work =>

src/ECER.Resources.Documents/Applications/ApplicationRepository.cs

@@ -174,7 +174,7 @@ public async Task<string> SubmitReference(SubmitReferenceRequest request, Cancel
   public async Task<string> OptOutReference(OptOutReferenceRequest request, CancellationToken cancellationToken) => request.PortalInvitation!.InviteType switch
   {
     InviteType.CharacterReference => await OptOutCharacterReference(request),
-    InviteType.WorkExperienceReference => await OptOutWorkExperienceReference(request),
+    InviteType.WorkExperienceReferenceforApplication => await OptOutWorkExperienceReference(request),
     _ => throw new NotSupportedException($"{request.GetType().Name} is not supported")
   };
 }

src/ECER.Resources.Documents/PortalInvitations/IPortalInvitationRepository.cs

@@ -23,7 +23,9 @@ public record PortalInvitation(string? Id, string Name, string ReferenceFirstNam
 public enum InviteType
 {
   CharacterReference,
-  WorkExperienceReference
+  PSIProgramRepresentative,
+  WorkExperienceReferenceforApplication,
+  WorkExperienceReferenceforICRA
 }
 
 public enum PortalInvitationStatusCode