fix merge conflict

Author: katieklein

STYLEGUIDE.md

@@ -299,6 +299,8 @@ Conform to the [JSON standard](https://www.json.org/json-en.html).
 }
 ```
 
+* * *
+
 ## 19. Prefix AWS and Amazon products when they first appear on a page
 
 When an AWS service or product appears on the page for the first time, refer to it with the appropriate prefix, either AWS or Amazon. You can [find a full listing here.](https://aws.amazon.com/about-aws/global-infrastructure/regional-product-services/)
@@ -324,6 +326,8 @@ When editing text content in markdown files use the markdown syntax for links. W
 
 `\[Use mdx link syntax](/some-link)`
 
+* * *
+
 ## 21. Use 2-space indents for code blocks
 
 When adding code blocks and indenting encapsulated code, use 2 spaces for each indent
@@ -348,4 +352,4 @@ Amplify.configure({
     // ...
   }
 });
-```
+```

cspell.json

@@ -742,6 +742,7 @@
     "jcenter",
     "jdoe",
     "jetbrains",
+    "Jetpack",
     "jobTitle",
     "jpg",
     "js",

customHttp.yml

@@ -13,5 +13,5 @@ customHeaders:
       - key: 'X-Content-Type-Options'
         value: 'nosniff'
       - key: 'Content-Security-Policy'
-        value: "upgrade-insecure-requests; default-src 'none'; prefetch-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self'; frame-src 'self' https://www.youtube-nocookie.com https://aws.demdex.net https://dpm.demdex.net; connect-src 'self' *.shortbread.aws.dev https://amazonwebservices.d2.sc.omtrdc.net https://aws.demdex.net https://dpm.demdex.net https://cm.everesttech.net https://a0.awsstatic.com/ https://d2c.aws.amazon.com https://vs.aws.amazon.com https://*.algolia.net https://*.algolianet.com *.amazonaws.com https://docs-backend.amplify.aws; img-src 'self' https://img.shields.io cm.everesttech.net https://amazonwebservices.d2.sc.omtrdc.net https://aws.demdex.net https://dpm.demdex.net https://cm.everesttech.net https://a0.awsstatic.com/; media-src 'self'; script-src 'self' https://a0.awsstatic.com/;"
+        value: "upgrade-insecure-requests; default-src 'none'; prefetch-src 'self'; style-src 'self' 'unsafe-inline'; font-src 'self'; frame-src 'self' https://www.youtube-nocookie.com https://aws.demdex.net https://dpm.demdex.net; connect-src 'self' *.shortbread.aws.dev https://amazonwebservices.d2.sc.omtrdc.net https://aws.demdex.net https://dpm.demdex.net https://cm.everesttech.net https://a0.awsstatic.com/ https://d2c.aws.amazon.com https://vs.aws.amazon.com https://*.algolia.net https://*.algolianet.com *.amazonaws.com https://aws.amazon.com/; img-src 'self' https://img.shields.io https://amazonwebservices.d2.sc.omtrdc.net https://aws.demdex.net https://dpm.demdex.net https://cm.everesttech.net https://a0.awsstatic.com/; media-src 'self'; script-src 'self' https://a0.awsstatic.com/ https://d2c.aws.amazon.com/;"
       # CSP also set in _document.tsx meta tag

src/components/LandingHeroCTA/index.tsx

@@ -13,9 +13,28 @@ export default function LandingHeroCTA() {
         <Link href="/start/q/integration/react?sc_icampaign=react-start&sc_ichannel=docs-home">
           <img alt={img.REACT.alt} height={40} width={40} src={img.REACT.src} />
         </Link>
+        <Link href="/start/q/integration/next?sc_icampaign=nextjs-start&sc_ichannel=docs-home">
+          <img alt={img.NEXT.alt} height={40} width={40} src={img.NEXT.src} />
+        </Link>
+        <Link href="/start/q/integration/react-native?sc_icampaign=react-native-start&sc_ichannel=docs-home">
+          <img
+            alt={img.REACTNATIVE.alt}
+            height={40}
+            width={40}
+            src={img.REACTNATIVE.src}
+          />
+        </Link>
         <Link href="/start/q/integration/vue?sc_icampaign=vue-start&sc_ichannel=docs-home">
           <img alt={img.VUE.alt} height={40} width={40} src={img.VUE.src} />
         </Link>
+        <Link href="/start/q/integration/angular?sc_icampaign=js-start&sc_ichannel=docs-home">
+          <img
+            alt={img.ANGULAR.alt}
+            height={40}
+            width={40}
+            src={img.ANGULAR.src}
+          />
+        </Link>
         <Link href="/start/q/integration/js?sc_icampaign=js-start&sc_ichannel=docs-home">
           <img alt={img.JS.alt} height={40} width={40} src={img.JS.src} />
         </Link>

src/directory/directory.mjs

@@ -2281,7 +2281,7 @@ export const directory = {
           {
             title: 'Connect to the cloud',
             route: '/start/getting-started/add-api',
-            filters: ['android', 'ios', 'flutter']
+            filters: ['android', 'ios']
           },
           {
             title: 'Connect API and database to the app',

src/fragments/lib-v1/auth/native_common/signin_next_steps/common.mdx

@@ -21,7 +21,7 @@ import ios2 from "/src/fragments/lib-v1/auth/ios/signin_next_steps/30_confirm_cu
 import ios3 from "/src/fragments/lib-v1/auth/ios/signin_next_steps/40_confirm_new_password.mdx";
 
 <Fragments fragments={{ios: ios3}} />
-    
+
 ### Reset password
 
 import ios4 from "/src/fragments/lib-v1/auth/ios/signin_next_steps/50_reset_password.mdx";

src/fragments/lib-v1/flutter.mdx

@@ -2,9 +2,7 @@
 
 Welcome to the Amplify Flutter documentation. To stay up to date with the latest changes and provide feedback, please take a look at our [Github repo](https://github.com/aws-amplify/amplify-flutter) or join us on [Discord](https://discord.gg/jWVbPfC).
 
-The stable release of Amplify Flutter currently supports iOS/Android as target platforms.
-
-This guide shows how to build an app using our Amplify Libraries for Flutter and the Amplify CLI toolchain.
+ Amplify Flutter v0 currently supports iOS/Android as target platforms.
 
 <InternalLinkButton href="/lib-v1/project-setup/prereq">
   <span slot="text">Get Started</span>

src/fragments/lib/auth/android/getting_started/05_authenticatorCallout.mdx

@@ -0,0 +1,7 @@
+<Callout info>
+
+**New**: The Authenticator UI component for Android via Jetpack Compose is now available in developer preview! 
+
+Once you've gone through the steps below, you can use it to automatically [add authentication capabilities to your application](#option-1-use-the-authenticator-ui-component).
+
+</Callout>

src/fragments/lib/auth/android/getting_started/45_authenticator.mdx

@@ -0,0 +1,18 @@
+## Authentication with Amplify
+
+There are two ways to add authentication capabilities to your application.
+
+### Option 1: Use the Authenticator UI component
+<Callout warning>
+
+**Note:** The Authenticator UI component is only available with Jetpack Compose.
+
+</Callout>
+
+The **Authenticator** is a UI component that automatically integrates with your existing Amplify configuration and allows you to easily add the entire authentication flow to your application.
+
+Visit [Authenticator | Amplify UI for Android](https://ui.docs.amplify.aws/android/connected-components/authenticator) to get started.
+
+### Option 2: Manually call the Authentication APIs
+
+Follow the instructions in [Sign In](/lib/auth/signin) to learn about how to integrate the registration and authentication flows in your application with the Auth APIs.

src/fragments/lib/auth/android/signin_next_steps/10_signin.mdx

@@ -36,32 +36,33 @@ try {
                           // Then invoke `confirmSignIn` api with new password
                           break;
                       }
-                      case RESET_PASSWORD: {
-                          Log.i("AuthQuickstart", "Reset password, additional info: " + nextStep.getAdditionalInfo());
-                          // User needs to reset their password.
-                          // Invoke `resetPassword` api to start the reset password
-                          // flow, and once reset password flow completes, invoke
-                          // `signIn` api to trigger signIn flow again.
-                          break;
-                      }
-                      case CONFIRM_SIGN_UP: {
-                          Log.i("AuthQuickstart", "Confirm signup, additional info: " + nextStep.getAdditionalInfo());
-                          // User was not confirmed during the signup process.
-                          // Invoke `confirmSignUp` api to confirm the user if
-                          // they have the confirmation code. If they do not have the
-                          // confirmation code, invoke `resendSignUpCode` to send the
-                          // code again.
-                          // After the user is confirmed, invoke the `signIn` api again.
-                          break;
-                      }
                       case DONE: {
                           Log.i("AuthQuickstart", "SignIn complete");
                           // User has successfully signed in to the app
                           break;
                       }
                   }
               },
-              error -> Log.e("AuthQuickstart", "SignIn failed: " + error)
+              error -> {
+                  if (error instanceof UserNotConfirmedException) {
+                      // User was not confirmed during the signup process.
+                      // Invoke `confirmSignUp` api to confirm the user if
+                      // they have the confirmation code. If they do not have the
+                      // confirmation code, invoke `resendSignUpCode` to send the
+                      // code again.
+                      // After the user is confirmed, invoke the `signIn` api again.
+                      Log.i("AuthQuickstart", "Signup confirmation required" + error);
+                  } else if (error instanceof PasswordResetRequiredException) {
+                      // User needs to reset their password.
+                      // Invoke `resetPassword` api to start the reset password
+                      // flow, and once reset password flow completes, invoke
+                      // `signIn` api to trigger signIn flow again.
+                      Log.i("AuthQuickstart", "Password reset required" + error);
+                  } else {
+                      Log.e("AuthQuickstart", "SignIn failed: " + error);
+                  }
+              }
+
       );
 } catch (Exception error) {
     Log.e("AuthQuickstart", "Unexpected error occurred: " + error);
@@ -98,22 +99,6 @@ try {
                       // Prompt the user to enter a new password
                       // Then invoke `confirmSignIn` api with new password
                   }
-                  AuthSignInStep.RESET_PASSWORD -> {
-                      Log.i("AuthQuickstart", "Reset password, additional info: ${nextStep.additionalInfo}")
-                      // User needs to reset their password.
-                      // Invoke `resetPassword` api to start the reset password
-                      // flow, and once reset password flow completes, invoke
-                      // `signIn` api to trigger signIn flow again.
-                  }
-                  AuthSignInStep.CONFIRM_SIGN_UP -> {
-                      Log.i("AuthQuickstart", "Confirm signup, additional info: ${nextStep.additionalInfo}")
-                      // User was not confirmed during the signup process.
-                      // Invoke `confirmSignUp` api to confirm the user if
-                      // they have the confirmation code. If they do not have the
-                      // confirmation code, invoke `resendSignUpCode` to send the
-                      // code again.
-                      // After the user is confirmed, invoke the `signIn` api again.
-                  }
                   AuthSignInStep.DONE -> {
                       Log.i("AuthQuickstart", "SignIn complete")
                       // User has successfully signed in to the app
@@ -122,8 +107,24 @@ try {
 
           }
       ) { error ->
-          Log.e("AuthQuickstart", "SignIn failed: $error")
-      }
+          if (error is UserNotConfirmedException) {
+              // User was not confirmed during the signup process.
+              // Invoke `confirmSignUp` api to confirm the user if
+              // they have the confirmation code. If they do not have the
+              // confirmation code, invoke `resendSignUpCode` to send the
+              // code again.
+              // After the user is confirmed, invoke the `signIn` api again.
+              Log.i("AuthQuickstart", "Signup confirmation required", error)
+          } else if (error is PasswordResetRequiredException) {
+              // User needs to reset their password.
+              // Invoke `resetPassword` api to start the reset password
+              // flow, and once reset password flow completes, invoke
+              // `signIn` api to trigger signIn flow again.
+              Log.i("AuthQuickstart", "Password reset required", error)
+          } else {
+              Log.e("AuthQuickstart", "Unexpected error occurred: $error")
+          }
+         }
 } catch (error: Exception) {
     Log.e("AuthQuickstart", "Unexpected error occurred: $error")
 }
@@ -163,29 +164,29 @@ try {
             // Prompt the user to enter a new password
             // Then invoke `confirmSignIn` api with new password
         }
-        AuthSignInStep.RESET_PASSWORD -> {
-            Log.i("AuthQuickstart", "Reset password, additional info: ${nextStep.additionalInfo}")
-            // User needs to reset their password.
-            // Invoke `resetPassword` api to start the reset password
-            // flow, and once reset password flow completes, invoke
-            // `signIn` api to trigger signIn flow again.
-        }
-        AuthSignInStep.CONFIRM_SIGN_UP -> {
-            Log.i("AuthQuickstart", "Confirm signup, additional info: ${nextStep.additionalInfo}")
-            // User was not confirmed during the signup process.
-            // Invoke `confirmSignUp` api to confirm the user if
-            // they have the confirmation code. If they do not have the
-            // confirmation code, invoke `resendSignUpCode` to send the
-            // code again.
-            // After the user is confirmed, invoke the `signIn` api again.
-        }
         AuthSignInStep.DONE -> {
             Log.i("AuthQuickstart", "SignIn complete")
             // User has successfully signed in to the app
         }
     }
 } catch (error: Exception) {
-    Log.e("AuthQuickstart", "Unexpected error occurred: $error")
+   if (error is UserNotConfirmedException) {
+       // User was not confirmed during the signup process.
+       // Invoke `confirmSignUp` api to confirm the user if
+       // they have the confirmation code. If they do not have the
+       // confirmation code, invoke `resendSignUpCode` to send the
+       // code again.
+       // After the user is confirmed, invoke the `signIn` api again.
+       Log.i("AuthQuickstart", "Signup confirmation required", error)
+   } else if (error is PasswordResetRequiredException) {
+       // User needs to reset their password.
+       // Invoke `resetPassword` api to start the reset password
+       // flow, and once reset password flow completes, invoke
+       // `signIn` api to trigger signIn flow again.
+       Log.i("AuthQuickstart", "Password reset required", error)
+   } else {
+       Log.e("AuthQuickstart", "Unexpected error occurred: $error")
+   }
 }
 ```
 
@@ -220,32 +221,32 @@ RxAmplify.Auth.signIn("username", "password", options).subscribe(
                     // Then invoke `confirmSignIn` api with new password
                     break;
                 }
-                case RESET_PASSWORD: {
-                    Log.i("AuthQuickstart", "Reset password, additional info: " + nextStep.getAdditionalInfo());
-                    // User needs to reset their password.
-                    // Invoke `resetPassword` api to start the reset password
-                    // flow, and once reset password flow completes, invoke
-                    // `signIn` api to trigger signIn flow again.
-                    break;
-                }
-                case CONFIRM_SIGN_UP: {
-                    Log.i("AuthQuickstart", "Confirm signup, additional info: " + nextStep.getAdditionalInfo());
-                    // User was not confirmed during the signup process.
-                    // Invoke `confirmSignUp` api to confirm the user if
-                    // they have the confirmation code. If they do not have the
-                    // confirmation code, invoke `resendSignUpCode` to send the
-                    // code again.
-                    // After the user is confirmed, invoke the `signIn` api again.
-                    break;
-                }
                 case DONE: {
                     Log.i("AuthQuickstart", "SignIn complete");
                     // User has successfully signed in to the app
                     break;
                 }
             }
         },
-        error -> Log.e("AuthQuickstart", "SignIn failed: " + error)
+        error -> {
+          if (error instanceof UserNotConfirmedException) {
+              // User was not confirmed during the signup process.
+              // Invoke `confirmSignUp` api to confirm the user if
+              // they have the confirmation code. If they do not have the
+              // confirmation code, invoke `resendSignUpCode` to send the
+              // code again.
+              // After the user is confirmed, invoke the `signIn` api again.
+              Log.i("AuthQuickstart", "Signup confirmation required" + error);
+          } else if (error instanceof PasswordResetRequiredException) {
+              // User needs to reset their password.
+              // Invoke `resetPassword` api to start the reset password
+              // flow, and once reset password flow completes, invoke
+              // `signIn` api to trigger signIn flow again.
+              Log.i("AuthQuickstart", "Password reset required" + error);
+          } else {
+              Log.e("AuthQuickstart", "SignIn failed: " + error);
+          }
+        }
 );
 ```