Skip to content

Commit 7b048e8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into yelevin/update-trigger
2 parents bbc726d + bbd7069 commit 7b048e8

File tree

248 files changed

+3500
-1914
lines changed

Some content is hidden

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

248 files changed

+3500
-1914
lines changed

.openpublishing.publish.config.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"url": "https://github.com/Azure-Samples/msdocs-storage-bind-function-service",
9292
"branch": "main",
9393
"branch_mapping": {}
94-
},
94+
},
9595
{
9696
"path_to_root": "azure_cli_scripts",
9797
"url": "https://github.com/Azure-Samples/azure-cli-samples",
@@ -901,8 +901,13 @@
901901
"url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
902902
"branch": "docs-snippets",
903903
"branch_mapping": {}
904+
},
905+
{
906+
"path_to_root": "ms-identity-node",
907+
"url": "https://github.com/Azure-Samples/ms-identity-node",
908+
"branch": "main",
909+
"branch_mapping": {}
904910
}
905-
906911
],
907912
"branch_target_mapping": {
908913
"live": ["Publish", "PDF"],

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@
119119
"source_path_from_root": "/articles/azure-monitor/alerts/activity-log-alerts.md" ,
120120
"redirect_url": "/azure/azure-monitor/alerts/alert-types.md#activity-log-alerts",
121121
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/articles/azure-monitor/insights/data-explorer.md" ,
125+
"redirect_url": "/azure/data-explorer/data-explorer-insights",
126+
"redirect_document_id": false
122127
}
123128
]
124129
}

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2718,6 +2718,11 @@
27182718
"redirect_url": "/azure/aks/load-balancer-standard",
27192719
"redirect_document_id": false
27202720
},
2721+
{
2722+
"source_path_from_root": "/articles/aks/keda.md",
2723+
"redirect_url": "/azure/aks/keda-about",
2724+
"redirect_document_id": false
2725+
},
27212726
{
27222727
"source_path_from_root": "/articles/analysis-services/analysis-services-create-model-portal.md",
27232728
"redirect_url": "/azure/analysis-services/analysis-services-overview",
@@ -43274,6 +43279,11 @@
4327443279
"redirect_url": "/azure/cognitive-services/translator/custom-translator/key-terms",
4327543280
"redirect_document_id": false
4327643281
},
43282+
{
43283+
"source_path_from_root": "/articles/applied-ai-services/form-recognizer/generate-sas-tokens.md",
43284+
"redirect_url": "/azure/applied-ai-services/form-recognizer/create-sas-tokens",
43285+
"redirect_document_id": false
43286+
},
4327743287
{
4327843288
"source_path_from_root": "/articles/cognitive-services/language-service/text-summarization/how-to/call-api.md",
4327943289
"redirect_url": "/azure/cognitive-services/language-service/summarization/how-to/document-summarization",

articles/active-directory-b2c/partner-gallery.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Our ISV partner network extends our solution capabilities to help you build seam
2121
To be considered into this sample documentation, submit your application request in the [Microsoft Application Network portal](https://microsoft.sharepoint.com/teams/apponboarding/Apps/SitePages/Default.aspx). For any additional questions, send an email to [[email protected]](mailto:[email protected]).
2222

2323
>[!NOTE]
24-
>The [Azure Active Directory B2C community site on GitHub](https://azure-ad-b2c.github.io/azureadb2ccommunity.io/) also provides sample custom policies from the community.
24+
>The [Azure Active Directory B2C community site on GitHub](https://github.com/azure-ad-b2c/partner-integrations) also provides sample custom policies from the community.
2525
2626
## Identity verification and proofing
2727

articles/active-directory/develop/includes/web-app/quickstart-nodejs-msal.md

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.custom: aaddev, scenarios:getting-started, languages:js, devx-track-js
1616
# Customer intent: As an application developer, I want to know how to set up authentication in a web application built using Node.js and MSAL Node.
1717
---
1818

19-
In this quickstart, you download and run a code sample that demonstrates how a Node.js web app can sign in users by using the authorization code flow. The code sample also demonstrates how to get an access token to call Microsoft Graph API.
19+
In this quickstart, you download and run a code sample that demonstrates how a Node.js web app can sign in users by using the authorization code flow. The code sample also demonstrates how to get an access token to call the Microsoft Graph API.
2020

2121
See [How the sample works](#how-the-sample-works) for an illustration.
2222

@@ -37,8 +37,8 @@ This quickstart uses the Microsoft Authentication Library for Node.js (MSAL Node
3737
1. If you have access to multiple tenants, use the **Directories + subscriptions** filter :::image type="icon" source="../../media/common/portal-directory-subscription-filter.png" border="false"::: in the top menu to switch to the tenant in which you want to register the application.
3838
1. Under **Manage**, select **App registrations** > **New registration**.
3939
1. Enter a **Name** for your application. Users of your app might see this name, and you can change it later.
40-
1. Under **Supported account types**, select **Accounts in any organizational directory and personal Microsoft accounts**.
41-
1. Set the **Redirect URI** value to `http://localhost:3000/redirect`.
40+
1. Under **Supported account types**, select **Accounts in this organizational directory only**.
41+
1. Set the **Redirect URI** value to `http://localhost:3000/auth/redirect`.
4242
1. Select **Register**.
4343
1. On the app **Overview** page, note the **Application (client) ID** value for later use.
4444
1. Under **Manage**, select **Certificates & secrets** > **Client secrets** > **New client secret**. Leave the description blank and default expiration, and then select **Add**.
@@ -51,67 +51,57 @@ To run the project with a web server by using Node.js, [download the core projec
5151

5252
#### Step 3: Configure your Node app
5353

54-
Extract the project, open the *ms-identity-node-main* folder, and then open the *index.js* file.
55-
56-
Set the `clientID` value with the application (client) ID, and then set the `clientSecret` value with the client secret.
57-
58-
```javascript
59-
const config = {
60-
auth: {
61-
clientId: "Enter_the_Application_Id_Here",
62-
authority: "https://login.microsoftonline.com/common",
63-
clientSecret: "Enter_the_Client_Secret_Here"
64-
},
65-
    system: {
66-
        loggerOptions: {
67-
            loggerCallback(loglevel, message, containsPii) {
68-
                console.log(message);
69-
            },
70-
         piiLoggingEnabled: false,
71-
         logLevel: msal.LogLevel.Verbose,
72-
        }
73-
    }
74-
};
75-
```
76-
54+
Extract the project, open the *ms-identity-node-main* folder, and then open the *.env* file under the *App* folder. Replace the values above as follows:
7755

78-
Modify the values in the `config` section:
56+
| Variable | Description | Example(s) |
57+
|-----------|--------------|------------|
58+
| `Enter_the_Cloud_Instance_Id_Here` | The Azure cloud instance in which your application is registered | `https://login.microsoftonline.com/` (include the trailing forward-slash) |
59+
| `Enter_the_Tenant_Info_here` | Tenant ID or Primary domain | `contoso.microsoft.com` or `cbe899ec-5f5c-4efe-b7a0-599505d3d54f` |
60+
| `Enter_the_Application_Id_Here` | Client ID of the application you registered | `cbe899ec-5f5c-4efe-b7a0-599505d3d54f` |
61+
| `Enter_the_Client_Secret_Here` | Client secret of the application you registered | `WxvhStRfDXoEiZQj1qCy` |
62+
| `Enter_the_Graph_Endpoint_Here` | The Microsoft Graph API cloud instance that your app will call | `https://graph.microsoft.com/` (include the trailing forward-slash) |
63+
| `Enter_the_Express_Session_Secret_Here` | A random string of characters used to sign the Express session cookie | `WxvhStRfDXoEiZQj1qCy` |
7964

80-
- `Enter_the_Application_Id_Here` is the application (client) ID for the application you registered.
65+
Your file should look similar to below:
8166

82-
To find the application (client) ID, go to the app registration's **Overview** page in the Azure portal.
83-
- `Enter_the_Client_Secret_Here` is the client secret for the application you registered.
67+
```text
68+
CLOUD_INSTANCE=https://login.microsoftonline.com/
69+
TENANT_ID=cbe899ec-5f5c-4efe-b7a0-599505d3d54f
70+
CLIENT_ID=fa29b4c9-7675-4b61-8a0a-bf7b2b4fda91
71+
CLIENT_SECRET=WxvhStRfDXoEiZQj1qCy
8472
85-
To retrieve or generate a new client secret, under **Manage**, select **Certificates & secrets**.
73+
REDIRECT_URI=http://localhost:3000/auth/redirect
74+
POST_LOGOUT_REDIRECT_URI=http://localhost:3000
8675
87-
The default `authority` value represents the main (global) Azure cloud:
76+
GRAPH_API_ENDPOINT=https://graph.microsoft.com/
8877
89-
```javascript
90-
authority: "https://login.microsoftonline.com/common",
78+
EXPRESS_SESSION_SECRET=6DP6v09eLiW7f1E65B8k
9179
```
9280

81+
9382
#### Step 4: Run the project
9483

9584
Run the project by using Node.js.
9685

9786
1. To start the server, run the following commands from within the project directory:
9887

9988
```console
89+
cd App
10090
npm install
10191
npm start
10292
```
10393

10494
1. Go to `http://localhost:3000/`.
10595

106-
1. Select **Sign In** to start the sign-in process.
96+
1. Select **Sign in** to start the sign-in process.
10797

108-
The first time you sign in, you're prompted to provide your consent to allow the application to access your profile and sign you in. After you're signed in successfully, you will see a log message in the command line.
98+
The first time you sign in, you're prompted to provide your consent to allow the application to sign you in and access your profile. After you're signed in successfully, you'll be redirected back to the application home page.
10999

110100
## More information
111101

112102
### How the sample works
113103

114-
The sample hosts a web server on localhost, port 3000. When a web browser accesses this site, the sample immediately redirects the user to a Microsoft authentication page. Because of this, the sample does not contain any HTML or display elements. Authentication success displays the message "OK".
104+
The sample hosts a web server on localhost, port 3000. When a web browser accesses this address, the app renders the home page. Once the user selects **Sign in**, the app redirects the browser to Azure AD sign-in screen, via the URL generated by the MSAL Node library. After user consents, the browser redirects the user back to the application home page, along with an ID and access token.
115105

116106
### MSAL Node
117107

@@ -123,5 +113,6 @@ npm install @azure/msal-node
123113

124114
## Next steps
125115

116+
Learn more about the web app scenario that the Microsoft identity platform supports:
126117
> [!div class="nextstepaction"]
127-
> [Adding Auth to an existing web app - GitHub code sample >](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/samples/msal-node-samples/auth-code)
118+
> [Web app that signs in users scenario](../../scenario-web-app-sign-user-overview.md)
456 KB
Loading
509 KB
Loading
350 KB
Loading
170 KB
Loading
343 KB
Loading

0 commit comments

Comments
 (0)