chore: clean up E-Signet / OIDP verification button code

packages/client/src/App.tsx

@@ -63,7 +63,6 @@ import { AdministrativeLevels } from '@client/views/Organisation/AdministrativeL
 import { VerifyCertificatePage } from '@client/views/VerifyCertificate/VerifyCertificatePage'
 import { IssueCertificate } from '@client/views/IssueCertificate/IssueCertificate'
 import { IssuePayment } from '@client/views/IssueCertificate/IssueCollectorForm/IssuePayment'
-import { OIDPVerificationCallback } from './views/OIDPVerificationCallback/OIDPVerificationCallback'
 import { ApolloProvider } from '@client/utils/ApolloProvider'
 import { Home } from '@client/views/OfficeHome/Home'
 import { PrintRecord } from './views/PrintRecord/PrintRecord'
@@ -533,15 +532,6 @@ export function App(props: IAppProps) {
                                               }
                                               component={IssuePayment}
                                             />
-                                            <ProtectedRoute
-                                              exact
-                                              path={
-                                                routes.OIDP_VERIFICATION_CALLBACK
-                                              }
-                                              component={
-                                                OIDPVerificationCallback
-                                              }
-                                            />
                                             <ProtectedRoute
                                               exact
                                               path={routes.PRINT_RECORD}

packages/client/src/components/form/FormFieldGenerator.tsx

@@ -82,8 +82,6 @@ import {
   DATE_RANGE_PICKER,
   IDateRangePickerValue,
   TIME,
-  NID_VERIFICATION_BUTTON,
-  INidVerificationButton,
   DIVIDER,
   HEADING3,
   SUBSECTION_HEADER,
@@ -132,9 +130,6 @@ import { buttonMessages } from '@client/i18n/messages/buttons'
 import { DateRangePickerForFormField } from '@client/components/DateRangePickerForFormField'
 import { IAdvancedSearchFormState } from '@client/search/advancedSearch/utils'
 import { UserDetails } from '@client/utils/userUtils'
-import { VerificationButton } from '@opencrvs/components/lib/VerificationButton'
-import { useOnlineStatus } from '@client/utils'
-import { useNidAuthentication } from '@client/views/OIDPVerificationCallback/utils'
 import { BulletList, Divider, InputLabel, Stack } from '@opencrvs/components'
 import { Heading2, Heading3 } from '@opencrvs/components/lib/Headings/Headings'
 import { SignatureUploader } from './SignatureField/SignatureUploader'
@@ -235,7 +230,6 @@ const GeneratedInputField = React.memo<GeneratedInputFieldProps>(
       (val: string) => setFieldValue(fieldDefinition.name, val),
       [fieldDefinition.name, setFieldValue]
     )
-    const isOnline = useOnlineStatus()
 
     const inputProps = {
       id: fieldDefinition.name,
@@ -615,21 +609,6 @@ const GeneratedInputField = React.memo<GeneratedInputFieldProps>(
       )
     }
 
-    if (fieldDefinition.type === NID_VERIFICATION_BUTTON) {
-      return (
-        <InputField {...inputFieldProps}>
-          <VerificationButton
-            id={fieldDefinition.name}
-            onClick={fieldDefinition.onClick}
-            labelForVerified={fieldDefinition.labelForVerified}
-            labelForUnverified={fieldDefinition.labelForUnverified}
-            labelForOffline={fieldDefinition.labelForOffline}
-            status={!isOnline ? 'offline' : value ? 'verified' : 'unverified'}
-          />
-        </InputField>
-      )
-    }
-
     if (fieldDefinition.type === REDIRECT) {
       return (
         <RedirectField
@@ -791,7 +770,6 @@ interface IFormSectionProps {
 interface IStateProps {
   offlineCountryConfig: IOfflineData
   userDetails: UserDetails | null
-  onNidAuthenticationClick: () => void
 }
 
 interface IDispatchProps {
@@ -1120,18 +1098,12 @@ class FormSectionComponent extends React.Component<Props> {
                     field.searchableType as LocationType[]
                   )
                 }
-              : field.type === NID_VERIFICATION_BUTTON
-              ? ({
-                  ...field,
-                  onClick: this.props.onNidAuthenticationClick
-                } as INidVerificationButton)
               : field
 
           if (
             field.type === FETCH_BUTTON ||
             field.type === FIELD_WITH_DYNAMIC_DEFINITIONS ||
             field.type === SELECT_WITH_DYNAMIC_OPTIONS ||
-            field.type === NID_VERIFICATION_BUTTON ||
             field.type === BUTTON
           ) {
             return (
@@ -1311,7 +1283,6 @@ export const FormFieldGenerator: React.FC<IFormSectionProps> = (props) => {
   const userDetails = useSelector(getUserDetails)
   const intl = useIntl()
   const dispatch = useDispatch()
-  const { onClick: onNidAuthenticationClick } = useNidAuthentication()
 
   return (
     <Formik<IFormSectionData>
@@ -1345,7 +1316,6 @@ export const FormFieldGenerator: React.FC<IFormSectionProps> = (props) => {
           offlineCountryConfig={offlineCountryConfig}
           userDetails={userDetails}
           dynamicDispatch={(...args) => dispatch(dynamicDispatch(...args))}
-          onNidAuthenticationClick={onNidAuthenticationClick}
         />
       )}
     </Formik>

packages/client/src/forms/index.ts

@@ -69,7 +69,6 @@ export const DYNAMIC_LIST = 'DYNAMIC_LIST'
 export const FETCH_BUTTON = 'FETCH_BUTTON'
 export const LOCATION_SEARCH_INPUT = 'LOCATION_SEARCH_INPUT'
 export const TIME = 'TIME'
-export const NID_VERIFICATION_BUTTON = 'NID_VERIFICATION_BUTTON'
 export const DIVIDER = 'DIVIDER'
 export const HEADING3 = 'HEADING3'
 export const SIGNATURE = 'SIGNATURE'
@@ -716,12 +715,6 @@ export interface ITimeFormFIeld extends IFormFieldBase {
   type: typeof TIME
   ignorePlaceHolder?: boolean
 }
-export interface INidVerificationButton extends IFormFieldBase {
-  type: typeof NID_VERIFICATION_BUTTON
-  labelForVerified: MessageDescriptor
-  labelForUnverified: MessageDescriptor
-  labelForOffline: MessageDescriptor
-}
 
 export interface ISignatureFormField extends IFormFieldBase {
   type: typeof SIGNATURE
@@ -790,7 +783,6 @@ export type IFormField =
   | ILocationSearchInputFormField
   | IDateRangePickerFormField
   | ITimeFormFIeld
-  | INidVerificationButton
   | IDividerFormField
   | ISignatureFormField
   | IHttpFormField
@@ -1231,13 +1223,6 @@ export interface Ii18nLoaderButtonField extends Ii18nFormFieldBase {
   errorText: string
   networkErrorText: string
 }
-export interface Ii18nNidVerificationButtonField extends Ii18nFormFieldBase {
-  type: typeof NID_VERIFICATION_BUTTON
-  onClick: () => void
-  labelForVerified: string
-  labelForUnverified: string
-  labelForOffline: string
-}
 
 export interface I18nDividerField extends Ii18nFormFieldBase {
   type: typeof DIVIDER
@@ -1317,7 +1302,6 @@ export type Ii18nFormField =
   | Ii18nLocationSearchInputFormField
   | Ii18nDateRangePickerFormField
   | Ii18nTimeFormField
-  | Ii18nNidVerificationButtonField
   | I18nDividerField
   | I18nHeading3Field
   | Ii18nSignatureField

packages/client/src/forms/utils.ts

@@ -41,8 +41,6 @@ import {
   FIELD_WITH_DYNAMIC_DEFINITIONS,
   IRadioGroupWithNestedFieldsFormField,
   ISelectFormFieldWithOptions,
-  NID_VERIFICATION_BUTTON,
-  INidVerificationButton,
   BULLET_LIST,
   HIDDEN,
   Ii18nHiddenFormField,
@@ -190,18 +188,6 @@ export const internationaliseFieldObject = (
     )
   }
 
-  if (base.type === NID_VERIFICATION_BUTTON) {
-    ;(base as any).labelForVerified = intl.formatMessage(
-      (field as INidVerificationButton).labelForVerified
-    )
-    ;(base as any).labelForUnverified = intl.formatMessage(
-      (field as INidVerificationButton).labelForUnverified
-    )
-    ;(base as any).labelForOffline = intl.formatMessage(
-      (field as INidVerificationButton).labelForOffline
-    )
-  }
-
   if (isFieldButton(field)) {
     ;(base as Ii18nButtonFormField).buttonLabel = intl.formatMessage(
       field.buttonLabel

packages/client/src/navigation/routes.ts

@@ -99,6 +99,4 @@ export const VIEW_RECORD = '/:declarationId/viewRecord'
 export const VIEW_VERIFY_CERTIFICATE = '/verify-certificate/:declarationId'
 export const ORGANISATIONS_INDEX = '/organisation/:locationId?'
 
-export const OIDP_VERIFICATION_CALLBACK = '/mosip-callback'
-
 export const PRINT_RECORD = '/print-record/:declarationId'

packages/client/src/setupTests.ts

@@ -286,11 +286,3 @@ vi.mock('react-router', async () => ({
     section: 'child'
   }))
 }))
-
-vi.mock('@client/views/OIDPVerificationCallback/utils', async () => ({
-  ...((await vi.importActual(
-    '@client/views/OIDPVerificationCallback/utils'
-  )) as any),
-  useExtractCallBackState: vi.fn(),
-  useQueryParams: vi.fn()
-}))

packages/client/src/tests/schema.graphql

@@ -1179,39 +1179,6 @@ input ObservationFHIRIDS {
   lastPreviousLiveBirth: String
 }
 
-type OIDPUserAddress {
-  formatted: String
-  street_address: String
-  locality: String
-  region: String
-  postal_code: String
-  city: String
-  country: String
-}
-
-type OIDPUserInfo {
-  sub: String!
-  name: String
-  given_name: String
-  family_name: String
-  middle_name: String
-  nickname: String
-  preferred_username: String
-  profile: String
-  picture: String
-  website: String
-  email: String
-  email_verified: Boolean
-  gender: String
-  birthdate: String
-  zoneinfo: String
-  locale: String
-  phone_number: String
-  phone_number_verified: Boolean
-  address: OIDPUserAddress
-  updated_at: Int
-}
-
 type OperationHistorySearchSet {
   operationType: String
   operatedOn: Date
@@ -1455,12 +1422,6 @@ type Query {
   getActiveCertificatesSVG: [CertificateSVG!]
   fetchSystem(clientId: ID!): System
   informantSMSNotifications: [SMSNotification!]
-  getOIDPUserInfo(
-    code: String!
-    clientId: String!
-    redirectUri: String!
-    grantType: String
-  ): UserInfo
 }
 
 type QuestionnaireQuestion {
@@ -1944,13 +1905,6 @@ input UserIdentifierInput {
   value: String
 }
 
-type UserInfo {
-  oidpUserInfo: OIDPUserInfo
-  districtFhirId: String
-  stateFhirId: String
-  locationLevel3FhirId: String
-}
-
 input UserInput {
   id: ID
   name: [HumanNameInput!]!