Merge branch 'master' into patch-1

android/src/main/AndroidManifest.xml

@@ -29,6 +29,14 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="com.auth0.android.provider.RedirectActivity"
+            tools:node="remove"/>
+
+        <activity
+            android:name="com.auth0.android.provider.AuthenticationActivity"
+            tools:node="remove"/>
+
     </application>
 
     <queries>

index.js

@@ -1,6 +1,7 @@
 export {TimeoutError} from './src/utils/fetchWithTimeout';
 export {default as useAuth0} from './src/hooks/use-auth0';
 export {default as Auth0Provider} from './src/hooks/auth0-provider';
+export {default as LAPolicy} from './src/credentials-manager/la-policies';
 
 import Auth0 from './src/auth0';
 export default Auth0;

src/credentials-manager/la-policies.js

@@ -0,0 +1,8 @@
+export default {
+  deviceOwnerAuthenticationWithBiometrics: 1,
+  deviceOwnerAuthentication: 2,
+  deviceOwnerAuthenticationWithWatch: 3,
+  deviceOwnerAuthenticationWithBiometricsOrWatch: 4,
+  deviceOwnerAuthenticationWithWristDetection: 5,
+  deviceOwnerAuthenticationWithBiometrics: 6
+}

src/hooks/__tests__/use-auth0.spec.js

@@ -5,6 +5,7 @@ import * as React from 'react';
 import {renderHook} from '@testing-library/react-hooks';
 import Auth0Provider from '../auth0-provider';
 import useAuth0 from '../use-auth0';
+import { LAPolicy } from '../../..';
 
 function makeJwt(claims) {
   const header = {alg: 'RS256', typ: 'JWT'};
@@ -155,7 +156,7 @@ describe('The useAuth0 hook', () => {
 
     expect(mockAuth0.webAuth.authorize).toHaveBeenCalledWith({
       scope: 'openid profile email',
-    });
+    }, undefined);
   });
 
   it('adds the default scopes when some are specified with custom scope', async () => {
@@ -167,7 +168,7 @@ describe('The useAuth0 hook', () => {
 
     expect(mockAuth0.webAuth.authorize).toHaveBeenCalledWith({
       scope: 'custom-scope openid profile email',
-    });
+    }, undefined);
   });
 
   it('does not duplicate default scopes', async () => {
@@ -185,7 +186,7 @@ describe('The useAuth0 hook', () => {
       scope: 'openid profile email',
       audience: 'http://my-api',
       customParam: '1234',
-    });
+    }, undefined);
   });
 
   it('sets the user prop after authorizing', async () => {
@@ -336,11 +337,12 @@ describe('The useAuth0 hook', () => {
       'description',
       'cancel',
       'fallback',
+      LAPolicy.deviceOwnerAuthentication
     );
 
     expect(
       mockAuth0.credentialsManager.requireLocalAuthentication,
-    ).toHaveBeenCalledWith('title', 'description', 'cancel', 'fallback');
+    ).toHaveBeenCalledWith('title', 'description', 'cancel', 'fallback', LAPolicy.deviceOwnerAuthentication);
   });
 
   it('dispatches an error when requireLocalAuthentication fails', async () => {