-
-
Note: The instructions on this page create an integration with the public Bitbucket at bitbucket.org. If you are trying to setup an integration with your own Bitbucket Data Center / Server consult the Bitbucket Data Center / Server setup guide.
+
+
+ This guide explains how to set up an OAuth integration for Private Packagist Self-Hosted with the public service on Bitbucket.org.
+ If you use Bitbucket Data Center / Server instead, consult this guide for Self-Hosted.
+
+
If you are using our Cloud product at packagist.com, this page is not relevant to you.
-## Initial Setup
-Hit the “Add Integration“ button on the admin page to get to the form below.
+To allow your users to authenticate to Private Packagist Self-Hosted with their Bitbucket account, you'll
+first need to create an integration in Private Packagist. This document walks you through the required steps.
+
+## Open the Add Integration form
+Go to the Admin section and hit the “Add Integration“ button to open the form to create your integration. If you've just
+installed Private Packagist Self-Hosted and it is still running in Setup Mode, you do not need to log in. If the application
+is no longer in Setup mode, you will have to log in with an admin account first.
To setup a Bitbucket integration with Private Packagist start by selecting "Bitbucket" as the platform and enter
https://bitbucket.org as the base URL, as seen in the example below.
+A link to set up the OAuth application on Bitbucket will automatically be displayed.
-
+
## Creating an OAuth Application
-Do not submit the integration form yet, but copy the content from the "Callback URL / Redirect URL" and go to
https://bitbucket.org/account. Find the "OAuth" menu item under "Access Management" and click on "Add consumer".
-
-
+Do not submit the integration form yet, the fields Client ID and Client Secret remain empty for now.
+Copy the content from the "Callback URL / Redirect URL" and open the setup link to your Bitbucket
+account. Replace the `
` string in the setup link with your actual Bitbucket workspace name.
-Make sure all the scopes listed on the Private Packagist form are checked and save the new consumer.
+
-
+Make sure all the scopes listed on the Private Packagist form are checked and save the new consumer. Click on the consumer
+you just created to reveal the credentials required to finish the setup on Private Packagist.
-Click on the consumer you just created to reveal the credentials required to finish the setup on Private Packagist.
+
## Finish the Setup
Copy and paste the "Key" and "Secret" values back into the Private Packagist integration form and submit the form with the "Create Integration" button.
-
+
+
+The Bitbucket integration will be created and you will be redirected to the admin page.
+
+The new integration will be shown in the list of available integrations, and your users can
+now log in to your Private Packagist Self-Hosted installation using their Bitbucket account.
+
+
diff --git a/docs/self-hosted/bitbucket-server-integration-setup.md b/docs/self-hosted/bitbucket-server-integration-setup.md
index 213ccb20..605267a3 100644
--- a/docs/self-hosted/bitbucket-server-integration-setup.md
+++ b/docs/self-hosted/bitbucket-server-integration-setup.md
@@ -1,8 +1,15 @@
# Bitbucket Data Center / Server Integration Setup
## Private Packagist Self-Hosted
-This guide explains how to setup an OAuth integration for Private Packagist Self-Hosted with Bitbucket Data Center / Server integration.
-If you are using our cloud product at packagist.com, [use this guide](../cloud/bitbucket-server-integration-setup.md).
+
+
+
+ This guide explains how to set up an OAuth integration for Private Packagist Self-Hosted with Bitbucket Data Center / Server.
+ If you use their public service on bitbucket.org, follow these instructions.
+
+
If you are using our Cloud product at packagist.com, use this guide.
+
+
@@ -10,17 +17,28 @@ If you are using our cloud product at packagist.com, [use this guide](../cloud/b
-## Initial Setup
-Hit the “Add integration“ button on the admin page to get to the form below.
+To allow your users to authenticate to Private Packagist Self-Hosted with their Bitbucket Data Center / Server account, you'll
+first need to create an integration in Private Packagist. This document walks you through the required steps.
+
+## Open the Add Integration form
+Go to the Admin section and hit the “Add Integration“ button to open the form to create your integration. If you've just
+installed Private Packagist Self-Hosted and it is still running in Setup Mode, you do not need to log in. If the application
+is no longer in Setup mode, you will have to log in with an admin account first.
+
+
+
To setup a Bitbucket Data Center / Server integration with Private Packagist, start by selecting "Bitbucket Data Center / Server"
-as the platform, enter the URL of your on-premise Bitbucket Data Center / Server into the base URL field and select OAuth 2 as the OAuth version as seen in the example below.
+as the platform, enter the URL of your on-premise Bitbucket Data Center / Server into the base URL field and select OAuth 2
+as the OAuth version as seen in the example below. A link to set up the OAuth application on your Bitbucket instance will automatically be displayed.
-
+
-Copy the content from the "Callback URL / Redirect URL" field and follow the link to set up an Application Link.
+## Create Application link
+Do not submit the integration form yet, but copy the content from the "Callback
+URL / Redirect URL" and follow the setup link to your Bitbucket Data Center / Server instance. The fields
+Client ID and Client Secret remain empty for now.
-## Configure Application link
-Click on the link to setup an Application Link on Bitbucket Data Center / Server and select "External application" as type and "Incoming" as direction.
+In Bitbucket, click on the "Create link" button and select "External application" as type and "Incoming" as direction.
@@ -29,12 +47,21 @@ Select Repositories "Read" as application permission and save the form.
+Once the form is saved, Bitbucket Data Center / Server will show you the Client ID and secret.
+
## Finish the Setup
+Copy and paste the "Client ID" and "Client Secret" values back into the Private
+Packagist integration form and submit the form with the "Create Integration"
+button.
-Once the form is saved, Bitbucket Data Center / Server will show you the Client ID and secret.
-Copy them over to Private Packagist and save the integration.
+
+
+The Bitbucket integration will be created and you will be redirected to the admin page.
+
+The new integration will be shown in the list of available integrations, and your users can
+now log in to your Private Packagist Self-Hosted installation using their Bitbucket Data Center / Server account.
-
+
## Configure Bitbucket Server plugins
diff --git a/docs/self-hosted/bitbucket-server-oauth1-integration-setup.md b/docs/self-hosted/bitbucket-server-oauth1-integration-setup.md
index f0001858..0506a9cb 100644
--- a/docs/self-hosted/bitbucket-server-oauth1-integration-setup.md
+++ b/docs/self-hosted/bitbucket-server-oauth1-integration-setup.md
@@ -1,6 +1,16 @@
# Bitbucket Data Center / Server Integration Setup (OAuth 1)
## Private Packagist Self-Hosted
+
+
+
+ This guide explains how to set up an OAuth 1 integration for Private Packagist Self-Hosted with Bitbucket Data Center / Server.
+ If you use their public service on bitbucket.org, these instructions are not relevant to you.
+
+
If you are using our Cloud product at packagist.com, please use this guide.
+
+