Skip to content

Commit 65cb3e5

Browse files
authored
Merge pull request #208528 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 0b4ee90 + 52a345b commit 65cb3e5

15 files changed

+59
-47
lines changed

articles/active-directory/develop/active-directory-schema-extensions.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ For example, here is a claims-mapping policy to emit a single claim from a direc
5959

6060
Where *xxxxxxx* is the appID (or Client ID) of the application that the extension was registered with.
6161

62+
> [!WARNING]
63+
> When you define a claims mapping policy for a directory extension attribute, use the `ExtensionID` property instead of the `ID` property within the body of the `ClaimsSchema` array, as shown in the example above.
64+
6265
> [!TIP]
6366
> Case consistency is important when setting directory extension attributes on objects. Extension attribute names aren't cases sensitive when being set up, but they are case sensitive when being read from the directory by the token service. If an extension attribute is set on a user object with the name "LegacyId" and on another user object with the name "legacyid", when the attribute is mapped to a claim using the name "LegacyId" the data will be successfully retrieved and the claim included in the token for the first user but not the second.
64-
>
65-
> The "Id" parameter in the claims schema used for built-in directory attributes is "ExtensionID" for directory extension attributes.
6667
6768
## Next steps
6869
- Learn how to [add custom or additional claims to the SAML 2.0 and JSON Web Tokens (JWT) tokens](active-directory-optional-claims.md).

articles/active-directory/develop/reply-url.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ This table shows the maximum number of redirect URIs you can add to an app regis
4545
| Microsoft work or school accounts in any organization's Azure Active Directory (Azure AD) tenant | 256 | `signInAudience` field in the application manifest is set to either *AzureADMyOrg* or *AzureADMultipleOrgs* |
4646
| Personal Microsoft accounts and work and school accounts | 100 | `signInAudience` field in the application manifest is set to *AzureADandPersonalMicrosoftAccount* |
4747

48+
The maximum number of redirect URIS can't be raised for [security reasons](#restrictions-on-wildcards-in-redirect-uris). If your scenario requires more redirect URIs than the maximum limit allowed, consider the following [state parameter approach](#use-a-state-parameter) as the solution.
49+
4850
## Maximum URI length
4951

5052
You can use a maximum of 256 characters for each redirect URI you add to an app registration.

articles/active-directory/saas-apps/facebook-work-accounts-tutorial.md renamed to articles/active-directory/saas-apps/meta-work-accounts-tutorial.md

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: 'Tutorial: Azure Active Directory single sign-on (SSO) integration with Facebook Work Accounts | Microsoft Docs'
3-
description: Learn how to configure single sign-on between Azure Active Directory and Facebook Work Accounts.
2+
title: 'Tutorial: Azure Active Directory single sign-on (SSO) integration with Meta Work Accounts | Microsoft Docs'
3+
description: Learn how to configure single sign-on between Azure Active Directory and Meta Work Accounts.
44
services: active-directory
55
author: jeevansd
66
manager: CelesteDG
@@ -14,56 +14,56 @@ ms.author: jeedes
1414

1515
---
1616

17-
# Tutorial: Azure Active Directory single sign-on (SSO) integration with Facebook Work Accounts
17+
# Tutorial: Azure Active Directory single sign-on (SSO) integration with Meta Work Accounts
1818

19-
In this tutorial, you'll learn how to integrate Facebook Work Accounts with Azure Active Directory (Azure AD). When you integrate Facebook Work Accounts with Azure AD, you can:
19+
In this tutorial, you'll learn how to integrate Meta Work Accounts with Azure Active Directory (Azure AD). When you integrate Meta Work Accounts with Azure AD, you can:
2020

21-
* Control in Azure AD who has access to Facebook Work Accounts.
22-
* Enable your users to be automatically signed-in to Facebook Work Accounts with their Azure AD accounts.
21+
* Control in Azure AD who has access to Meta Work Accounts.
22+
* Enable your users to be automatically signed-in to Meta Work Accounts with their Azure AD accounts.
2323
* Manage your accounts in one central location - the Azure portal.
2424

2525
## Prerequisites
2626

2727
To get started, you need the following items:
2828

2929
* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
30-
* Facebook Work Accounts single sign-on (SSO) enabled subscription.
30+
* Meta Work Accounts single sign-on (SSO) enabled subscription.
3131

3232
## Scenario description
3333

3434
In this tutorial, you configure and test Azure AD SSO in a test environment.
3535

36-
* Facebook Work Accounts supports **SP and IDP** initiated SSO.
36+
* Meta Work Accounts supports **SP and IDP** initiated SSO.
3737

38-
## Add Facebook Work Accounts from the gallery
38+
## Add Meta Work Accounts from the gallery
3939

40-
To configure the integration of Facebook Work Accounts into Azure AD, you need to add Facebook Work Accounts from the gallery to your list of managed SaaS apps.
40+
To configure the integration of Meta Work Accounts into Azure AD, you need to add Meta Work Accounts from the gallery to your list of managed SaaS apps.
4141

4242
1. Sign in to the Azure portal using either a work or school account, or a personal Microsoft account.
4343
1. On the left navigation pane, select the **Azure Active Directory** service.
4444
1. Navigate to **Enterprise Applications** and then select **All Applications**.
4545
1. To add new application, select **New application**.
46-
1. In the **Add from the gallery** section, type **Facebook Work Accounts** in the search box.
47-
1. Select **Facebook Work Accounts** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
46+
1. In the **Add from the gallery** section, type **Meta Work Accounts** in the search box.
47+
1. Select **Meta Work Accounts** from results panel and then add the app. Wait a few seconds while the app is added to your tenant.
4848

49-
## Configure and test Azure AD SSO for Facebook Work Accounts
49+
## Configure and test Azure AD SSO for Meta Work Accounts
5050

51-
Configure and test Azure AD SSO with Facebook Work Accounts using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Facebook Work Accounts.
51+
Configure and test Azure AD SSO with Meta Work Accounts using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in Meta Work Accounts.
5252

53-
To configure and test Azure AD SSO with Facebook Work Accounts, perform the following steps:
53+
To configure and test Azure AD SSO with Meta Work Accounts, perform the following steps:
5454

5555
1. **[Configure Azure AD SSO](#configure-azure-ad-sso)** - to enable your users to use this feature.
5656
1. **[Create an Azure AD test user](#create-an-azure-ad-test-user)** - to test Azure AD single sign-on with B.Simon.
5757
1. **[Assign the Azure AD test user](#assign-the-azure-ad-test-user)** - to enable B.Simon to use Azure AD single sign-on.
58-
1. **[Configure Facebook Work Accounts SSO](#configure-facebook-work-accounts-sso)** - to configure the single sign-on settings on application side.
59-
1. **[Create Facebook Work Accounts test user](#create-facebook-work-accounts-test-user)** - to have a counterpart of B.Simon in Facebook Work Accounts that is linked to the Azure AD representation of user.
58+
1. **[Configure Meta Work Accounts SSO](#configure-meta-work-accounts-sso)** - to configure the single sign-on settings on application side.
59+
1. **[Create Meta Work Accounts test user](#create-meta-work-accounts-test-user)** - to have a counterpart of B.Simon in Meta Work Accounts that is linked to the Azure AD representation of user.
6060
1. **[Test SSO](#test-sso)** - to verify whether the configuration works.
6161

6262
## Configure Azure AD SSO
6363

6464
Follow these steps to enable Azure AD SSO in the Azure portal.
6565

66-
1. In the Azure portal, on the **Facebook Work Accounts** application integration page, find the **Manage** section and select **single sign-on**.
66+
1. In the Azure portal, on the **Meta Work Accounts** application integration page, find the **Manage** section and select **single sign-on**.
6767
1. On the **Select a single sign-on method** page, select **SAML**.
6868
1. On the **Set up single sign-on with SAML** page, click the pencil icon for **Basic SAML Configuration** to edit the settings.
6969

@@ -89,7 +89,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8989

9090
![The Certificate download link](common/certificatebase64.png)
9191

92-
1. On the **Set up Facebook Work Accounts** section, copy the appropriate URL(s) based on your requirement.
92+
1. On the **Set up Meta Work Accounts** section, copy the appropriate URL(s) based on your requirement.
9393

9494
![Copy configuration URLs](common/copy-configuration-urls.png)
9595

@@ -107,29 +107,29 @@ In this section, you'll create a test user in the Azure portal called B.Simon.
107107

108108
### Assign the Azure AD test user
109109

110-
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Facebook Work Accounts.
110+
In this section, you'll enable B.Simon to use Azure single sign-on by granting access to Meta Work Accounts.
111111

112112
1. In the Azure portal, select **Enterprise Applications**, and then select **All applications**.
113-
1. In the applications list, select **Facebook Work Accounts**.
113+
1. In the applications list, select **Meta Work Accounts**.
114114
1. In the app's overview page, find the **Manage** section and select **Users and groups**.
115115
1. Select **Add user**, then select **Users and groups** in the **Add Assignment** dialog.
116116
1. In the **Users and groups** dialog, select **B.Simon** from the Users list, then click the **Select** button at the bottom of the screen.
117117
1. If you are expecting a role to be assigned to the users, you can select it from the **Select a role** dropdown. If no role has been set up for this app, you see "Default Access" role selected.
118118
1. In the **Add Assignment** dialog, click the **Assign** button.
119119

120-
## Configure Facebook Work Accounts SSO
120+
## Configure Meta Work Accounts SSO
121121

122-
1. Log in to your Facebook Work Accounts company site as an administrator.
122+
1. Log in to your Meta Work Accounts company site as an administrator.
123123

124124
1. Go to **Security** > **Single Sign-On**.
125125

126126
1. Enable **Single-sign on(SSO)** checkbox and click **+Add new SSO Provider**.
127127

128-
![Screenshot shows the SSO Account.](./media/facebook-work-accounts-tutorial/security.png "SSO Account")
128+
![Screenshot shows the SSO Account.](./media/meta-work-accounts-tutorial/security.png "SSO Account")
129129

130130
1. On the **Single Sign-On (SSO) Setup** page, perform the following steps:
131131

132-
![Screenshot shows the SSO Configuration.](./media/facebook-work-accounts-tutorial/certificate.png "Configuration")
132+
![Screenshot shows the SSO Configuration.](./media/meta-work-accounts-tutorial/certificate.png "Configuration")
133133

134134
1. Enter a valid **Name of the SSO Provider**.
135135

@@ -149,26 +149,26 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
149149

150150
1. Click **Save Changes**.
151151

152-
### Create Facebook Work Accounts test user
152+
### Create Meta Work Accounts test user
153153

154-
In this section, you create a user called Britta Simon in Facebook Work Accounts. Work with the [Work Accounts team](https://www.workplace.com/help/work) to add the users in the Facebook Work Accounts platform. Users must be created and activated before you use single sign-on.
154+
In this section, you create a user called Britta Simon in Meta Work Accounts. Work with the [Work Accounts team](https://www.workplace.com/help/work) to add the users in the Meta Work Accounts platform. Users must be created and activated before you use single sign-on.
155155

156156
## Test SSO
157157

158158
In this section, you test your Azure AD single sign-on configuration with following options.
159159

160160
#### SP initiated:
161161

162-
* Click on **Test this application** in Azure portal. This will redirect to Facebook Work Accounts Sign on URL where you can initiate the login flow.
162+
* Click on **Test this application** in Azure portal. This will redirect to Meta Work Accounts Sign on URL where you can initiate the login flow.
163163

164-
* Go to Facebook Work Accounts Sign-on URL directly and initiate the login flow from there.
164+
* Go to Meta Work Accounts Sign-on URL directly and initiate the login flow from there.
165165

166166
#### IDP initiated:
167167

168-
* Click on **Test this application** in Azure portal and you should be automatically signed in to the Facebook Work Accounts for which you set up the SSO.
168+
* Click on **Test this application** in Azure portal and you should be automatically signed in to the Meta Work Accounts for which you set up the SSO.
169169

170-
You can also use Microsoft My Apps to test the application in any mode. When you click the Facebook Work Accounts tile in the My Apps, if configured in SP mode you would be redirected to the application sign on page for initiating the login flow and if configured in IDP mode, you should be automatically signed in to the Facebook Work Accounts for which you set up the SSO. For more information about the My Apps, see [Introduction to the My Apps](../user-help/my-apps-portal-end-user-access.md).
170+
You can also use Microsoft My Apps to test the application in any mode. When you click the Meta Work Accounts tile in the My Apps, if configured in SP mode you would be redirected to the application sign on page for initiating the login flow and if configured in IDP mode, you should be automatically signed in to the Meta Work Accounts for which you set up the SSO. For more information about the My Apps, see [Introduction to the My Apps](../user-help/my-apps-portal-end-user-access.md).
171171

172172
## Next steps
173173

174-
Once you configure Facebook Work Accounts you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Defender for Cloud Apps](/cloud-app-security/proxy-deployment-aad).
174+
Once you configure Meta Work Accounts you can enforce session control, which protects exfiltration and infiltration of your organization’s sensitive data in real time. Session control extends from Conditional Access. [Learn how to enforce session control with Microsoft Defender for Cloud Apps](/cloud-app-security/proxy-deployment-aad).

articles/azure-fluid-relay/how-tos/container-recovery.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ Fluid framework periodically saves state, called summary, without any explicit b
2020

2121
We've added following methods to AzureClient that will enable developers to recover data from corrupted containers.
2222

23-
[`getContainerVersions(ID, options)`](https://fluidframework.com/docs/apis/azure-client/azureclient/#azure-client-azureclient-getcontainerversions-Method)
23+
[`getContainerVersions(ID, options)`](https://fluidframework.com/docs/apis/azure-client/azureclient#getcontainerversions-Method)
2424

2525
`getContainerVersions` allows developers to view the previously generated versions of the container.
2626

27-
[copyContainer(ID, containerSchema)](https://fluidframework.com/docs/apis/azure-client/azureclient/#azure-client-azureclient-copycontainer-Method)
27+
[`copyContainer(ID, containerSchema)`](https://fluidframework.com/docs/apis/azure-client/azureclient#copycontainer-Method)
2828

2929
`copyContainer` allows developers to generate a new detached container from a specific version of another container.
3030

articles/azure-fluid-relay/how-tos/fluid-json-web-token.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Each part is separated by a period (.) and separately Base64 encoded.
3434

3535
| Claim | Format | Description |
3636
|------------|--------------------------|-------------|
37-
| documentId | string | Generated by FRS, identifies the document for which the token is being generated. |
37+
| documentId | string | Generated by Azure Fluid Relay (AFR) service. Identifies the document for which the token is being generated. |
3838
| scope | string[] | Identifies the permissions required by the client on the document or summary. For every scope, you can define the permissions you want to give to the client. |
3939
| tenantId | string | Identifies the tenant. |
4040
| user | JSON | *Optional* `{ displayName: <display_name>, id: <user_id>, name: <user_name>, }` Identifies users of your application. This is sent back to your application by Alfred, the ordering service. It can be used by your application to identify your users from the response it gets from Alfred. Azure Fluid Relay doesn't validate this information. |

articles/azure-fluid-relay/how-tos/test-automation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fluid.url: https://fluidframework.com/docs/testing/testing/
1414

1515
Testing and automation are crucial to maintaining the quality and longevity of your code. Internally, Fluid uses a range of unit and integration tests powered by [Mocha](https://mochajs.org/), [Jest](https://jestjs.io/), [Puppeteer](https://github.com/puppeteer/puppeteer), and [Webpack](https://webpack.js.org/).
1616

17-
You can run tests using the local **@fluidframework/azure-local-service** or using a test tenant in Azure Fluid Relay service. **AzureClient** can be configured to connect to both a remote service and a local service, which enables you to use a single client type between tests against live and local service instances. The only difference is the configuration used to create the client.
17+
You can run tests using the local [@fluidframework/azure-local-service](https://www.npmjs.com/package/@fluidframework/azure-local-service) or using a test tenant in Azure Fluid Relay service. [AzureClient](https://fluidframework.com/docs/apis/azure-client/azureclient) can be configured to connect to both a remote service and a local service, which enables you to use a single client type between tests against live and local service instances. The only difference is the configuration used to create the client.
1818

1919
## Automation against Azure Fluid Relay
2020

articles/azure-fluid-relay/how-tos/validate-document-creator.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ fluid.url: https://fluidframework.com/docs/apis/azure-client/itokenprovider/
1212

1313
# How to: Validate a User Created a Document
1414

15-
When you create a document in Azure Fluid Relay, the JWT provided by the `ITokenProvider` for the creation request can only be used once. After creating a document, the client must generate a new JWT that contains the document ID provided by the service at creation time. If an application has an authorization service that manages document access control, it will need to know who created a document with a given ID in order to authorize the generation of a new JWT for access to that document.
15+
When you create a document in Azure Fluid Relay, the JWT provided by the [ITokenProvider](https://fluidframework.com/docs/apis/azure-client/itokenprovider/) for the creation request can only be used once. After creating a document, the client must generate a new JWT that contains the document ID provided by the service at creation time. If an application has an authorization service that manages document access control, it will need to know who created a document with a given ID in order to authorize the generation of a new JWT for access to that document.
1616

1717
## Inform an Authorization Service when a document is Created
1818

19-
An application can tie into the document creation lifecycle by implementing a public `documentPostCreateCallback()` property in its `TokenProvider`. This callback will be triggered directly after creating the document, before a client requests the new JWT it needs to gain read/write permissions to the document that was created.
19+
An application can tie into the document creation lifecycle by implementing a public [documentPostCreateCallback()](https://fluidframework.com/docs/apis/azure-client/itokenprovider#documentpostcreatecallback-MethodSignature) method in its `TokenProvider`. This callback will be triggered directly after creating the document, before a client requests the new JWT it needs to gain read/write permissions to the document that was created.
2020

2121
The `documentPostCreateCallback()` receives two parameters: 1) the ID of the document that was created and 2) a JWT signed by the service with no permission scopes. The authorization service can verify the given JWT and use the information in the JWT to grant the correct user permissions for the newly created document.
2222

0 commit comments

Comments
 (0)