Skip to content

Commit ca872f0

Browse files
msmbaldwinmsmbaldwin
committed
Merge branch 'main' of https://github.com/microsoftdocs/azure-docs-pr into akv-misc
2 parents c0ac892 + 57de504 commit ca872f0

File tree

270 files changed

+5439
-2666
lines changed

Some content is hidden

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

270 files changed

+5439
-2666
lines changed

‎.openpublishing.redirection.active-directory.json

Lines changed: 18 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,21 @@
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/develop/v2-permissions-and-consent.md",
5546+
"redirect_url": "/azure/active-directory/develop/permissions-consent-overview",
5547+
"redirect_document_id": false
5548+
},
5549+
{
5550+
"source_path_from_root": "/articles/active-directory/manage-apps/consent-and-permissions-overview.md",
5551+
"redirect_url": "/azure/active-directory/manage-apps/user-admin-consent-overview",
5552+
"redirect_document_id": false
5553+
},
55395554
{
55405555
"source_path_from_root": "/articles/active-directory/manage-apps/application-proxy-enable.md",
55415556
"redirect_url": "/azure/active-directory/app-proxy/application-proxy-add-on-premises-application",

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5511,6 +5511,11 @@
55115511
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-metrics-addon.md",
55125512
"redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-enable",
55135513
"redirect_document_id": false
5514+
},
5515+
{
5516+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md",
5517+
"redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
5518+
"redirect_document_id": false
55145519
}
55155520
]
55165521
}

‎.whatsnew/.application-management.json

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
2-
"$schema": "https://whatsnewapi.azurewebsites.net/schema",
3-
"docSetProductName": "Azure Active Directory application management",
4-
"rootDirectory": "articles/active-directory/manage-apps/",
5-
"docLinkSettings": {
6-
"linkFormat": "relative",
7-
"relativeLinkPrefix": "/azure/active-directory/manage-apps"
8-
},
9-
"inclusionCriteria": {
10-
"excludePullRequestTitles": true,
11-
"minAdditionsToFile" : 10,
12-
"maxFilesChanged": 50,
13-
"labels": [
14-
"label:active-directory/svc",
15-
"label:app-mgmt/subsvc"
16-
]
17-
},
18-
"areas": [
19-
{
20-
"name": ".",
21-
"heading": "Azure Active Directory application management"
22-
}
23-
]
24-
}
2+
"$schema": "https://whatsnewapi.azurewebsites.net/schema",
3+
"docSetProductName": "Azure Active Directory application management",
4+
"rootDirectory": "articles/active-directory/manage-apps/",
5+
"docLinkSettings": {
6+
"linkFormat": "relative",
7+
"relativeLinkPrefix": "/azure/active-directory/manage-apps"
8+
},
9+
"inclusionCriteria": {
10+
"omitPullRequestTitles": true,
11+
"minAdditionsToFile": 10,
12+
"maxFilesChanged": 50,
13+
"labels": [
14+
"label:active-directory/svc",
15+
"label:app-mgmt/subsvc"
16+
]
17+
},
18+
"areas": [
19+
{
20+
"name": ".",
21+
"heading": "Azure Active Directory application management"
22+
}
23+
]
24+
}

‎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/conditional-access/concept-conditional-access-conditions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ On Windows 7, iOS, Android, and macOS Azure AD identifies the device using a cli
127127

128128
#### Chrome support
129129

130-
For Chrome support in **Windows 10 Creators Update (version 1703)** or later, install the [Windows 10 Accounts](https://chrome.google.com/webstore/detail/windows-10-accounts/ppnbnpeolgkicgegkbkbjmhlideopiji) or [Office Online](https://chrome.google.com/webstore/detail/office/ndjpnladcallmjemlbaebfadecfhkepb) extensions. These extensions are required when a Conditional Access policy requires device-specific details.
130+
For Chrome support in **Windows 10 Creators Update (version 1703)** or later, install the [Windows Accounts](https://chrome.google.com/webstore/detail/windows-accounts/ppnbnpeolgkicgegkbkbjmhlideopiji) or [Office](https://chrome.google.com/webstore/detail/office/ndjpnladcallmjemlbaebfadecfhkepb) extensions. These extensions are required when a Conditional Access policy requires device-specific details.
131131

132132
To automatically deploy this extension to Chrome browsers, create the following registry key:
133133

‎articles/active-directory/develop/TOC.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,19 @@
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

‎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)).

0 commit comments

Comments
 (0)