diff --git a/public/docs-static/img/manage/team/single-sign-on/auth0-idp/application-create.png b/public/docs-static/img/manage/team/single-sign-on/auth0-idp/application-create.png
deleted file mode 100644
index c7694cdba..000000000
Binary files a/public/docs-static/img/manage/team/single-sign-on/auth0-idp/application-create.png and /dev/null differ
diff --git a/src/pages/manage/team/add-users-to-your-network.mdx b/src/pages/manage/team/add-users-to-your-network.mdx
index 23c67f720..c9112bfdf 100644
--- a/src/pages/manage/team/add-users-to-your-network.mdx
+++ b/src/pages/manage/team/add-users-to-your-network.mdx
@@ -37,11 +37,13 @@ As the name stands, this way of inviting users is straightforward and works thro
To invite a new user, proceed to `Team` then select the `Users` tab and click the button.
A window will appear, allowing you to specify the name and email address of the user you want to invite. Optionally, you could select a set of groups with which you want this user to be associated.
-The invited users will receive an email invitation that they have to confirm.
+On NetBird Cloud, invited users receive an email invitation that they have to confirm.
After logging in to the system, they will join your network automatically.
+On a self-hosted installation the same button reads `Add User`, and it only appears when [local user management](/selfhosted/identity-providers/local) is enabled. Select **Invite User** to generate an invite link that you share with the user, or **Create User** to generate a password that you share securely. See [local user management](/selfhosted/identity-providers/local#user-management) for the steps. If you have [disabled local authentication](/selfhosted/identity-providers/disable-local-authentication), the button is disabled and users have to come from your IdP instead.
+
-
+
@@ -52,12 +54,10 @@ After logging in to the system, they will join your network automatically.
## Identity Provider (IdP) Sync
-NetBird's IdP-Sync automates user access management by integrating with your IdP and automatically
-provisioning users and groups. You can enable this feature from the `Users` tab by clicking the `Identity Provider Sync`
-button.
+NetBird's IdP-Sync automates user access management by integrating with your IdP and automatically provisioning users and groups. You configure it from the `Integrations` page, on the `Identity Provider Sync` tab.
-
+
See the [Provision Users and Groups From Your Identity Provider](/manage/team/idp-sync) section for more details.
diff --git a/src/pages/manage/team/approve-users.mdx b/src/pages/manage/team/approve-users.mdx
index 0f97a2197..514d93ccb 100644
--- a/src/pages/manage/team/approve-users.mdx
+++ b/src/pages/manage/team/approve-users.mdx
@@ -15,7 +15,7 @@ Navigate to the Dashboard's `Settings` page and the `Authentication` tab and ena
- **Disabled**: Manual approval for new users is not required. Users joining via domain matching will be automatically added to the organization.
-
+
## Approve or reject user
@@ -24,9 +24,17 @@ To approve a user, navigate to the [Users Page](https://app.netbird.io/team/user
While they wait, the user sees a **Waiting for Approval** screen that names the account owner's email address, partly hidden, when NetBird can look it up. Otherwise it just asks them to contact the account owner. Any admin can approve them, not only the owner. Once approved, the user clicks **Refresh** on that screen to join the account.
-
+
+Pending users have the `Pending` status in the `Users` table. When several people are waiting, the `Pending Approval` button above the table filters it down to just those users, and carries a badge with the number outstanding. The button only appears while at least one user is waiting.
+
+
+ `Reject` removes the user from the account, and that removal can't be undone. A rejected user can sign in again and be recreated as pending; rejection does not permanently block future sign-ins.
+
+
+The `Approve` and `Reject` buttons only render for roles that can update users, which means `Owner` and `Admin`. A `Network Admin` has read-only access to the `Team` tab and won't see them. See [User Roles](/manage/team/user-roles) for the full breakdown.
+
## Get started
diff --git a/src/pages/manage/team/auto-offboard-users.mdx b/src/pages/manage/team/auto-offboard-users.mdx
index e53541843..1834c671e 100644
--- a/src/pages/manage/team/auto-offboard-users.mdx
+++ b/src/pages/manage/team/auto-offboard-users.mdx
@@ -1,20 +1,22 @@
# Automatically Offboard Team Members from NetBird
-[NetBird's IdP-Sync integration](https://docs.netbird.io/manage/team/idp-sync) simplifies offboarding team members, enhancing
+[NetBird's IdP-Sync integration](/manage/team/idp-sync) simplifies offboarding team members, enhancing
security and efficiency. With this integration, you can automatically revoke access when users leave the company, when
temporary access for a freelancer ends after project completion, or when a seasonal employee's contract concludes.
Likewise, you can use this integration to restrict access to specific resources or environments when a project finishes.
For instance, you can limit network and resource access when a team member is removed from a group or when an entire group
is deleted from your Identity Provider.
+Automatic removal applies to users managed by the IdP-Sync integration. SCIM does not manage users created or invited directly in NetBird; remove those users manually in NetBird when offboarding. Group-based access revocation also depends on the [user group propagation setting](#revoking-group-access).
+
## Removing Team Members
In this tutorial, we will focus on `user_01`, `user_02`, and `user_03`. From NetBird's `Users` dashboard, you can see
that `user_01` is part of the `IT Administrators` group, while `user_02` and `user_03` belong to the `Staging` group.
-
+
-To get started, access your Identity Provider (IdP) dashboard. For this example, we'll use [Microsoft Entra ID (Azure AD)](https://docs.netbird.io/manage/team/idp-sync/microsoft-entra-id-sync).
+To get started, access your Identity Provider (IdP) dashboard. For this example, we'll use [Microsoft Entra ID (Azure AD)](/manage/team/idp-sync/microsoft-entra-id-sync).
Next, locate the user you want to offboard in your IdP's user management section. Let’s say you want to revoke access to
`user_01`, in that case, you will need to select it and click the `Delete` button as shown below.
@@ -25,7 +27,9 @@ After deletion, click the `Refresh` button to confirm that the user is no longer

-Wait for the NetBird integration to complete its next synchronization cycle, which usually takes 300 seconds. Alternatively, go to the `Integrations` screen in the NetBird admin console and click the corresponding integration button to manually trigger the synchronization.
+For the Entra ID API integration used in this example, wait for the next synchronization cycle, which usually takes 300 seconds. Alternatively, go to `Integrations` in the NetBird dashboard, open the `Identity Provider Sync` tab, and trigger the synchronization manually.
+
+Manual sync in NetBird is only available for the API-based integrations, Google Workspace and Microsoft Entra ID via API. SCIM-based integrations send changes from the IdP on the provider's provisioning schedule. For example, [Entra ID (SCIM)](/manage/team/idp-sync/microsoft-entra-id-scim-sync#start-provisioning) normally runs approximately every 40 minutes after the initial sync. To request an earlier update, use your IdP's on-demand provisioning option if it provides one. Confirm that the user has been removed in NetBird before treating offboarding as complete.

@@ -35,6 +39,8 @@ Now, go to NetBird's `Users` dashboard to verify that the user is no longer list
## Revoking Group Access
+For changes to a user's IdP group memberships to update their peers, [Enable user group propagation](/manage/settings/groups#enable-user-group-propagation) must be enabled in `Settings` > `Groups`. When it is disabled, peers retain their existing group memberships, even after the user's groups change. Update the peer memberships manually in NetBird to revoke access granted through those groups.
+
Imagine a scenario where you have an access policy that grants all members of the `Staging` group access to resources in the `Servers` group.

@@ -44,7 +50,6 @@ Let's say the current project is finished, and you no longer want members of the

-Once the changes synchronize in NetBird, users and their group memberships will be updated; therefore,
-[network access associated with that group](https://docs.netbird.io/manage/access-control/manage-network-access) will automatically be revoked.
+Once the changes synchronize in NetBird, verify that the affected peers no longer belong to the `Staging` group and no longer have [network access through that group](/manage/access-control/manage-network-access). If peer memberships remain, remove them manually before treating the revocation as complete.
-
\ No newline at end of file
+
diff --git a/src/pages/manage/team/entra-id-app-enablement.mdx b/src/pages/manage/team/entra-id-app-enablement.mdx
index f085576e6..df9282392 100644
--- a/src/pages/manage/team/entra-id-app-enablement.mdx
+++ b/src/pages/manage/team/entra-id-app-enablement.mdx
@@ -2,29 +2,36 @@ import {Note} from "@/components/mdx";
# Enable NetBird for Microsoft Entra ID
-Before your organization can use Microsoft Entra ID features with NetBird — such as user provisioning, group sync, or single sign-on — you need to enable the NetBird enterprise application in your Entra ID tenant and grant admin consent.
+This guide explains how to grant tenant-wide admin consent to the NetBird enterprise application in your Microsoft Entra ID tenant. API-based user and group provisioning uses a separate app registration, covered in the [Entra ID (API) setup guide](/manage/team/idp-sync/microsoft-entra-id-sync).
## Prerequisites
- A Microsoft Entra ID tenant
-- An account with **Global Administrator** or **Cloud Application Administrator** role
+- An account with the **Cloud Application Administrator**, **Application Administrator**, **Privileged Role Administrator**, or **Global Administrator** role
+
+
+ The required role depends on the permissions requested. **Cloud Application Administrator** and **Application Administrator** can consent to delegated permissions, including Microsoft Graph delegated permissions. If the application requests Microsoft Graph **application permissions**, use a **Privileged Role Administrator** or **Global Administrator** for the consent step. Review the requested permissions and Microsoft's [admin consent requirements](https://learn.microsoft.com/en-us/entra/identity/enterprise-apps/grant-admin-consent#prerequisites).
+
## Step 1: Find the NetBird Enterprise Application
-1. Sign in to the [Azure portal](https://portal.azure.com)
-2. Navigate to **Home** → **Microsoft Entra ID** → **Enterprise Applications**
+1. Sign in to the [Microsoft Entra admin center](https://entra.microsoft.com)
+2. Navigate to **Entra ID** → **Enterprise apps** → **All applications**
3. Search for the application with Application ID: `7a7538de-b7ed-4e49-befe-edbe74d5e0a1`
4. Select the **NetBird** application from the results
+You can reach the same blade from the [Azure portal](https://portal.azure.com) under
+**Microsoft Entra ID** → **Enterprise applications**.
+
## Step 2: Grant Admin Consent
-1. In the NetBird application overview, click **Permissions** in the left menu
-2. Click **Grant admin consent for Default Directory**
-3. Review the requested permissions and confirm
+1. In the NetBird application overview, select **Permissions** under **Security**
+2. Review the requested permissions carefully, then click **Grant admin consent for ``**
+3. Confirm the consent prompt
@@ -36,7 +43,7 @@ Before your organization can use Microsoft Entra ID features with NetBird — su
## Next Steps
-Once admin consent is granted, you can configure Entra ID integration with NetBird:
+To configure user and group provisioning, follow the guide for your integration:
- [Provision Users & Groups via API](/manage/team/idp-sync/microsoft-entra-id-sync)
- [Provision Users & Groups via SCIM](/manage/team/idp-sync/microsoft-entra-id-scim-sync)
diff --git a/src/pages/manage/team/idp-sync/embedded/microsoft-entra-id-sync.mdx b/src/pages/manage/team/idp-sync/embedded/microsoft-entra-id-sync.mdx
index 7cb16a807..7bb88b9cf 100644
--- a/src/pages/manage/team/idp-sync/embedded/microsoft-entra-id-sync.mdx
+++ b/src/pages/manage/team/idp-sync/embedded/microsoft-entra-id-sync.mdx
@@ -33,12 +33,16 @@ This will open a pop-up window featuring a user-friendly wizard, guiding you thr
## Prerequisites
Before starting the integration process, verify that you have the required permissions in Microsoft Entra ID (Azure AD).
-Specifically, you will need an Azure user account with at least one of these roles:
+To create and configure the app registration, use an Azure user account with at least one of these roles:
* Application Administrator
* Cloud Application Administrator
* Global Administrator
+
+ Granting the Microsoft Graph `User.Read.All` and `Group.Read.All` **application permissions** later in this guide requires a **Privileged Role Administrator** or **Global Administrator**. See Microsoft's [admin consent requirements](https://learn.microsoft.com/en-us/entra/identity/enterprise-apps/grant-admin-consent#prerequisites).
+
+
To check your permissions:
* Log in to the [Azure portal](portal.azure.com).
@@ -97,7 +101,7 @@ Once done, click the `Add permissions` button. You will see a few warnings:

-Locate the `Grant admin consent for [Your Organization Name]` button (you'll find it next to `+Add a permission` button). Click on it to grant the required permissions.
+Have a **Privileged Role Administrator** or **Global Administrator** open the app registration's **API permissions** page and click `Grant admin consent for [Your Organization Name]` to grant the required permissions.
A confirmation dialog will appear, asking you to verify this action. Review the permissions listed in the dialog and click `Yes` to confirm. Wait for the process to complete, this may take a few seconds.
diff --git a/src/pages/manage/team/idp-sync/google-workspace-sync.mdx b/src/pages/manage/team/idp-sync/google-workspace-sync.mdx
index b1b6fb98f..b92e01bc4 100644
--- a/src/pages/manage/team/idp-sync/google-workspace-sync.mdx
+++ b/src/pages/manage/team/idp-sync/google-workspace-sync.mdx
@@ -9,6 +9,8 @@ Google Workspace to NetBird. You can utilize these synchronized groups to config
access policies, and automate onboarding and offboarding processes, adding significant value to your organizational
workflow and security posture.
+For changes to a user's synced groups to update their peers, [Enable user group propagation](/manage/settings/groups#enable-user-group-propagation) must be enabled in `Settings` > `Groups`. If it is disabled, removing a user from a Google Workspace group leaves their peers' existing group memberships intact. Update those peer memberships manually in NetBird to revoke access granted through that group.
+
The integration process involves two complementary services: Google Workspace and Google Cloud Platform (GCP).
Google Workspace serves as your Identity Provider (IdP), managing user and group identities and providing Single Sign-On (SSO)
capabilities. GCP is used to create a service account, which NetBird uses to authenticate and access Google Workspace
diff --git a/src/pages/manage/team/idp-sync/index.mdx b/src/pages/manage/team/idp-sync/index.mdx
index af7765f52..465768098 100644
--- a/src/pages/manage/team/idp-sync/index.mdx
+++ b/src/pages/manage/team/idp-sync/index.mdx
@@ -12,8 +12,8 @@ security risks, and impacts productivity.
NetBird's IdP-Sync automates user access management to private networks by integrating with your identity provider (IdP)
and automatically provisioning users and groups. This integration ensures that changes to groups and users are
-synchronized from your identity provider to NetBird, granting appropriate network access to new users and immediately
-revoking access for departing employees.
+synchronized from your identity provider to NetBird, granting appropriate network access to new users and
+revoking access for departing employees after the changes synchronize.
NetBird allows you to use synchronized groups to create [access control policies](/manage/access-control/manage-network-access#creating-policies),
or update network configurations like [DNS](/manage/dns#distribution-groups),
@@ -32,44 +32,46 @@ offboarding scenarios:
-## Supported Identity Providers
-
-NetBird provides native support for syncing with the most popular identity providers. Pick yours below for detailed setup and configuration steps.
-
-### Entra ID (API)
-
-Provision users and groups from Microsoft Entra ID through the Graph API. See [Entra ID (API) setup](/manage/team/idp-sync/microsoft-entra-id-sync).
+## How syncing works
-### Entra ID (SCIM)
+NetBird receives users and groups from your identity provider in one of two ways, depending on the integration.
-Provision users and groups from Microsoft Entra ID over SCIM. See [Entra ID (SCIM) setup](/manage/team/idp-sync/microsoft-entra-id-scim-sync).
+**Pull, over the provider's API.** NetBird holds credentials for your IdP and reads users and groups from it on a schedule. You can also trigger a sync by hand from the dashboard. Google Workspace and Entra ID (API) work this way.
-### Okta
+**Push, over SCIM.** SCIM, the System for Cross-domain Identity Management, is a standard protocol for provisioning users and groups between systems. Your IdP sends changes to a SCIM endpoint using a token that NetBird issues. Entra ID (SCIM), Okta, JumpCloud, and any generic SCIM provider work this way. NetBird has no manual sync button for these integrations; your IdP may provide an on-demand provisioning option.
-Provision users and groups from Okta. See [Okta setup](/manage/team/idp-sync/okta-sync).
+Sync timing depends on the provider's schedule and successful delivery of the changes. For example, [Entra ID (SCIM)](/manage/team/idp-sync/microsoft-entra-id-scim-sync#start-provisioning) normally runs provisioning cycles approximately every 40 minutes after the initial sync. Entra also offers [Provisioning on demand](https://learn.microsoft.com/en-us/entra/identity/app-provisioning/provision-on-demand?pivots=app-provisioning) for individual users or groups. If changes are delayed, check the integration status in NetBird and your IdP's provisioning logs.
-### Google Workspace
+## Supported Identity Providers
-Provision users and groups from Google Workspace. See [Google Workspace setup](/manage/team/idp-sync/google-workspace-sync).
+NetBird supports the most common identity providers directly. Pick yours from the table for the full setup guide.
-### JumpCloud
+| Provider | Direction | Set up in NetBird with |
+| --- | --- | --- |
+| [Google Workspace](/manage/team/idp-sync/google-workspace-sync) | Pull (API) | `Connect Google Workspace` |
+| [Entra ID (API)](/manage/team/idp-sync/microsoft-entra-id-sync) | Pull (API) | `Connect Entra ID (API)` |
+| [Entra ID (SCIM)](/manage/team/idp-sync/microsoft-entra-id-scim-sync) | Push (SCIM) | `Connect Entra ID (SCIM)` |
+| [Okta](/manage/team/idp-sync/okta-sync) | Push (SCIM) | `Connect Okta` |
+| [JumpCloud](/manage/team/idp-sync/jumpcloud-sync) | Push (SCIM) | `Connect Jumpcloud` |
+| [Keycloak](/manage/team/idp-sync/keycloak-sync) | Push (SCIM) | `Connect Generic SCIM` |
+| [IIJ ID](/manage/team/idp-sync/iij-id-sync) | Push (SCIM) | `Connect Generic SCIM` |
-Provision users and groups from JumpCloud. See [JumpCloud setup](/manage/team/idp-sync/jumpcloud-sync).
+Keycloak and IIJ ID have no dedicated card on the `Identity Provider Sync` tab. Both are set up through `Connect Generic SCIM`, and their linked guides walk through that path.
-### Keycloak
+
+ The dashboard configures one IdP-Sync integration at a time. While one is enabled, the setup buttons on every other card are disabled, so switching providers means disabling the current integration first.
+
-Provision users and groups from Keycloak. See [Keycloak setup](/manage/team/idp-sync/keycloak-sync).
+## What IdP-Sync does not do
-### IIJ ID
+IdP-Sync manages users and group membership:
-Provision users and groups from IIJ ID over SCIM. See [IIJ ID setup](/manage/team/idp-sync/iij-id-sync).
+- **Roles stay in NetBird.** A synced group never sets a user's NetBird role. If you move someone into an `Administrators` group in your IdP, they do not become a NetBird `Admin`. You assign roles in NetBird, as described in [User Roles](/manage/team/user-roles).
+- **Access still comes from policies.** Syncing a group grants no access on its own. A group is only useful once a [policy](/manage/access-control/manage-network-access#creating-policies) references it.
## Generic SCIM
-NetBird provides a way to sync users and groups from any identity provider that supports the SCIM (System for Cross-domain Identity Management) protocol.
-SCIM is a standardized protocol that works with most modern identity providers, although configuration varies between providers.
-
-If your provider is not listed above, contact us at support@netbird.io for assistance with your specific IdP setup.
+If your provider is not in the table, it can still work as long as it speaks SCIM. Set it up with `Connect Generic SCIM`, which is the same path the Keycloak and IIJ ID guides follow. Configuration details vary between providers, so contact us at support@netbird.io if you get stuck on yours.
+ Granting the Microsoft Graph `User.Read.All` and `Group.Read.All` **application permissions** later in this guide requires a **Privileged Role Administrator** or **Global Administrator**. See Microsoft's [admin consent requirements](https://learn.microsoft.com/en-us/entra/identity/enterprise-apps/grant-admin-consent#prerequisites).
+
+
To check your permissions:
* Log in to the [Azure portal](portal.azure.com).
@@ -94,7 +98,7 @@ Once done, click the `Add permissions` button. You will see a few warnings:

-Locate the `Grant admin consent for [Your Organization Name]` button (you’ll find it next to `+Add a permission` button). Click on it to grant the required permissions.
+Have a **Privileged Role Administrator** or **Global Administrator** open the app registration's **API permissions** page and click `Grant admin consent for [Your Organization Name]` to grant the required permissions.
A confirmation dialog will appear, asking you to verify this action. Review the permissions listed in the dialog and click `Yes` to confirm. Wait for the process to complete, this may take a few seconds.
@@ -167,4 +171,4 @@ synchronized users.
The NetBird API integration polls Microsoft Graph approximately every 5 minutes. NetBird controls this interval and actively fetches users and groups from your Entra tenant on each cycle.
-This differs from the [SCIM integration](/manage/team/idp-sync/microsoft-entra-id-scim-sync), which is event-driven from Entra. Entra pushes changes to NetBird on its own schedule (typically every 40 minutes), and you can use Provisioning on Demand for immediate syncs of individual users or groups.
\ No newline at end of file
+This differs from the [SCIM integration](/manage/team/idp-sync/microsoft-entra-id-scim-sync), which is event-driven from Entra. Entra pushes changes to NetBird on its own schedule (typically every 40 minutes), and you can use Provisioning on Demand for immediate syncs of individual users or groups.
diff --git a/src/pages/manage/team/single-sign-on/auth0.mdx b/src/pages/manage/team/single-sign-on/auth0.mdx
index ad50a5c71..66ec7aaca 100644
--- a/src/pages/manage/team/single-sign-on/auth0.mdx
+++ b/src/pages/manage/team/single-sign-on/auth0.mdx
@@ -1,38 +1,42 @@
import {Note} from "@/components/mdx";
-# Auth0 on NetBird Cloud
+# Auth0 on NetBird Cloud
You can use Auth0 as your Identity Provider with NetBird, but it will require some additional configuration steps. Auth0 is a flexible, drop-in solution to add authentication and authorization services to your applications. It's a managed service that offers extensive customization options, developer-friendly APIs, universal login, social identity providers, and advanced security features like anomaly detection and breached password detection.
+
+ Support for OIDC-compliant IdPs is available on the Team plan and higher. The Free plan supports Google, Microsoft, and social logins.
+
+
1. Access the [Auth0 console](https://manage.auth0.com/) and navigate to Applications > Applications
2. Click **+ Create Application**
-3. Enter **NetBird** as the name, select **Single Page Web Applications** as the application type and click **Create**
+3. Enter **NetBird** as the name, select **Regular Web Applications** as the application type and click **Create**
-
-
-
+
+ NetBird exchanges the authorization code server-side using a Client Secret. Select **Regular Web Applications** to configure a [confidential client](https://auth0.com/docs/get-started/applications/confidential-and-public-applications) that supports this authentication method.
+
4. On the New Application screen, go to the Settings tab and under Application URIs set the following values:
-- Application Login URI: https://app.netbird.io
-- Allowed Callback URLs: https://login.netbird.io/login/callback
-- Allowed Logout URLs: https://app.netbird.io
-- Allowed Web Origins: https://app.netbird.io
+- **Application Login URI**: `https://app.netbird.io`
+- **Allowed Callback URLs**: `https://login.netbird.io/login/callback`
+- **Allowed Logout URLs**: `https://app.netbird.io`
+- **Allowed Web Origins**: `https://app.netbird.io`
-6. Record the **Client ID** and **Client Secret** that Auth0 generates for your application.
+5. Record the **Client ID** and **Client Secret** that Auth0 generates for your application.
-7. Retrieve Application's **Domain** from the **Basic Information** tab
+6. Retrieve Application's **Domain** from the **Basic Information** tab
-8. Share following with our team. Please use a secure method for sharing the sensitive parts of this information:
+7. Share the following with our team. Please use a secure method for sharing the sensitive parts of this information:
1. Application's **Domain**,
2. (sensitive) **Client ID** and **Client Secret**,
3. list of email domains to be registered for this SSO configuration,
diff --git a/src/pages/manage/team/single-sign-on/authentik.mdx b/src/pages/manage/team/single-sign-on/authentik.mdx
index 84fbf01ea..4e8497a78 100644
--- a/src/pages/manage/team/single-sign-on/authentik.mdx
+++ b/src/pages/manage/team/single-sign-on/authentik.mdx
@@ -1,6 +1,6 @@
import {Note} from "@/components/mdx";
-# Authentik on NetBird Cloud
+# Authentik on NetBird Cloud
You can use Authentik as your Identity Provider with NetBird, but it will require some additional configuration steps. Authentik is an open-source identity provider focused on flexibility and security. It serves as a self-hosted alternative to commercial solutions like Okta and Auth0, providing single sign-on (SSO), multi-factor authentication (MFA), access policies, user management, and support for SAML and OIDC protocols.
@@ -28,7 +28,7 @@ You can use Authentik as your Identity Provider with NetBird, but it will requir
- - Click on Advanced protocol settings and ensure that the email, opened, and profile scopes are selected and that Based on the User’s Hash ID is selected for Subject mode:
+ - Click on Advanced protocol settings and ensure that the `openid`, `email`, and `profile` scopes are selected and that Based on the User’s Hash ID is selected for Subject mode:
diff --git a/src/pages/manage/team/single-sign-on/jumpcloud.mdx b/src/pages/manage/team/single-sign-on/jumpcloud.mdx
index 9a7cd41fe..8284ae731 100644
--- a/src/pages/manage/team/single-sign-on/jumpcloud.mdx
+++ b/src/pages/manage/team/single-sign-on/jumpcloud.mdx
@@ -1,10 +1,14 @@
import {Note} from "@/components/mdx";
-# JumpCloud on NetBird Cloud
+# JumpCloud on NetBird Cloud
You can use JumpCloud as your Identity Provider with NetBird, but it will require some additional configuration steps. JumpCloud is a cloud-based directory platform that provides identity, access, and device management in a unified solution. It offers single sign-on, multi-factor authentication, directory services, device management, and network access control, providing a comprehensive approach to managing users, devices, and applications from a single platform.
-1. Access the JumpCloud and navigate to USER AUTHENTICATION > SSO Applications
+
+ Support for OIDC-compliant IdPs is available on the Team plan and higher. The Free plan supports Google, Microsoft, and social logins.
+
+
+1. In the JumpCloud Admin Console, navigate to **Access** > **SSO Applications**
2. Click + Add New Application, select Custom Application and click Next
@@ -24,20 +28,25 @@ You can use JumpCloud as your Identity Provider with NetBird, but it will requir
6. On the New Application screen, go to the SSO tab and under Endpoint Configuration set the following values:
-- Redirect URIs: https://login.netbird.io/login/callback
+- **Redirect URIs**: `https://login.netbird.io/login/callback`
-- Login URL: https://app.netbird.io
+- **Login URL**: `https://app.netbird.io`
7. Under Attribute Mapping enable Email and Profile scopes
- Sometimes, the Jumpcloud application configuration will add duplicate attributes, like email and email_verified. The duplicates should be removed.
+ Sometimes the JumpCloud application configuration adds duplicate attribute mappings. Remove the duplicates so each claim is mapped only once.
8. Go to the User Groups and select the list of groups to which you want to give access to the application and then click activate
9. Record the Client ID and Client Secret that JumpCloud generates for your application.
+
+ JumpCloud shows the Client ID and Secret only once, right after you click activate. Copy them before closing the window, otherwise you have to regenerate the secret.
+
+
+
10. Share your Client ID and Client Secret with our team, along with the region your JumpCloud console is in (US, EU, or India). Please use a secure method for sharing this information.
diff --git a/src/pages/manage/team/single-sign-on/keycloak.mdx b/src/pages/manage/team/single-sign-on/keycloak.mdx
index 17707480b..d79ef37ef 100644
--- a/src/pages/manage/team/single-sign-on/keycloak.mdx
+++ b/src/pages/manage/team/single-sign-on/keycloak.mdx
@@ -1,9 +1,13 @@
import {Note} from "@/components/mdx";
-# Keycloak on NetBird Cloud
+# Keycloak on NetBird Cloud
You can use Keycloak as your Identity Provider with NetBird, but it will require some additional configuration steps. Keycloak is an open-source Identity and Access Management solution aimed at modern applications and services. It's one of the most popular self-hosted IDP solutions with extensive documentation and community support. Keycloak provides single sign-on, social login, user federation, fine-grained authorization, and supports OpenID Connect, OAuth 2.0, and SAML 2.0 protocols.
+
+ Support for OIDC-compliant IdPs is available on the Team plan and higher. The Free plan supports Google, Microsoft, and social logins.
+
+
1. You need to create a new client
- Browse to the Clients section of the Administration console and click Create client.
diff --git a/src/pages/manage/team/user-roles.mdx b/src/pages/manage/team/user-roles.mdx
index b700851c7..fa81554fb 100644
--- a/src/pages/manage/team/user-roles.mdx
+++ b/src/pages/manage/team/user-roles.mdx
@@ -80,7 +80,13 @@ A `Usage Viewer` has read-only access to the Agent Network **Usage** overview an
Any signed-in user, whatever their role, sees their own usage and their own requests on **Usage & Logs**. Once an Agent Network policy covers them, they also see the **Connect** page, which lists the providers and models their policies allow.
## Roles and the API
-Roles apply the same way whether a user works in the dashboard or through the [NetBird management API](/api) - a user's permissions over API resources match their role. Every role except `User`, `Agent Network Admin`, and `Usage Viewer` can create a personal access token that carries the same permissions as that user's role, so they can interact with the API programmatically.
+Roles apply the same way whether a user works in the dashboard or through the [NetBird management API](/api) - a user's permissions over API resources match their role.
+
+`Owner`, `Admin`, and `Network Admin` can create personal access tokens, which carry the same permissions as the user who owns them. `Billing Admin`, `Auditor`, `User`, `Agent Network Admin`, and `Usage Viewer` cannot create personal access tokens. For programmatic read access, an `Owner` or `Admin` can create a service user with the `Auditor` role and generate a token for that service user. The token then carries the service user's read-only permissions.
+
+For access issued to an individual auditor, use a dedicated service user and revoke its tokens when that auditor is offboarded. Removing the auditor's own account does not revoke tokens owned by the service user.
+
+Token expiration must be between 1 and 365 days.
## Roles and identity provider sync