From bad66243bed076b5cb96f0adef67d0e888284579 Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Fri, 24 Jan 2025 16:25:28 -0500
Subject: [PATCH 1/4] Update SAML-SSO.md

https://github.com/Expensify/Expensify/issues/460782
---
 .../expensify-classic/domains/SAML-SSO.md     | 142 ++++++++----------
 1 file changed, 60 insertions(+), 82 deletions(-)

diff --git a/docs/articles/expensify-classic/domains/SAML-SSO.md b/docs/articles/expensify-classic/domains/SAML-SSO.md
index df73cf5d54c0..a9e4efeae567 100644
--- a/docs/articles/expensify-classic/domains/SAML-SSO.md
+++ b/docs/articles/expensify-classic/domains/SAML-SSO.md
@@ -3,95 +3,73 @@ title: Managing Single Sign-On (SSO) and User Authentication in Expensify
 description: Learn how to effectively manage Single Sign-On (SSO) and user authentication in Expensify alongside your preferred SSO provider. Our comprehensive guide covers SSO setup, domain verification, and specific instructions for popular providers like AWS, Okta, and Microsoft Azure. Streamline user access and enhance security with Expensify's SAML-based SSO integration.
 ---
 
-# Using SSO in Expensify
-Before setting up Single Sign-On with Expensify you will need to make sure the [domain is verified](https://help.expensify.com/articles/expensify-classic/domains/Claim-And-Verify-A-Domain#step-2-verify-domain-ownership). 
+## Accessing SSO Settings
+⚠️ **Pre-requisite:** Ensure your [domain is verified](https://help.expensify.com/articles/expensify-classic/domains/Claim-And-Verify-A-Domain#step-2-verify-domain-ownership).
 
-Once the domain is verified, you can access the SSO settings by navigating to Settings > Domains > [Domain Name] > SAML. 
+1. Navigate to: **Settings > Domains > [Domain Name] > SAML**.  
+2. **From the Domains page:**  
+   - Download Expensify's **Service Provider Metadata** to provide to your Identity Provider.  
+   - Enter the **Identity Provider Metadata** from your SSO provider. (Contact your provider if unsure how to obtain this).  
+   - Enable the **"SAML required for login"** option, ensuring users sign in via SSO only.
 
-## The Domains page 
-**On this page, you can:**
-- Get Expensify's Service Provider MetaData. You will need to give this to your identity provider. 
-- Enter your Identity Provider MetaData. Please contact your SAML SSO provider if you are unsure how to get this. 
-- Choose whether you want to make SAML SSO required for login. If you choose this option, members will only be able to log in to Expensify via SAML SSO.
-
-**Below are instructions for setting up Expensify for specific SSO providers:**
-- [Amazon Web Services (AWS SSO)](https://static.global.sso.amazonaws.com/app-202a715cb67cddd9/instructions/index.htm)
-- [Google SAML](https://support.google.com/a/answer/7371682) (for GSuite, not Google SSO)
-- [Microsoft Entra ID (formerly Azure Active Directory)](https://learn.microsoft.com/en-us/entra/identity/saas-apps/expensify-tutorial)
-- [Okta](https://saml-doc.okta.com/SAML_Docs/How-to-Configure-SAML-2.0-for-Expensify.html)
-- [OneLogin](https://onelogin.service-now.com/support?id=kb_article&sys_id=e44c9e52db187410fe39dde7489619ba)
-- [Oracle Identity Cloud Service](https://docs.oracle.com/en/cloud/paas/identity-cloud/idcsc/expensify.html#Expensify)
-- [SAASPASS](https://saaspass.com/saaspass/expensify-two-factor-authentication-2fa-single-sign-on-sso-saml.html)
-- Microsoft Active Directory Federation Services (see instructions in the FAQ section below)
-
-If your provider is not listed, please contact them and request instructions.
-
-When SSO is enabled, employees will be prompted to sign in through Single Sign-On when using their company email (private domain email) and also a public email (e.g. gmail.com) linked as a [Secondary Login](https://help.expensify.com/articles/expensify-classic/settings/Change-or-add-email-address).
-
-{% include faq-begin.md %}
-
-## What should I do if I’m getting an error when trying to set up SSO? 
-You can double-check your configuration data for errors using samltool.com. If you’re still having issues, you can contact your Account Manager or Concierge for assistance.
-
-## What is the EntityID for Expensify? 
-The entityID for Expensify is https://expensify.com. Remember not to copy and paste any extra slashes or spaces. If you've enabled the Multi-Domain support (see below) then your entityID will be https://expensify.com/mydomainname.com.
-
-## Can you have multiple domains with only one entity ID?
-Yes. Please send a message to the Concierge or your account manager, and we will enable the use of the same entity ID with multiple domains.
+---
+## Provider-Specific Setup Instructions
+Click on your Identity (SAML) Provider for detailed steps:  
+- [Amazon Web Services (AWS SSO)](https://static.global.sso.amazonaws.com/app-202a715cb67cddd9/instructions/index.htm)  
+- [Google SAML (Gsuite)](https://support.google.com/a/answer/7371682)  
+- [Microsoft Entra ID (formerly Azure Active Directory)](https://learn.microsoft.com/en-us/entra/identity/saas-apps/expensify-tutorial)  
+- [Okta](https://saml-doc.okta.com/SAML_Docs/How-to-Configure-SAML-2.0-for-Expensify.html)  
+- [OneLogin](https://onelogin.service-now.com/support?id=kb_article&sys_id=e44c9e52db187410fe39dde7489619ba)  
+- [Oracle Identity Cloud Service](https://docs.oracle.com/en/cloud/paas/identity-cloud/idcsc/expensify.html#Expensify)  
+- [SAASPASS](https://saaspass.com/saaspass/expensify-two-factor-authentication-2fa-single-sign-on-sso-saml.html)  
+- Microsoft ADFS (instructions below).  
+
+**Note: If your provider isn't listed, contact them directly for guidance.**
 
-## How can I update the Microsoft Entra ID SSO Certificate?
-Expensify's SAML configuration doesn't support multiple active certificates. This means that if you create the new certification ahead of time without first removing the old one, the respective IDP will include two unique x509 certificates instead of one, and the connection will break. Should you need to access Expensify, switching back to the old certificate will continue to allow access while that certificate is still valid.
+---
+# FAQ and Troubleshooting
 
-**To transfer from one Microsoft Entra certificate to another, please follow the below steps:**
-1. In Microsoft Entra, create your new certificate.
-2. In Microsoft Entra, remove the old, expiring certificate.
-3. In Microsoft Entra, activate the remaining certificate and get a new IDP for Expensify from it.
-4. In Expensify, replace the previous IDP with the new IDP.
-5. Log in via SSO. If login continues to fail, write to Concierge for assistance.
+## User Login with SSO
+- Employees using their **company email** or a **secondary linked email** (e.g., Gmail) will be prompted to log in through SSO.  
+- Secondary login setup guide: [Change or Add Email Address](https://help.expensify.com/articles/expensify-classic/settings/Change-or-add-email-address).
 
-## How can I enable "deactivating users" with the Okta SSO integration?
-Companies using Okta can deactivate users in Expensify using the Okta SCIM API: 
-- When a user is deactivated in Okta, their access to Expensify expires, and they are logged out of both the web and mobile apps.
-- Deactivating a user through Okta will not close their account in Expensify
-- If you are offboarding this employee, you will still want to close the account.
-- A verified domain and a complete SAML setup are required before you can configure the deactivation feature.
+## Error During SSO Setup?
+- Use [samltool.com](https://samltool.com) to validate your configuration data.  
+- Contact your Account Manager or Concierge for further help.  
 
-**To enable deactivating users in Okta, follow these steps:**
-1. In Expensify, head to *Settings > Domains > _[Domain Name]_ > SAML*
-2. Ensure that the toggle is set to Enabled for *SAML Login* and *Required for login*
-3. In Okta, go to *Admin > Applications > Add Application*
-4. Search for Expensify and click on Add.
-5. On the next screen, enter your company domain (e.g. yourcompany.com).
-6. In the tab Sign-On Options, click *Next* (leaving default settings).
-7. In the tab Assign to People, click *Next* and then click Done.
-8. Next, in Okta, go to *Admin > Applications > Expensify > Sign On > View Setup Instructions* and follow the steps listed.
-9. Then, go to *Directory > Profile Editor > Okta user > Profile*
-10. Click the information bubble to the right of the *First name* and *Last name* attributes
-11. Uncheck *Yes* under *Attribute required* field and press *Save Attribute*.
-12. Email concierge@expensify.com, providing your domain, and request that Okta SCIM be enabled. You will receive a response when this step has been completed.
-13. In Expensify, go to *Domains > _[Domain Name]_ > SAML > Show Token* and copy the Okta SCIM Token you received.
-14. In Okta, go to *Admin > Applications > Expensify > Provisioning > API Integration >  Configure API Integration*
-15. Select Enable API Integration, paste the Okta SCIM Token in the API Token field, and then click Save.
-15. Go to To App, click Edit Provisioning Users, select Enable Deactivate Users, and then Save. (You may also need to set up the Expensify Attribute Mappings if you have not previously in steps 9-11).
+## What is Expensify's Entity ID?
+- Default: `https://expensify.com`  
+- For Multi-Domain setups: `https://expensify.com/mydomainname.com`.
 
-Successful activation of this function will be indicated by the green Push User Deactivation icon being enabled at the top of the app page.
+## Managing Multiple Domains with One Entity ID 
+Yes, it's possible. Contact Concierge or your Account Manager to enable this feature.  
 
-## How do I set up the SAML authentication with Microsoft ADFS?
-Before getting started, you will need a verified domain and Control plan to set up SSO with Microsoft ADFS.
+## Updating Microsoft Entra ID SSO Certificate
+Steps to avoid configuration errors during certificate renewal:  
+1. **Create** a new certificate in Microsoft Entra.  
+2. **Remove** the old certificate before activating the new one.  
+3. Replace the **IDP** in Expensify with the new one.  
+4. Log in via SSO.  
 
-**To enable SSO with Microsoft ADFS follow these steps:**
-1. Open the ADFS management console, and click the *Add Relying Party Trust* link on the right.
-2. Check the option to *Import data about the relying party from a file*, then click the *Browse* button. You will input the XML file of Expensify’s metadata which can be found on the Expensify SAML setup page.
-3. The metadata file will provide the critical information that ADFS needs to set up the trust. In ADFS, give it a name, and click Next.
-4. Select the option to permit all users, then click Next.
-5. The next step will give you an overview of what is being configured. Click Next.
-6. The new trust is now created. Highlight the trust, then click *Edit claim rules* on the right.
-7. Click *Add a Rule*.
-8. The default option should be *Send LDAP Attributes as Claims*. Click Next. 
-9. Depending upon how your Active Directory is set up, you may or may not have a useful email address associated with each user, or you may have a workspace to use the UPN as the user attribute for authentication. If so, using the UPN user attribute may be appropriate for you. If not, you can use the email address attribute.
-10. Give the rule a name like *Get email address from AD*. Choose Active Directory as the attribute store from the dropdown list. Choose your source user attribute to pass to Expensify that has users’ email address info in it, usually either *E-Mail-Address* or *User-Principal-Name*. Select the outgoing claim type as “E-Mail Address”. Click OK. 
-11. Add another rule; this time, we want to *Transform an Incoming Claim*. Click Next. 
-12. Name the rule *Send email address*. The Incoming claim type should be *E-Mail Address*. The outgoing claim type should be *Name ID*, and the outgoing name ID format should be *Email*. Click OK.
-13. You should now have two claim rules.
+If issues persist, contact Concierge for assistance.  
 
-{% include faq-end.md %}
+---
+# Advanced Configurations
+
+## Okta SCIM API for User Deactivation
+Ensure your domain is verified and the SAML setup is complete. Then, do the following:
+1. Go to **Settings > Domains > [Domain Name] > SAML**.  
+2. Enable SAML Login and toggle **Required for login**.  
+3. In Okta, add Expensify as an application, and configure user profile mappings.  
+4. Request **Okta SCIM API** activation via concierge@expensify.com.  
+5. Integrate the **SCIM token** with Okta API provisioning.  
+
+Refer to the full setup in Okta's documentation for attribute mapping and provisioning options.
+
+## Microsoft ADFS SAML Authentication
+1. Open **ADFS Management Console** and add a new trust.  
+2. Import Expensify's metadata XML from the SAML page.  
+3. Configure **LDAP Attributes** for email or UPN.  
+4. Add two claim rules:  
+   - Send LDAP Attributes as Claims.  
+   - Transform Incoming Claim (Name ID). 

From cc0986b044ef6508d442c19c66d80f914a3dc4cf Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Fri, 24 Jan 2025 16:54:46 -0500
Subject: [PATCH 2/4] Update and rename SAML-SSO.md to
 Managing-Single-Sign-On-(SSO)-in-Expensify.md

---
 ...L-SSO.md => Managing-Single-Sign-On-(SSO)-in-Expensify.md} | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 rename docs/articles/expensify-classic/domains/{SAML-SSO.md => Managing-Single-Sign-On-(SSO)-in-Expensify.md} (91%)

diff --git a/docs/articles/expensify-classic/domains/SAML-SSO.md b/docs/articles/expensify-classic/domains/Managing-Single-Sign-On-(SSO)-in-Expensify.md
similarity index 91%
rename from docs/articles/expensify-classic/domains/SAML-SSO.md
rename to docs/articles/expensify-classic/domains/Managing-Single-Sign-On-(SSO)-in-Expensify.md
index a9e4efeae567..0229b71e5af3 100644
--- a/docs/articles/expensify-classic/domains/SAML-SSO.md
+++ b/docs/articles/expensify-classic/domains/Managing-Single-Sign-On-(SSO)-in-Expensify.md
@@ -3,7 +3,9 @@ title: Managing Single Sign-On (SSO) and User Authentication in Expensify
 description: Learn how to effectively manage Single Sign-On (SSO) and user authentication in Expensify alongside your preferred SSO provider. Our comprehensive guide covers SSO setup, domain verification, and specific instructions for popular providers like AWS, Okta, and Microsoft Azure. Streamline user access and enhance security with Expensify's SAML-based SSO integration.
 ---
 
-## Accessing SSO Settings
+Expensify supports Single Sign-On (SSO) through the SAML protocol, allowing you to optimize user authentication and improve security across your organization. Whether you're an IT admin configuring your domain or a team lead ensuring secure user access, this guide walks you through setting up and managing SAML SSO for your Expensify account
+
+# Accessing SAML Settings
 ⚠️ **Pre-requisite:** Ensure your [domain is verified](https://help.expensify.com/articles/expensify-classic/domains/Claim-And-Verify-A-Domain#step-2-verify-domain-ownership).
 
 1. Navigate to: **Settings > Domains > [Domain Name] > SAML**.  

From bb287df57701285b84f798d59c5b2e284de04307 Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Fri, 24 Jan 2025 16:55:36 -0500
Subject: [PATCH 3/4] Update redirects.csv

---
 docs/redirects.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/redirects.csv b/docs/redirects.csv
index 839aa19531fe..a4c864b7faf4 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -622,3 +622,4 @@ https://help.expensify.com/articles/expensify-classic/connect-credit-cards/compa
 https://help.expensify.com/articles/new-expensify/expensify-card/Upgrade-to-the-new-Expensify-Card-from-Visa,https://help.expensify.com/new-expensify/hubs/expensify-card/
 https://help.expensify.com/articles/new-expensify/expensify-card/Dispute-Expensify-Card-transaction,https://help.expensify.com/articles/new-expensify/expensify-card/Disputing-Expensify-Card-Transactions
 https://help.expensify.com/articles/expensify-classic/settings/Change-or-add-email-address,https://help.expensify.com/articles/expensify-classic/settings/Managing-Primary-and-Secondary-Logins-in-Expensify
+https://help.expensify.com/articles/expensify-classic/domains/SAML-SSO,https://help.expensify.com/articles/expensify-classic/domains/Managing-Single-Sign-On-(SSO)-in-Expensify

From 2e5d1b8bdbc07729ff1ea1d4e28d1c6f497fa0d0 Mon Sep 17 00:00:00 2001
From: maddylewis <38016013+maddylewis@users.noreply.github.com>
Date: Mon, 27 Jan 2025 15:13:25 -0500
Subject: [PATCH 4/4] Update redirects.csv

---
 docs/redirects.csv | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/redirects.csv b/docs/redirects.csv
index 8f3bbdbfc5dd..61d4d7519ae3 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -612,7 +612,6 @@ https://help.expensify.com/articles/expensify-classic/expenses/Apply-Tax,https:/
 https://help.expensify.com/articles/expensify-classic/workspaces/Tax-Tracking,https://help.expensify.com/articles/expensify-classic/workspaces/Track-Taxes
 https://help.expensify.com/articles/new-expensify/travel/manage-travel-member-roles,https://help.expensify.com/articles/new-expensify/travel/Manage-Travel-Member-Roles
 https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Personal-Credit-Cards,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Connect-Personal-Credit-Cards
-https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Direct-Bank-Connections,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/
 https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/CSV-Import,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Connect-Company-Cards/
 https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Commercial-Card-Feeds,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Connect-Company-Cards/
 https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Configure-Company-Card-Settings/
@@ -623,4 +622,4 @@ https://help.expensify.com/articles/new-expensify/expensify-card/Upgrade-to-the-
 https://help.expensify.com/articles/new-expensify/expensify-card/Dispute-Expensify-Card-transaction,https://help.expensify.com/articles/new-expensify/expensify-card/Disputing-Expensify-Card-Transactions
 https://help.expensify.com/articles/expensify-classic/settings/Change-or-add-email-address,https://help.expensify.com/articles/expensify-classic/settings/Managing-Primary-and-Secondary-Logins-in-Expensify
 https://help.expensify.com/articles/expensify-classic/domains/SAML-SSO,https://help.expensify.com/articles/expensify-classic/domains/Managing-Single-Sign-On-(SSO)-in-Expensify
-https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Direct-Bank-Connections,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Connect-Company-Cards
\ No newline at end of file
+https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Direct-Bank-Connections,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Connect-Company-Cards
