diff --git a/modules/administration-guide/pages/configuring-oauth-2-for-the-bitbucket-cloud.adoc b/modules/administration-guide/pages/configuring-oauth-2-for-the-bitbucket-cloud.adoc index ff31f339cb..ad977414b4 100644 --- a/modules/administration-guide/pages/configuring-oauth-2-for-the-bitbucket-cloud.adoc +++ b/modules/administration-guide/pages/configuring-oauth-2-for-the-bitbucket-cloud.adoc @@ -9,9 +9,9 @@ You can enable users to work with a remote Git repository that is hosted in the Bitbucket Cloud: -. Set up an OAuth consumer (OAuth 2.0) in the Bitbucket Cloud. -. Apply an OAuth consumer Secret for the Bitbucket Cloud. +. Set up an OAuth client (OAuth 2.0) in the Bitbucket Cloud. +. Apply an OAuth client Secret for the Bitbucket Cloud. -include::partial$proc_setting-up-an-oauth-consumer-in-the-bitbucket-cloud.adoc[leveloffset=+1] +include::partial$proc_setting-up-an-oauth-client-in-the-bitbucket-cloud.adoc[leveloffset=+1] -include::partial$proc_applying-an-oauth-consumer-secret-for-the-bitbucket-cloud.adoc[leveloffset=+1] +include::partial$proc_applying-an-oauth-client-secret-for-the-bitbucket-cloud.adoc[leveloffset=+1] diff --git a/modules/administration-guide/partials/proc_applying-an-oauth-consumer-secret-for-the-bitbucket-cloud.adoc b/modules/administration-guide/partials/proc_applying-an-oauth-client-secret-for-the-bitbucket-cloud.adoc similarity index 53% rename from modules/administration-guide/partials/proc_applying-an-oauth-consumer-secret-for-the-bitbucket-cloud.adoc rename to modules/administration-guide/partials/proc_applying-an-oauth-client-secret-for-the-bitbucket-cloud.adoc index e2356c99d5..9cc06c87e3 100644 --- a/modules/administration-guide/partials/proc_applying-an-oauth-consumer-secret-for-the-bitbucket-cloud.adoc +++ b/modules/administration-guide/partials/proc_applying-an-oauth-client-secret-for-the-bitbucket-cloud.adoc @@ -1,21 +1,21 @@ :_content-type: PROCEDURE -:description: Applying an OAuth consumer Secret for the Bitbucket Cloud -:keywords: bitbucket, bitbucket-cloud, oauth-consumer, bitbucket-consumer, oauth-consumer-secret, bitbucket-client-secret -:navtitle: Applying an OAuth consumer Secret for the Bitbucket Cloud +:description: Applying an OAuth client Secret for the Bitbucket Cloud +:keywords: bitbucket, bitbucket-cloud, oauth-client, bitbucket-client, oauth-client-secret, bitbucket-client-secret +:navtitle: Applying an OAuth client Secret for the Bitbucket Cloud // :page-aliases: -[id="applying-an-oauth-consumer-secret-for-the-bitbucket-cloud"] -= Applying an OAuth consumer Secret for the Bitbucket Cloud +[id="applying-an-oauth-client-secret-for-the-bitbucket-cloud"] += Apply an OAuth client Secret for the Bitbucket Cloud -Prepare and apply an OAuth consumer Secret for the Bitbucket Cloud. +Apply an OAuth client Secret for the Bitbucket Cloud. .Prerequisites -* The OAuth consumer is set up in the Bitbucket Cloud. +* The OAuth client is set up in the Bitbucket Cloud. -* The following values, which were generated when setting up the Bitbucket OAuth consumer, are prepared: -** Bitbucket OAuth consumer Key -** Bitbucket OAuth consumer Secret +* The following values, which were generated when setting up the Bitbucket OAuth client, are prepared: +** Bitbucket OAuth client ID +** Bitbucket OAuth client Secret * An active `{orch-cli}` session with administrative permissions to the destination {orch-name} cluster. See {orch-cli-link}. @@ -37,12 +37,12 @@ metadata: che.eclipse.org/oauth-scm-server: bitbucket type: Opaque stringData: - id: ____ <2> - secret: ____ <3> + id: ____ <2> + secret: ____ <3> ---- <1> The {prod-short} namespace. The default is `{prod-namespace}`. -<2> The *Bitbucket OAuth consumer Key*. -<3> The *Bitbucket OAuth consumer Secret*. +<2> The *Bitbucket OAuth client ID*. +<3> The *Bitbucket OAuth client Secret*. . Apply the Secret: + diff --git a/modules/administration-guide/partials/proc_setting-up-an-oauth-client-in-the-bitbucket-cloud.adoc b/modules/administration-guide/partials/proc_setting-up-an-oauth-client-in-the-bitbucket-cloud.adoc new file mode 100644 index 0000000000..19d087d915 --- /dev/null +++ b/modules/administration-guide/partials/proc_setting-up-an-oauth-client-in-the-bitbucket-cloud.adoc @@ -0,0 +1,31 @@ +:_content-type: PROCEDURE +:description: Setting up an OAuth client in the Bitbucket Cloud +:keywords: bitbucket, bitbucket-cloud, oauth-client, bitbucket-oauth-client, oauth-application +:navtitle: Setting up an OAuth client in the Bitbucket Cloud +// :page-aliases: +[id="set-up-an-oauth-client-in-the-bitbucket-cloud"] += Set up an OAuth client in the Bitbucket Cloud + +Set up an OAuth client for OAuth 2.0 in the Bitbucket Cloud. + +.Prerequisites + +* You are logged in to the Bitbucket Cloud. + +.Procedure + +. Click the Gear(Settings) icon and go to the *Workspace Settings* page. + +. Go to menu:Apps and features[OAuth clients > Create OAuth client]. + +. In the *Details* tab enter *{prod-short}* as the *Name*. + +. In the *Authorization* tab click the *Authorization code* checkbox and enter `pass:c,a,q[{prod-url}]/api/oauth/callback` as the *Callback URL*. +. In the *Scopes* tab check all of the *Account* and *Repositories* checkboxes, and click *Save*. +. Copy and save the *Client ID* value for use when applying the Bitbucket OAuth client Secret. +. Copy and save the *Secret* value for use when applying the Bitbucket OAuth client Secret. + +[role="_additional-resources"] +.Additional resources + +* link:https://support.atlassian.com/bitbucket-cloud/docs/use-oauth-on-bitbucket-cloud[Bitbucket Docs: Use OAuth on Bitbucket Cloud] diff --git a/modules/administration-guide/partials/proc_setting-up-an-oauth-consumer-in-the-bitbucket-cloud.adoc b/modules/administration-guide/partials/proc_setting-up-an-oauth-consumer-in-the-bitbucket-cloud.adoc deleted file mode 100644 index ef2c9fd48f..0000000000 --- a/modules/administration-guide/partials/proc_setting-up-an-oauth-consumer-in-the-bitbucket-cloud.adoc +++ /dev/null @@ -1,36 +0,0 @@ -:_content-type: PROCEDURE -:description: Setting up an OAuth consumer in the Bitbucket Cloud -:keywords: bitbucket, bitbucket-cloud, oauth-consumer, bitbucket-oauth-consumer, oauth-application -:navtitle: Setting up an OAuth consumer in the Bitbucket Cloud -// :page-aliases: - -[id="setting-up-an-oauth-consumer-in-the-bitbucket-cloud"] -= Setting up an OAuth consumer in the Bitbucket Cloud - -Set up an OAuth consumer for OAuth 2.0 in the Bitbucket Cloud. - -.Prerequisites - -* You are logged in to the Bitbucket Cloud. - -.Procedure - -. Click your avatar and go to the *All workspaces* page. - -. Select a workspace and click it. - -. Go to menu:Settings[OAuth consumers > Add consumer]. - -. Enter *{prod-short}* as the *Name*. - -. Enter `pass:c,a,q[{prod-url}]/api/oauth/callback` as the *Callback URL*. - -. Under *Permissions*, check all of the *Account* and *Repositories* checkboxes, and click *Save*. - -. Expand the added consumer and then copy and save the *Key* value for use when applying the Bitbucket OAuth consumer Secret: - -. Copy and save the *Secret* value for use when applying the Bitbucket OAuth consumer Secret. - -.Additional resources - -* link:https://support.atlassian.com/bitbucket-cloud/docs/use-oauth-on-bitbucket-cloud[Bitbucket Docs: Use OAuth on Bitbucket Cloud]