Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ configuring the Mailsac to work with Entra.
Copy the "Login URL" and "Microsoft Entra Identifier" values.

#. In the "Users and Groups" item in the sidebar, you can add users and groups
that will be able to sign in to Mailsac using Azure AD.
that will be able to sign in to Mailsac using Microsoft Entra.

.. figure:: users_and_groups.png
:align: center
Expand All @@ -117,7 +117,7 @@ Configuring Mailsac

#. Navigate to the `Mailsac SAML`_ page.

#. Copy and paste the SAML Certificate (Base64), that you downloaded from Azure AD,
#. Copy and paste the SAML Certificate (Base64), that you downloaded from Microsoft Entra,
into the "Identity Provider Certs" field.

.. figure:: identity_provider_certs.png
Expand Down Expand Up @@ -146,7 +146,7 @@ Configuring Mailsac

#. The final step is to add a :ref:`team user<sec_sub_account_user>`
to Mailsac. Open the `API Keys and Users`_ page and click "Manage Users".
Add a user with the same name as their Azure AD email address.
Add a user with the same name as their Microsoft Entra email address.

.. figure:: add_sub_account.png
:align: center
Expand All @@ -155,5 +155,5 @@ Configuring Mailsac
Click "Manage Users" and add a team user with the same name as their
Microsoft Entra email address.

Now, Mailsac and Entra should be set up for SAML SSO. Users will be able to
Now, Mailsac and Entra are configured for SAML SSO. Users will be able to
sign in to Mailsac using their Microsoft Entra credentials.
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ SAML/SSO Integration

SAML provides a way for team users to authenticate using a third party
identity provider. Mailsac has been tested with Okta, Google Workspace, and
Microsoft Cloud based Active Directory products. Other SAML identity providers
Microsoft Entra. Other SAML identity providers
may work since SAML is based on a standard framework.

- :ref:`Microsoft Azure Active Directory SAML/SSO Configuration <doc_azure_ad_saml_configuration>`
- :ref:`Microsoft Entra SAML/SSO Configuration <doc_azure_ad_saml_configuration>`

SAML Setup
^^^^^^^^^^
Expand Down Expand Up @@ -224,7 +224,7 @@ the identity provider.

- `Google Workspace Custom SAML Application <https://support.google.com/a/answer/6087519?hl=en>`_
- `Okta Custom SAML Application <https://developer.okta.com/docs/guides/build-sso-integration/saml2/main/>`_
- `Microsoft Azure AD - Enterprise Application <https://docs.microsoft.com/en-us/azure/active-directory/manage-apps/add-application-portal>`_
- `Microsoft Entra - Enterprise Application <https://learn.microsoft.com/en-us/entra/identity/enterprise-apps/add-application-portal>`_

Adding SAML Users
^^^^^^^^^^^^^^^^^
Expand All @@ -234,7 +234,7 @@ must be created with a username that matches the name ID returned from the SAML
provider. This is typically the username used to authenticate to the
identity provider.

After the user is added as a sub account user they will be able to login
After the user is added as a team account user they will be able to login
using SAML SSO.

.. figure:: ../saml/saml_sub_account.png
Expand All @@ -250,7 +250,7 @@ SAML SSO :ref:`team users <sec_sub_account_user>` can be removed by
clicking on the "Delete" button next to the user login on the `API Keys and Users`_
page.

Login As a SAML SSO User
Login as a SAML SSO User
^^^^^^^^^^^^^^^^^^^^^^^^

The `SSO login page`_, which can be accessed directly or found via the
Expand Down