Minor fixes

Author: kalyankrishna1

.gitignore

@@ -105,3 +105,4 @@ dist
 
 # NPM lock file
 package-lock.json
+/.vs

1-Authentication/1-sign-in/AppCreationScripts/Cleanup.ps1

@@ -59,9 +59,9 @@ Function Cleanup
     # Removes the applications
     Write-Host "Cleaning-up applications from tenant '$tenantName'"
 
-    Write-Host "Removing 'webApp' (WebApp) if needed"
-    Get-AzureADApplication -Filter "DisplayName eq 'WebApp'"  | ForEach-Object {Remove-AzureADApplication -ObjectId $_.ObjectId }
-    $apps = Get-AzureADApplication -Filter "DisplayName eq 'WebApp'"
+    Write-Host "Removing 'webApp' (ms-identity-nodejs-webapp) if needed"
+    Get-AzureADApplication -Filter "DisplayName eq 'ms-identity-nodejs-webapp'"  | ForEach-Object {Remove-AzureADApplication -ObjectId $_.ObjectId }
+    $apps = Get-AzureADApplication -Filter "DisplayName eq 'ms-identity-nodejs-webapp'"
     if ($apps)
     {
         Remove-AzureADApplication -ObjectId $apps.ObjectId
@@ -73,7 +73,7 @@ Function Cleanup
         Write-Host "Removed WebApp.."
     }
     # also remove service principals of this app
-    Get-AzureADServicePrincipal -filter "DisplayName eq 'WebApp'" | ForEach-Object {Remove-AzureADServicePrincipal -ObjectId $_.Id -Confirm:$false}
+    Get-AzureADServicePrincipal -filter "DisplayName eq 'ms-identity-nodejs-webapp'" | ForEach-Object {Remove-AzureADServicePrincipal -ObjectId $_.Id -Confirm:$false}
 
 }
 

1-Authentication/1-sign-in/AppCreationScripts/Configure.ps1

@@ -137,16 +137,16 @@ Function ConfigureApplications
     $user = Get-AzureADUser -ObjectId $creds.Account.Id
 
    # Create the webApp AAD application
-   Write-Host "Creating the AAD application (WebApp)"
+   Write-Host "Creating the AAD application (ms-identity-nodejs-webapp)"
    # Get a 2 years application key for the webApp Application
    $pw = ComputePassword
    $fromDate = [DateTime]::Now;
    $key = CreateAppKey -fromDate $fromDate -durationInYears 2 -pw $pw
    $webAppAppKey = $pw
    # create the application 
-   $webAppAadApplication = New-AzureADApplication -DisplayName "WebApp" `
+   $webAppAadApplication = New-AzureADApplication -DisplayName "ms-identity-nodejs-webapp" `
                                                   -HomePage "https://localhost:4000" `
-                                                  -ReplyUrls "https://localhost:4000/redirect" `
+                                                  -ReplyUrls "http://localhost:4000/redirect" `
                                                   -IdentifierUris "https://$tenantName/WebApp" `
                                                   -PasswordCredentials $key `
                                                   -PublicClient $False
@@ -164,18 +164,18 @@ Function ConfigureApplications
    }
 
 
-   Write-Host "Done creating the webApp application (WebApp)"
+   Write-Host "Done creating the webApp application (ms-identity-nodejs-webapp)"
 
    # URL of the AAD application in the Azure portal
    # Future? $webAppPortalUrl = "https://portal.azure.com/#@"+$tenantName+"/blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/Overview/appId/"+$webAppAadApplication.AppId+"/objectId/"+$webAppAadApplication.ObjectId+"/isMSAApp/"
    $webAppPortalUrl = "https://portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/CallAnAPI/appId/"+$webAppAadApplication.AppId+"/objectId/"+$webAppAadApplication.ObjectId+"/isMSAApp/"
    Add-Content -Value "<tr><td>webApp</td><td>$currentAppId</td><td><a href='$webAppPortalUrl'>WebApp</a></td></tr>" -Path createdApps.html
 
 
-   # Update config file for 'webApp'
+   # Update config file for 'ms-identity-nodejs-webapp'
    $configFile = $pwd.Path + "\..\auth.json"
    Write-Host "Updating the sample code ($configFile)"
-   $dictionary = @{ "ClientId" = $webAppAadApplication.AppId;"TenantId" = $tenantId;"ClientSecret" = $webAppAppKey };
+   $dictionary = @{ "clientId" = $webAppAadApplication.AppId;"tenantId" = $tenantId;"clientSecret" = $webAppAppKey };
    UpdateTextFile -configFilePath $configFile -dictionary $dictionary
 
    Add-Content -Value "</tbody></table></body></html>" -Path createdApps.html  

1-Authentication/1-sign-in/AppCreationScripts/sample.json

@@ -13,26 +13,26 @@
         "Kind": "WebApp",
         "Audience": "AzureADMyOrg",
         "HomePage": "https://localhost:4000",
-        "ReplyUrls": "https://localhost:4000/redirect",
+        "ReplyUrls": "http://localhost:4000/redirect",
         "PasswordCredentials": "Auto"
       }
     ],
     "CodeConfiguration": [
       {
-        "App": "webApp",
+        "App": "ms-identity-nodejs-webapp",
         "SettingKind": "JSON",
         "SettingFile": "\\..\\auth.json",
         "Mappings": [
           {
-            "key": "ClientId",
+            "key": "clientId",
             "value": ".AppId"
           },
           {
-            "key": "TenantId",
+            "key": "tenantId",
             "value": "$tenantId"
           },
           {
-            "key": "ClientSecret",
+            "key": "clientSecret",
             "value": ".AppKey"
           }
         ]

1-Authentication/1-sign-in/README.md

@@ -10,6 +10,7 @@ name: A Node.js & Express Web App authenticating users against Azure AD with MSA
 urlFragment: ms-identity-javascript-nodejs-tutorial
 description: "This sample demonstrates a Node.js & Express Web App authenticating users against Azure AD with MSAL Node"
 ---
+
 # A Node.js & Express Web App authenticating users against Azure AD with MSAL Node
 
  1. [Overview](#overview)
@@ -27,7 +28,7 @@ description: "This sample demonstrates a Node.js & Express Web App authenticatin
 
 ## Overview
 
-This sample demonstrates a Node.js & Express web application that authenticates users against Azure AD, with the help of [Microsoft Authentication Library for Node.js]() (MSAL Node). In doing so, it also illustrates various authentication concepts, such as [OIDC scopes](), [ID Tokens](), [ID Token validation](), [National Clouds]() and more.
+This sample demonstrates a Node.js & Express web application that authenticates users against Azure AD, with the help of [Microsoft Authentication Library for Node.js](https://aka.ms/msalnode) (MSAL Node). In doing so, it also illustrates various authentication concepts, such as [OpenID scopes](https://docs.microsoft.com/azure/active-directory/develop/v2-permissions-and-consent#openid-connect-scopes), [ID Tokens](https://docs.microsoft.com/azure/active-directory/develop/id-tokens), [ID Token validation]() and more.
 
 ## Scenario
 
@@ -73,6 +74,7 @@ or download and extract the repository .zip file.
 Locate the root of the sample folder. Then:
 
 ```console
+    cd 1-Authentication\1-sign-in
     npm install
 ```
 
@@ -123,7 +125,7 @@ As a first step you'll need to:
 1. Navigate to the [Azure portal](https://portal.azure.com) and select the **Azure AD** service.
 1. Select the **App Registrations** blade on the left, then select **New registration**.
 1. In the **Register an application page** that appears, enter your application's registration information:
-   - In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `WebApp`.
+   - In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `ms-identity-nodejs-webapp`.
    - Under **Supported account types**, select **Accounts in this organizational directory only**.
    - In the **Redirect URI (optional)** section, select **Web** in the combo-box and enter the following redirect URI: `http://localhost:4000/redirect`.
 1. Select **Register** to create the application.

README.md

@@ -83,7 +83,7 @@ Here we build on the concepts we learnt earlier to authenticate users and acquir
 
 ## We'd love your feedback!
 
-Were we successful in addressing your learning objective? Consider taking a moment to [share your experience with us]().
+Were we successful in addressing your learning objective? Consider taking a moment to [share your experience with us][(](https://forms.office.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbR73pcsbpbxNJuZCMKN0lURpUQkRCSVdRSk8wUjdZSkg2NEZGOFFaTkxQVyQlQCN0PWcu)).
 
 ## More information