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

Author: aws-amplify-bot

src/components/Layout/Layout.tsx

@@ -37,6 +37,7 @@ import {
 } from '@/components/NextPrevious';
 import { Modal } from '@/components/Modal';
 import { Gen1Banner } from '@/components/Gen1Banner';
+import { PinpointEOLBanner } from '@/components/PinpointEOLBanner';
 import { ApiModalProvider } from '../ApiDocs/ApiModalProvider';
 
 export const Layout = ({
@@ -281,6 +282,10 @@ export const Layout = ({
                     {(isGen1GettingStarted || isGen1HowAmplifyWorks) && (
                       <Gen1Banner currentPlatform={currentPlatform} />
                     )}
+                    {(asPathWithNoHash.includes('/push-notifications/') ||
+                      asPathWithNoHash.includes('/analytics/')) && (
+                      <PinpointEOLBanner />
+                    )}
                     {children}
                     {showNextPrev && <NextPrevious />}
                   </Flex>

src/components/PinpointEOLBanner/PinpointEOLBanner.tsx

@@ -0,0 +1,52 @@
+import { Callout } from '@/components/Callout';
+import Link from 'next/link';
+import classNames from 'classnames';
+
+export const PinpointEOLBanner = () => {
+  return (
+    <Callout backgroundColor="background.error">
+      <Link
+        href="https://docs.aws.amazon.com/pinpoint/latest/userguide/migrate.html"
+        passHref
+        className={classNames('amplify-link')}
+      >
+        AWS will end support for Amazon Pinpoint on October 30, 2026,
+      </Link>
+      , and is no longer accepting any new users as of May 20 (see the linked
+      doc). The guidance is to use{' '}
+      <Link
+        href="https://aws.amazon.com/end-user-messaging"
+        passHref
+        className={classNames('amplify-link')}
+      >
+        AWS End User Messaging
+      </Link>{' '}
+      for push notifications and SMS,{' '}
+      <Link
+        href="https://aws.amazon.com/ses"
+        passHref
+        className={classNames('amplify-link')}
+      >
+        Amazon Simple Email Service
+      </Link>{' '}
+      for sending emails,{' '}
+      <Link
+        href="https://aws.amazon.com/connect/outbound/"
+        passHref
+        className={classNames('amplify-link')}
+      >
+        Amazon Connect
+      </Link>{' '}
+      for campaigns, journeys, endpoints, and engagement analytics. Pinpoint
+      recommends{' '}
+      <Link
+        href="https://aws.amazon.com/kinesis"
+        passHref
+        className={classNames('amplify-link')}
+      >
+        Amazon Kinesis
+      </Link>{' '}
+      for event collection and mobile analytics.
+    </Callout>
+  );
+};

src/components/PinpointEOLBanner/index.ts

@@ -0,0 +1 @@
+export { PinpointEOLBanner } from './PinpointEOLBanner';

src/data/api-categories.mjs

@@ -1,7 +1,8 @@
 // mapping of api categories coming in from libraries to the associated categories in the docs
 export const API_CATEGORIES = {
   auth: 'auth',
-  storage: 'storage'
+  storage: 'storage',
+  data: 'api'
 };
 
 export const API_SUB_CATEGORIES = {

src/fragments/lib-v1/analytics/flutter/record.mdx

@@ -26,6 +26,14 @@ However, it can take upwards of 30 minutes for the event to display in the Filte
 
 </Callout>
 
+<Callout>
+
+Security Notice: Amplify Analytics temporarily stores event data locally in an unencrypted format before sending it to Pinpoint. 
+
+To protect your sensitive information, please do not include any passwords, API keys, or other confidential information in your analytic events.
+
+</Callout>
+
 ## Flush events
 
 Events have default configuration to flush out to the network every 30 seconds. If you would like to change this, update `amplifyconfiguration.dart` with the value in milliseconds you would like for `autoFlushEventsInterval`. This configuration will flush events every 10 seconds:

src/fragments/lib-v1/analytics/ios/record.mdx

@@ -23,6 +23,14 @@ However, it can take upwards of 30 minutes for the event to display in the Filte
 
 </Callout>
 
+<Callout>
+
+Security Notice: Amplify Analytics temporarily stores event data locally in an unencrypted format before sending it to Pinpoint. 
+
+To protect your sensitive information, please do not include any passwords, API keys, or other confidential information in your analytic events.
+
+</Callout>
+
 ## Flush Events
 
 Events have default configuration to flush out to the network every 60 seconds. If you would like to change this, update `amplifyconfiguration.json` with the value you would like for `autoFlushEventsInterval` like so:

src/fragments/lib/analytics/flutter/record.mdx

@@ -26,6 +26,14 @@ However, it can take upwards of 30 minutes for the event to display in the Filte
 
 </Callout>
 
+<Callout>
+
+Security Notice: Amplify Analytics temporarily stores event data locally in an unencrypted format before sending it to Pinpoint. 
+
+To protect your sensitive information, please do not include any passwords, API keys, or other confidential information in your analytic events.
+
+</Callout>
+
 ## Flush events
 
 Events have default configuration to flush out to the network every 30 seconds. To modify the default value, assign the `autoFlushEventsInterval` property to your desired duration. The example below configures the plugin to flush events every 10 seconds.

src/fragments/lib/analytics/ios/record.mdx

@@ -14,6 +14,14 @@ However, it can take upwards of 30 minutes for the event to display in the Filte
 
 </Callout>
 
+<Callout>
+
+Security Notice: Amplify Analytics temporarily stores event data locally in an unencrypted format before sending it to Pinpoint. 
+
+To protect your sensitive information, please do not include any passwords, API keys, or other confidential information in your analytic events.
+
+</Callout>
+
 ## Flush Events
 
 By default, events are automatically flushed out to the network every 60 seconds.

src/pages/[platform]/build-a-backend/storage/download-files/index.mdx

@@ -336,6 +336,14 @@ const { body, eTag } = await downloadData({
 
 Use the `downloadFile` API to download the file locally on the client.
 
+<Callout>
+**Note:** When downloading a file that will overwrite a preexisting file, ensure that your app has the proper write permission to overwrite it. If you are attempting to write to a file that a different app already contributed to the media store, you must request user consent[as described here](https://developer.android.com/training/data-storage/shared/media#update-other-apps-files).
+
+To learn more, refer to Android's developer documentation about [Scoped Storage](https://developer.android.com/training/data-storage#scoped-storage).
+
+Amplify will throw a `StorageException` if it is unable to modify a preexisting file.
+</Callout>
+
 <BlockSwitcher>
 <Block name="Java">