From dd8107409f6f4c5513051e00909bb168be3a0465 Mon Sep 17 00:00:00 2001 From: Sreenadh S <32409698+sree96@users.noreply.github.com> Date: Wed, 17 Apr 2024 12:05:36 +0530 Subject: [PATCH] [INJIMOB-932] - revert quickshare implemantation (#1379) * [INJIMOB-932] - pixelpass integration Signed-off-by: Sreenadh S <32409698+sree96@users.noreply.github.com> * [INJIMOB-932] - add navigation to home and notification banner Signed-off-by: Sreenadh S <32409698+sree96@users.noreply.github.com> * [INJIMOB-932] - update pixelpass version Signed-off-by: Sreenadh S <32409698+sree96@users.noreply.github.com> * [INJIMOB-932] - revert testing changes Signed-off-by: Sreenadh S <32409698+sree96@users.noreply.github.com> * [INJIMOB-932] - remove unsused imports Signed-off-by: Sreenadh S <32409698+sree96@users.noreply.github.com> * [INJIMOB-932] - revert quick share feature Signed-off-by: Sreenadh S <32409698+sree96@users.noreply.github.com> * [INJIMOB-932] - revert scan screen changes Signed-off-by: Sreenadh S <32409698+sree96@users.noreply.github.com> --------- Signed-off-by: Sreenadh S <32409698+sree96@users.noreply.github.com> --- components/QrCodeOverlay.tsx | 4 ++-- ios/Inji.xcodeproj/project.pbxproj | 7 +++---- machines/bleShare/scan/scanMachine.ts | 12 +++++++++--- machines/bleShare/scan/scanMachine.typegen.ts | 6 +++++- machines/store.ts | 2 +- screens/Scan/ScanScreenController.ts | 14 ++++++++++---- 6 files changed, 30 insertions(+), 15 deletions(-) diff --git a/components/QrCodeOverlay.tsx b/components/QrCodeOverlay.tsx index d4730428dd..f011908881 100644 --- a/components/QrCodeOverlay.tsx +++ b/components/QrCodeOverlay.tsx @@ -11,7 +11,7 @@ import {SvgImage} from './ui/svg'; import {generateQRData} from '@mosip/pixelpass'; import {VerifiableCredential} from '../machines/VerifiableCredential/VCMetaMachine/vc'; import RNSecureKeyStore, {ACCESSIBLE} from 'react-native-secure-key-store'; -import {DEFAULT_ECL, DEFAULT_QR_HEADER} from '../shared/constants'; +import {DEFAULT_ECL} from '../shared/constants'; import {VCMetadata} from '../shared/VCMetadata'; export const QrCodeOverlay: React.FC = props => { @@ -27,7 +27,7 @@ export const QrCodeOverlay: React.FC = props => { verifiableCredential: props.verifiableCredential, meta: props.meta, }; - qrData = generateQRData(JSON.stringify(qrDataJSON), DEFAULT_QR_HEADER); + qrData = generateQRData(JSON.stringify(qrDataJSON)); await RNSecureKeyStore.set(props.meta.id, qrData, { accessible: ACCESSIBLE.ALWAYS_THIS_DEVICE_ONLY, }); diff --git a/ios/Inji.xcodeproj/project.pbxproj b/ios/Inji.xcodeproj/project.pbxproj index 10c401772b..861871a21a 100644 --- a/ios/Inji.xcodeproj/project.pbxproj +++ b/ios/Inji.xcodeproj/project.pbxproj @@ -432,10 +432,10 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Inji/Inji.entitlements; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = V2ABX7953Z; + DEVELOPMENT_TEAM = V2ABX7953Z; ENABLE_BITCODE = NO; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -458,7 +458,6 @@ PRODUCT_BUNDLE_IDENTIFIER = io.mosip.inji.wallet.mobileid; PRODUCT_NAME = Inji; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.mosip.inji.wallet.mobileid"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/machines/bleShare/scan/scanMachine.ts b/machines/bleShare/scan/scanMachine.ts index d22431b43c..8f31a269c9 100644 --- a/machines/bleShare/scan/scanMachine.ts +++ b/machines/bleShare/scan/scanMachine.ts @@ -463,7 +463,7 @@ export const scanMachine = entry: 'loadVCDataToMemory', on: { STORE_RESPONSE: { - actions: ['refreshVCs','setShowQuickShareSuccessBanner'], + actions: ['refreshVCs', 'setShowQuickShareSuccessBanner'], target: '.navigatingToHome', }, }, @@ -688,7 +688,11 @@ export const scanMachine = }, }, disconnect: { - entry: ['resetFlowType', 'resetSelectedVc','resetShowQuickShareSuccessBanner'], + entry: [ + 'resetFlowType', + 'resetSelectedVc', + 'resetShowQuickShareSuccessBanner', + ], invoke: { src: 'disconnect', }, @@ -1330,7 +1334,9 @@ export const scanMachine = event.params.startsWith('OPENID4VP://'), // sample: 'INJIQUICKSHARE://NAKDFK:DB:JAHDIHAIDJXKABDAJDHUHW' isQuickShare: (_context, event) => - event.params.startsWith(DEFAULT_QR_HEADER), + // event.params.startsWith(DEFAULT_QR_HEADER), + // toggling the feature for now + false, isQrLogin: (context, event) => { try { let linkCode = new URL(event.params); diff --git a/machines/bleShare/scan/scanMachine.typegen.ts b/machines/bleShare/scan/scanMachine.typegen.ts index b037c593c5..6073222ef2 100644 --- a/machines/bleShare/scan/scanMachine.typegen.ts +++ b/machines/bleShare/scan/scanMachine.typegen.ts @@ -62,6 +62,7 @@ export interface Typegen0 { removeLoggers: | 'DISCONNECT' | 'DISMISS' + | 'DISMISS_QUICK_SHARE_BANNER' | 'SCREEN_BLUR' | 'STORE_RESPONSE' | 'xstate.init'; @@ -69,16 +70,18 @@ export interface Typegen0 { resetFlowType: | 'DISCONNECT' | 'DISMISS' + | 'DISMISS_QUICK_SHARE_BANNER' | 'GOTO_HISTORY' | 'SCREEN_BLUR' | 'xstate.init'; - resetIsQuickShareDone: 'DISMISS'; resetSelectedVc: | 'DISCONNECT' | 'DISMISS' + | 'DISMISS_QUICK_SHARE_BANNER' | 'GOTO_HISTORY' | 'SCREEN_BLUR' | 'xstate.init'; + resetShowQuickShareSuccessBanner: 'DISMISS' | 'DISMISS_QUICK_SHARE_BANNER'; sendBLEConnectionErrorEvent: 'BLE_ERROR'; sendScanData: 'SCAN'; sendVCShareFlowCancelEndEvent: 'CANCEL'; @@ -97,6 +100,7 @@ export interface Typegen0 { setShareLogTypeUnverified: 'ACCEPT_REQUEST' | 'CHECK_FLOW_TYPE'; setShareLogTypeVerified: 'FACE_VALID'; setShowFaceAuthConsent: 'FACE_VERIFICATION_CONSENT'; + setShowQuickShareSuccessBanner: 'STORE_RESPONSE'; setUri: 'SCAN'; storeLoginItem: 'done.invoke.QrLogin'; storeShowFaceAuthConsent: 'FACE_VERIFICATION_CONSENT'; diff --git a/machines/store.ts b/machines/store.ts index c71bee1889..7bc84d0640 100644 --- a/machines/store.ts +++ b/machines/store.ts @@ -613,7 +613,7 @@ export async function getItem( } decryptedData = await decryptJson(encryptionKey, data); return JSON.parse(decryptedData); - } + } if (data === null && VCMetadata.isVCKey(key)) { await removeItem(key, data, encryptionKey); sendErrorEvent( diff --git a/screens/Scan/ScanScreenController.ts b/screens/Scan/ScanScreenController.ts index 2138c4dcc5..e3c6ae4231 100644 --- a/screens/Scan/ScanScreenController.ts +++ b/screens/Scan/ScanScreenController.ts @@ -10,7 +10,9 @@ import { selectIsScanning, selectIsInvalid, selectIsShowQrLogin, - selectQrLoginRef, selectIsQuickShareDone, selectShowQuickShareSuccessBanner, + selectQrLoginRef, + selectIsQuickShareDone, + selectShowQuickShareSuccessBanner, } from '../../machines/bleShare/scan/selectors'; import { selectIsBluetoothDenied, @@ -75,7 +77,7 @@ export function useScanScreen() { const GOTO_HOME = () => navigation.navigate(BOTTOM_TAB_ROUTES.home); return { locationError, - isEmpty: false, + isEmpty: !shareableVcsMetadata.length, isBluetoothPermissionDenied, isNearByDevicesPermissionDenied, isLocationDisabled, @@ -86,7 +88,10 @@ export function useScanScreen() { isMinimumStorageRequiredForAuditEntryLimitReached, isScanning: useSelector(scanService, selectIsScanning), isQuickShareDone: useSelector(scanService, selectIsQuickShareDone), - showQuickShareSuccessBanner: useSelector(scanService, selectShowQuickShareSuccessBanner), + showQuickShareSuccessBanner: useSelector( + scanService, + selectShowQuickShareSuccessBanner, + ), selectIsInvalid: useSelector(scanService, selectIsInvalid), isQrLogin: useSelector(scanService, selectIsShowQrLogin), isQrLoginstoring: useSelector(scanService, selectIsQrLoginStoring), @@ -94,7 +99,8 @@ export function useScanScreen() { LOCATION_REQUEST: () => scanService.send(ScanEvents.LOCATION_REQUEST()), GOTO_SETTINGS: () => scanService.send(ScanEvents.GOTO_SETTINGS()), DISMISS: () => scanService.send(ScanEvents.DISMISS()), - DISMISS_QUICK_SHARE_BANNER: () => scanService.send(ScanEvents.DISMISS_QUICK_SHARE_BANNER()), + DISMISS_QUICK_SHARE_BANNER: () => + scanService.send(ScanEvents.DISMISS_QUICK_SHARE_BANNER()), START_PERMISSION_CHECK: () => scanService.send(ScanEvents.START_PERMISSION_CHECK()), SCAN: (qrCode: string) => scanService.send(ScanEvents.SCAN(qrCode)),