Skip to content

Updating Id Web version and fixing graphics bug #727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 17, 2023
Merged

Updating Id Web version and fixing graphics bug #727

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6afa3b5
changing samples 1-1, 2, and 5 to Id Web 2.13.0
JoshLozensky Jul 13, 2023
39fde66
changed Id Web Version and fixed small bugs and docs
JoshLozensky Aug 16, 2023
d530996
Merge branch 'master' into lozensky/2.13.0IdWeb
JoshLozensky Aug 16, 2023
31dcf07
fixing nav bar 5-1
JoshLozensky Aug 16, 2023
60f16dc
changing more navbars for standardization
JoshLozensky Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions 1-WebApp-OIDC/1-1-MyOrg/WebApp-OpenIDConnect-DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions 1-WebApp-OIDC/1-2-AnyOrg/WebApp-OpenIDConnect-DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion 1-WebApp-OIDC/1-3-AnyOrgOrPersonal/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</environment>
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<nav class="navbar navbar-inverse navbar-toggleable-sm border-bottom box-shadow mb-3">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
Expand Down
4 changes: 2 additions & 2 deletions 1-WebApp-OIDC/1-3-AnyOrgOrPersonal/WebApp-OpenIDConnect-DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion 1-WebApp-OIDC/1-4-Sovereign/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</environment>
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<nav class="navbar navbar-inverse navbar-toggleable-sm border-bottom box-shadow mb-3">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
Expand Down
4 changes: 2 additions & 2 deletions 1-WebApp-OIDC/1-4-Sovereign/WebApp-OpenIDConnect-DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions 1-WebApp-OIDC/1-5-B2C/WebApp-OpenIDConnect-DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions 2-WebApp-graph-user/2-1-Call-MSGraph/WebApp-OpenIDConnect-DotNet-graph.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClientBeta" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClientBeta" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.5" />
</ItemGroup>

Expand Down
4 changes: 3 additions & 1 deletion 2-WebApp-graph-user/2-2-TokenCache/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,11 @@ Note: if you had used the automation to setup your application mentioned in [Ste
> // Rest of strings...
> },
> ```
>

1. If you do not have an existing database and tables needed for token caching, you can execute the `dotnet sql-cache create` command to create the table for you. To do that, follow the steps below.

> 1. In Visual Studio, open the SQL Server Object Explorer, then (localdb)\MSSQLLocalDB
> 2. Right click on Databases and select "Add New database", and then choose the name of the database: 'MY_TOKEN_CACHE_DATABASE'
```powershell
dotnet tool install --global dotnet-sql-cache
dotnet sql-cache create "Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=MY_TOKEN_CACHE_DATABASE;Integrated Security=True;" dbo TokenCache
Expand Down
4 changes: 2 additions & 2 deletions 2-WebApp-graph-user/2-2-TokenCache/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ public void ConfigureServices(IServiceCollection services)
// For production deployments, preferably, generate the schema from the tables generated in dev environments and use it to create the necessary tables in production.
/*
* 1. For instance in Visual Studio, open the SQL Server Object explorer, then (localdb)\MSSQLLocalDB, then databases
* 2. Right click on Databases and select "Add New database", and then choose the name of the database: 'MsalTokenCacheDatabase'
* 2. Right click on Databases and select "Add New database", and then choose the name of the database: 'MY_TOKEN_CACHE_DATABASE'
* 3. In the console application run the 2 following commands:
dotnet tool install --global dotnet-sql-cache
dotnet sql-cache create "Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=MsalTokenCacheDatabase;Integrated Security=True;" dbo TokenCache
dotnet sql-cache create "Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=MY_TOKEN_CACHE_DATABASE;Integrated Security=True;" dbo TokenCache
*/

services.AddAuthentication(OpenIdConnectDefaults.AuthenticationScheme)
Expand Down
4 changes: 2 additions & 2 deletions 2-WebApp-graph-user/2-2-TokenCache/WebApp-OpenIDConnect-DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.13.3" />
</ItemGroup>


Expand Down
4 changes: 2 additions & 2 deletions 2-WebApp-graph-user/2-3-Multi-Tenant/WebApp-MultiTenant-v2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.13.3" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions 2-WebApp-graph-user/2-5-HybridFlow/2-5-HybridFlow.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.3" />
</ItemGroup>

Expand Down
Binary file modified 2-WebApp-graph-user/2-5-HybridFlow/appsettings.json
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion 3-WebApp-multi-APIs/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</environment>
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<nav class="navbar navbar-inverse navbar-toggleable-sm border-bottom box-shadow mb-3">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
Expand Down
6 changes: 3 additions & 3 deletions 3-WebApp-multi-APIs/WebApp-OpenIDConnect-DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.13.3" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions 4-WebApp-your-API/4-1-MyOrg/Client/TodoListClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.DownstreamApi" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.DownstreamApi" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion 4-WebApp-your-API/4-1-MyOrg/Client/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</environment>
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<nav class="navbar navbar-inverse navbar-toggleable-sm border-bottom box-shadow mb-3">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
Expand Down
2 changes: 1 addition & 1 deletion 4-WebApp-your-API/4-1-MyOrg/TodoListService/TodoListService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions 4-WebApp-your-API/4-2-B2C/Client/TodoListClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion 4-WebApp-your-API/4-2-B2C/TodoListService/TodoListService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web" Version="2.13.3" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions 4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/ToDoListClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.13.3" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion 4-WebApp-your-API/4-3-AnyOrg/ToDoListClient/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- a scope corresponding to a V1 application (for instance <GUID>/user_impersonation, where <GUID> is the
clientId of a V1 application, created in the https://portal.azure.com portal.
*/
"TodoListServiceAppId": "[Enter_client_ID_Of_TodoListService-v2_from_Azure_Portal,_e.g._2ec40e65-ba09-4853-bcde-bcb60029e596",
"TodoListServiceAppId": "[Enter_client_ID_Of_TodoListService-v2_from_Azure_Portal,_e.g._2ec40e65-ba09-4853-bcde-bcb60029e596]",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch

"TodoListServiceScope": "api://[Enter_client_ID_Of_TodoListService-v2_from_Azure_Portal,_e.g._2ec40e65-ba09-4853-bcde-bcb60029e596]/.default",
"TodoListBaseAddress": "https://localhost:44351/",
"AdminConsentRedirectApi": "https://localhost:44351/api/Home"
Expand Down
4 changes: 2 additions & 2 deletions 4-WebApp-your-API/4-3-AnyOrg/TodoListService/ToDoListService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="7.0.1" Condition="'$(Configuration)' == 'Debug'" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion 5-WebApp-AuthZ/5-1-Roles/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</environment>
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<nav class="navbar navbar-inverse navbar-toggleable-sm border-bottom box-shadow mb-3">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
Expand Down
4 changes: 2 additions & 2 deletions 5-WebApp-AuthZ/5-1-Roles/WebApp-OpenIDConnect-DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.MicrosoftGraph" Version="2.13.3" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions 5-WebApp-AuthZ/5-2-Groups/WebApp-OpenIDConnect-DotNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Session" Version="2.2.0" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.2" />
<PackageReference Include="Microsoft.Identity.Web.GraphServiceClient" Version="2.13.3" />
<PackageReference Include="Microsoft.Identity.Web.UI" Version="2.13.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>

Expand Down