diff --git a/_articles/directory-connector/azure-active-directory.md b/_articles/directory-connector/azure-active-directory.md index 55e38e9f..f32a8689 100644 --- a/_articles/directory-connector/azure-active-directory.md +++ b/_articles/directory-connector/azure-active-directory.md @@ -43,9 +43,7 @@ This article will cover how to connect the Bitwarden Directory Connector tool to 1. Select the **Bitwarden** application you created in the previous section. 2. Navigate to **Settings** and select **Required Permissions**. -3. Select the existing **Windows Azure Active Directory** API. -4. Check **all** Application and Delegated permissions and click **Save**. - {% image directory-connector/azure/directory-permissions.png %} +3. Delete the existing **Windows Azure Active Directory** API permission set that is automatically created by default. It is not needed. 5. Select the **Add** button to create a new API permission set. 6. For step 1, **Select an API** for **Microsoft Graph**. 7. For step 2, **Select Permissions** for the following: @@ -78,15 +76,15 @@ This article will cover how to connect the Bitwarden Directory Connector tool to ## Get Your Tenant Hostname -1. Select your username in the top right corner of the Azure Portal. +1. Select the **Directory and Subscription** filter in the top right corner of the Azure Portal. 2. Note the **hostname** value that appears under your directory (ex. company.onmicrosoft.com). This is your **Tenant** hostname. Copy the **Tenant** hostname to a safe place. We will need to reference it later. {% image directory-connector/azure/tenant.png %} ## Configure Directory Connector -1. Launch the Directory Connector console by double clicking the shortcut. -2. Select option 3 (Configure directory connection) from the main menu. -3. Select **Azure Active Directory** as the type. +1. Launch the Directory Connector desktop application +2. Go to the **Settings** tab. +3. Select **Azure Active Directory** as the directory type. 6. Enter the **Tenant** hostname that you copied from the steps above (ex. company.onmicrosoft.com). 7. Enter the **Application ID** that you copied from the steps above. 8. Enter the Application **Secret** Key that you copied from the steps above. @@ -95,7 +93,6 @@ Congrats! You are done configuring Azure Active Directory with the Bitwarden Dir ## Testing - {% note %} It can take up to 15 minutes for the granted permissions for your application to properly propagate. You may receive "Insufficient privileges to complete the operation" errors in the meantime. {% endnote %} diff --git a/_articles/directory-connector/gsuite-directory.md b/_articles/directory-connector/gsuite-directory.md index 63b72739..ffd6b7a8 100644 --- a/_articles/directory-connector/gsuite-directory.md +++ b/_articles/directory-connector/gsuite-directory.md @@ -85,15 +85,13 @@ If you already have a Google Cloud project available, you can skip this step and ## Configure Directory Connector -1. Locate the secret key JSON file that was downloaded whenever you created your service account in the steps above. -2. Copy this file to the Bitwarden Directory Connector program data folder at `C:/ProgramData/bitwarden/Directory Connector`. - - Optionally rename the JSON file to something that is easier to remember, such as `client_secret.json` -3. Launch the Directory Connector console by double clicking the shortcut. -4. Select option 3 (Configure directory connection) from the main menu. -5. Select **G Suite Directory** as the type. -6. Enter the name of the JSON file that you copied in step 2. -7. Enter the domain of your G Suite account. -8. Enter the email address of an admin user that has full access to the G Suite directory (such as your own). +1. Launch the Directory Connector desktop application +2. Go to the **Settings** tab. +3. Select **G Suite Directory** as the directory type. +4. Enter the **Domain** of your G Suite account. +5. Enter the email address of an **Admin User** that has full access to the G Suite directory (such as your own). +6. If you have one, enter the **Customer Id** of your directory (most users won't need to enter a Customer Id). +7. Select the **JSON Key File** that was downloaded whenever you created your service account in the steps above. The **Client Email** and **Private Key** will be automatically extracted from this key file for you. Congrats! You are done configuring G Suite with the Bitwarden Directory Connector. diff --git a/_articles/directory-connector/ldap-directory.md b/_articles/directory-connector/ldap-directory.md index 20e39c25..890e2ba4 100644 --- a/_articles/directory-connector/ldap-directory.md +++ b/_articles/directory-connector/ldap-directory.md @@ -50,9 +50,10 @@ The following options can be set: ## Configuring Sync Settings -1. Launch the Directory Connector console by double clicking the shortcut. -2. Select option 4 (Configure sync) from the main menu. -3. Step through and set each sync configuration setting. +1. Launch the Directory Connector desktop application +2. Go to the **Settings** tab. +3. Select **Active Directory / LDAP** as the directory type. +3. Specify the appropriate settings for your Active Directory or LDAP server. {% table %} diff --git a/images/directory-connector/azure/grant-permissions.png b/images/directory-connector/azure/grant-permissions.png index 0525873a..d13711cf 100644 Binary files a/images/directory-connector/azure/grant-permissions.png and b/images/directory-connector/azure/grant-permissions.png differ diff --git a/images/directory-connector/azure/tenant.png b/images/directory-connector/azure/tenant.png index 2aecadb9..e157379f 100644 Binary files a/images/directory-connector/azure/tenant.png and b/images/directory-connector/azure/tenant.png differ