Skip to content

Commit cfc7244

Browse files
authored
Merge pull request #54454 from CelesteDG/celested-updates
Moved files to develop node
2 parents 51b9012 + 8af2a32 commit cfc7244

Some content is hidden

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

45 files changed

+180
-142
lines changed

.openpublishing.redirection.json

+20-5
Original file line numberDiff line numberDiff line change
@@ -16371,6 +16371,26 @@
1637116371
"redirect_url": "/azure/active-directory/develop/quickstart-v2-register-an-app",
1637216372
"redirect_document_id": true
1637316373
},
16374+
{
16375+
"source_path": "articles/active-directory/active-directory-claims-mapping.md",
16376+
"redirect_url": "/azure/active-directory/develop/active-directory-claims-mapping",
16377+
"redirect_document_id": true
16378+
},
16379+
{
16380+
"source_path": "articles/active-directory/active-directory-configurable-token-lifetimes.md",
16381+
"redirect_url": "/azure/active-directory/develop/active-directory-configurable-token-lifetimes",
16382+
"redirect_document_id": true
16383+
},
16384+
{
16385+
"source_path": "articles/active-directory/active-directory-enterprise-app-role-management.md",
16386+
"redirect_url": "/azure/active-directory/develop/active-directory-enterprise-app-role-management",
16387+
"redirect_document_id": true
16388+
},
16389+
{
16390+
"source_path": "articles/active-directory/application-consent-experience.md",
16391+
"redirect_url": "/azure/active-directory/develop/application-consent-experience",
16392+
"redirect_document_id": true
16393+
},
1637416394
{
1637516395
"source_path": "articles/active-directory/develop/active-directory-integrating-applications.md",
1637616396
"redirect_url": "/azure/active-directory/develop/quickstart-v1-integrate-apps-with-azure-ad",
@@ -27000,11 +27020,6 @@
2700027020
"redirect_url": "/azure/active-directory/manage-apps/application-proxy-integrate-with-sharepoint-server",
2700127021
"redirect_document_id": false
2700227022
},
27003-
{
27004-
"source_path": "articles/active-directory/develop/active-directory-enterprise-app-role-management.md",
27005-
"redirect_url": "/azure/active-directory/active-directory-enterprise-app-role-management",
27006-
"redirect_document_id": false
27007-
},
2700827023
{
2700927024
"source_path": "articles/iot-accelerators/iot-security-architecture.md",
2701027025
"redirect_url": "/azure/iot-fundamentals/iot-security-architecture",

articles/active-directory/TOC.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# How to
2626
## Plan and design
2727
### [Understand Azure AD architecture](fundamentals/active-directory-architecture.md)
28-
### [Claims mapping in Azure Active Directory](active-directory-claims-mapping.md)
28+
### [Claims mapping in Azure Active Directory](develop/active-directory-claims-mapping.md)
2929
### [Deploy a hybrid identity solution](hybrid/plan-hybrid-identity-design-considerations-overview.md)
3030
#### Determine requirements
3131
##### [Identity](hybrid/plan-hybrid-identity-design-considerations-business-needs.md)
@@ -200,7 +200,7 @@
200200
#### [Tenant restrictions](manage-apps/tenant-restrictions.md)
201201
#### [Use SCIM provision users](manage-apps/use-scim-to-provision-users-and-groups.md)
202202

203-
### [Understanding Azure AD application consent experiences](application-consent-experience.md)
203+
### [Understanding Azure AD application consent experiences](develop/application-consent-experience.md)
204204

205205
### Troubleshoot
206206

@@ -323,7 +323,7 @@
323323

324324
### [Integrate on-premises identities using Azure AD Connect](hybrid/whatis-hybrid-identity.md)
325325

326-
### [Configure token lifetimes](active-directory-configurable-token-lifetimes.md)
326+
### [Configure token lifetimes](develop/active-directory-configurable-token-lifetimes.md)
327327

328328
## Secure your identities
329329

articles/active-directory/develop/TOC.yml

+26-12
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,14 @@
9393
href: single-sign-on-saml-protocol.md
9494
- name: Signout
9595
href: single-sign-out-saml-protocol.md
96-
- name: WS-Federation
97-
items:
98-
- name: Federation metadata
99-
href: azure-ad-federation-metadata.md
100-
- name: Signing key rollover
101-
href: active-directory-signing-key-rollover.md
96+
- name: How Azure AD uses the SAML protocol
97+
href: active-directory-saml-protocol-reference.md
98+
- name: WS-Federation
99+
items:
100+
- name: Federation metadata
101+
href: azure-ad-federation-metadata.md
102+
- name: Signing key rollover
103+
href: active-directory-signing-key-rollover.md
102104
- name: ID tokens
103105
href: id-tokens.md
104106
- name: Access tokens
@@ -123,7 +125,7 @@
123125
- name: Consent framework
124126
href: consent-framework.md
125127
- name: Application consent experiences
126-
href: ../application-consent-experience.md
128+
href: application-consent-experience.md
127129
- name: Conditional access
128130
href: conditional-access-dev-guide.md
129131
- name: National Clouds
@@ -144,9 +146,15 @@
144146
- name: Configure claims
145147
items:
146148
- name: Configure role claims
147-
href: ../active-directory-enterprise-app-role-management.md
149+
href: active-directory-enterprise-app-role-management.md
148150
- name: Customize claims
149151
href: active-directory-saml-claims-customization.md
152+
- name: Customize claims (Public Preview)
153+
href: active-directory-claims-mapping.md
154+
- name: Configure optional claims (Public Preview)
155+
href: active-directory-optional-claims.md
156+
- name: Configure token lifetimes (Public Preview)
157+
href: active-directory-configurable-token-lifetimes.md
150158
- name: ADAL error handling best practices
151159
href: active-directory-devhowto-adal-error-handling.md
152160
- name: Application configuration
@@ -196,8 +204,6 @@
196204
href: active-directory-authentication-libraries.md
197205
- name: Azure AD Graph API
198206
href: active-directory-graph-api.md
199-
- name: Claims in Azure AD security tokens
200-
href: active-directory-optional-claims.md
201207
- name: Application manifest
202208
href: reference-app-manifest.md
203209
- name: Authentication and authorization error codes
@@ -317,17 +323,25 @@
317323
- name: Consent framework
318324
href: consent-framework.md
319325
- name: Application consent experiences
320-
href: ../application-consent-experience.md
326+
href: application-consent-experience.md
321327
- name: National Clouds
322328
href: authentication-national-cloud.md
323329
- name: How-to guides
324330
items:
325331
- name: Authentication
326332
items:
327333
- name: Configure role claims
328-
href: ../active-directory-enterprise-app-role-management.md
334+
href: active-directory-enterprise-app-role-management.md
329335
- name: Customize claims
330336
href: active-directory-saml-claims-customization.md
337+
- name: Customize claims (Public Preview)
338+
href: active-directory-claims-mapping.md
339+
- name: Configure optional claims (Public Preview)
340+
href: active-directory-optional-claims.md
341+
- name: Configure token lifetimes (Public Preview)
342+
href: active-directory-configurable-token-lifetimes.md
343+
- name: Authenticate with Azure AD and get a JWT token using OAuth 2.0
344+
href: active-directory-protocols-oauth-get-jwt-token.md
331345
- name: Application configuration
332346
items:
333347
- name: Convert a single-tenant app to a multi-tenant app

0 commit comments

Comments
 (0)