Merge remote-tracking branch 'origin/main' into pre-prod/main

Author: aws-amplify-bot

src/pages/[platform]/build-a-backend/add-aws-services/analytics/record-events/index.mdx

@@ -130,85 +130,6 @@ RxAmplify.Analytics.flushEvents();
 
 When flushing events, a [Hub event](/[platform]/build-a-backend/auth/connect-your-frontend/listen-to-auth-events/) is sent containing the events which were successfully sent to the Pinpoint service.  To receive a list of these events, subscribe to the `HubChannel.ANALYTICS` channel and handle an event of the type `AnalyticsChannelEventName.FLUSH_EVENTS`.
 
-## Authentication events
-
-Authentication events indicate how frequently users authenticate with your application.
-
-On the **Analytics** page, the **Users** tab displays charts for **Sign-ins, Sign-ups, and Authentication failures**.
-
-To learn how frequently users authenticate with your app, update your application code so that Amazon Pinpoint receives the following standard event types for authentication:
-
- - `_userauth.sign_in`
- - `_userauth.sign_up`
- - `_userauth.auth_fail`
-
-You can report authentication events by doing either of the following:
-
- - Managing user sign-up and sign-in with Amazon Cognito user pools.
-
-  Cognito user pools are user directories that make it easier to add sign-up and sign-in to your app. As users authenticate with your app, Cognito reports authentication events to Pinpoint. For more information, see [Using Amazon Pinpoint Analytics with Amazon Cognito User Pools](https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-pools-pinpoint-integration.html) in the _Amazon Cognito Developer Guide_. Also update **amplify_outputs.json** by adding the `PinpointAppId` key under `CognitoUserPool`.
-
-  ```json
-  "CognitoUserPool": {
-      "Default": {
-          "PoolId": "<your-user-pool-id>",
-          "AppClientId": "<your-app-client-id>",
-          "Region": "<your-app-region>",
-          "PinpointAppId": "<your-pinpoint-app-id>"
-     }
-  }
-  ```
-
-- Manually recording events using the `recordEvent()` API.
-
-  If you don't want to use Cognito user pools, you can use the Pinpoint client to record and submit authentication events, as shown in the following examples. In these examples, the event type is set to `_userauth.sign_in`, but you can substitute any authentication event type.
-
-<BlockSwitcher>
-<Block name="Java">
-
-  ```java
-  /**
-  * Call this method to log an authentication event to the analytics client.
-  */
-  public void logAuthenticationEvent() {
-    AnalyticsEvent event = AnalyticsEvent.builder()
-      .name("_userauth.sign_in")
-      .build();
-    Amplify.Analytics.recordEvent(event);
-  }
-  ```
-
-  </Block>
-  <Block name="Kotlin">
-
-  ```kotlin
-  /**
-  * Call this method to log an authentication event to the analytics client.
-  */
-  fun logAuthenticationEvent() {
-    val event = AnalyticsEvent.builder()
-      .name("_userauth.sign_in")
-      .build()
-    Amplify.Analytics.recordEvent(event)
-  }
-  ```
-  </Block>
-  <Block name="RxJava">
-
-  ```java
-
-  /**
-  * Call this method to log an authentication event to the analytics client.
-  */
-  public void logAuthenticationEvent() {
-    AnalyticsEvent event = AnalyticsEvent.builder()
-      .name("_userauth.sign_in")
-      .build();
-    RxAmplify.Analytics.recordEvent(event);
-  }
-  ```
-  </Block>
-  </BlockSwitcher>
 
 ## Global Properties
 

src/pages/[platform]/build-a-backend/auth/concepts/external-identity-providers/index.mdx

@@ -587,7 +587,7 @@ import 'aws-amplify/auth/enable-oauth-listener';
 import { getCurrentUser, fetchUserAttributes } from 'aws-amplify/auth';
 import { Hub } from 'aws-amplify/utils';
 
-Hub.listen("auth", ({ payload }) => {
+Hub.listen("auth", async ({ payload }) => {
   switch (payload.event) {
     case "signInWithRedirect":
       const user = await getCurrentUser();

src/pages/[platform]/build-a-backend/auth/concepts/passwordless/index.mdx

@@ -42,7 +42,7 @@ Passwordless authentication removes the security risks and user friction associa
 
 </Callout>
 
-Learn how to implement passwordless sign-in flows by [overriding the Cognito UserPool to enable the sign-in methods below](/[platform]/build-a-backend/auth/modify-resources-with-cdk/#override-cognito-userpool-to-enable-passwordless-sign-in-methods).
+Learn how to enable passwordless sign-in flows by [overriding the Cognito UserPool to enable the sign-in methods below](/[platform]/build-a-backend/auth/modify-resources-with-cdk/#override-cognito-userpool-to-enable-passwordless-sign-in-methods).
 
 {/* need a section about what a "preferred" factor is */}
 
@@ -131,7 +131,17 @@ WebAuthn uses biometrics or security keys for authentication, leveraging device-
 </InlineFilter>
 <InlineFilter filters={["android"]}>
 
-{/*  */}
+You can read more about how passkeys work in the [Android developer docs](https://developer.android.com/design/ui/mobile/guides/patterns/passkeys).
+
+<Callout warning>
+Registering a passkey is supported on Android 9 (API level 28) and above.
+</Callout>
+
+Using passkeys with Amplify requires following these steps:
+
+1. Deploy a Digital Asset Links file to your website granting the `get_login_creds` permission to your application. See the [Credential Manager documentation](https://developer.android.com/identity/sign-in/credential-manager#add-support-dal) for more details about this file.
+1. [Configure your Amazon Cognito user pool](/[platform]/build-a-backend/auth/modify-resources-with-cdk/#override-cognito-userpool-to-enable-passwordless-sign-in-methods) with `WEB_AUTHN` as an allowed first factor, and specify your website domain as the `WebAuthnRelyingPartyID`.
+1. Use the Amplify Android APIs to first [register a passkey](/[platform]/build-a-backend/auth/manage-users/manage-webauthn-credentials/#associate-webauthn-credentials) and then to [sign in with WebAuthn](/[platform]/build-a-backend/auth/connect-your-frontend/sign-in/#webauthn-passkeys).
 
 </InlineFilter>
 <InlineFilter filters={["swift"]}>
@@ -144,6 +154,6 @@ WebAuthn uses biometrics or security keys for authentication, leveraging device-
 
 ### Managing credentials
 
-{/* quick blurb then segue over to "manage WebAuthn credentials" page */}
+Passwordless authentication with WebAuthn requires associating one or more credentials with the user's Amazon Cognito account. Amplify provides APIs that integrate with each platform's local authenticator to easily create, view, and delete these credential associations.
 
 [Learn more about managing WebAuthn credentials](/[platform]/build-a-backend/auth/manage-users/manage-webauthn-credentials).