Skip to content

Commit c868d8e

Browse files
BenBagBagBenBagBag
committed
remove azure wording
1 parent 55c2acf commit c868d8e

76 files changed

Lines changed: 238 additions & 255 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const msalConfig = {
77
auth: {
88
clientId: 'Enter_the_Application_Id_Here', // This is the ONLY mandatory field that you need to supply.
99
authority: 'https://Enter_the_Tenant_Subdomain_Here.ciamlogin.com/', // Replace the placeholder with your tenant subdomain
10-
redirectUri: 'http://localhost:3000/redirect', // You must register this URI on Azure Portal/App Registration. Defaults to window.location.href e.g. http://localhost:3000/
10+
redirectUri: 'http://localhost:3000/redirect', // You must register this URI on Microsoft Entra admin center/App Registration. Defaults to window.location.href e.g. http://localhost:3000/
1111
navigateToLoginRequestUrl: true, // If "true", will navigate back to the original request location before processing the auth code response.
1212
},
1313
cache: {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const createClaimsTable = (claims) => {
1414
populateClaim(
1515
key,
1616
claims[key],
17-
"Identifies the intended recipient of the token. In ID tokens, the audience is your app's Application ID, assigned to your app in the Azure portal.",
17+
"Identifies the intended recipient of the token. In ID tokens, the audience is your app's Application ID, assigned to your app in the Microsoft Entra admin center.",
1818
index,
1919
claimsObj
2020
);
@@ -24,7 +24,7 @@ const createClaimsTable = (claims) => {
2424
populateClaim(
2525
key,
2626
claims[key],
27-
'Identifies the issuer, or authorization server that constructs and returns the token. It also identifies the Azure AD tenant for which the user was authenticated. If the token was issued by the v2.0 endpoint, the URI will end in /v2.0. The GUID that indicates that the user is a consumer user from a Microsoft account is 9188040d-6c67-4c5b-b112-36a304b66dad.',
27+
'Identifies the issuer, or authorization server that constructs and returns the token. It also identifies the external tenant for which the user was authenticated. If the token was issued by the v2.0 endpoint, the URI will end in /v2.0. The GUID that indicates that the user is a consumer user from a Microsoft account is 9188040d-6c67-4c5b-b112-36a304b66dad.',
2828
index,
2929
claimsObj
3030
);
@@ -94,7 +94,7 @@ const createClaimsTable = (claims) => {
9494
populateClaim(
9595
key,
9696
claims[key],
97-
'The oid (user’s object id) is the only claim that should be used to uniquely identify a user in an Azure AD tenant. The token might have one or more of the following claim, that might seem like a unique identifier, but is not and should not be used as such.',
97+
'The oid (user’s object id) is the only claim that should be used to uniquely identify a user in an external tenant. The token might have one or more of the following claim, that might seem like a unique identifier, but is not and should not be used as such.',
9898
index,
9999
claimsObj
100100
);
@@ -104,7 +104,7 @@ const createClaimsTable = (claims) => {
104104
populateClaim(
105105
key,
106106
claims[key],
107-
'The tenant ID. You will use this claim to ensure that only users from the current Azure AD tenant can access this app.',
107+
'The tenant ID. You will use this claim to ensure that only users from the current external tenant can access this app.',
108108
index,
109109
claimsObj
110110
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
<title>Azure AD | Vanilla JavaScript SPA</title>
6+
<title>Microsoft Entra External ID | Vanilla JavaScript SPA</title>
77
<link rel="SHORTCUT ICON" href="./favicon.svg" type="image/x-icon">
88

99
<!-- adding Bootstrap 4 for UI components -->

‎1-Authentication/0-sign-in-vanillajs/AppCreationScripts/AppCreationScripts.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
### Presentation of the scripts
3030

31-
This sample comes with two PowerShell scripts, which automate the creation of the Azure Active Directory applications, and the configuration of the code for this sample. Once you run them, you will only need to build the solution and you are good to test.
31+
This sample comes with two PowerShell scripts, which automate the creation of the Microsoft Entra applications, and the configuration of the code for this sample. Once you run them, you will only need to build the solution and you are good to test.
3232

3333
These scripts are:
3434

@@ -109,9 +109,8 @@ Note that the script will choose the tenant in which to create the applications,
109109
if you want to create the apps in a particular tenant, you can use the following option:
110110
111111
- Open the [Microsoft Entra admin center](https://entra.microsoft.com/)
112-
- Select the Azure Active directory you are interested in (in the combo-box below your name on the top right of the browser window)
113-
- Find the "Active Directory" object in this tenant
114-
- Go to **Properties** and copy the content of the **Directory Id** property
112+
- Select the Microsoft Entra tenant you are interested in (in the combo-box below your name on the top right of the browser window)
113+
- Select **Overview** on the left side menu and then select the **Overview** tab. Copy the content of the **Tenant Id** property
115114
- Then use the full syntax to run the scripts:
116115
117116
```PowerShell

‎1-Authentication/0-sign-in-vanillajs/AppCreationScripts/Cleanup.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Function Cleanup
2121
This function removes the Microsoft Entra applications for the sample. These applications were created by the Configure.ps1 script
2222
#>
2323

24-
# $tenantId is the Active Directory Tenant. This is a GUID which represents the "Directory ID" of the AzureAD tenant
25-
# into which you want to create the apps. Look it up in the Azure portal in the "Properties" of the Azure AD.
24+
# $tenantId is the Microsoft Entra Tenant. This is a GUID which represents the "Directory ID" of the AzureAD tenant
25+
# into which you want to create the apps. Look it up in the Microsoft Entra admin center in the "Properties" of the Azure AD.
2626

2727
# Connect to the Microsoft Graph API
2828
Write-Host "Connecting to Microsoft Graph"

‎1-Authentication/0-sign-in-vanillajs/AppCreationScripts/Configure.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ Function CreateOptionalClaim([string] $name)
173173
Function ConfigureApplications
174174
{
175175
<#.Description
176-
This function creates the Microsoft Entra applications for the sample in the provided Azure AD tenant and updates the
176+
This function creates the Microsoft Entra applications for the sample in the provided external tenant and updates the
177177
configuration files in the client and service project of the visual studio solution (App.Config and Web.Config)
178178
so that they are consistent with the Applications parameters
179179
#>
@@ -251,7 +251,7 @@ Function ConfigureApplications
251251
Update-MgApplication -ApplicationId $currentAppObjectId -OptionalClaims $optionalClaims
252252
Write-Host "Done creating the client application (ciam-msal-javascript-spa)"
253253

254-
# URL of the AAD application in the Azure portal
254+
# URL of the AAD application in the Microsoft Entra admin center
255255
# Future? $clientPortalUrl = "https://portal.azure.com/#@"+$tenantName+"/blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/Overview/appId/"+$currentAppId+"/objectId/"+$currentAppObjectId+"/isMSAApp/"
256256
$clientPortalUrl = "https://portal.azure.com/#view/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/~/Overview/appId/"+$currentAppId+"/isMSAApp~/false"
257257

@@ -289,7 +289,7 @@ Function ConfigureApplications
289289

290290
ReplaceInTextFile -configFilePath $configFile -dictionary $dictionary
291291
Write-Host -ForegroundColor Green "------------------------------------------------------------------------------------------------"
292-
Write-Host "IMPORTANT: Please follow the instructions below to complete a few manual step(s) in the Azure portal":
292+
Write-Host "IMPORTANT: Please follow the instructions below to complete a few manual step(s) in the Microsoft Entra admin center":
293293
Write-Host "- For client"
294294
Write-Host " - Navigate to $clientPortalUrl"
295295
Write-Host " - Navigate to your tenant and create user flows to allow users to sign up for the application." -ForegroundColor Red
@@ -338,7 +338,7 @@ if ($null -eq (Get-Module -ListAvailable -Name "Microsoft.Graph.Users")) {
338338
Import-Module Microsoft.Graph.Users
339339

340340
Set-Content -Value "<html><body><table>" -Path createdApps.html
341-
Add-Content -Value "<thead><tr><th>Application</th><th>AppId</th><th>Url in the Azure portal</th></tr></thead><tbody>" -Path createdApps.html
341+
Add-Content -Value "<thead><tr><th>Application</th><th>AppId</th><th>Url in the Microsoft Entra admin center</th></tr></thead><tbody>" -Path createdApps.html
342342

343343
$ErrorActionPreference = "Stop"
344344

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
page_type: sample
33
name: Vanilla JavaScript single-page application using MSAL.js to authenticate users against Microsoft Entra External ID
4-
description: This sample demonstrates a Vanilla JavaScript single-page application using MSAL.js to authenticate users against Azure Active Directory Customer Identity Access Management (Microsoft Entra External ID)
4+
description: This sample demonstrates a Vanilla JavaScript single-page application using MSAL.js to authenticate users against Microsoft Entra External ID
55
languages:
66
- javascript
77
products:
@@ -36,7 +36,7 @@ extensions:
3636

3737
## Overview
3838

39-
This sample demonstrates a vanilla JavaScript single-page application (SPA) that lets users authenticate to [Azure Active Directory CIAM](https://github.com/microsoft/entra-previews/blob/PP2/docs/1-Create-a-CIAM-tenant.md) (Microsoft Entra External ID) using the [Microsoft Authentication Library for JavaScript](https://github.com/AzureAD/microsoft-authentication-library-for-js) (MSAL.js).
39+
This sample demonstrates a vanilla JavaScript single-page application (SPA) that lets users authenticate to [Microsoft Entra External ID](https://github.com/microsoft/entra-previews/blob/PP2/docs/1-Create-a-CIAM-tenant.md) (Microsoft Entra External ID) using the [Microsoft Authentication Library for JavaScript](https://github.com/AzureAD/microsoft-authentication-library-for-js) (MSAL.js).
4040
Here you'll learn about [ID Tokens](https://docs.microsoft.com/azure/active-directory/develop/id-tokens), [OIDC scopes](https://docs.microsoft.com/azure/active-directory/develop/v2-permissions-and-consent#openid-connect-scopes), [single-sign on](https://docs.microsoft.com/azure/active-directory/develop/msal-js-sso), **silent requests** and more.
4141

4242
## Scenario
@@ -124,9 +124,9 @@ To manually register the apps, as a first step you'll need to:
124124
125125
#### Create User Flows
126126
127-
Please refer to: [Tutorial: Create user flow in Azure Active Directory CIAM](https://github.com/microsoft/entra-previews/blob/PP2/docs/3-Create-sign-up-and-sign-in-user-flow.md)
127+
Please refer to: [Tutorial: Create user flow in Microsoft Entra External ID](https://github.com/microsoft/entra-previews/blob/PP2/docs/3-Create-sign-up-and-sign-in-user-flow.md)
128128
129-
> :information_source: To enable password reset in Microsoft Entra External ID in Azure Active Directory (Azure AD), please refer to: [Tutorial: Enable self-service password reset](https://github.com/microsoft/entra-previews/blob/PP2/docs/4-Enable-password-reset.md)
129+
> :information_source: To enable password reset in Microsoft Entra External ID in Microsoft Entra, please refer to: [Tutorial: Enable self-service password reset](https://github.com/microsoft/entra-previews/blob/PP2/docs/4-Enable-password-reset.md)
130130
131131
#### Add External Identity Providers
132132
@@ -166,7 +166,7 @@ Open the project in your IDE (like Visual Studio or Visual Studio Code) to confi
166166
> In the steps below, "ClientID" is the same as "Application ID" or "AppId".
167167
168168
1. Open the `App\public\authConfig.js` file.
169-
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.
169+
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 Microsoft Entra admin center.
170170
1. Find the placeholder `Enter_the_Tenant_Subdomain_Here` and replace it with the Directory (tenant) subdomain. For instance, if your tenant primary domain is `contoso.onmicrosoft.com`, use `contoso`. If you don't have your tenant domain name, learn how to [read your tenant details](https://review.learn.microsoft.com/azure/active-directory/external-identities/customers/how-to-create-customer-tenant-portal#get-the-customer-tenant-details).
171171
172172
### Step 4: Running the sample
@@ -196,7 +196,7 @@ Were we successful in addressing your learning objective? Consider taking a mome
196196
Ask your questions on Stack Overflow first and browse existing issues to see if someone has asked your question before.
197197
Make sure that your questions or comments are tagged with [`azure-active-directory-b2c` `node` `ms-identity` `adal` `msal-js` `msal`].
198198

199-
To provide feedback on or suggest features for Azure Active Directory, visit [User Voice page](https://feedback.azure.com/d365community/forum/79b1327d-d925-ec11-b6e6-000d3a4f06a4).
199+
To provide feedback on or suggest features for Microsoft Entra, visit [User Voice page](https://feedback.azure.com/d365community/forum/79b1327d-d925-ec11-b6e6-000d3a4f06a4).
200200
</details>
201201

202202
## About the code
@@ -285,7 +285,7 @@ There is one single-page application in this sample. To deploy it to **Azure Sto
285285
1. Select **Enabled** to enable static website hosting for the storage account.
286286
1. In the **Index document name** field, specify a default index page (For example: `index.html`).
287287
1. The default **index page** is displayed when a user navigates to the root of your static website.
288-
1. Select **Save**. The Azure portal now displays your static website endpoint. Make a note of the **Primary endpoint field**.
288+
1. Select **Save**. The Microsoft Entra admin center now displays your static website endpoint. Make a note of the **Primary endpoint field**.
289289
1. In the `ciam-msal-javascript-spa` project source code, update your configuration file with the **Primary endpoint field** as your new **Redirect URI** (you will register this URI later).
290290
1. Next, select **Storage Explorer**.
291291
1. Expand the **BLOB CONTAINERS** node, and then select the `$web` container.
@@ -296,7 +296,7 @@ There is one single-page application in this sample. To deploy it to **Azure Sto
296296
#### Update the CIAM app registration for ciam-msal-javascript-spa
297297

298298
1. Navigate back to to the [Microsoft Entra admin center](https://entra.microsoft.com/).
299-
1. In the left-hand navigation pane, select the **Azure Active Directory** service, and then select **App registrations**.
299+
1. In the left-hand navigation pane, select the **Microsoft Entra** service, and then select **App registrations**.
300300
1. In the resulting screen, select `ciam-msal-javascript-spa`.
301301
1. In the app's registration screen, select **Authentication** in the menu.
302302
1. In the **Redirect URIs** section, update the reply URLs to match the site URL of your Azure deployment. For example:

‎1-Authentication/1-sign-in-react/AppCreationScripts/AppCreationScripts.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
### Presentation of the scripts
3030

31-
This sample comes with two PowerShell scripts, which automate the creation of the Azure Active Directory applications, and the configuration of the code for this sample. Once you run them, you will only need to build the solution and you are good to test.
31+
This sample comes with two PowerShell scripts, which automate the creation of the Microsoft Entra applications, and the configuration of the code for this sample. Once you run them, you will only need to build the solution and you are good to test.
3232

3333
These scripts are:
3434

@@ -109,9 +109,8 @@ Note that the script will choose the tenant in which to create the applications,
109109
if you want to create the apps in a particular tenant, you can use the following option:
110110
111111
- Open the [Microsoft Entra admin center](https://entra.microsoft.com/)
112-
- Select the Azure Active directory you are interested in (in the combo-box below your name on the top right of the browser window)
113-
- Find the "Active Directory" object in this tenant
114-
- Go to **Properties** and copy the content of the **Directory Id** property
112+
- Select the Microsoft Entra tenant you are interested in (in the combo-box below your name on the top right of the browser window)
113+
- Select **Overview** on the left side menu and then select the **Overview** tab. Copy the content of the **Tenant Id** property
115114
- Then use the full syntax to run the scripts:
116115
117116
```PowerShell

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Function Cleanup
2121
This function removes the Microsoft Entra applications for the sample. These applications were created by the Configure.ps1 script
2222
#>
2323

24-
# $tenantId is the Active Directory Tenant. This is a GUID which represents the "Directory ID" of the AzureAD tenant
25-
# into which you want to create the apps. Look it up in the Azure portal in the "Properties" of the Azure AD.
24+
# $tenantId is the Microsoft Entra Tenant. This is a GUID which represents the "Directory ID" of the AzureAD tenant
25+
# into which you want to create the apps. Look it up in the Microsoft Entra admin center in the "Properties" of the Azure AD.
2626

2727
# Connect to the Microsoft Graph API
2828
Write-Host "Connecting to Microsoft Graph"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ Function ReplaceInTextFile([string] $configFilePath, [System.Collections.HashTab
156156
Function ConfigureApplications
157157
{
158158
<#.Description
159-
This function creates the Microsoft Entra applications for the sample in the provided Azure AD tenant and updates the
159+
This function creates the Microsoft Entra applications for the sample in the provided external tenant and updates the
160160
configuration files in the client and service project of the visual studio solution (App.Config and Web.Config)
161161
so that they are consistent with the Applications parameters
162162
#>
@@ -221,7 +221,7 @@ Function ConfigureApplications
221221
}
222222
Write-Host "Done creating the client application (msal-react-spa)"
223223

224-
# URL of the AAD application in the Azure portal
224+
# URL of the AAD application in the Microsoft Entra admin center
225225
# Future? $clientPortalUrl = "https://portal.azure.com/#@"+$tenantName+"/blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/Overview/appId/"+$currentAppId+"/objectId/"+$currentAppObjectId+"/isMSAApp/"
226226
$clientPortalUrl = "https://portal.azure.com/#view/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/~/Overview/appId/"+$currentAppId+"/isMSAApp~/false"
227227

@@ -259,7 +259,7 @@ Function ConfigureApplications
259259

260260
ReplaceInTextFile -configFilePath $configFile -dictionary $dictionary
261261
Write-Host -ForegroundColor Green "------------------------------------------------------------------------------------------------"
262-
Write-Host "IMPORTANT: Please follow the instructions below to complete a few manual step(s) in the Azure portal":
262+
Write-Host "IMPORTANT: Please follow the instructions below to complete a few manual step(s) in the Microsoft Entra admin center":
263263
Write-Host "- For client"
264264
Write-Host " - Navigate to $clientPortalUrl"
265265
Write-Host " - Navigate to your tenant and create user flows to allow users to sign up for the application." -ForegroundColor Red
@@ -308,7 +308,7 @@ if ($null -eq (Get-Module -ListAvailable -Name "Microsoft.Graph.Users")) {
308308
Import-Module Microsoft.Graph.Users
309309

310310
Set-Content -Value "<html><body><table>" -Path createdApps.html
311-
Add-Content -Value "<thead><tr><th>Application</th><th>AppId</th><th>Url in the Azure portal</th></tr></thead><tbody>" -Path createdApps.html
311+
Add-Content -Value "<thead><tr><th>Application</th><th>AppId</th><th>Url in the Microsoft Entra admin center</th></tr></thead><tbody>" -Path createdApps.html
312312

313313
$ErrorActionPreference = "Stop"
314314

0 commit comments

Comments
 (0)