Merge pull request #43 from Azure-Samples/update-authority-js

Update authority in vanilla and angular

Author: derisen

1-Authentication/0-sign-in-vanillajs/App/package-lock.json

@@ -10,7 +10,7 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@azure/msal-browser": "^2.36.0",
+        "@azure/msal-browser": "^2.37.0",
         "express": "^4.18.2",
         "morgan": "^1.10.0"
     },

1-Authentication/0-sign-in-vanillajs/App/package.json

@@ -19,6 +19,7 @@ function selectAccount () {
         // Add your account choosing logic here
         console.warn("Multiple accounts detected.");
     } else if (currentAccounts.length === 1) {
+        username = currentAccounts[0].username
         welcomeUser(currentAccounts[0].username);
         updateTable(currentAccounts[0]);
     }
@@ -32,7 +33,8 @@ function handleResponse(response) {
      */
 
     if (response !== null) {
-        welcomeUser(response.account.username);
+        username = response.account.username
+        welcomeUser(username);
         updateTable(response.account);
     } else {
         selectAccount();

1-Authentication/0-sign-in-vanillajs/App/public/authPopup.js

@@ -30,6 +30,7 @@ function selectAccount() {
         // Add your account choosing logic here
         console.warn("Multiple accounts detected.");
     } else if (currentAccounts.length === 1) {
+        username = currentAccounts[0].username
         welcomeUser(currentAccounts[0].username);
         updateTable(currentAccounts[0]);
     }
@@ -43,7 +44,8 @@ function handleResponse(response) {
      */
 
     if (response !== null) {
-        welcomeUser(response.account.username);
+        username = response.account.username
+        welcomeUser(username);
         updateTable(response.account);
     } else {
         selectAccount();

1-Authentication/0-sign-in-vanillajs/App/public/authRedirect.js

@@ -12,7 +12,7 @@
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/css/bootstrap.min.css" rel="stylesheet"
         integrity="sha384-Zenh87qX5JnK2Jl0vWa8Ck2rdkQ2Bzep5IDxbcnCeuOxjzrPF/et3URy9Bv1WTRi" crossorigin="anonymous">
 
-    <!-- msal.min.js can be used in the place of msal.js -->
+    <!-- msal.min.js can be used in the place of msal-browser.js -->
     <script src="/msal-browser.min.js"></script>
 </head>
 

1-Authentication/0-sign-in-vanillajs/App/public/index.html

@@ -163,7 +163,7 @@ Open the project in your IDE (like Visual Studio or Visual Studio Code) to confi
 
 1. Open the `App\public\authConfig.js` file.
 1. Find the key `Enter_the_Application_Id_Here` and replace the existing value with the application ID (clientId) of `ciam-msal-javascript-spa` app copied from the Azure portal.
-1. Find the key `Enter_the_Tenant_Id_Here` and replace the existing value with your Azure AD tenant/directory ID.
+1. Find the key `Enter_the_Tenant_Name_Here` and replace the existing value with the name of your Azure AD CIAM tenant.
 
 ### Step 4: Running the sample
 

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

@@ -251,7 +251,7 @@ Function ConfigureApplications
     # $configFile = $pwd.Path + "\..\SPA\src\app\auth-config.ts"
     $configFile = $(Resolve-Path ($pwd.Path + "\..\SPA\src\app\auth-config.ts"))
 
-    $dictionary = @{ "Enter_the_Application_Id_Here" = $spaAadApplication.AppId;"Enter_the_Tenant_Info_Here" = $tenantId };
+    $dictionary = @{ "Enter_the_Application_Id_Here" = $spaAadApplication.AppId;"Enter_the_Tenant_Name_Here" = $tenantName.Split(".onmicrosoft.com")[0] };
 
     Write-Host "Updating the sample config '$configFile' with the following config values:" -ForegroundColor Yellow 
     $dictionary

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

@@ -38,7 +38,7 @@
                     "settingFile": "/SPA/src/app/auth-config.ts",
                     "replaceTokens": {
                         "appId": "Enter_the_Application_Id_Here",
-                        "tenantId": "Enter_the_Tenant_Info_Here"
+                        "tenantName": "Enter_the_Tenant_Name_Here"
                     }
                 }
             ]

1-Authentication/2-sign-in-angular/AppCreationScripts/apps.json

@@ -1,37 +1,31 @@
 ---
-title: Portal quickstart for Angular SPA
-description: This is a portal quickstart for an Angular single-page application
-services: active-directory
-author: kengaderdus
-manager: mwongerapk
-ms.author: kengaderdus
-ms.service: active-directory
-ms.workload: identity
-ms.subservice: ciam
-ms.topic: quickstart
-ms.date: 04/11/2023
+title: "Portal quickstart for Angular SPA" 
+description: Learn how to run an sample Angular single-page application to sign in users 
+services: active-directory 
+author: kengaderdus 
+manager: mwongerapk 
+ms.author: kengaderdus 
+ms.service: active-directory 
+ms.workload: identity 
+ROBOTS: NOINDEX 
+ms.subservice: ciam 
+ms.topic: portal 
+ms.date: 04/19/2023 
 ---
-
 # Portal quickstart for Angular SPA
 
-> [!div renderon="portal" id="display-on-portal" class="sxs-lookup"]
-> In this quickstart, you download and run a code sample that demonstrates how an Angular single-page application (SPA) can sign in users with Azure AD CIAM.
->
-> ## Prerequisites
+> In this quickstart, you download and run a code sample that demonstrates how an Angular SPA that can sign in users with Azure AD for Customers.
 >
-> * [Node.js](https://nodejs.org/en/download/)
-> * [Visual Studio Code](https://code.visualstudio.com/download) or another code editor
->
-> ## Run the sample
+> [!div renderon="portal" id="display-on-portal" class="sxs-lookup"]
 >
-> 1. Unzip the downloaded file.
-> 1. Locate the folder in your terminal, then type:
+> 1. Make sure you've installed [Node.js](https://nodejs.org/download/).
+> 1. Unzip the sample.
+> 1. Locate the sample folder in your terminal, then run the following commands:
 >
->     ```console
->     cd SPA
->     npm install && npm start
->     ```
+>    ```console
+>    cd SPA && npm install && npm start
+>    ```
 >
-> 1. Open your browser and visit `http://locahost:4200`.
-> 1. Select **Sign-in** on the navigation bar.
+> 1. Visit `http://locahost:4200` in your browser.
+> 1. Select **Sign-in** on the navigation bar, then follow the prompts.
 >

1-Authentication/2-sign-in-angular/AppCreationScripts/quickstart.md

@@ -54,8 +54,8 @@
                     "value": ".AppId"
                 },
                 {
-                    "key": "Enter_the_Tenant_Info_Here",
-                    "value": "$tenantId"
+                    "key": "Enter_the_Tenant_Name_Here",
+                    "value": "$tenantName"
                 }
             ]
         }