Device auth check update (#942)

* Remove 8th check from device so all devices follow same pattern * Bump app version
dvsa · Nov 11, 2022 · 92fee3d · 92fee3d
1 parent fecde1b
commit 92fee3d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="uk.gov.dvsa.drivingexaminerservices" version="4.6.0.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="uk.gov.dvsa.drivingexaminerservices" version="4.6.0.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>DES 4</name>
     <description>A template ionic 5 application</description>
     <content src="index.html" />

diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.6.0.4</string>
+	<string>4.6.0.5</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>4.6.0.4</string>
+	<string>4.6.0.5</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/src/app/providers/device-authentication/device-authentication.ts b/src/app/providers/device-authentication/device-authentication.ts
@@ -41,25 +41,17 @@ export class DeviceAuthenticationProvider {
   };
 
   private performBiometricVerification = async (): Promise<void> => {
-    const deviceType: string = this.deviceProvider.getDeviceType();
-    const isASAMEnabled: boolean = await this.deviceProvider.checkSingleAppMode();
-    // handle bug caused by accessing touch id while ASAM enabled in iPad 8th only
-    const shouldToggleASAM: boolean = isASAMEnabled && this.deviceProvider.is8thGenDevice(deviceType);
-    if (shouldToggleASAM) {
+    try {
       await this.deviceProvider.disableSingleAppMode();
-    }
 
-    try {
       await NativeBiometric.verifyIdentity({
         reason: 'Please authenticate',
         useFallback: true, // fallback to passcode if biometric authentication unavailable
       });
     } finally {
-      if (shouldToggleASAM) {
-        await this.loadingProvider.handleUILoading(true);
-        await this.deviceProvider.enableSingleAppMode();
-        await this.loadingProvider.handleUILoading(false);
-      }
+      await this.loadingProvider.handleUILoading(true);
+      await this.deviceProvider.enableSingleAppMode();
+      await this.loadingProvider.handleUILoading(false);
     }
   };
 }