diff --git a/src/.vitepress/sidebar/en.js b/src/.vitepress/sidebar/en.js index 2a770043..56042770 100644 --- a/src/.vitepress/sidebar/en.js +++ b/src/.vitepress/sidebar/en.js @@ -27,6 +27,7 @@ export default { collapsed: true, items: [ { text: 'User Account', link: '/manage/account/' }, + { text: 'Single Sign-On (SSO)', link: '/manage/sso/' }, { text: 'Workspaces', link: '/manage/workspaces/' }, { text: 'Subscriptions and Invoicing', link: '/manage/subscriptions/' }, { text: 'Member Roles and Permissions', link: '/manage/permissions/' }, diff --git a/src/index.md b/src/index.md index c252028f..0fc96ad2 100644 --- a/src/index.md +++ b/src/index.md @@ -39,6 +39,7 @@ The ecosystem consist of various components: ## Manage Account & Project - [User Account](./manage/account/) +- [Single Sign-On (SSO)](./manage/sso/) - [Workspaces](./manage/workspaces/) - [Subscriptions and Invoicing](./manage/subscriptions/) - [Member Roles and Permissions](./manage/permissions/) diff --git a/src/manage/dashboard/index.md b/src/manage/dashboard/index.md index 5e1321fa..b7d370b1 100644 --- a/src/manage/dashboard/index.md +++ b/src/manage/dashboard/index.md @@ -91,13 +91,16 @@ For details about different subscription plans visit our using the same credentials as you use in your organisation. SSO is available on the , the and the . + +This means you don't have to create a new account with a specific password: you can simply use your work email. The identity provider (e.g. Microsoft Entra ID or Auth0) used by your organisation will check your credential and redirect you back to . + + account will be created automatically after the first sign in via SSO. + +When a user signs in to using SSO, they will stay signed in for a time period before they are asked to enter their credentials again. By default, this period is set to 14 days. If you use , you can set it to a different value. + +::: warning Removing workspace users +If you remove a user from your Identity provider (you remove their account in your organisation), they will still be able to log into the workspace for 14 days. + +To cancel their access to the workspace immediately, you have to remove them manually through the [Members tab](../dashboard/#members) on the . +::: + +### Connection setup +If you are the admin or owner of a workspace and you want to set up SSO, please contact our . + +You will receive a link with a step-by-step guide for your identity provider. Currently, we support **SAML** and **OIDC** SSO protocols. Directory sync is not supported. + +::: tip SSO for self-hosted servers +If you want to use SSO on your server, you can do so from the admin panel. See [Single Sign-On Deployment](../../server/sso-deployment/) for more details. + +SSO is not available for . +::: + +Once SSO is configured for your workspace, you will see the relevant information in the , under the *advanced* section. If you need to make any changes to your SSO connection, please . + +![Mergin Maps workspace settings with enabled SSO](./dashboard-workspace-settings-sso.jpg "Mergin Maps workspace settings with enabled SSO") + diff --git a/src/setup/sign-up-to-mergin-maps/index.md b/src/setup/sign-up-to-mergin-maps/index.md index a49cf64b..0f909566 100644 --- a/src/setup/sign-up-to-mergin-maps/index.md +++ b/src/setup/sign-up-to-mergin-maps/index.md @@ -6,7 +6,7 @@ outline: deep To make full use of , you need to sign up. You can sign up using: - [Email and password](#email-and-password-sign-up) -- [Single sign-on (SSO)](#single-sign-on-sso) +- [Single sign-on (SSO)](#single-sign-on) ::: tip Manage your account Do you want to delete your account or change your details? Go to [**User Account**](../../manage/account/) for detailed steps. @@ -107,30 +107,14 @@ You can get up-to-speed quickly by following our [Quick Start tutorials](../../t See our for more details. ::: -## Single sign-on (SSO) -Single sign-on (SSO) is an authentication method that allows you to sign in to using the same credentials as you use in your organisation. +## Single sign-on -This means you don't have to create a new account with a specific password: you can simply use your work email. The identity provider (e.g. Microsoft Entra ID or Auth0) used by your organisation will check your credential and redirect you back to . +If your organisation set up [SSO](../../manage/sso/) for , you can sign in using the same credentials as you use in your organisation. - account will be created automatically after the first sign in via SSO. - -SSO is available on the , the and the . - -### Connection setup -If you are the admin or owner of a workspace and you want to set up SSO, please contact our . - -You will receive a link with step-by-step guide for your identity provider. Currently, we support **SAML** and **OIDC** SSO protocols. Directory sync is not supported. - -::: tip SSO for self-hosted servers -If you want to use SSO on your server, you can do so from the admin panel. See [Single Sign-On Deployment](../../server/sso-deployment/) for more details. - -SSO is not available for . +::: tip +You can find out more about this topic in [Single Sign-On (SSO)](../../manage/sso/). ::: -Once SSO is configured for your workspace, you will see the relevant information in the , under the *advanced* section. If you need to make any changes to your SSO connection, please . - -![Mergin Maps workspace settings with enabled SSO](./dashboard-workspace-settings-sso.jpg "Mergin Maps workspace settings with enabled SSO") - ### From dashboard To sign in or sign up to using SSO on the : 1. Navigate to