Merge pull request #228161 from MicrosoftDocs/main

Publish to Live Wednesday 4AM PST, 02/22

Author: PMEds28

.openpublishing.redirection.json

@@ -21965,6 +21965,16 @@
             "source_path": "articles/virtual-machines/workloads/sap/index.md",
             "redirect_URL": "/azure/sap/workloads/get-started",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/private-multi-access-edge-compute-mec/deploy-metaswitch-fusion-core-solution.md",
+            "redirect_URL": "/azure/private-5g-core",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/private-multi-access-edge-compute-mec/metaswitch-fusion-core-overview.md",
+            "redirect_URL": "/azure/private-5g-core",
+            "redirect_document_id": false
         }
     ]
 }

articles/active-directory/develop/daemon-quickstart-portal-python.md

@@ -139,7 +139,7 @@ ms.custom: aaddev, identityplatformtop40, devx-track-python, "scenarios:getting-
 > result = app.acquire_token_silent(config["scope"], account=None)
 > 
 > if not result:
->     logging.info("No suitable token exists in cache. Let's get a new one from AAD.")
+>     logging.info("No suitable token exists in cache. Let's get a new one from Azure AD.")
 >     result = app.acquire_token_for_client(scopes=config["scope"])
 > ```
 > 

articles/active-directory/develop/desktop-quickstart-portal-uwp.md

@@ -2,15 +2,15 @@
 title: "Quickstart: Sign in users and call Microsoft Graph in a Universal Windows Platform app"
 description: In this quickstart, learn how a Universal Windows Platform (UWP) application can get an access token and call an API protected by Microsoft identity platform.
 services: active-directory
-author: OwenRichards1
+author: Dickson-Mwendia
 manager: CelesteDG
 ms.service: active-directory
 ms.subservice: develop
 ms.topic: quickstart
 ms.workload: identity
 ms.date: 08/18/2022
 ROBOTS: NOINDEX
-ms.author: owenrichards
+ms.author: dmwendia
 ms.custom: aaddev, identityplatformtop40, "scenarios:getting-started", "languages:UWP", mode-api
 #Customer intent: As an application developer, I want to learn how my Universal Windows Platform (XAML) application can get an access token and call an API that's protected by the Microsoft identity platform.
 ---

articles/active-directory/develop/msal-js-pass-custom-state-authentication-request.md

@@ -20,58 +20,23 @@ ms.custom: aaddev
 
 The *state* parameter, as defined by OAuth 2.0, is included in an authentication request and is also returned in the token response to prevent cross-site request forgery attacks. By default, the Microsoft Authentication Library for JavaScript (MSAL.js) passes a randomly generated unique *state* parameter value in the authentication requests.
 
-The state parameter can also be used to encode information of the app's state before redirect. You can pass the user's state in the app, such as the page or view they were on, as input to this parameter. The MSAL.js library allows you to pass your custom state as state parameter in the `Request` object:
+The state parameter can also be used to encode information of the app's state before redirect. You can pass the user's state in the app, such as the page or view they were on, as input to this parameter. The MSAL.js library allows you to pass your custom state as state parameter in the [Request](https://azuread.github.io/microsoft-authentication-library-for-js/ref/modules/_azure_msal_browser.html#redirectrequest) object. For example:
 
 ```javascript
-// Request type
-export type AuthenticationParameters = {
-    scopes?: Array<string>;
-    extraScopesToConsent?: Array<string>;
-    prompt?: string;
-    extraQueryParameters?: QPDict;
-    claimsRequest?: string;
-    authority?: string;
-    state?: string;
-    correlationId?: string;
-    account?: Account;
-    sid?: string;
-    loginHint?: string;
-    forceRefresh?: boolean;
-};
-```
-
-> [!Note]
-> If you would like to skip a cached token and go to the server, please pass in the boolean `forceRefresh` into the AuthenticationParameters object used to make a login/token request.
-> `forceRefresh` should not be used by default, because of the performance impact on your application.
-> Relying on the cache will give your users a better experience.
-> Skipping the cache should only be used in scenarios where you know the currently cached data does not have up-to-date information.
-> Such as an Admin tool that adds roles to a user that needs to get a new token with updated roles.
+import {PublicClientApplication} from "@azure/msal-browser";
 
-For example:
+const myMsalObj = new PublicClientApplication({
+    clientId: "ENTER_CLIENT_ID_HERE"
+});
 
-```javascript
 let loginRequest = {
-    scopes: ["user.read", "user.write"],
+    scopes: ["user.read"],
     state: "page_url"
 }
 
-myMSALObj.loginPopup(loginRequest);
+myMSALObj.loginRedirect(loginRequest);
 ```
 
-The passed in state is appended to the unique GUID set by MSAL.js when sending the request. When the response is returned, MSAL.js checks for a state match and then returns the custom passed in state in the `Response` object as `accountState`.
-
-```javascript
-export type AuthResponse = {
-    uniqueId: string;
-    tenantId: string;
-    tokenType: string;
-    idToken: IdToken;
-    accessToken: string;
-    scopes: Array<string>;
-    expiresOn: Date;
-    account: Account;
-    accountState: string;
-};
-```
+The passed in state is appended to the unique GUID set by MSAL.js when sending the request. When the response is returned, MSAL.js checks for a state match and then returns the custom passed in state in the [Response](https://azuread.github.io/microsoft-authentication-library-for-js/ref/modules/_azure_msal_common.html#authenticationresult) object as `state`.
 
-To learn more, read about [building a single-page application (SPA)](scenario-spa-overview.md) using MSAL.js.
+To learn more, read about [building a single-page application (SPA)](scenario-spa-overview.md) using MSAL.js.

articles/active-directory/develop/msal-net-migration-public-client.md

@@ -192,7 +192,7 @@ result = await context.AcquireTokenAsync(resource, clientId,
    // to a URL to consent: https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id={clientId}&response_type=code&scope=user.read
 
    // AADSTS50079: The user is required to use multi-factor authentication.
-   // There is no mitigation - if MFA is configured for your tenant and AAD decides to enforce it,
+   // There is no mitigation - if MFA is configured for your tenant and Azure AD decides to enforce it,
    // you need to fallback to an interactive flows such as AcquireTokenInteractive or AcquireTokenByDeviceCode
    }
    catch (MsalServiceException ex)
@@ -210,7 +210,7 @@ result = await context.AcquireTokenAsync(resource, clientId,
    catch (MsalClientException ex)
    {
       // Error Code: unknown_user Message: Could not identify logged in user
-      // Explanation: the library was unable to query the current Windows logged-in user or this user is not AD or AAD
+      // Explanation: the library was unable to query the current Windows logged-in user or this user is not AD or Azure AD
       // joined (work-place joined users are not supported).
 
       // Mitigation 1: on UWP, check that the application has the following capabilities: Enterprise Authentication,
@@ -222,7 +222,7 @@ result = await context.AcquireTokenAsync(resource, clientId,
       // Error Code: integrated_windows_auth_not_supported_managed_user
       // Explanation: This method relies on a protocol exposed by Active Directory (AD). If a user was created in Azure
       // Active Directory without AD backing ("managed" user), this method will fail. Users created in AD and backed by
-      // AAD ("federated" users) can benefit from this non-interactive method of authentication.
+      // Azure AD ("federated" users) can benefit from this non-interactive method of authentication.
       // Mitigation: Use interactive authentication
    }
  }
@@ -394,7 +394,7 @@ static async Task<AuthenticationResult> GetATokenForGraph()
     }
     catch (MsalUiRequiredException ex)
     {
-        // No token found in the cache or AAD insists that a form interactive auth is required (e.g. the tenant admin turned on MFA)
+        // No token found in the cache or Azure AD insists that a form interactive auth is required (e.g. the tenant admin turned on MFA)
         // If you want to provide a more complex user experience, check out ex.Classification
 
         return await AcquireByDeviceCodeAsync(pca);

articles/active-directory/develop/quickstart-v2-python-daemon.md

@@ -138,7 +138,7 @@ ms.custom: aaddev, identityplatformtop40, devx-track-python, "scenarios:getting-
 > result = app.acquire_token_silent(config["scope"], account=None)
 > 
 > if not result:
->     logging.info("No suitable token exists in cache. Let's get a new one from AAD.")
+>     logging.info("No suitable token exists in cache. Let's get a new one from Azure AD.")
 >     result = app.acquire_token_for_client(scopes=config["scope"])
 > ```
 > 

articles/active-directory/develop/scenario-daemon-acquire-token.md

@@ -175,7 +175,7 @@ result = None
 result = app.acquire_token_silent(config["scope"], account=None)
 
 if not result:
-    logging.info("No suitable token exists in cache. Let's get a new one from AAD.")
+    logging.info("No suitable token exists in cache. Let's get a new one from Azure AD.")
     result = app.acquire_token_for_client(scopes=config["scope"])
 
 if "access_token" in result:

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

@@ -105,7 +105,7 @@ When you build a confidential client with client secrets, the [parameters.json](
   "authority": "https://login.microsoftonline.com/<your_tenant_id>",
   "client_id": "your_client_id",
   "scope": [ "https://graph.microsoft.com/.default" ],
-  "secret": "The secret generated by AAD during your confidential app registration",
+  "secret": "The secret generated by Azure AD during your confidential app registration",
   "endpoint": "https://graph.microsoft.com/v1.0/users"
 }
 ```
@@ -117,7 +117,7 @@ When you build a confidential client with certificates, the [parameters.json](ht
   "authority": "https://login.microsoftonline.com/<your_tenant_id>",
   "client_id": "your_client_id",
   "scope": [ "https://graph.microsoft.com/.default" ],
-  "thumbprint": "790E... The thumbprint generated by AAD when you upload your public cert",
+  "thumbprint": "790E... The thumbprint generated by Azure AD when you upload your public cert",
   "private_key_file": "server.pem",
   "endpoint": "https://graph.microsoft.com/v1.0/users"
 }