From bfcae8088de7ce56934bc14acf7e61f0df2a7e57 Mon Sep 17 00:00:00 2001 From: Alexander Haase Date: Thu, 26 Sep 2024 14:20:05 +0200 Subject: [PATCH] Rename Microsoft Azure AD to Entra ID Occurrences of the old term have been replaced by the new term. However, the documentation still needs some work to reflect the new Entra ID screenshots and terminology. --- .../{microsoft-azure-ad.md => microsoft-entra-id.md} | 8 ++++---- docs/features/authentication-permissions.md | 2 +- mkdocs.yml | 2 +- netbox/netbox/authentication/__init__.py | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) rename docs/administration/authentication/{microsoft-azure-ad.md => microsoft-entra-id.md} (94%) diff --git a/docs/administration/authentication/microsoft-azure-ad.md b/docs/administration/authentication/microsoft-entra-id.md similarity index 94% rename from docs/administration/authentication/microsoft-azure-ad.md rename to docs/administration/authentication/microsoft-entra-id.md index 17b1308189..3451c656f1 100644 --- a/docs/administration/authentication/microsoft-azure-ad.md +++ b/docs/administration/authentication/microsoft-entra-id.md @@ -1,8 +1,8 @@ -# Microsoft Azure AD +# Microsoft Entra ID -This guide explains how to configure single sign-on (SSO) support for NetBox using [Microsoft Azure Active Directory (AD)](https://azure.microsoft.com/en-us/services/active-directory/) as an authentication backend. +This guide explains how to configure single sign-on (SSO) support for NetBox using [Microsoft Entra ID](https://www.microsoft.com/en-us/security/business/identity-access/microsoft-entra-id) as an authentication backend. -## Azure AD Configuration +## Entra ID Configuration ### 1. Create a test user (optional) @@ -16,7 +16,7 @@ Under the Azure Active Directory dashboard, navigate to **Add > App registration Enter a name for the registration (e.g. "NetBox") and ensure that the "single tenant" option is selected. -Under "Redirect URI", select "Web" for the platform and enter the path to your NetBox installation, ending with `/oauth/complete/azuread-oauth2/`. Note that this URI **must** begin with `https://` unless you are referencing localhost (for development purposes). +Under "Redirect URI", select "Web" for the platform and enter the path to your NetBox installation, ending with `/oauth/complete/entraid-oauth2/`. Note that this URI **must** begin with `https://` unless you are referencing localhost (for development purposes). ![App registration parameters](../../media/authentication/azure_ad_app_registration.png) diff --git a/docs/features/authentication-permissions.md b/docs/features/authentication-permissions.md index 14e13d5cde..cf3d11ef38 100644 --- a/docs/features/authentication-permissions.md +++ b/docs/features/authentication-permissions.md @@ -41,7 +41,7 @@ NetBox integrates with the open source [python-social-auth](https://github.com/p * Google * Hashicorp Vault * Keycloak -* Microsoft Azure AD +* Microsoft Entra ID * Microsoft Graph * Okta * OIDC diff --git a/mkdocs.yml b/mkdocs.yml index 656a2e03f6..94a4edcb32 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -156,7 +156,7 @@ nav: - Administration: - Authentication: - Overview: 'administration/authentication/overview.md' - - Microsoft Azure AD: 'administration/authentication/microsoft-azure-ad.md' + - Microsoft Entra ID: 'administration/authentication/microsoft-entra-id.md' - Okta: 'administration/authentication/okta.md' - Permissions: 'administration/permissions.md' - Error Reporting: 'administration/error-reporting.md' diff --git a/netbox/netbox/authentication/__init__.py b/netbox/netbox/authentication/__init__.py index 7394f6ded4..f80454f999 100644 --- a/netbox/netbox/authentication/__init__.py +++ b/netbox/netbox/authentication/__init__.py @@ -20,10 +20,10 @@ 'amazon': ('Amazon AWS', 'aws'), 'apple': ('Apple', 'apple'), 'auth0': ('Auth0', None), - 'azuread-oauth2': ('Microsoft Azure AD', 'microsoft'), - 'azuread-b2c-oauth2': ('Microsoft Azure AD', 'microsoft'), - 'azuread-tenant-oauth2': ('Microsoft Azure AD', 'microsoft'), - 'azuread-v2-tenant-oauth2': ('Microsoft Azure AD', 'microsoft'), + 'entraid-oauth2': ('Microsoft Entra ID', 'microsoft'), + 'entraid-b2c-oauth2': ('Microsoft Entra ID', 'microsoft'), + 'entraid-tenant-oauth2': ('Microsoft Entra ID', 'microsoft'), + 'entraid-v2-tenant-oauth2': ('Microsoft Entra ID', 'microsoft'), 'bitbucket': ('BitBucket', 'bitbucket'), 'bitbucket-oauth2': ('BitBucket', 'bitbucket'), 'digitalocean': ('DigitalOcean', 'digital-ocean'),