-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #84 from packagist/bitbucket-server-oauth2
Bitbucket Server: add OAuth2 docs
- Loading branch information
Showing
23 changed files
with
141 additions
and
56 deletions.
There are no files selected for viewing
Binary file added
BIN
+161 KB
Resources/public/img/docs/bitbucket-server-oauth1-01-packagist-setup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+125 KB
(190%)
...urces/public/img/docs/integration-setup/bitbucket-server-01-packagist-setup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+250 KB
...ocs/integration-setup/bitbucket-server-02-bitbucket-create-application-link.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-169 KB
Resources/public/img/docs/integration-setup/bitbucket-server-02-packagist-form.png
Binary file not shown.
Binary file modified
BIN
+37.1 KB
(120%)
.../integration-setup/bitbucket-server-03-bitbucket-configure-application-link.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+275 KB
...es/public/img/docs/integration-setup/bitbucket-server-04-packagist-finalize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-169 KB
...es/public/img/docs/integration-setup/bitbucket-server-08-packagist-finalize.png
Binary file not shown.
Binary file added
BIN
+162 KB
...ublic/img/docs/integration-setup/bitbucket-server-oauth1-01-packagist-setup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+475 KB
...public/img/docs/integration-setup/bitbucket-server-oauth1-02-packagist-form.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+215 KB
...ation-setup/bitbucket-server-oauth1-03-bitbucket-configure-application-link.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added
BIN
+473 KB
...ic/img/docs/integration-setup/bitbucket-server-oauth1-08-packagist-finalize.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+213 KB
(410%)
...public/img/docs/integration-setup/cloud/bitbucket-server-01-packagist-setup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed
BIN
-202 KB
...blic/img/docs/integration-setup/cloud/bitbucket-server-02-packagist-details.png
Binary file not shown.
Binary file added
BIN
+180 KB
...img/docs/integration-setup/cloud/bitbucket-server-oauth1-01-packagist-setup.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+519 KB
...g/docs/integration-setup/cloud/bitbucket-server-oauth1-02-packagist-details.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,40 @@ | ||
| # Bitbucket Data Center / Server Integration Setup | ||
| ## Private Packagist Cloud | ||
|
|
||
| ## Initial Setup | ||
| <div class="row column"> | ||
| <div class="callout warning"> | ||
| <p>Note: Application Links using OAuth 2 are available since Bitbucket Data Center / Server v7.21. If you are using an older Bitbucket Data Center / Server version then consult the<a href="/docs/cloud/bitbucket-server-oauth1-integration-setup.md">Bitbucket Data Center / Server OAuth 1 setup guide</a>.</p> | ||
| </div> | ||
| </div> | ||
|
|
||
| From the organization settings page, select the "Integrations" subtab. Hit the "Add Integration" button on the integrations listing page to get to the form below. | ||
| To set up a Bitbucket Data Center / Server integration with Private Packagist start by selecting "Bitbucket Data Center / Server" as the platform and enter the URL of your on-premise Bitbucket Server into the base URL field as seen in the example below. | ||
| ## Initial Setup | ||
| From the organization settings page, select the "Integrations" subtab. | ||
| Hit the "Add Integration" button on the integrations listing page to get to the form below. | ||
| To set up 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. | ||
|
|
||
|  | ||
|
|
||
| Submit the form to see the additional information. | ||
|
|
||
|  | ||
| Copy the content from the "Callback URL / Redirect URL" field and follow the link to set up an Application Link. | ||
|
|
||
| ## Configure Application link | ||
| Click on the link to setup an Application Link on Bitbucket Data Center / Server. You will need the "Client Id" and the "Public Key" shown in the form. | ||
|
|
||
|  | ||
|
|
||
| For Bitbucket Data Center versions 7.21 and newer, select "Atlassian product" and not "External application" to be able to set up an OAuth1 link. | ||
|
|
||
| After you hit the button to create a new Application Link a configuration window may appear. If it does, verify that the url matches your Private Packagist URL and hit "Continue", otherwise skip this step. | ||
|
|
||
|  | ||
|
|
||
| Now setup a "Generic Application". The only field required is the "Application Name". Submit the form to finish creating the 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. | ||
|
|
||
|  | ||
|  | ||
|
|
||
|  | ||
| After you click the button to continue, enter a name and the content from the "Callback URL / Redirect URL" from the Private Packagist form. | ||
| Select Repositories "Read" as application permission and save the form. | ||
|
|
||
| Click on the pen icon to the right of the application you just created to edit the Application Link and configure Incoming Authentication. | ||
|  | ||
|
|
||
|  | ||
| ## Finish the Setup | ||
|
|
||
| This is where we will need the "Client ID" and the "Public Key" that were previously generated on the Private Packagist integration form. Make sure the entire content of the "Public Key" field gets copied and the "Consumer Callback" field stays empty. Submit the form and go back to Private Packagist. | ||
| 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. | ||
|
|
||
| ## Configure Bitbucket Server plugins | ||
|
|
||
| In case the U2F & TOTP plugin by Alpha Server is installed on the Bitbucket Server then you will need to enable the OAuth whitelist | ||
| otherwise Private Packagist will not be able to authenticate with the Bitbucket Server. | ||
| In case the U2F & TOTP plugin by Alpha Server is installed on the Bitbucket Data Center / Server then you will need to enable the OAuth whitelist | ||
| otherwise Private Packagist won't be able to authenticate with the Bitbucket Data Center / Server. | ||
|
|
||
|  | ||
|  |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| # Bitbucket Data Center / Server Integration Setup (OAuth 1) | ||
| ## Private Packagist Cloud | ||
|
|
||
| ## Initial Setup | ||
|
|
||
| From the organization settings page, select the "Integrations" subtab. | ||
| Hit the "Add Integration" button on the integrations listing page to get to the form below. | ||
| To set up 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 1 as the OAuth version as seen in the example below. | ||
|
|
||
|  | ||
|
|
||
| Submit the form to see the additional information. | ||
|
|
||
|  | ||
|
|
||
| ## Configure Application link | ||
| Click on the link to setup an Application Link on Bitbucket Data Center / Server. You will need the "Client Id" and the "Public Key" shown in the form. | ||
|
|
||
|  | ||
|
|
||
| For Bitbucket Data Center versions 7.21 and newer, select "Atlassian product" and not "External application" to be able to set up an OAuth1 link. | ||
|
|
||
| After you hit the button to create a new Application Link a configuration window may appear. If it does, verify that the url matches your Private Packagist URL and hit "Continue", otherwise skip this step. | ||
|
|
||
|  | ||
|
|
||
| Now setup a "Generic Application". The only field required is the "Application Name". Submit the form to finish creating the Application Link. | ||
|
|
||
|  | ||
|
|
||
|  | ||
|
|
||
| Click on the pen icon to the right of the application you just created to edit the Application Link and configure Incoming Authentication. | ||
|
|
||
|  | ||
|
|
||
| This is where we will need the "Client ID" and the "Public Key" that were previously generated on the Private Packagist integration form. | ||
| Enter the "Client ID" into the "Consumer Key" field, make sure the entire content of the "Public Key" field gets copied and the "Consumer Callback" field stays empty. | ||
| Submit the form and go back to Private Packagist. | ||
|
|
||
| ## Configure Bitbucket Server plugins | ||
|
|
||
| In case the U2F & TOTP plugin by Alpha Server is installed on the Bitbucket Data Center / Server then you will need to enable the OAuth whitelist | ||
| otherwise Private Packagist won't be able to authenticate with the Bitbucket Data Center / Server. | ||
|
|
||
|  |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
docs/self-hosted/bitbucket-server-oauth1-integration-setup.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| # Bitbucket Data Center / Server Integration Setup (OAuth 1) | ||
| ## Private Packagist Self-Hosted | ||
|
|
||
| ## Initial Setup | ||
| Hit the “Add integration“ button on the admin page to get to the form below. | ||
| 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 1 as the OAuth version as seen in the example below. | ||
|
|
||
|  | ||
|
|
||
| Submit the form to see the additional information. | ||
|
|
||
|  | ||
|
|
||
| ## Configure Application link | ||
| Click on the link to setup an Application Link on Bitbucket Data Center / Server. You will need the "Client Id" and the "Public Key" shown in the form. | ||
|
|
||
|  | ||
|
|
||
| For Bitbucket Data Center versions 7.21 and newer, select "Atlassian product" and not "External application" to be able to set up an OAuth1 link. | ||
|
|
||
| After you hit the button to create a new Application Link a configuration window may appear. If it does, verify that the url matches your Private Packagist URL and hit "Continue", otherwise skip this step. | ||
|
|
||
|  | ||
|
|
||
| Now setup a "Generic Application". The only field required is the "Application Name". Submit the form to finish creating the Application Link. | ||
|
|
||
|  | ||
|
|
||
|  | ||
|
|
||
| Click on the pen icon to the right of the application you just created to edit the Application Link and configure Incoming Authentication. | ||
|
|
||
|  | ||
|
|
||
| This is where we will need the "Client ID" and the "Public Key" that were previously generated on the Private Packagist integration form. | ||
| Enter the "Client ID" into the "Consumer Key" field, make sure the entire content of the "Public Key" field gets copied and the "Consumer Callback" field stays empty. | ||
| Submit the form and go back to Private Packagist. | ||
|
|
||
| ## Finish the Setup | ||
| Update the Integration on Private Packagist to save everything and finish the setup. | ||
|
|
||
|  | ||
|
|
||
| ## Configure Bitbucket Data Center / Server plugins | ||
|
|
||
| In case the U2F & TOTP plugin by Alpha Server is installed on the Bitbucket Data Center / Server then you will need to enable the OAuth whitelist | ||
| otherwise Private Packagist won't be able to authenticate with the Bitbucket Data Center / Server. | ||
|
|
||
|  |