AdobeDocs · jeff-matthews · Aug 7, 2025 · Jul 17, 2025 · Jul 17, 2025 · Jul 18, 2025
diff --git a/src/_includes/authentication/get-tenant-id.md b/src/_includes/authentication/get-tenant-id.md
@@ -1,18 +1,18 @@
-From Cloud Manager, you can find your tenant ID in the instance detailLs for your Commerce Optimizer project.
+From Cloud Manager, you can find your instance ID in the instance detailLs for your Commerce Optimizer project.
 
 1. Log in to your [Adobe Experience Cloud](https://experience.adobe.com/) account.
 
 1. Under **Quick access**, click **Commerce** to open the Commerce Cloud Manager.
 
    The Commerce Cloud Manager displays a list of instances that are available in your Adobe IMS organization.
 
-1. To get the tenant ID, click the information icon next to the Adobe Commerce Optimizer instance name.
+1. To get the instance ID, click the information icon next to the Adobe Commerce Optimizer instance name.
 
    ![Access URLs for Commerce Optimizer UI, REST, and GraphQL APIs](../../pages/_images/reporting/aco-instance-details.png)
 
-   The instance details page opens, displaying the tenant ID and other instance information. The tenant ID is displayed in the `Instance ID` field.
+   The instance details page opens, displaying the instance ID and other instance information. The instance ID is displayed in the `Instance ID` field.
 
-You can also find the tenant ID from the access URL for the Adobe Commerce Optimizer application interface, the value is in the path, for example `/in:XDevkG9W6UbwgQmPn995r3/`.
+You can also find the instance ID from the access URL for the Adobe Commerce Optimizer application interface, the value is in the path, for example `/in:XDevkG9W6UbwgQmPn995r3/`.
 
 <InlineAlert variant="info" slots="text" />
 

diff --git a/src/openapi/.redocly.yaml b/src/openapi/.redocly.yaml
diff --git a/src/pages/credential/GetCredentialOAuthS2s.js b/src/pages/credential/GetCredentialOAuthS2s.js
@@ -0,0 +1,173 @@
+import React from 'react'
+import { GetCredential } from '@adobe/gatsby-theme-aio/src/components/GetCredential';
+import commerce from "./images/commerce.svg";
+
+const GetCredentialOAuthS2s = () => {
+
+  return (
+
+    <GetCredential className="getCredentialContainer" templateId="6887db9dbaf36ca1f2c4539b" productName='Adobe Commerce Optimizer' >
+
+      <GetCredential.SignIn title="Get credentials" paragraph="After signing in, you can create credentials that can be used to call the Catalog Data Ingestion REST API." buttonText="Sign in" />
+
+      <GetCredential.Form title="Get credentials" paragraph="Create credentials that you can use to call the Catalog Data Ingestion REST API. You also need the sandbox instance ID to call the API." className="formClass">
+
+        <GetCredential.Form.CredentialName label="Credential name" description="The credential name must be unique, use alphanumeric characters, and between 6 and 45 characters long. A project will be automatically created with the same name in Adobe Developer Console." range="45" />
+
+        <GetCredential.Form.Products label="Included products and services">
+          <GetCredential.Form.Product label="Adobe Commerce Optimizer" icon={commerce} />
+        </GetCredential.Form.Products>
+
+        <GetCredential.Form.AdobeDeveloperConsole label='By checking this box, you agree to' linkText="Adobe Developer Terms of Use" href="https://wwwimages2.adobe.com/content/dam/cc/en/legal/servicetou/Adobe-Developer-Additional-Terms_en-US_20230822.pdf" />
+
+        <GetCredential.Form.Side>
+          <div style={{ display: "flex", gap: "32px", flexDirection: "column" }}>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                OAuth server-to-server credential
+              </h3>
+              <p className="spectrum-Body spectrum-Body--sizeM">
+                This credential allows you to use industry standard OAuth2.0 libraries to generate access tokens using the OAuth 2.0 client credentials grant type.
+              </p>
+              <p className="spectrum-Body spectrum-Body--sizeM">
+                This credential only provides an access token. It does not return the instance ID associated with your Adobe Commerce Optimizer sandbox environment, which is required for API calls. In addition to the access token, you must manually copy and paste a instance ID from the Commerce Cloud Manager into the <code>tenantID</code> field in the <strong>Try it</strong> panel below. See the <a href="https://developer.adobe.com/commerce/services/optimizer/data-ingestion/using-the-api/">Get started</a> documentation for help finding your instance ID.
+              </p>
+            </div>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                Learn more
+              </h3>
+              <a style={{ color: "#0265DC" }} href="https://developer.adobe.com/commerce/services/optimizer/data-ingestion/authentication/">
+                Authentication documentation
+              </a>
+            </div>
+          </div>
+        </GetCredential.Form.Side>
+
+      </GetCredential.Form>
+
+      <GetCredential.UnknownError helpLink="https://some_help_link" helpLinkText="Get Help" className="unKnownError" />
+
+      <GetCredential.Card title="Your credential is ready to use" developerConsoleManage="Manage on Developer Console" className="card_developer_console" devConsoleDirection="/console" isCollapsable="true">
+
+        <GetCredential.Card.Side>
+          <div style={{ display: "flex", gap: "32px", flexDirection: "column" }}>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                OAuth server-to-server credential
+              </h3>
+              <p className="spectrum-Body spectrum-Body--sizeM">
+                This credential allows you to use industry standard OAuth2.0 libraries to generate access tokens using the OAuth 2.0 client credentials grant type.
+              </p>
+            </div>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                Learn more
+              </h3>
+              <a style={{ color: "#0265DC" }} href="https://developer.adobe.com/commerce/services/optimizer/data-ingestion/authentication/">
+                Authentication documentation
+              </a>
+            </div>
+          </div>
+        </GetCredential.Card.Side>
+
+        <GetCredential.Card.Products label="Included products and services">
+          <GetCredential.Card.Product label="Adobe Commerce Optimizer" icon={commerce} />
+        </GetCredential.Card.Products>
+
+        <GetCredential.Card.ProjectsDropdown label="Projects" subHeading="Only your projects that contain credentials are shown" />
+
+        <GetCredential.Card.ManageDeveloperConsole label="Manage all your projects and credentials on Adobe Developer Console" direction='/console' />
+
+        <GetCredential.Card.DevConsoleLink heading="Developer Console Project" />
+
+        <GetCredential.Card.AccessToken helpText="" buttonLabel="Generate and copy token" heading={(<>Access token<br/><br/> <span style="font-weight:normal"><small>Paste the access token into the <strong>Authorization</strong> header in the <strong>Try it</strong> panel below. Then, add the <a href="https://developer.adobe.com/commerce/services/optimizer/data-ingestion/using-the-api/#base-url">instance ID</a> to the <strong>instance ID</strong> field. You only need to do this once; future requests reuse the values automatically.</small></span></>)}/>
+
+        <GetCredential.Card.CredentialDetails heading={(<>Credential details<br/><br/> <span style="font-weight:normal"><small>The following Client ID and Organization ID are used to generate the access token:</small></span></>)} orderBy="ClientId,ImsOrgID">
+          <GetCredential.Card.CredentialDetails.ClientId heading="Client ID (x-api-key)" />
+          <GetCredential.Card.CredentialDetails.ImsOrgID heading="Organization ID (x-gw-ims-org-id)" />
+          <GetCredential.Card.CredentialDetails.Scopes heading="Scopes" scope="openid,session,AdobeID,read_organizations,additional_info.projectedProductContext" />
+        </GetCredential.Card.CredentialDetails>
+
+      </GetCredential.Card>
+
+      <GetCredential.Return title="Previously created projects" paragraph="Select a project and access your existing credentials for Adobe Commerce Optimizer." className="card_developer_console" isCollapsable="true">
+
+        <GetCredential.Return.Side>
+          <GetCredential.Return.Side.Custom>
+            <div style={{ display: "flex", gap: "30px", flexDirection: "column", width: "100%" }}>
+              <h3 className='spectrum-Heading spectrum-Heading--sizeM'>Welcome back</h3>
+              <p className="spectrum-Body spectrum-Body--sizeM">You can either re-use an existing credential or create a new credential.</p>
+            </div>
+          </GetCredential.Return.Side.Custom>
+          <GetCredential.Return.Side.NewCredential heading="Need another credential?" buttonLabel="Create new credential" />
+        </GetCredential.Return.Side>
+
+        <GetCredential.Return.CredentialDetails heading={(<>Credential details<br/><br/> <span style="font-weight:normal"><small>The following Client ID and Organization ID are used to generate the access token:</small></span></>)} orderBy="ClientId,ImsOrgID">
+          <GetCredential.Return.CredentialDetails.ClientId heading="Client ID (x-api-key)" />
+          <GetCredential.Return.CredentialDetails.ImsOrgID heading="Organization ID (x-gw-ims-org-id)" />
+          <GetCredential.Return.CredentialDetails.Scopes heading="Scopes" scope="openid,session,AdobeID,read_organizations,additional_info.projectedProductContext" />
+        </GetCredential.Return.CredentialDetails>
+
+        <GetCredential.Return.ProjectsDropdown label="Projects" subHeading="Only your projects that contain credentials are shown" />
+
+        <GetCredential.Return.ManageDeveloperConsole label="Manage all your projects and credentials on Adobe Developer Console" direction='/console/projects' />
+
+        <GetCredential.Return.AccessToken helpText="" buttonLabel="Generate and copy token" heading={(<>Access token<br/><br/> <span style="font-weight:normal"><small>Paste the access token into the <strong>Authorization</strong> header in the <strong>Try it</strong> panel below. Then, add the <a href="https://developer.adobe.com/commerce/services/optimizer/data-ingestion/using-the-api/#base-url">instance ID</a> to the <strong>instance ID</strong> field. You only need to do this once; future requests reuse the values automatically.</small></span></>)} />
+
+        <GetCredential.Return.DevConsoleLink heading="Developer Console project" />
+
+        <GetCredential.Return.Products label="Included products and services">
+          <GetCredential.Return.Product label="Adobe Commerce Optimizer" icon={commerce} />
+        </GetCredential.Return.Products>
+
+      </GetCredential.Return>
+
+      <GetCredential.RequestAccess
+        title="Get credentials"
+        paragraph="Create unique credentials that you will use to call multiple APIs from your application."
+      >
+        <GetCredential.RequestAccess.EdgeCase>
+          <GetCredential.RequestAccess.EdgeCase.NoProduct title="Your organization does not have access to Adobe Commerce Optimizer." />
+          <GetCredential.RequestAccess.EdgeCase.Type1User title="You do not have access to Adobe Commerce Optimizer. Please use another organization and try again." />
+          <GetCredential.RequestAccess.EdgeCase.NotMember title="You do not have access to Adobe Commerce Optimizer. Please use another organization and try again." />
+        </GetCredential.RequestAccess.EdgeCase>
+
+        <GetCredential.RequestAccess.RestrictedAccess
+          title="Restricted Access"
+          buttonLabel="Request access"
+        >
+          <GetCredential.RequestAccess.RestrictedAccess.Products label="Included products and services">
+            <GetCredential.RequestAccess.RestrictedAccess.Products.Product
+              icon={commerce}
+              label="Adobe Commerce Optimizer"
+            />
+          </GetCredential.RequestAccess.RestrictedAccess.Products>
+        </GetCredential.RequestAccess.RestrictedAccess>
+        <GetCredential.RequestAccess.RequestAccessSide>
+          <div style={{ display: "flex", gap: "32px", flexDirection: "column" }}>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                OAuth server-to-server credential
+              </h3>
+              <p className="spectrum-Body spectrum-Body--sizeM">
+                This credential allows you to use industry standard OAuth2.0 libraries to generate access tokens using the OAuth 2.0 client credentials grant type.
+              </p>
+            </div>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                Learn more
+              </h3>
+              <a style={{ color: "#0265DC" }} href="https://developer.adobe.com/commerce/webapi/rest/authentication/">
+                Authentication documentation
+              </a>
+            </div>
+          </div>
+        </GetCredential.RequestAccess.RequestAccessSide>
+      </GetCredential.RequestAccess>
+    </GetCredential>
+
+  )
+}
+
+export default GetCredentialOAuthS2s;
diff --git a/src/pages/credential/images/commerce.svg b/src/pages/credential/images/commerce.svg
diff --git a/src/pages/optimizer/admin/using-the-api.md b/src/pages/optimizer/admin/using-the-api.md
@@ -32,7 +32,7 @@ The URL structure is:
 &NewLine; <!--Add space between the collapsible section and the previous paragraph-->
 
 <details>
-      <summary><b>Get your tenant ID</b></summary>
+      <summary><b>Get your instance ID</b></summary>
 
 import GetTenantId from '/src/_includes/authentication/get-tenant-id.md'
 

diff --git a/src/pages/optimizer/data-ingestion/api-reference.md b/src/pages/optimizer/data-ingestion/api-reference.md
diff --git a/src/pages/optimizer/data-ingestion/using-the-api.md b/src/pages/optimizer/data-ingestion/using-the-api.md
@@ -36,7 +36,7 @@ The URL structure is:
 &NewLine; <!--Add space between the collapsible section and the previous paragraph-->
 
 <details>
-      <summary><b>Get your tenant ID</b></summary>
+      <summary><b>Get your instance ID</b></summary>
 
 import GetTenantId from '/src/_includes/authentication/get-tenant-id.md'
 

diff --git a/src/pages/optimizer/merchandising-services/api-reference.md b/src/pages/optimizer/merchandising-services/api-reference.md
diff --git a/src/pages/optimizer/merchandising-services/troubleshooting.md b/src/pages/optimizer/merchandising-services/troubleshooting.md
@@ -15,7 +15,7 @@ When building dynamic storefronts with the Merchandising GraphQL API, it's essen
 
 ## Common Issues
 
-- **Authentication Errors**: Verify that the tenant ID used in the endpoint URL to ensure it matches the tenant ID in your Adobe Commerce Optimizer instance.
+- **Authentication Errors**: Verify that the instance ID used in the endpoint URL to ensure it matches the instance ID in your Adobe Commerce Optimizer instance.
 - **Missing Data**: Ensure products are properly ingested via the Data Ingestion API. You can check the synchronization status for product data from the [Data Sync page](https://experienceleague.adobe.com/en/docs/commerce/optimizer/setup/data-sync) in Adobe Commerce Optimizer.
 - **Performance Issues**: Optimize queries and implement caching.
 - **Rate Limiting**: Monitor API usage and implement proper throttling.

diff --git a/src/pages/optimizer/merchandising-services/using-the-api.md b/src/pages/optimizer/merchandising-services/using-the-api.md
@@ -17,7 +17,7 @@ Use the Merchandising API to retrieve product data from your Commerce catalogs a
 
 Before using the Merchandising API, ensure you have:
 
-- **Adobe Commerce Optimizer Access**: Active subscription and the tenant ID associated with your Adobe Commerce Optimizer instance
+- **Adobe Commerce Optimizer Access**: Active subscription and the instance ID associated with your Adobe Commerce Optimizer instance
 - **Catalog Data**: Products and pricing data ingested via the [Data Ingestion API](../data-ingestion/index.md)
 - **Catalog Views**: Configured views and policies in Adobe Commerce Optimizer
 - **Authentication Setup**: Proper headers configured for API requests
@@ -48,7 +48,7 @@ The URL structure is:
 &NewLine; <!--Add space between the collapsible section and the previous paragraph-->
 
 <details>
-      <summary><b>Get your tenant ID</b></summary>
+      <summary><b>Get your instance ID</b></summary>
 
 import GetTenantId from '/src/_includes/authentication/get-tenant-id.md'
 
@@ -100,9 +100,9 @@ Get the values for catalog view, policy, catalog source locale, and price book d
 
 To get started with the Merchandising API, follow these steps to make your first request:
 
-1. Get values for the tenant ID and required headers.
+1. Get values for the instance ID and required headers.
 
-   - `tenantId`: Your unique tenant ID for Adobe Commerce Optimizer
+   - `tenantId`: Your unique instance ID for Adobe Commerce Optimizer
    - `AC-View-ID`: Catalog view ID from Adobe Commerce Optimizer
    - `AC-Source-Locale`: Locale for data filtering (for example, `en-US`, `en-GB`)
 

diff --git a/src/pages/reference/rest/index.md b/src/pages/reference/rest/index.md
@@ -9,6 +9,8 @@ keywords:
 layout: none
 ---
 
-# API Reference
+import GetCredentialOAuthS2s from '/src/pages/credential/GetCredentialOAuthS2s.js'
 
-<RedoclyAPIBlock src="https://raw.githubusercontent.com/AdobeDocs/commerce-services/refs/heads/main/src/openapi/data-ingestion-schema-v1.yaml" scrollYOffset={64} hideTryItPanel="true" nativeScrollbars="true" />
+<GetCredentialOAuthS2s />
+
+<RedoclyAPIBlock src='/commerce/services/rest/data-ingestion-schema-v1.yaml' hideLoading />
diff --git a/src/openapi/README.md → static/rest/README.md b/src/openapi/README.md → static/rest/README.md