Merge pull request #154 from BeInLife/patch-1

Changes to avoid Keychain Prompt on Login screen (Android)
jarden-digital · Sep 11, 2020 · 99299f0 · 99299f0
2 parents 1373a1c + 0668681
commit 99299f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/PinCodeChoose.tsx b/src/PinCodeChoose.tsx
@@ -1,4 +1,5 @@
 import PinCode, { PinStatus } from './PinCode'
+import { noBiometricsConfig } from './utils'
 
 import * as React from 'react'
 import { StyleProp, StyleSheet, TextStyle, View, ViewStyle } from 'react-native'
@@ -101,7 +102,8 @@ class PinCodeChoose extends React.PureComponent<IProps, IState> {
         await Keychain.setInternetCredentials(
           this.props.pinCodeKeychainName,
           this.props.pinCodeKeychainName,
-          pinCode
+          pinCode,
+          noBiometricsConfig
         )
       }
       if (!!this.props.finishProcess) this.props.finishProcess(pinCode)

diff --git a/src/PinCodeEnter.tsx b/src/PinCodeEnter.tsx
@@ -1,6 +1,6 @@
 import delay from './delay'
 import PinCode, { PinStatus } from './PinCode'
-import { PinResultStatus } from './utils'
+import { PinResultStatus, noBiometricsConfig } from './utils'
 
 import AsyncStorage from '@react-native-community/async-storage'
 import * as React from 'react'
@@ -112,7 +112,8 @@ class PinCodeEnter extends React.PureComponent<IProps, IState> {
     this.launchTouchID = this.launchTouchID.bind(this)
     if (!this.props.storedPin) {
       Keychain.getInternetCredentials(
-        this.props.pinCodeKeychainName
+        this.props.pinCodeKeychainName,
+        noBiometricsConfig
       ).then(result => {
         this.keyChainResult = result && result.password || undefined
       }).catch(error => {

diff --git a/src/utils.ts b/src/utils.ts
@@ -1,3 +1,4 @@
+import { Platform } from 'react-native'
 import AsyncStorage from '@react-native-community/async-storage'
 import * as Keychain from 'react-native-keychain'
 
@@ -21,3 +22,10 @@ export const deletePinCode = async (serviceName: string) => {
 export const resetInternalStates = async (asyncStorageKeys: string[]) => {
   return await AsyncStorage.multiRemove(asyncStorageKeys)
 }
+
+export const noBiometricsConfig = Platform.select({
+    android: {
+        accessControl: Keychain.ACCESS_CONTROL.APPLICATION_PASSWORD,
+    },
+    ios: {}
+})