Skip to content

Commit 786b9cf

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents e26125d + afd0eb3 commit 786b9cf

File tree

217 files changed

+4664
-3285
lines changed

Some content is hidden

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

217 files changed

+4664
-3285
lines changed

.openpublishing.redirection.active-directory.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3433,17 +3433,17 @@
34333433
},
34343434
{
34353435
"source_path_from_root": "/articles/active-directory/develop/active-directory-permissions.md",
3436-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3436+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34373437
"redirect_document_id": false
34383438
},
34393439
{
34403440
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-scopes.md",
3441-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3441+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34423442
"redirect_document_id": false
34433443
},
34443444
{
34453445
"source_path_from_root": "/articles/active-directory/develop/v1-permissions-and-consent.md",
3446-
"redirect_url": "/azure/active-directory/develop/v2-permissions-and-consent",
3446+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
34473447
"redirect_document_id": false
34483448
},
34493449
{
@@ -5536,6 +5536,16 @@
55365536
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",
55375537
"redirect_document_id": true
55385538
},
5539+
{
5540+
"source_path_from_root": "/articles/active-directory/develop/consent-framework.md",
5541+
"redirect_url": "/azure/active-directory/develop/application-consent-experience",
5542+
"redirect_document_id": false
5543+
},
5544+
{
5545+
"source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
5546+
"redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
5547+
"redirect_document_id": false
5548+
},
55395549
{
55405550
"source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
55415551
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",

.openpublishing.redirection.azure-monitor.json

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -278,12 +278,27 @@
278278
},
279279
{
280280
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
281-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",
281+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
282+
"redirect_document_id": false
283+
},
284+
{
285+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections.md",
286+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
287+
"redirect_document_id": false
288+
},
289+
{
290+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-cherwell.md",
291+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
292+
"redirect_document_id": false
293+
},
294+
{
295+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-provance.md",
296+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
282297
"redirect_document_id": false
283298
},
284299
{
285300
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-scsm.md" ,
286-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections",
301+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
287302
"redirect_document_id": false
288303
},
289304
{
@@ -2908,13 +2923,13 @@
29082923
},
29092924
{
29102925
"source_path_from_root": "/articles/log-analytics/log-analytics-itsmc-connections.md",
2911-
"redirect_url": "/azure/azure-monitor/platform/itsmc-connections",
2926+
"redirect_url": "/azure/azure-monitor/platform/itsmc-overview",
29122927
"redirect_document_id": true
29132928
},
29142929
{
29152930
"source_path_from_root": "/articles/log-analytics/log-analytics-itsmc-overview.md",
29162931
"redirect_url": "/azure/azure-monitor/platform/itsmc-overview",
2917-
"redirect_document_id": true
2932+
"redirect_document_id": false
29182933
},
29192934
{
29202935
"source_path_from_root": "/articles/log-analytics/log-analytics-itsmc-service-manager-script.md",
@@ -3571,6 +3586,12 @@
35713586
"redirect_url": "/azure/service-health/alerts-activity-log-service-notifications",
35723587
"redirect_document_id": false
35733588
},
3589+
{
3590+
"source_path_from_root": "/articles/azure-monitor/logs/azure-data-explorer-monitor-proxy.md",
3591+
"redirect_url": "/azure/data-explorer/query-monitor-data",
3592+
"redirect_document_id": false
3593+
},
3594+
35743595
{
35753596
"source_path_from_root": "/articles/azure-monitor/platform/service-notifications.md",
35763597
"redirect_url": "/azure/service-health/service-notifications",
@@ -5108,17 +5129,17 @@
51085129
},
51095130
{
51105131
"source_path_from_root": "/articles/azure-monitor/platform/itsmc-connections-cherwell.md",
5111-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections-cherwell",
5132+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
51125133
"redirect_document_id": false
51135134
},
51145135
{
51155136
"source_path_from_root": "/articles/azure-monitor/platform/itsmc-connections-provance.md",
5116-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections-provance",
5137+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
51175138
"redirect_document_id": false
51185139
},
51195140
{
51205141
"source_path_from_root": "/articles/azure-monitor/platform/itsmc-connections-scsm.md",
5121-
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections-scsm",
5142+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-overview",
51225143
"redirect_document_id": false
51235144
},
51245145
{

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,11 @@
768768
"redirect_url": "/azure/frontdoor/create-front-door-cli",
769769
"redirect_document_id": false
770770
},
771+
{
772+
"source_path_from_root": "/articles/frontdoor/standard-premium/how-to-create-origin.md",
773+
"redirect_url": "/azure/frontdoor/how-to-configure-origin",
774+
"redirect_document_id": false
775+
},
771776
{
772777
"source_path_from_root": "/articles/aks/aks-resource-health.md",
773778
"redirect_url": "/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",

articles/active-directory/authentication/concept-certificate-based-authentication-certificateuserids.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,27 @@ GET https://graph.microsoft.com/v1.0/users?$filter=startswith(certificateUserIds
157157
GET https://graph.microsoft.com/v1.0/users?$filter=certificateUserIds eq '[email protected]'
158158
```
159159
160+
## Update certificate user IDs using Microsoft Graph queries
161+
PATCH the user object certificateUserIds value for a given userId
162+
163+
#### Request body:
164+
165+
```http
166+
PATCH https://graph.microsoft.us/v1.0/users/{id}
167+
Content-Type: application/json
168+
{
169+
170+
"@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users(authorizationInfo,department)/$entity",
171+
"department": "Accounting",
172+
"authorizationInfo": {
173+
"certificateUserIds": [
174+
"X509:<PN>123456789098765@mil"
175+
]
176+
}
177+
}
178+
```
179+
180+
160181
## Next steps
161182

162183
- [Overview of Azure AD CBA](concept-certificate-based-authentication.md)

articles/active-directory/develop/TOC.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,27 @@
3535
items:
3636
- name: Permissions and consent overview
3737
href: permissions-consent-overview.md
38+
- name: Delegated access
39+
href: delegated-access-primer.md
40+
- name: Scopes and permissions
41+
href: scopes-oidc.md
3842
- name: "Authorization options: ACLs, RBAC, ABAC"
3943
href: authorization-basics.md
4044
- name: RBAC for app developers
4145
href: custom-rbac-for-developers.md
42-
- name: Scopes, permissions, and consent
43-
displayName: Scopes
44-
href: v2-permissions-and-consent.md
46+
- name: Requesting permissions through consent
47+
href: consent-types-developer.md
4548
- name: Application consent experiences
4649
displayName: App consent experiences
4750
href: application-consent-experience.md
48-
- name: Consent framework
49-
href: consent-framework.md
5051
- name: Conditional Access dev guide
5152
href: v2-conditional-access-dev-guide.md
5253
displayName: ca
5354
- name: Conditional Access auth context
5455
href: developer-guide-conditional-access-authentication-context.md
5556
displayName: ca
57+
- name: Permissions and consent framework
58+
href: v2-permissions-and-consent.md
5659
- name: App registrations and workload identities
5760
displayName: App configuration
5861
items:

articles/active-directory/develop/access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,4 +324,4 @@ Check out [Primary Refresh Tokens](../devices/concept-primary-refresh-token.md)
324324
## Next steps
325325

326326
- Learn about [`id_tokens` in Azure AD](id-tokens.md).
327-
- Learn about permission and consent ( [v1.0](../azuread-dev/v1-permissions-consent.md), [v2.0](v2-permissions-and-consent.md)).
327+
- Learn about permission and consent ( [v1.0](../azuread-dev/v1-permissions-consent.md), [v2.0](permissions-consent-overview.md)).

articles/active-directory/develop/active-directory-v2-protocols.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Your client app needs a way to trust the security tokens issued to it by the Mic
5353

5454
When you register your app in Azure AD, the Microsoft identity platform automatically assigns it some values, while others you configure based on the application's type.
5555

56-
Two the most commonly referenced app registration settings are:
56+
Two of the most commonly referenced app registration settings are:
5757

5858
* **Application (client) ID** - Also called _application ID_ and _client ID_, this value is assigned to your app by the Microsoft identity platform. The client ID uniquely identifies your app in the identity platform and is included in the security tokens the platform issues.
5959
* **Redirect URI** - The authorization server uses a redirect URI to direct the resource owner's *user-agent* (web browser, mobile app) to another destination after completing their interaction. For example, after the end-user authenticates with the authorization server. Not all client types use redirect URIs.

0 commit comments

Comments
 (0)