@opencrvs/mosip 1.7.0-alpha.3 → 1.7.0-alpha.5

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;
         };
@@ -72,17 +72,11 @@ 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;
@@ -119,3 +113,70 @@ export declare const idReader: (event: string, sectionId: string, conditionals:
 export declare const qr: () => {
     type: string;
 };
+export declare const verified: (event: string, sectionId: string) => {
+    name: string;
+    fieldId: string;
+    customQuestionMappingId: string;
+    type: string;
+    custom: boolean;
+    label: {
+        id: string;
+        defaultMessage: string;
+    };
+    initialValue: {
+        dependsOn: string[];
+        expression: string;
+    };
+    validator: never[];
+};
+export declare const idPendingVerificationBanner: (event: string, sectionId: string) => {
+    name: string;
+    type: string;
+    fieldId: string;
+    hideInPreview: boolean;
+    custom: boolean;
+    bannerType: string;
+    idFieldName: string;
+    label: {
+        id: string;
+        defaultMessage: string;
+    };
+    validator: never[];
+    conditionals: {
+        action: string;
+        expression: string;
+    }[];
+};
+export declare const idVerificationFields: (event: string, sectionId: string) => ({
+    name: string;
+    fieldId: string;
+    customQuestionMappingId: string;
+    type: string;
+    custom: boolean;
+    label: {
+        id: string;
+        defaultMessage: string;
+    };
+    initialValue: {
+        dependsOn: string[];
+        expression: string;
+    };
+    validator: never[];
+} | {
+    name: string;
+    type: string;
+    fieldId: string;
+    hideInPreview: boolean;
+    custom: boolean;
+    bannerType: string;
+    idFieldName: string;
+    label: {
+        id: string;
+        defaultMessage: string;
+    };
+    validator: never[];
+    conditionals: {
+        action: string;
+        expression: 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.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.qr = exports.idReader = exports.esignetHidden = exports.returnExpression
  * @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: [],
@@ -48,7 +33,7 @@ const esignet = (esignetAuthUrl, openIdProviderClientId, openIdProviderClaims, f
             desktop: 'Globe',
             mobile: 'Fingerprint'
         },
-        type: "REDIRECT",
+        type: 'LINK_BUTTON',
         custom: true,
         label: {
             id: 'views.idReader.label.eSignet',
@@ -57,19 +42,19 @@ const esignet = (esignetAuthUrl, openIdProviderClientId, openIdProviderClaims, f
         hideInPreview: true,
         conditionals: [
             {
-                action: "disable",
-                expression: "!!$form.redirectCallbackFetch",
-            },
+                action: 'disable',
+                expression: '!!$form.redirectCallbackFetch'
+            }
         ],
         options: {
-            url: esignetAuthUrl,
+            url: url.toString(),
             callback: {
                 params: {
-                    code: "esignet-mock-code",
+                    state: 'fetch-on-mount'
                 },
                 trigger: callbackFieldName
-            },
-        },
+            }
+        }
     };
 };
 exports.esignet = esignet;
@@ -103,21 +88,12 @@ const esignetCallback = ({ fieldName, getOIDPUserInfoUrl, openIdProviderClientId
             'Content-type': 'application/json'
         },
         body: {
-            code: "esignet-mock-code",
-            clientId: openIdProviderClientId,
-            redirectUri: ""
+            clientId: openIdProviderClientId
         },
         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',
@@ -163,3 +139,56 @@ const qr = () => ({
     type: 'QR'
 });
 exports.qr = qr;
+const verified = (event, sectionId) => {
+    const fieldName = 'verified';
+    const fieldId = `${event}.${sectionId}.${sectionId}-view-group.${fieldName}`;
+    return {
+        name: 'verified',
+        fieldId,
+        customQuestionMappingId: fieldId,
+        type: 'HIDDEN',
+        custom: true,
+        label: {
+            id: 'messages.empty',
+            defaultMessage: ''
+        },
+        initialValue: {
+            dependsOn: ['idReader'],
+            expression: 'Boolean($form?.idReader)? "pending":""'
+        },
+        validator: []
+    };
+};
+exports.verified = verified;
+const idPendingVerificationBanner = (event, sectionId) => {
+    const fieldName = 'verified';
+    const fieldId = `${event}.${sectionId}.${sectionId}-view-group.${fieldName}`;
+    return {
+        name: 'idPending',
+        type: 'ID_VERIFICATION_BANNER',
+        fieldId,
+        hideInPreview: true,
+        custom: true,
+        bannerType: 'pending',
+        idFieldName: 'idReader',
+        label: {
+            id: 'messages.empty',
+            defaultMessage: ''
+        },
+        validator: [],
+        conditionals: [
+            {
+                action: 'hide',
+                expression: '$form?.verified !== "pending"'
+            }
+        ]
+    };
+};
+exports.idPendingVerificationBanner = idPendingVerificationBanner;
+const idVerificationFields = (event, sectionId) => {
+    return [
+        (0, exports.verified)(event, sectionId),
+        (0, exports.idPendingVerificationBanner)(event, sectionId)
+    ];
+};
+exports.idVerificationFields = idVerificationFields;

package/package.json

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

package/src/forms.ts

@@ -16,36 +16,31 @@
  * @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 const esignet = (esignetAuthUrl: string, openIdProviderClientId: string, openIdProviderClaims: string, fieldName: string, callbackFieldName: string) => {
-
-  const url = new URL(esignetAuthUrl)
+export const esignet = (
+  event: string,
+  sectionId: string,
+  esignetAuthUrl: string,
+  openIdProviderClientId: string,
+  openIdProviderClaims: string = "name,family_name,given_name,middle_name,birthdate,address",
+  fieldName: string,
+  callbackFieldName: string
+) => {
+  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('response_type', 'code');
+  url.searchParams.append('scope', 'openid profile');
+  url.searchParams.append('acr_values', 'mosip:idp:acr:static-code');
+  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,
@@ -54,28 +49,28 @@ export const esignet = (esignetAuthUrl: string, openIdProviderClientId: string,
       desktop: 'Globe',
       mobile: 'Fingerprint'
     },
-    type: "REDIRECT",
+    type: 'LINK_BUTTON',
     custom: true,
-    label: {    
+    label: {
       id: 'views.idReader.label.eSignet',
       defaultMessage: 'E-signet'
     },
     hideInPreview: true,
     conditionals: [
       {
-        action: "disable",
-        expression: "!!$form.redirectCallbackFetch",
-      },
+        action: 'disable',
+        expression: '!!$form.redirectCallbackFetch'
+      }
     ],
     options: {
-      url: esignetAuthUrl,
+      url: url.toString(),
       callback: {
         params: {
-          code: "esignet-mock-code",
-        },      
+          state: 'fetch-on-mount'
+        },
         trigger: callbackFieldName
-      },
-    },
+      }
+    }
   };
 };
 
@@ -101,7 +96,7 @@ export const popupButton = ({
 export const esignetCallback = ({
   fieldName,
   getOIDPUserInfoUrl,
-  openIdProviderClientId 
+  openIdProviderClientId
 }: {
   fieldName: string;
   getOIDPUserInfoUrl: string;
@@ -121,21 +116,13 @@ export const esignetCallback = ({
       'Content-type': 'application/json'
     },
     body: {
-      code: "esignet-mock-code",
-      clientId: openIdProviderClientId,
-      redirectUri: ""
+      clientId: openIdProviderClientId
     },
+    
     method: 'POST'
   }
 });
 
-export const returnExpression = (fieldName: string) => {
-  return {
-    dependsOn: ["redirectCallbackFetch"],
-    expression: `$form.redirectCallbackFetch?.data?.${fieldName}`,
-  };
-};
-
 export const esignetHidden = () => {
   return {
     name: 'INFORMANT_PSUT_TOKEN',
@@ -187,5 +174,58 @@ export const qr = () => ({
   type: 'QR'
 });
 
+export const verified = (event: string, sectionId: string) => {
+  const fieldName = 'verified';
+  const fieldId = `${event}.${sectionId}.${sectionId}-view-group.${fieldName}`;
+  return {
+    name: 'verified',
+    fieldId,
+    customQuestionMappingId: fieldId,
+    type: 'HIDDEN',
+    custom: true,
+    label: {
+      id: 'messages.empty',
+      defaultMessage: ''
+    },
+    initialValue: {
+      dependsOn: ['idReader'],
+      expression: 'Boolean($form?.idReader)? "pending":""'
+    },
+    validator: []
+  };
+};
 
+export const idPendingVerificationBanner = (
+  event: string,
+  sectionId: string
+) => {
+  const fieldName = 'verified';
+  const fieldId = `${event}.${sectionId}.${sectionId}-view-group.${fieldName}`;
+  return {
+    name: 'idPending',
+    type: 'ID_VERIFICATION_BANNER',
+    fieldId,
+    hideInPreview: true,
+    custom: true,
+    bannerType: 'pending',
+    idFieldName: 'idReader',
+    label: {
+      id: 'messages.empty',
+      defaultMessage: ''
+    },
+    validator: [],
+    conditionals: [
+      {
+        action: 'hide',
+        expression: '$form?.verified !== "pending"'
+      }
+    ]
+  };
+};
 
+export const idVerificationFields = (event: string, sectionId: string) => {
+  return [
+    verified(event, sectionId),
+    idPendingVerificationBanner(event, sectionId)
+  ];
+};