Merge branch 'main' of https://github.com/AdobeDocs/adobe-dev-console into eds-migration

Author: BaskarMitrah

package.json

@@ -12,7 +12,7 @@
     "url": "https://github.com/icaraps"
   },
   "dependencies": {
-    "@adobe/gatsby-theme-aio": "^4.14.4",
+    "@adobe/gatsby-theme-aio": "^4.14.18",
     "gatsby": "4.22.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"

src/pages/guides/authentication/JWT/index.md

@@ -2,7 +2,7 @@
 
 <InlineAlert slots="text"/>
 
-The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jan 27, 2025. You must migrate to the new credential by **Jan 27, 2025**, to ensure your application continues functioning. [Learn more](./ServerToServerAuthentication/migration.md).
+The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jun 30, 2025. You must migrate to the new credential by **Jun 30, 2025**, to ensure your application continues functioning. [Learn more](./ServerToServerAuthentication/migration.md).
 
 To establish a secure service-to-service Adobe I/O API session, you must create a JSON Web Token (JWT) that encapsulates the identity of your integration, and then exchange it for an access token. Every request to an Adobe service must include the access token in the `Authorization` header, along with the API Key (Client ID) that was generated when you created the [Service Account Integration](../service-account-integration.md) in the [Adobe Developer Console](https://developer.adobe.com/console/).
 

src/pages/guides/authentication/JWT/jwt-certificate.md

@@ -3,7 +3,7 @@
 
 <InlineAlert slots="text"/>
 
-The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jan 27, 2025. You must migrate to the new credential by **Jan 27, 2025**, to ensure your application continues functioning. [Learn more](../ServerToServerAuthentication/migration.md).
+The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jun 30, 2025. You must migrate to the new credential by **Jun 30, 2025**, to ensure your application continues functioning. [Learn more](./ServerToServerAuthentication/migration.md).
 
 Create a private key and a public certificate. Make sure you store these securely.
 

src/pages/guides/authentication/JWT/samples.md

@@ -3,7 +3,7 @@
 
 <InlineAlert slots="text"/>
 
-The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jan 27, 2025. You must migrate to the new credential by **Jan 27, 2025**, to ensure your application continues functioning. [Learn more](../ServerToServerAuthentication/migration.md).
+The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jun 30, 2025. You must migrate to the new credential by **Jun 30, 2025**, to ensure your application continues functioning. [Learn more](./ServerToServerAuthentication/migration.md).
 
 The following samples demonstrate JWT generation and exchanging it with Adobe IMS endpoint to retrieve an access token.
 

src/pages/guides/authentication/JWT/scopes.md

@@ -3,7 +3,7 @@
 
 <InlineAlert slots="text"/>
 
-The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jan 27, 2025. You must migrate to the new credential by **Jan 27, 2025**, to ensure your application continues functioning. [Learn more](../ServerToServerAuthentication/migration.md).
+The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jun 30, 2025. You must migrate to the new credential by **Jun 30, 2025**, to ensure your application continues functioning. [Learn more](./ServerToServerAuthentication/migration.md).
 
 JSON Web Token (JWT) metascopes govern the access and privileges for service accounts. As an application developer, you will choose the set of scopes to access certain resources by specifying the scopes as part of the encoding claims for your JWTs.
 

src/pages/guides/authentication/ServerToServerAuthentication/faqs.md

@@ -7,6 +7,7 @@
 + [Benefits of the new credential](#benefits-of-the-new-credential)
 + [Migration next steps](#migration-next-steps)
 + [Migrating vendor applications](#migrating-vendor-applications)
++ [Migrating Auto-generated projects](#migrating-auto-generated-projects)
 + [Adobe assistance](#adobe-assistance)
 
 
@@ -16,7 +17,7 @@
 
 
 ### What's happening?  
-In May 2023, Adobe announced the deprecation and end of life of Service Account (JWT) credentials. This means that any of your integrations or custom applications using a Service Account (JWT) credential will need to migrate to the new OAuth Server-to-Server credential before January 27, 2025. 
+In May 2023, Adobe announced the deprecation and end of life of Service Account (JWT) credentials. This means that any of your integrations or custom applications using a Service Account (JWT) credential will need to migrate to the new OAuth Server-to-Server credential before Jun 30, 2025. 
 
 
 
@@ -31,23 +32,23 @@ A credential is used to uniquely identify your integration to Adobe. To use an A
 
 ### Will my Adobe integrations or applications stop working immediately?
 
-No. Any integration or application using the Service Account (JWT) credential will continue to work until January 27, 2025. See [deprecation timelines](./migration.md#deperecation-timelines). See section on [migration next steps](#migration-next-steps).
+No. Any integration or application using the Service Account (JWT) credential will continue to work until June 30, 2025. See [deprecation timelines](./migration.md#deperecation-timelines). See section on [migration next steps](#migration-next-steps).
 
 
 
 ### What is the deadline to migrate to the new credential? 
-You must migrate your application to use the new OAuth Server-to-Server credential before January 27, 2025, to ensure your application does not face any downtime. See [migration guide](./migration.md).
+You must migrate your application to use the new OAuth Server-to-Server credential before June 30, 2025, to ensure your application does not face any downtime. See [deprecation timelines](./migration.md#deperecation-timelines). See [migration guide](./migration.md).
 
 
 
-### What happens if we do not migrate our application by Jan 27, 2025? 
-
-Projects on the Developer Console still containing any Service Account (JWT) credentials will be 'frozen' after January 27, 2025. This will disable certificate rotation for your application or any other action to modify the Project or the credential. The ability to migrate will, however, still be available. Once you migrate your application, the Project will be 'unfrozen' again.
+### What happens if we do not migrate our integration by Jun 30, 2025? 
 
+After June 30, 2025, you can no longer refresh certificates for integrations using Service Account (JWT) credentials. Your integration will stop working once existing certificates expire. 
 
+Furthermore, Adobe will automatically convert Service Account (JWT) to OAuth Server-to-Server credentials when certificates expire or on March 1, 2026, whichever comes first.
 
 ### We can currently create new Service Account (JWT) credentials even though they are marked as deprecated. Is it recommended? 
-No. Creating any new Service Account (JWT) credentials is not recommended. All Service Account (JWT) credentials, whether old or new, will stop working after January 27, 2025. We recommend you avoid migrating your application again and use the new OAuth Server-to-Server credential from the beginning. See our [implementation guide](./implementation.md).
+No. Creating any new Service Account (JWT) credentials is not recommended. All Service Account (JWT) credentials, whether old or new, will stop working after June 30, 2025. We recommend you avoid migrating your application again and use the new OAuth Server-to-Server credential from the beginning. See our [implementation guide](./implementation.md).
 
 
 
@@ -152,11 +153,19 @@ The company or organization that developed the integration must add support to u
 
 
 ### We are a company or organization that develops applications using Service Account (JWT) credentials that Adobe customers install. What do we need to do? 
-Until June 3, 2024, customers can still create Service Account (JWT) credentials to use your application. However, any existing or new customers of your application must switch to using the new OAuth Server-to-Server credentials before January 27, 2025.
+Until June 3, 2024, customers can still create Service Account (JWT) credentials to use your application. However, any existing or new customers of your application must switch to using the new OAuth Server-to-Server credentials before June 30, 2025.
 
 Therefore, we recommend enhancing your application before June3, 2024. You must add support to use the new credential and support for customers to migrate from the old credential to the new credential.
 
 
+## Migrating Auto-generated projects
+
+### Do we need to migrate auto-generated projects?
+No. Adobe will migrate all auto-generated projects without needing your action. However, you may be required to upgrade the version of your Adobe Experience Manager (AEM) or Adobe Campaign as a pre-requisite.
+
+### When will Adobe migrate auto-generated projects?
+Adobe will migrate all auto-generated projects before Jun 30, 2025.
+
 
 ## Adobe assistance
 

src/pages/guides/authentication/ServerToServerAuthentication/index.md

@@ -51,7 +51,7 @@ Read our OAuth Server-to-server credential implementation guide -
 
 <InlineAlert slots="text"/>
 
-The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jan 27, 2025. You must migrate to the new credential by **Jan 27, 2025**, to ensure your application continues functioning. [Learn more](./ServerToServerAuthentication/migration.md).
+The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jun 30, 2025. You must migrate to the new credential by **Jun 30, 2025**, to ensure your application continues functioning. [Learn more](./ServerToServerAuthentication/migration.md).
 
 Service Account (JWT) credentials rely on the JWT token exchange mechanism to generate access tokens. This credential's details include two secrets a `client_secret` and a `private.key` (part of a public certificate private key pair).
 

src/pages/guides/authentication/ServerToServerAuthentication/migration.md

@@ -1,29 +1,27 @@
 # Migrating from Service Account (JWT) credential to OAuth Server-to-Server credential
 
-The Service Account (JWT) credentials have been deprecated in favor of the new OAuth Server-to-Server credentials. 
+The Service Account (JWT) credentials have been deprecated in favor of the new OAuth Server-to-Server credentials. They will reach end of life on June 30, 2025.
 
 The new OAuth Server-to-Server credentials simplify all aspects of application development - experimentation, implementation, and maintenance. See the section on [Why OAuth Server-to-Server credentials?](#why-oauth-server-to-server-credentials) below to learn more.
 
-While the Service Account (JWT) credentials have been marked as deprecated, they will continue to work until **Jan 27, 2025**. Therefore you must migrate your application or integration to use the new OAuth Server-to-Server credential before Jan 27, 2025. See the section on [deprecation timelines](#deperecation-timelines) below to learn more.
+While the Service Account (JWT) credentials have been marked as deprecated, they will continue to work until **Jun 30, 2025**. Therefore you must migrate your application or integration to use the new OAuth Server-to-Server credential before Jun 30, 2025. See the section on [deprecation timelines](#deprecation-timelines) below to learn more.
 
 Migrating your applications to the OAuth Server-to-Server credential is a simple two-step process that enables a zero downtime migration for your applications and integrations. Please read our [migration guide](#migration-overview) below to familiarize yourself with the migration process.
 
 If you have more questions, check out our [frequently asked questions](#faqs) or visit the Adobe Developer Console [forums](https://experienceleaguecommunities.adobe.com/t5/adobe-developer-console/ct-p/adobe-io-console).
 
 ## Table of Contents
 
-- [Migrating from Service Account (JWT) credential to OAuth Server-to-Server credential](#migrating-from-service-account-jwt-credential-to-oauth-server-to-server-credential)
-  - [Table of Contents](#table-of-contents)
-  - [Why OAuth Server-to-Server credentials?](#why-oauth-server-to-server-credentials)
-  - [Deprecation Timelines](#deprecation-timelines)
-  - [Migration Overview](#migration-overview)
-    - [Preparation: Find out which applications are using the Service Account (JWT) credentials](#preparation-find-out-which-applications-are-using-the-service-account-jwt-credentials)
-    - [Step 1: Add the new credential to your project](#step-1-add-the-new-credential-to-your-project)
-    - [Step 2: Update your application and delete old credential](#step-2-update-your-application-and-delete-old-credential)
-      - [Update your application](#update-your-application)
-      - [Test if the new credential is working](#test-if-the-new-credential-is-working)
-      - [Delete the old credential](#delete-the-old-credential)
-    - [Cancelling Migration](#cancelling-migration)
++ [Why OAuth Server-to-Server credentials?](#why-oauth-server-to-server-credentials)
++ [Deperecation Timelines](#deprecation-timelines)
++ [Migration Overview](#migration-overview)
+   + [Preparation: Find out which applications are using the Service Account (JWT) credentials](#preparation-find-out-which-applications-are-using-the-service-account-jwt-credentials)
+   + [Step 1: Add the new credential to your project](#step-1-add-the-new-credential-to-your-project)
+   + [Step 2: Update your application and delete old credential](#step-2-update-your-application-and-delete-old-credential)
+     + [Update your application](#update-your-application)
+     + [Test if the new credential is working](#test-if-the-new-credential-is-working)
+     + [Delete the old credential](#delete-the-old-credential)
+   + [Cancelling Migration](#cancelling-migration)
 
 
 ## Why OAuth Server-to-Server credentials?
@@ -44,16 +42,23 @@ Lastly, while the new OAuth Server-to-Server credentials do not use expiring cer
 
 ## Deprecation Timelines
 
-
 <InlineAlert slots="text"/>
 
-Your applications using the Service Account (JWT) credentials will stop working after Jan 27, 2025.
+The end of life date for Service Account (JWT) credentials has been extended from Jan 27, 2025, to Jun 30, 2025, to give customers more time to migrate. You must migrate your integrations to use OAuth Server-to-Server credentials before June 30, 2025 to avoid any downtime.
+
+
+1. **May 1, 2023**
+   * Adobe announces the deprecation of Service Account (JWT) credentials. The deprecation timelines and the end-of-life date are also announced. 
+   * All existing integrations using Service Account (JWT) credentials continue to work.
+
+2. **June 3, 2024** 
+   * After June 3, 2024, you cannot create new Service Account (JWT) credentials.
+   * All existing integrations using Service Account (JWT) credentials continue to work.
 
+3. **June 30, 2025 (End of Life)**
+   * After June 30, 2025, you cannot refresh certificates for integrations using Service Account (JWT) credentials. Your integrations will stop working once existing certificates expire.
+   * Furthermore, Adobe will automatically convert Service Account (JWT) credentials to OAuth Server-to-Server credentials when certificates expire or on March 1, 2026, whichever comes first.
 
-| | May 1, 2023 - Jun 2, 2024 | Jun 3, 2024 - Jan 26, 2024 | Jan 27, 2025 (end of life) |
-|-|------------------------------|---------------------------------|-------------------------------|
-| Existing applications using a Service Account (JWT) credential |   Existing applications using the Service Account (JWT) credential will continue to work. |   Existing applications using the Service Account (JWT) credential will continue to work.  |  **Existing applications cannot refresh expiring certificates after Jan 27, 2025, and will stop working**.  |
-| New applications creating a Service Account (JWT) credential   |  A new Service Account (JWT) credential can be added to the project.  |  A new Service Account (JWT) credential **cannot** be created or added to the project.  |  A new Service Account (JWT) credential **cannot** be created or added to the project.  |
 
 ## Migration Overview
 
@@ -71,7 +76,7 @@ To find out which of your Adobe applications and integrations are using the Serv
 
 Perform the steps below for each application/project you have identified. If a project is not in use, we recommend deleting the project or the Service Account (JWT) credential in the project.
 
-Note: you do not have to worry about auto-generated projects. Adobe will automatically migrate those during the migration window.
+Note: you do not have to worry about auto-generated projects. Adobe will automatically migrate all auto-generated projects before June 30, 2025.
 
 ### Step 1: Add the new credential to your project
 

src/pages/guides/authentication/index.md

@@ -48,7 +48,7 @@ View our guide on server to server authentication credentials -
 
 <InlineAlert slots="text"/>
 
-The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jan 27, 2025. You must migrate to the new credential by **Jan 27, 2025**, to ensure your application continues functioning. [Learn more](./ServerToServerAuthentication/migration.md).
+The Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jun 30, 2025. You must migrate to the new credential by **Jun 30, 2025**, to ensure your application continues functioning. [Learn more](./ServerToServerAuthentication/migration.md).
 
 
 ## API key authentication 

src/pages/guides/authentication/service-account-integration.md

@@ -2,7 +2,7 @@
 
 <InlineAlert slots="text"/>
 
-Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jan 27, 2025. **You must migrate to the new credential by Jan 27, 2025 in order to ensure your application continues to function. View our [migration guide](../authentication/ServerToServerAuthentication/migration.md) to know more.**
+Service Account (JWT) credentials have been deprecated in favor of the OAuth Server-to-Server credentials. Your applications using the Service Account (JWT) credentials will stop working after Jun 30, 2025. **You must migrate to the new credential by Jun 30, 2025 in order to ensure your application continues to function. View our [migration guide](../ServerToServerAuthentication/migration.md) to know more.**
 
 A Service Account connection allows your application to call Adobe services on behalf of the application itself or on behalf of an enterprise organization.