Skip to content

Commit 23901a7

Browse files
authored
Merge pull request #108457 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 397f3c7 + f725668 commit 23901a7

File tree

9 files changed

+114
-63
lines changed

9 files changed

+114
-63
lines changed

articles/active-directory/develop/authentication-scenarios.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,23 @@ Tokens are only valid for a limited amount of time. Usually the STS provides a p
7474

7575
Access tokens are passed to a Web API as the bearer token in the `Authorization` header. An app can provide a refresh token to the STS, and if the user access to the app wasn't revoked, it will get back a new access token and a new refresh token. This is how the scenario of someone leaving the enterprise is handled. When the STS receives the refresh token, it won't issue another valid access token if the user is no longer authorized.
7676

77+
### How each flow emits tokens and codes
78+
79+
Depending on how your client is built, it can use one (or several) of the authentication flows supported by Azure AD. These flows can produce a variety of tokens (id_tokens, refresh tokens, access tokens) as well as authorization codes, and require different tokens to make them work. This chart provides an overview:
80+
81+
|Flow | Requires | id_token | access token | refresh token | authorization code |
82+
|-----|----------|----------|--------------|---------------|--------------------|
83+
|[Authorization code flow](v2-oauth2-auth-code-flow.md) | | x | x | x | x|
84+
|[Implicit flow](v2-oauth2-implicit-grant-flow.md) | | x | x | | |
85+
|[Hybrid OIDC flow](v2-protocols-oidc.md#get-access-tokens)| | x | | | x |
86+
|[Refresh token redemption](v2-oauth2-auth-code-flow.md#refresh-the-access-token) | refresh token | x | x | x| |
87+
|[On-behalf-of flow](v2-oauth2-on-behalf-of-flow.md) | access token| x| x| x| |
88+
|[Client credentials](v2-oauth2-client-creds-grant-flow.md) | | | x (app-only)| | |
89+
90+
Tokens issued via the implicit mode have a length limitation due to being passed back to the browser via the URL (where `response_mode` is `query` or `fragment`). Some browsers have a limit on the size of the URL that can be put in the browser bar and fail when it is too long. Thus, these tokens do not have `groups` or `wids` claims.
91+
92+
Now that you have an overview of the basics, read on to understand the identity app model and API, learn how provisioning works in Azure AD, and get links to detailed information about common scenarios Azure AD supports.
93+
7794
## Application model
7895

7996
Applications can sign in users themselves or delegate sign-in to an identity provider. See [Authentication flows and app scenarios](authentication-flows-app-scenarios.md) to learn about sign-in scenarios supported by Azure AD.

articles/active-directory/fundamentals/license-users-groups.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ You can remove a license from a user's Azure AD user page, from the group overvi
132132
1. Select **Remove license**.
133133

134134
![Licensed groups page with Remove license option highlighted](media/license-users-groups/license-products-group-blade-with-remove-option-highlight.png)
135+
136+
> [!NOTE]
137+
> When an on-premises user account synced to Azure AD falls out of scope for the sync or when the sync is removed, the user is soft-deleted in Azure AD. When this occurs, licenses assigned to the user directly or via group-based licensing will be marked as **suspended** rather than **deleted**.
135138
136139
## Next steps
137140

articles/active-directory/governance/entitlement-management-troubleshoot.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ This article describes some items you should check to help you troubleshoot Azur
4747

4848
* Ensure your directory is not configured for multi-geo. Entitlement management currently does not support multi-geo locations for SharePoint Online. SharePoint Online sites must be in the default geo-location to be governed with entitlement management. For more information, see [Multi-Geo Capabilities in OneDrive and SharePoint Online](https://docs.microsoft.com/Office365/Enterprise/multi-geo-capabilities-in-onedrive-and-sharepoint-online-in-office-365).
4949

50+
## Access packages
51+
52+
* If you attempt to delete an access package or policy and see an error message that says there are active assignments, if you don't see any users with assignments, check to see whether any recently deleted users still have assignments. During the 30-day window after a user is deleted, the user account can be restored.
53+
5054
## External users
5155

5256
* When an external user wants to request access to an access package, make sure they are using the **My Access portal link** for the access package. For more information, see [Share link to request an access package](entitlement-management-access-package-settings.md). If an external user just visits **myaccess.microsoft.com** and does not use the full My Access portal link, then they will see the access packages available to them in their own organization and not in your organization.

articles/application-gateway/tutorial-multiple-sites-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ for ($i=1; $i -le 2; $i++)
272272

273273
## Create CNAME record in your domain
274274

275-
After the application gateway is created with its public IP address, you can get the DNS address and use it to create a CNAME record in your domain. You can use [Get-AzPublicIPAddress](/powershell/module/az.network/get-azpublicipaddress) to get the DNS address of the application gateway. Copy the *fqdn* value of the DNSSettings and use it as the value of the CNAME record that you create. Using A-records isn't recommended because the VIP may change when the application gateway is restarted.
275+
After the application gateway is created with its public IP address, you can get the DNS address and use it to create a CNAME record in your domain. You can use [Get-AzPublicIPAddress](/powershell/module/az.network/get-azpublicipaddress) to get the DNS address of the application gateway. Copy the *fqdn* value of the DNSSettings and use it as the value of the CNAME record that you create. Using A-records isn't recommended because the VIP may change when the application gateway is restarted in the V1 SKU.
276276

277277
```azurepowershell-interactive
278278
Get-AzPublicIPAddress -ResourceGroupName myResourceGroupAG -Name myAGPublicIPAddress

articles/azure-resource-manager/templates/deploy-to-subscription.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ The following example creates a resource group, and deploys a storage account to
221221
"location": "[parameters('rgLocation')]",
222222
"sku": {
223223
"name": "Standard_LRS"
224-
}
225-
"kind": "StorageV2",
224+
},
225+
"kind": "StorageV2"
226226
}
227227
],
228228
"outputs": {}

0 commit comments

Comments
 (0)