Skip to content

Commit 99bbde7

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into Oct-21-2022-OnPremTS
2 parents ab2c35b + e4e7d93 commit 99bbde7

File tree

57 files changed

+645
-604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+645
-604
lines changed

articles/active-directory/develop/scenario-desktop-acquire-token.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
title: Acquire a token to call a web API (desktop app)
33
description: Learn how to build a desktop app that calls web APIs to acquire a token for the app
44
services: active-directory
5-
author: Dickson-Mwendia
5+
author: OwenRichards1
66
manager: CelesteDG
7-
87
ms.service: active-directory
98
ms.subservice: develop
109
ms.topic: conceptual
1110
ms.workload: identity
12-
ms.date: 08/25/2021
13-
ms.author: dmwendia
14-
ms.custom: aaddev, devx-track-python, has-adal-ref
11+
ms.date: 10/21/2022
12+
ms.author: owenrichards
13+
ms.custom: aaddev, devx-track-python, has-adal-ref, engagement-fy23
14+
1515
#Customer intent: As an application developer, I want to know how to write a desktop app that calls web APIs by using the Microsoft identity platform.
1616
---
1717

@@ -21,7 +21,7 @@ After you've built an instance of the public client application, you'll use it t
2121

2222
## Recommended pattern
2323

24-
The web API is defined by its `scopes`. Whatever the experience you provide in your application, the pattern to use is:
24+
The web API is defined by its *scopes*. Whatever the experience you provide in your application, the pattern to use is:
2525

2626
- Systematically attempt to get a token from the token cache by calling `AcquireTokenSilent`.
2727
- If this call fails, use the `AcquireToken` flow that you want to use, which is represented here by `AcquireTokenXX`.

articles/active-directory/external-identities/b2b-quickstart-add-guest-users-portal.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ ms.collection: M365-identity-device-management
1616

1717
# Quickstart: Add a guest user and send an invitation
1818

19-
With Azure AD [B2B collaboration](what-is-b2b.md), you can invite anyone to collaborate with your organization using their own work, school, or social account. In this quickstart, you'll learn how to add a new guest user to your Azure AD directory in the Azure portal. You'll also send an invitation and see what the guest user's invitation redemption process looks like. In addition to this quickstart, you can learn more about adding guest users [in the Azure portal](add-users-administrator.md), via [PowerShell](b2b-quickstart-invite-powershell.md), or [in bulk](tutorial-bulk-invite.md).
19+
With Azure AD [B2B collaboration](what-is-b2b.md), you can invite anyone to collaborate with your organization using their own work, school, or social account.
20+
21+
In this quickstart, you'll learn how to add a new guest user to your Azure AD directory in the Azure portal. You'll also send an invitation and see what the guest user's invitation redemption process looks like. In addition to this quickstart, you can learn more about adding guest users [in the Azure portal](add-users-administrator.md), via [PowerShell](b2b-quickstart-invite-powershell.md), or [in bulk](tutorial-bulk-invite.md).
2022

2123
If you don’t have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
2224

@@ -34,15 +36,15 @@ To complete the scenario in this quickstart, you need:
3436

3537
1. Under **Azure services**, select **Azure Active Directory** (or use the search box to find and select **Azure Active Directory**).
3638

37-
![Screenshot showing where to select the Azure Active Directory service.](media/quickstart-add-users-portal/azure-active-directory-service.png)
39+
:::image type="content" source="media/quickstart-add-users-portal/azure-active-directory-service.png" alt-text="Screenshot showing where to select the Azure Active Directory service.":::
3840

3941
1. Under **Manage**, select **Users**.
4042

41-
![Screenshot showing where to select the Users option](media/quickstart-add-users-portal/quickstart-users-portal-user.png)
43+
:::image type="content" source="media/quickstart-add-users-portal/quickstart-users-portal-user.png" alt-text="Screenshot showing where to select the Users option.":::
4244

43-
1. Select **New guest user**.
45+
1. Under **New user** select **Invite external user**.
4446

45-
![Screenshot showing where to select the New guest user option.](media/quickstart-add-users-portal/new-guest-user.png)
47+
:::image type="content" source="media/quickstart-add-users-portal/new-guest-user.png" alt-text="Screenshot showing where to select the New guest user option.":::
4648

4749
1. On the **New user** page, select **Invite user** and then add the guest user's information.
4850

@@ -52,13 +54,14 @@ To complete the scenario in this quickstart, you need:
5254
- **Groups**: You can add the guest user to one or more existing groups, or you can do it later.
5355
- **Roles**: If you require Azure AD administrative permissions for the user, you can add them to an Azure AD role.
5456

55-
![Screenshot showing the new user page.](media/quickstart-add-users-portal/invite-user.png)
57+
:::image type="content" source="media/quickstart-add-users-portal/invite-user.png" alt-text="Screenshot showing the new user page.":::
5658

5759
1. Select **Invite** to automatically send the invitation to the guest user. A notification appears in the upper right with the message **Successfully invited user**.
5860

5961
1. After you send the invitation, the user account is automatically added to the directory as a guest.
6062

61-
![Screenshot showing the new guest user in the directory.](media/quickstart-add-users-portal/new-guest-user-directory.png)
63+
:::image type="content" source="media/quickstart-add-users-portal/new-guest-user-directory.png" alt-text="Screenshot showing the new guest user in the directory.":::
64+
6265

6366
## Accept the invitation
6467

@@ -68,11 +71,12 @@ Now sign in as the guest user to see the invitation.
6871

6972
1. In your inbox, open the email from "Microsoft Invitations on behalf of Contoso."
7073

71-
![Screenshot showing the B2B invitation email](media/quickstart-add-users-portal/quickstart-users-portal-email-small.png)
74+
:::image type="content" source="media/quickstart-add-users-portal/quickstart-users-portal-email-small.png" alt-text="Screenshot showing the B2B invitation email.":::
75+
7276

7377
1. In the email body, select **Accept invitation**. A **Review permissions** page opens in the browser.
7478

75-
![Screenshot showing the Review permissions page.](media/quickstart-add-users-portal/consent-screen.png)
79+
:::image type="content" source="media/quickstart-add-users-portal/consent-screen.png" alt-text="Screenshot showing the Review permissions page.":::
7680

7781
1. Select **Accept**.
7882

49.3 KB
Loading
742 Bytes
Loading
-8.76 KB
Loading
9.4 KB
Loading
-698 Bytes
Loading
Loading
-11.3 KB
Loading

articles/active-directory/saas-apps/documo-provisioning-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The scenario outlined in this tutorial assumes that you already have the followi
4242

4343
## Step 2. Configure Documo to support provisioning with Azure AD
4444

45-
1. [Generate an API key](https://help.documo.com/support/solutions/articles/72000513690-how-to-enable-api-and-retrieve-api-key) to use for Azure AD provisioning.
45+
1. [Generate an API key](https://help.documo.com/hc/en-us/articles/7789630698011-How-to-Enable-and-Retrieve-API-Keys) to use for Azure AD provisioning.
4646
1. Find and remember your API URL. The default API URL is `https://api.documo.com`. If you have a custom Documo API domain, you can reference it in the domain tab of the Documo branding settings page.
4747

4848
## Step 3. Add Documo from the Azure AD application gallery

0 commit comments

Comments
 (0)