@opencrvs/mosip 1.7.0-alpha.4 → 1.7.0-alpha.6

package/build/forms.d.ts

@@ -13,7 +13,7 @@
  * @description E-Signet REDIRECT button form definition.  Calls E-Signet /authorize (this field may not be supported in the latest release of OpenCRVS yet)
  *
  */
-export declare const esignet: (esignetAuthUrl: string, openIdProviderClientId: string, openIdProviderClaims: string, fieldName: string, callbackFieldName: string) => {
+export declare const esignet: (event: string, sectionId: string, esignetAuthUrl: string, openIdProviderClientId: string, openIdProviderClaims: string | undefined, fieldName: string, callbackFieldName: string) => {
     name: string;
     validator: never[];
     icon: {
@@ -35,7 +35,7 @@ export declare const esignet: (esignetAuthUrl: string, openIdProviderClientId: s
         url: string;
         callback: {
             params: {
-                code: string;
+                state: string;
             };
             trigger: string;
         };
@@ -53,8 +53,10 @@ export declare const popupButton: ({ url }: {
  * @description esignet callback button form definition.  Calls server/esignet-api /esignet/get-oidp-user-info (this field may not be supported in the latest release of OpenCRVS yet)
  *
  */
-export declare const esignetCallback: ({ fieldName, getOIDPUserInfoUrl, openIdProviderClientId }: {
+export declare const esignetCallback: ({ fieldName, event, sectionId, getOIDPUserInfoUrl, openIdProviderClientId }: {
     fieldName: string;
+    event: string;
+    sectionId: string;
     getOIDPUserInfoUrl: string;
     openIdProviderClientId: string;
 }) => {
@@ -72,17 +74,12 @@ export declare const esignetCallback: ({ fieldName, getOIDPUserInfoUrl, openIdPr
             'Content-type': string;
         };
         body: {
-            code: string;
             clientId: string;
             redirectUri: string;
         };
         method: string;
     };
 };
-export declare const returnExpression: (fieldName: string) => {
-    dependsOn: string[];
-    expression: string;
-};
 export declare const esignetHidden: () => {
     name: string;
     type: string;

package/build/forms.js

@@ -1,7 +1,7 @@
 "use strict";
 // @TODO: Yet to be implemented! Placeholders for NPM publish.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.idVerificationFields = exports.idPendingVerificationBanner = exports.verified = exports.qr = exports.idReader = exports.esignetHidden = exports.returnExpression = exports.esignetCallback = exports.popupButton = exports.esignet = void 0;
+exports.idVerificationFields = exports.idPendingVerificationBanner = exports.verified = exports.qr = exports.idReader = exports.esignetHidden = exports.esignetCallback = exports.popupButton = exports.esignet = void 0;
 /**
  * E-Signet popup button and hidden field form definitions
  * @example
@@ -17,30 +17,15 @@ exports.idVerificationFields = exports.idPendingVerificationBanner = exports.ver
  * @description E-Signet REDIRECT button form definition.  Calls E-Signet /authorize (this field may not be supported in the latest release of OpenCRVS yet)
  *
  */
-const esignet = (esignetAuthUrl, openIdProviderClientId, openIdProviderClaims, fieldName, callbackFieldName) => {
+const esignet = (event, sectionId, esignetAuthUrl, openIdProviderClientId, openIdProviderClaims = "name,family_name,given_name,middle_name,birthdate,address", fieldName, callbackFieldName) => {
     const url = new URL(esignetAuthUrl);
     url.searchParams.append('client_id', openIdProviderClientId || 'mock-client_id');
     url.searchParams.append('response_type', 'code');
     url.searchParams.append('scope', 'openid profile');
     url.searchParams.append('acr_values', 'mosip:idp:acr:static-code');
-    url.searchParams.append('claims', openIdProviderClaims || 'mock-claims');
-    url.searchParams.append('state', 'trigger-onmount');
-    /*
-  
-    TODO: Understand from Tahmid about how to handle this:
-    
-    url.searchParams.append(
-      'redirect_uri',
-      `${window.location.origin}${OIDP_VERIFICATION_CALLBACK}`
-    )
-    const stateToBeSent: INidCallbackState = {
-      pathname: currentPathname,
-      declarationId: declarationId,
-      section: currentSection
-    }
-    url.searchParams.append('state', JSON.stringify(stateToBeSent))
-    */
-    window.location.href = url.toString();
+    url.searchParams.append('claims', openIdProviderClaims);
+    url.searchParams.append('state', 'fetch-on-mount');
+    url.searchParams.append('redirect_uri', `${window.location.origin}/drafts/${window.location.pathname.split("/")[2]}/events/${event}/${sectionId}/group/${sectionId}`);
     return {
         name: fieldName,
         validator: [],
@@ -62,10 +47,10 @@ const esignet = (esignetAuthUrl, openIdProviderClientId, openIdProviderClaims, f
             }
         ],
         options: {
-            url: esignetAuthUrl,
+            url: url.toString(),
             callback: {
                 params: {
-                    code: 'esignet-mock-code'
+                    state: 'fetch-on-mount'
                 },
                 trigger: callbackFieldName
             }
@@ -88,7 +73,7 @@ exports.popupButton = popupButton;
  * @description esignet callback button form definition.  Calls server/esignet-api /esignet/get-oidp-user-info (this field may not be supported in the latest release of OpenCRVS yet)
  *
  */
-const esignetCallback = ({ fieldName, getOIDPUserInfoUrl, openIdProviderClientId }) => ({
+const esignetCallback = ({ fieldName, event, sectionId, getOIDPUserInfoUrl, openIdProviderClientId }) => ({
     name: fieldName,
     type: 'HTTP',
     custom: true,
@@ -103,21 +88,13 @@ const esignetCallback = ({ fieldName, getOIDPUserInfoUrl, openIdProviderClientId
             'Content-type': 'application/json'
         },
         body: {
-            code: 'esignet-mock-code',
             clientId: openIdProviderClientId,
-            redirectUri: ''
+            redirectUri: `${window.location.origin}/drafts/${window.location.pathname.split("/")[2]}/events/${event}/${sectionId}/group/${sectionId}`
         },
         method: 'POST'
     }
 });
 exports.esignetCallback = esignetCallback;
-const returnExpression = (fieldName) => {
-    return {
-        dependsOn: ['redirectCallbackFetch'],
-        expression: `$form.redirectCallbackFetch?.data?.${fieldName}`
-    };
-};
-exports.returnExpression = returnExpression;
 const esignetHidden = () => {
     return {
         name: 'INFORMANT_PSUT_TOKEN',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencrvs/mosip",
-  "version": "1.7.0-alpha.4",
+  "version": "1.7.0-alpha.6",
   "license": "MPL-2.0",
   "main": "./build/index.js",
   "exports": {

package/src/forms.ts

@@ -17,9 +17,11 @@
  *
  */
 export const esignet = (
+  event: string,
+  sectionId: string,
   esignetAuthUrl: string,
   openIdProviderClientId: string,
-  openIdProviderClaims: string,
+  openIdProviderClaims: string = "name,family_name,given_name,middle_name,birthdate,address",
   fieldName: string,
   callbackFieldName: string
 ) => {
@@ -32,25 +34,13 @@ export const esignet = (
   url.searchParams.append('response_type', 'code');
   url.searchParams.append('scope', 'openid profile');
   url.searchParams.append('acr_values', 'mosip:idp:acr:static-code');
-  url.searchParams.append('claims', openIdProviderClaims || 'mock-claims');
-  url.searchParams.append('state', 'trigger-onmount');
-
-  /*
-
-  TODO: Understand from Tahmid about how to handle this:
-  
+  url.searchParams.append('claims', openIdProviderClaims);
+  url.searchParams.append('state', 'fetch-on-mount');
   url.searchParams.append(
     'redirect_uri',
-    `${window.location.origin}${OIDP_VERIFICATION_CALLBACK}`
+    `${window.location.origin}/drafts/${window.location.pathname.split("/")[2]}/events/${event}/${sectionId}/group/${sectionId}`
   )
-  const stateToBeSent: INidCallbackState = {
-    pathname: currentPathname,
-    declarationId: declarationId,
-    section: currentSection
-  }
-  url.searchParams.append('state', JSON.stringify(stateToBeSent))
-  */
-  window.location.href = url.toString();
+
 
   return {
     name: fieldName,
@@ -73,10 +63,10 @@ export const esignet = (
       }
     ],
     options: {
-      url: esignetAuthUrl,
+      url: url.toString(),
       callback: {
         params: {
-          code: 'esignet-mock-code'
+          state: 'fetch-on-mount'
         },
         trigger: callbackFieldName
       }
@@ -105,10 +95,14 @@ export const popupButton = ({
 
 export const esignetCallback = ({
   fieldName,
+  event,
+  sectionId,
   getOIDPUserInfoUrl,
   openIdProviderClientId
 }: {
   fieldName: string;
+  event: string;
+  sectionId: string;
   getOIDPUserInfoUrl: string;
   openIdProviderClientId: string;
 }) => ({
@@ -126,21 +120,14 @@ export const esignetCallback = ({
       'Content-type': 'application/json'
     },
     body: {
-      code: 'esignet-mock-code',
       clientId: openIdProviderClientId,
-      redirectUri: ''
+      redirectUri: `${window.location.origin}/drafts/${window.location.pathname.split("/")[2]}/events/${event}/${sectionId}/group/${sectionId}`
     },
+    
     method: 'POST'
   }
 });
 
-export const returnExpression = (fieldName: string) => {
-  return {
-    dependsOn: ['redirectCallbackFetch'],
-    expression: `$form.redirectCallbackFetch?.data?.${fieldName}`
-  };
-};
-
 export const esignetHidden = () => {
   return {
     name: 'INFORMANT_PSUT_TOKEN',