Skip to content

Commit f18d43c

Browse files
inward-eyeinward-eye
authored
Merge branch 'MicrosoftDocs:master' into master
2 parents 5a8fd7c + ff0492c commit f18d43c

File tree

691 files changed

+51279
-6842
lines changed

Some content is hidden

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

691 files changed

+51279
-6842
lines changed

‎.openpublishing.publish.config.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,13 @@
800800
"url": "https://github.com/Azure-Samples/msdocs-python-django-webapp-quickstart",
801801
"branch": "main",
802802
"branch_mapping": {}
803-
}
803+
},
804+
{
805+
"path_to_root": "msdocs-nodejs-mongodb-azure-sample-app",
806+
"url": "https://github.com/Azure-Samples/msdocs-nodejs-mongodb-azure-sample-app",
807+
"branch": "main",
808+
"branch_mapping": {}
809+
}
804810
],
805811
"branch_target_mapping": {
806812
"live": [

‎.openpublishing.redirection.active-directory.json

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,111 @@
740740
"redirect_url": "/visualstudio/azure/vs-active-directory-webapi-what-happened",
741741
"redirect_document_id": false
742742
},
743+
{
744+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-javascript-auth-code-angular.md",
745+
"redirect_url": "/azure/active-directory/develop/single-page-app-quickstart?pivots=devlang-angular",
746+
"redirect_document_id": false
747+
},
748+
{
749+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-javascript-auth-code.md",
750+
"redirect_url": "/azure/active-directory/develop/single-page-app-quickstart?pivots=devlang-javascript",
751+
"redirect_document_id": false
752+
},
753+
{
754+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-javascript-auth-code-react.md",
755+
"redirect_url": "/azure/active-directory/develop/single-page-app-quickstart?pivots=devlang-react",
756+
"redirect_document_id": false
757+
},
758+
{
759+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-webapp.md",
760+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-aspnet",
761+
"redirect_document_id": false
762+
},
763+
{
764+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-core-webapp.md",
765+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-aspnet-core",
766+
"redirect_document_id": false
767+
},
768+
{
769+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-core-webapp-calls-graph.md",
770+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-aspnet-core",
771+
"redirect_document_id": false
772+
},
773+
{
774+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-webapp-msal.md",
775+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-msal",
776+
"redirect_document_id": false
777+
},
778+
{
779+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-webapp.md",
780+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-nodejs-passport",
781+
"redirect_document_id": false
782+
},
783+
{
784+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-java-webapp.md",
785+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-java",
786+
"redirect_document_id": false
787+
},
788+
{
789+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-python-webapp.md",
790+
"redirect_url": "/azure/active-directory/develop/web-app-quickstart?pivots=devlang-python",
791+
"redirect_document_id": false
792+
},
793+
{
794+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-dotnet-native-aspnet.md",
795+
"redirect_url": "/azure/active-directory/develop/web-api-quickstart?pivots=devlang-aspnet",
796+
"redirect_document_id": false
797+
},
798+
{
799+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-aspnet-core-web-api.md",
800+
"redirect_url": "/azure/active-directory/develop/web-api-quickstart?pivots=devlang-aspnet-core",
801+
"redirect_document_id": false
802+
},
803+
{
804+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-android.md",
805+
"redirect_url": "/azure/active-directory/develop/mobile-app-quickstart?pivots=devlang-android",
806+
"redirect_document_id": false
807+
},
808+
{
809+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-ios.md",
810+
"redirect_url": "/azure/active-directory/develop/mobile-app-quickstart?pivots=devlang-ios",
811+
"redirect_document_id": false
812+
},
813+
{
814+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-uwp.md",
815+
"redirect_url": "/azure/active-directory/develop/desktop-app-quickstart?pivots=devlang-uwp",
816+
"redirect_document_id": false
817+
},
818+
{
819+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-windows-desktop.md",
820+
"redirect_url": "/azure/active-directory/develop/desktop-app-quickstart?pivots=devlang-windows-desktop",
821+
"redirect_document_id": false
822+
},
823+
{
824+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-desktop.md",
825+
"redirect_url": "/azure/active-directory/develop/desktop-app-quickstart?pivots=devlang-nodejs-electron",
826+
"redirect_document_id": false
827+
},
828+
{
829+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-netcore-daemon.md",
830+
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-dotnet-core",
831+
"redirect_document_id": false
832+
},
833+
{
834+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-python-daemon.md",
835+
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-python",
836+
"redirect_document_id": false
837+
},
838+
{
839+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-nodejs-console.md",
840+
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-nodejs",
841+
"redirect_document_id": false
842+
},
843+
{
844+
"source_path_from_root": "/articles/active-directory/develop/quickstart-v2-java-daemon.md",
845+
"redirect_url": "/azure/active-directory/develop/console-app-quickstart?pivots=devlang-java",
846+
"redirect_document_id": false
847+
},
743848
{
744849
"source_path_from_root": "/articles/active-directory/active-directory-application-proxy-connectors.md",
745850
"redirect_url": "/azure/active-directory/active-directory-application-proxy-connectors-azure-portal",

‎.openpublishing.redirection.azure-productivity.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,31 @@
44
"source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
55
"redirect_url": "/azure/lab-services/get-started-manage-labs",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
10+
"redirect_url": "/azure/devtest-labs/samples-powershell",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
15+
"redirect_url": "/azure/devtest-labs/samples-powershell",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
20+
"redirect_url": "/azure/devtest-labs/samples-powershell",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
25+
"redirect_url": "/azure/devtest-labs/samples-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
30+
"redirect_url": "/azure/devtest-labs/samples-powershell",
31+
"redirect_document_id": false
732
}
833
]
934
}

‎.openpublishing.redirection.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29327,6 +29327,11 @@
2932729327
"redirect_url": "/azure/vpn-gateway/point-to-site-about",
2932829328
"redirect_document_id": false
2932929329
},
29330+
{
29331+
"source_path_from_root": "/articles/security/fundamentals/ddos-best-practices.md",
29332+
"redirect_url": "/azure/ddos-protection/fundamental-best-practices",
29333+
"redirect_document_id": false
29334+
},
2933029335
{
2933129336
"source_path_from_root": "/articles/vpn-gateway/create-vpn-azure-aws-managed-solutions.md",
2933229337
"redirect_url": "/azure/vpn-gateway/tutorial-site-to-site-portal",
@@ -45271,6 +45276,11 @@
4527145276
"source_path_from_root": "/articles/azure/cognitive-services/translator/tutorial-build-flask-app-translation-synthesis.md",
4527245277
"redirect_url": "/learn/modules/translate-text-with-translator-service?toc=/azure/cognitive-services/translator/toc.json&bc=/azure/cognitive-services/translator/breadcrumb/toc.json",
4527345278
"redirect_document_id": false
45274-
}
45279+
},
45280+
{
45281+
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-group-policy.md",
45282+
"redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
45283+
"redirect_document_id": false
45284+
}
4527545285
]
4527645286
}

‎articles/active-directory-b2c/whats-new-docs.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,26 @@ manager: CelesteDG
1515

1616
Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Azure Active Directory](../active-directory/fundamentals/whats-new.md).
1717

18+
## January 2022
19+
20+
### Updated articles
21+
22+
- [Tutorial: Secure Hybrid Access to applications with Azure AD B2C and F5 BIG-IP](partner-f5.md)
23+
- [Set up a force password reset flow in Azure Active Directory B2C](force-password-reset.md)
24+
- [Boolean claims transformations](boolean-transformations.md)
25+
- [Date claims transformations](date-transformations.md)
26+
- [General claims transformations](general-transformations.md)
27+
- [Integer claims transformations](integer-transformations.md)
28+
- [JSON claims transformations](json-transformations.md)
29+
- [Define phone number claims transformations in Azure AD B2C](phone-number-claims-transformations.md)
30+
- [Social accounts claims transformations](social-transformations.md)
31+
- [String claims transformations](string-transformations.md)
32+
- [StringCollection claims transformations](stringcollection-transformations.md)
33+
- [Billing model for Azure Active Directory B2C](billing.md)
34+
- [Configure SAML identity provider options with Azure Active Directory B2C](identity-provider-generic-saml-options.md)
35+
- [About claim resolvers in Azure Active Directory B2C custom policies](claim-resolver-overview.md)
36+
- [Add AD FS as a SAML identity provider using custom policies in Azure Active Directory B2C](identity-provider-adfs-saml.md)
37+
1838
## December 2021
1939

2040
### New articles

‎articles/active-directory-domain-services/manage-group-policy.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ This article shows you how to install the Group Policy Management tools, then ed
2323

2424
If you are interested in server management strategy, including machines in Azure and
2525
[hybrid connected](../azure-arc/servers/overview.md),
26-
consider reading how to
27-
[convert Group Policy content](../governance/policy/how-to/guest-configuration-create-group-policy.md)
28-
to the
26+
consider reading about the
2927
[guest configuration](../governance/policy/concepts/guest-configuration.md)
3028
feature of
3129
[Azure Policy](../governance/policy/overview.md).

‎articles/active-directory/authentication/concept-authentication-passwordless.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@ The following providers offer FIDO2 security keys of different form factors that
122122
| IDmelon Technologies Inc. | ![y] | ![y]| ![y]| ![y]| ![n] | https://www.idmelon.com/#idmelon |
123123
| Kensington | ![y] | ![y]| ![n]| ![n]| ![n] | https://www.kensington.com/solutions/product-category/why-biometrics/ |
124124
| KONA I | ![y] | ![n]| ![y]| ![y]| ![n] | https://konai.com/business/security/fido |
125-
| NEOWAVE | ![n] | ![y]| ![y]| ![n]| ![n] | https://neowave.fr/en/products/fido-range/ |
125+
| NeoWave | ![n] | ![y]| ![y]| ![n]| ![n] | https://neowave.fr/en/products/fido-range/ |
126126
| Nymi | ![y] | ![n]| ![y]| ![n]| ![n] | https://www.nymi.com/nymi-band |
127+
| Octatco | ![y] | ![y]| ![n]| ![n]| ![n] | https://octatco.com/ |
127128
| OneSpan Inc. | ![n] | ![y]| ![n]| ![y]| ![n] | https://www.onespan.com/products/fido |
128129
| Thales Group | ![n] | ![y]| ![y]| ![n]| ![n] | https://cpl.thalesgroup.com/access-management/authenticators/fido-devices |
129130
| Thetis | ![y] | ![y]| ![y]| ![y]| ![n] | https://thetis.io/collections/fido2 |

‎articles/active-directory/develop/msal-net-token-cache-serialization.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ services.Configure<MsalDistributedTokenCacheAdapterOptions>(options =>
116116
// Then, choose your implementation of distributed cache
117117
// -----------------------------------------------------
118118
119-
// For instance, the distributed in-memory cache (not cleared when you stop the app)
119+
// good for prototyping and testing, but this is NOT persisted and it is NOT distributed - do not use in production
120120
services.AddDistributedMemoryCache();
121121

122122
// Or a Redis cache
@@ -163,10 +163,10 @@ services.AddCosmosCache((CosmosCacheOptions cacheOptions) =>
163163
```
164164

165165
For more information, see:
166-
- [Difference between in-memory and distributed in memory caches](https://github.com/AzureAD/microsoft-identity-web/wiki/token-cache-serialization#inmemory-vs-distributedmemory-cache-options)
167166
- [Distributed cache advanced options](https://github.com/AzureAD/microsoft-identity-web/wiki/L1-Cache-in-Distributed-(L2)-Token-Cache)
168167
- [Handle L2 cache eviction](https://github.com/AzureAD/microsoft-identity-web/wiki/Handle-L2-cache-eviction)
169168
- [Set up a Redis cache in Docker](https://github.com/AzureAD/microsoft-identity-web/wiki/Set-up-a-Redis-cache-in-Docker)
169+
- [Troubleshooting](https://github.com/AzureAD/microsoft-identity-web/wiki/Token-Cache-Troubleshooting)
170170
171171
The usage of distributed cache is featured in the [ASP.NET Core web app tutorial](/aspnet/core/tutorials/first-mvc-app/) in the [phase 2-2 token cache](https://github.com/Azure-Samples/active-directory-aspnetcore-webapp-openidconnect-v2/tree/master/2-WebApp-graph-user/2-2-TokenCache).
172172
@@ -276,7 +276,6 @@ You can also specify options to limit the size of the in-memory token cache:
276276
);
277277
```
278278

279-
280279
#### Distributed caches
281280

282281
If you use `app.AddDistributedTokenCache`, the token cache is an adapter against the .NET `IDistributedCache` implementation. So you can choose between a distributed memory cache, a SQL Server cache, a Redis cache, or an Azure Cosmos DB cache. For details about the `IDistributedCache` implementations, see [Distributed memory cache](/aspnet/core/performance/caching/distributed).
@@ -386,10 +385,10 @@ Here's the code for an Azure Cosmos DB cache:
386385

387386
For more information about distributed caches, see:
388387

389-
- [Difference between in-memory and distributed in-memory caches](https://github.com/AzureAD/microsoft-identity-web/wiki/token-cache-serialization#inmemory-vs-distributedmemory-cache-options)
390388
- [Distributed cache advanced options](https://github.com/AzureAD/microsoft-identity-web/wiki/L1-Cache-in-Distributed-(L2)-Token-Cache)
391389
- [Handle L2 cache eviction](https://github.com/AzureAD/microsoft-identity-web/wiki/Handle-L2-cache-eviction)
392390
- [Set up a Redis cache in Docker](https://github.com/AzureAD/microsoft-identity-web/wiki/Set-up-a-Redis-cache-in-Docker)
391+
- [Troubleshooting](https://github.com/AzureAD/microsoft-identity-web/wiki/Token-Cache-Troubleshooting)
393392
394393
### Disabling a legacy token cache
395394

‎articles/active-directory/develop/scenario-daemon-app-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Daemon applications use application permissions rather than delegated permission
3131

3232
The authority specified in the application configuration should be tenanted (specifying a tenant ID or a domain name associated with your organization).
3333

34-
Even if want to provide a multitenant tool, you should use a tenant ID or domain name, and **not** `common` or `organizations` with this flow, because the service cannot reliably infer which tenant should be used.
34+
Even if you want to provide a multitenant tool, you should use a tenant ID or domain name, and **not** `common` or `organizations` with this flow, because the service cannot reliably infer which tenant should be used.
3535

3636
## Configure and instantiate the application
3737

‎articles/active-directory/develop/tutorial-v2-nodejs-desktop.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ Create a folder to host your application, for example *ElectronDesktopApp*.
153153
width: 800,
154154
height: 600,
155155
webPreferences: {
156-
nodeIntegration: true
156+
nodeIntegration: true,
157+
contextIsolation: false
157158
}
158159
});
159160

0 commit comments

Comments
 (0)