Skip to content

Commit d089d7a

Browse files
authored
Merge branch 'main' into replace-entra-previews-links
2 parents 03f3bf0 + 41781d2 commit d089d7a

15 files changed

Lines changed: 43368 additions & 554 deletions

File tree

1-Authentication/7-sign-in-express-mfa/README.md

Lines changed: 103 additions & 93 deletions
Large diffs are not rendered by default.

2-Authorization/1-call-api-react/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ Open the project in your IDE (like Visual Studio or Visual Studio Code) to confi
245245
From your shell or command line, execute the following commands:
246246
247247
```console
248-
cd 2-Authorization\1-call-api-react\API
248+
cd 2-Authorization\1-call-api-react\API\ToDoListAPI
249249
dotnet run
250250
```
251251

2-Authorization/1-call-api-react/SPA/package-lock.json

Lines changed: 26793 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

2-Authorization/1-call-api-react/SPA/package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,21 @@
44
"private": true,
55
"description": "React single-page application using MSAL React to authenticate users with Microsoft Entra External ID and call a protected ASP.NET Core web API",
66
"dependencies": {
7-
"@azure/msal-browser": "^2.37.0",
8-
"@azure/msal-react": "^1.5.7",
9-
"bootstrap": "^5.2.3",
10-
"react": "^18.2.0",
11-
"react-bootstrap": "^2.7.2",
12-
"react-dom": "^18.2.0",
13-
"react-icons": "^4.8.0",
14-
"react-router-dom": "^6.9.0"
7+
"@azure/msal-browser": "^3.17.0",
8+
"@azure/msal-react": "^2.0.19",
9+
"bootstrap": "^5.3.3",
10+
"react": "^18.3.1",
11+
"react-bootstrap": "^2.10.3",
12+
"react-dom": "^18.3.1",
13+
"react-icons": "^5.2.1",
14+
"react-router-dom": "^6.24.0"
1515
},
1616
"devDependencies": {
17-
"@testing-library/jest-dom": "^5.16.5",
18-
"@testing-library/react": "^13.4.0",
19-
"@testing-library/user-event": "^13.5.0",
20-
"react-scripts": "5.0.1"
17+
"@babel/plugin-transform-private-property-in-object": "^7.24.7",
18+
"@testing-library/jest-dom": "^6.4.6",
19+
"@testing-library/react": "^16.0.0",
20+
"@testing-library/user-event": "^14.5.2",
21+
"react-scripts": "^5.0.1"
2122
},
2223
"scripts": {
2324
"start": "react-scripts start",
Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
{
2-
"AzureAd": {
3-
"Instance": "https://Enter_the_Tenant_Subdomain_Here.ciamlogin.com/",
4-
"TenantId": "Enter_the_Tenant_Id_Here",
5-
"ClientId": "Enter_the_Application_Id_Here",
6-
"Scopes": {
7-
"Read": ["ToDoList.Read", "ToDoList.ReadWrite"],
8-
"Write": ["ToDoList.ReadWrite"]
9-
},
10-
"AppPermissions": {
11-
"Read": ["ToDoList.Read.All", "ToDoList.ReadWrite.All"],
12-
"Write": ["ToDoList.ReadWrite.All"]
13-
}
14-
},
15-
"https_port": 44351,
16-
"Logging": {
17-
"LogLevel": {
18-
"Default": "Information",
19-
"Microsoft": "Warning",
20-
"Microsoft.Hosting.Lifetime": "Information"
21-
}
22-
},
23-
"AllowedHosts": "*"
24-
}
1+
{
2+
"AzureAd": {
3+
"Instance": "https://Enter_the_Tenant_Subdomain_Here.ciamlogin.com/",
4+
"TenantId": "Enter_the_Application_Id_Here",
5+
"ClientId": "Enter_the_Tenant_Id_Here",
6+
"Scopes": {
7+
"Read": ["ToDoList.Read", "ToDoList.ReadWrite"],
8+
"Write": ["ToDoList.ReadWrite"]
9+
},
10+
"AppPermissions": {
11+
"Read": ["ToDoList.Read.All", "ToDoList.ReadWrite.All"],
12+
"Write": ["ToDoList.ReadWrite.All"]
13+
}
14+
},
15+
"https_port": 44351,
16+
"Logging": {
17+
"LogLevel": {
18+
"Default": "Information",
19+
"Microsoft": "Warning",
20+
"Microsoft.Hosting.Lifetime": "Information"
21+
}
22+
},
23+
"AllowedHosts": "*"
24+
}
Lines changed: 108 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,108 @@
1-
{
2-
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"version": 1,
4-
"newProjectRoot": "projects",
5-
"projects": {
6-
"SPA": {
7-
"projectType": "application",
8-
"schematics": {},
9-
"root": "",
10-
"sourceRoot": "src",
11-
"prefix": "app",
12-
"architect": {
13-
"build": {
14-
"builder": "@angular-devkit/build-angular:browser",
15-
"options": {
16-
"outputPath": "dist/spa",
17-
"index": "src/index.html",
18-
"main": "src/main.ts",
19-
"polyfills": "src/polyfills.ts",
20-
"tsConfig": "tsconfig.app.json",
21-
"assets": [
22-
"src/favicon.svg",
23-
"src/assets"
24-
],
25-
"styles": [
26-
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
27-
"src/styles.css"
28-
],
29-
"scripts": []
30-
},
31-
"configurations": {
32-
"production": {
33-
"budgets": [
34-
{
35-
"type": "initial",
36-
"maximumWarning": "500kb",
37-
"maximumError": "1mb"
38-
},
39-
{
40-
"type": "anyComponentStyle",
41-
"maximumWarning": "2kb",
42-
"maximumError": "4kb"
43-
}
44-
],
45-
"fileReplacements": [
46-
{
47-
"replace": "src/environments/environment.ts",
48-
"with": "src/environments/environment.prod.ts"
49-
}
50-
],
51-
"outputHashing": "all"
52-
},
53-
"development": {
54-
"buildOptimizer": false,
55-
"optimization": false,
56-
"vendorChunk": true,
57-
"extractLicenses": false,
58-
"sourceMap": true,
59-
"namedChunks": true
60-
}
61-
},
62-
"defaultConfiguration": "production"
63-
},
64-
"serve": {
65-
"builder": "@angular-devkit/build-angular:dev-server",
66-
"configurations": {
67-
"production": {
68-
"browserTarget": "SPA:build:production"
69-
},
70-
"development": {
71-
"browserTarget": "SPA:build:development"
72-
}
73-
},
74-
"defaultConfiguration": "development"
75-
},
76-
"extract-i18n": {
77-
"builder": "@angular-devkit/build-angular:extract-i18n",
78-
"options": {
79-
"browserTarget": "SPA:build"
80-
}
81-
},
82-
"test": {
83-
"builder": "@angular-devkit/build-angular:karma",
84-
"options": {
85-
"main": "src/test.ts",
86-
"polyfills": "src/polyfills.ts",
87-
"tsConfig": "tsconfig.spec.json",
88-
"karmaConfig": "karma.conf.js",
89-
"assets": [
90-
"src/favicon.ico",
91-
"src/assets"
92-
],
93-
"styles": [
94-
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
95-
"src/styles.css"
96-
],
97-
"scripts": []
98-
}
99-
}
100-
}
101-
}
102-
}
103-
}
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"SPA": {
7+
"projectType": "application",
8+
"schematics": {},
9+
"root": "",
10+
"sourceRoot": "src",
11+
"prefix": "app",
12+
"architect": {
13+
"build": {
14+
"builder": "@angular-devkit/build-angular:application",
15+
"options": {
16+
"outputPath": {
17+
"base": "dist/spa"
18+
},
19+
"index": "src/index.html",
20+
"polyfills": [
21+
"src/polyfills.ts"
22+
],
23+
"tsConfig": "tsconfig.app.json",
24+
"assets": [
25+
"src/favicon.svg",
26+
"src/assets"
27+
],
28+
"styles": [
29+
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
30+
"src/styles.css"
31+
],
32+
"scripts": [],
33+
"browser": "src/main.ts"
34+
},
35+
"configurations": {
36+
"production": {
37+
"budgets": [
38+
{
39+
"type": "initial",
40+
"maximumWarning": "500kb",
41+
"maximumError": "1mb"
42+
},
43+
{
44+
"type": "anyComponentStyle",
45+
"maximumWarning": "2kb",
46+
"maximumError": "4kb"
47+
}
48+
],
49+
"fileReplacements": [
50+
{
51+
"replace": "src/environments/environment.ts",
52+
"with": "src/environments/environment.prod.ts"
53+
}
54+
],
55+
"outputHashing": "all"
56+
},
57+
"development": {
58+
"optimization": false,
59+
"extractLicenses": false,
60+
"sourceMap": true,
61+
"namedChunks": true
62+
}
63+
},
64+
"defaultConfiguration": "production"
65+
},
66+
"serve": {
67+
"builder": "@angular-devkit/build-angular:dev-server",
68+
"configurations": {
69+
"production": {
70+
"buildTarget": "SPA:build:production"
71+
},
72+
"development": {
73+
"buildTarget": "SPA:build:development"
74+
}
75+
},
76+
"defaultConfiguration": "development"
77+
},
78+
"extract-i18n": {
79+
"builder": "@angular-devkit/build-angular:extract-i18n",
80+
"options": {
81+
"buildTarget": "SPA:build"
82+
}
83+
},
84+
"test": {
85+
"builder": "@angular-devkit/build-angular:karma",
86+
"options": {
87+
"main": "src/test.ts",
88+
"polyfills": "src/polyfills.ts",
89+
"tsConfig": "tsconfig.spec.json",
90+
"karmaConfig": "karma.conf.js",
91+
"assets": [
92+
"src/favicon.ico",
93+
"src/assets"
94+
],
95+
"styles": [
96+
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
97+
"src/styles.css"
98+
],
99+
"scripts": []
100+
}
101+
}
102+
}
103+
}
104+
},
105+
"cli": {
106+
"analytics": false
107+
}
108+
}

0 commit comments

Comments
 (0)