Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #17774: Fix social auth for Entra ID #17809

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/administration/authentication/microsoft-entra-id.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/entraid-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/azuread-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)

Expand Down
8 changes: 4 additions & 4 deletions netbox/netbox/authentication/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
'amazon': ('Amazon AWS', 'aws'),
'apple': ('Apple', 'apple'),
'auth0': ('Auth0', None),
'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'),
'azuread-oauth2': ('Microsoft Entra ID', 'microsoft'),
'azuread-b2c-oauth2': ('Microsoft Entra ID', 'microsoft'),
'azuread-tenant-oauth2': ('Microsoft Entra ID', 'microsoft'),
'azuread-v2-tenant-oauth2': ('Microsoft Entra ID', 'microsoft'),
'bitbucket': ('BitBucket', 'bitbucket'),
'bitbucket-oauth2': ('BitBucket', 'bitbucket'),
'digitalocean': ('DigitalOcean', 'digital-ocean'),
Expand Down