🚀 Release/2.0.0-beta1

README.md

@@ -12,8 +12,6 @@
 
 The application is written in the **Asp.Net Core MVC - using .NET Core 3.1**
 
-**NOTE:** Currently works only with **IdentityServer4 version 3** 🚀
-
 ## Requirements
 
 - [Install](https://www.microsoft.com/net/download/windows#/current) the latest .NET Core 3.x SDK (using older versions may lead to 502.5 errors when hosted on IIS or application exiting immediately after starting when self-hosted)
@@ -22,11 +20,23 @@ The application is written in the **Asp.Net Core MVC - using .NET Core 3.1**
 
 - Install the dotnet new template:
 
+### Stable version 1.0.0 works with **IdentityServer4 version 3** 🚀
+
 ```sh
 dotnet new -i Skoruba.IdentityServer4.Admin.Templates::1.0.0
 ```
 
-- Create new project:
+### Beta version 2.0.0 works with **IdentityServer4 version 4** 🚀
+
+- 🔒 **NOTE:** This version affects your database data if you use the default database migrations that are part of the project - double check the migrations according to your database provider and create a database backup
+
+- The source code for version **2.0.0** is available in the branch [release/2.0.0-beta1](https://github.com/skoruba/IdentityServer4.Admin/tree/release/2.0.0-beta1)
+
+```sh
+dotnet new -i Skoruba.IdentityServer4.Admin.Templates::2.0.0-beta1
+```
+
+### Create new project:
 
 ```sh
 dotnet new skoruba.is4admin --name MyProject --title MyProject --adminemail "admin@example.com" --adminpassword "Pa$$word123" --adminrole MyRole --adminclientid MyClientId --adminclientsecret MyClientSecret --dockersupport true
@@ -161,11 +171,20 @@ docker-compose up -d
 ### Docker images
 - Docker images will be available also in [docker hub](https://hub.docker.com/u/skoruba)
   - AdminUI:
+    - **Stable version:** 
     - `skoruba/identityserver4-admin:1.0.0`
+    - **Beta version:** 
+    - `skoruba/identityserver4-admin:2.0.0-beta1`
   - Admin Api:
+    - **Stable version:** 
     - `skoruba/identityserver4-admin-api:1.0.0`
+    - **Beta version:** 
+    - `skoruba/identityserver4-admin-api:2.0.0-beta1`
   - STS:
+    - **Stable version:** 
     - `skoruba/identityserver4-sts-identity:1.0.0`
+    - **Beta version:** 
+    - `skoruba/identityserver4-sts-identity:2.0.0-beta1`
 
 ### Publish Docker images to Docker hub
 - Check the script in `build/publish-docker-images.ps1` - change the profile name according to your requirements.
@@ -722,7 +741,7 @@ It is possible to define the configuration according the client type - by defaul
 - [x] Protect keys for dataprotection from Azure Key Vault ([#715](https://github.com/skoruba/IdentityServer4.Admin/pull/715))
 
 ### 2.0.0
-- [ ] Update to IdentityServer4 version 4 ([#633](https://github.com/skoruba/IdentityServer4.Admin/issues/633))
+- [x] Update to IdentityServer4 version 4 ([#633](https://github.com/skoruba/IdentityServer4.Admin/issues/633))
 
 ### 3.0.0:
 

build/add-migrations.ps1

@@ -1,4 +1,4 @@
-param([string] $migration = 'DbInit', [string] $migrationProviderName = 'All')
+param([string] $migration = 'DbInit', [string] $migrationProviderName = 'All', [string] $targetContext = 'All')
 $projectName = "Skoruba.IdentityServer4";
 $currentPath = Get-Location
 Set-Location "../src/$projectName.Admin"
@@ -12,7 +12,7 @@ $targetContexts = @{
     IdentityServerConfigurationDbContext  = "Migrations\IdentityServerConfiguration";
     IdentityServerPersistedGrantDbContext = "Migrations\IdentityServerGrants";
     AdminAuditLogDbContext                = "Migrations\AuditLogging";
-	IdentityServerDataProtectionDbContext = "Migrations\DataProtection";
+    IdentityServerDataProtectionDbContext = "Migrations\DataProtection";
 }
 
 #Initialize the db providers and it's respective projects
@@ -41,10 +41,14 @@ foreach ($provider in $dpProviders.Keys) {
         $settings | set-content appsettings.json
         if ((Test-Path $projectPath) -eq $true) {
             foreach ($context in $targetContexts.Keys) {
-                $migrationPath = $targetContexts[$context];
+
+                if ($targetContext -eq 'All' -or $context -eq $targetContext) {
 
-                Write-Host "Migrating context " $context
-                dotnet ef migrations add $migration -c $context -o $migrationPath -p $projectPath
+                    $migrationPath = $targetContexts[$context];
+
+                    Write-Host "Migrating context " $context
+                    dotnet ef migrations add $migration -c $context -o $migrationPath -p $projectPath
+                }
             } 
         }
 

build/rollback-migrations.ps1

@@ -0,0 +1,59 @@
+param([string] $migration = 'DbInit', [string] $migrationProviderName = 'All', [string] $targetContext = 'All')
+$projectName = "Skoruba.IdentityServer4";
+$currentPath = Get-Location
+Set-Location "../src/$projectName.Admin"
+Copy-Item appsettings.json -Destination appsettings-backup.json
+$settings = Get-Content appsettings.json -raw
+
+#Initialze db context and define the target directory
+$targetContexts = @{ 
+    AdminIdentityDbContext                = "Migrations\Identity"
+    AdminLogDbContext                     = "Migrations\Logging";
+    IdentityServerConfigurationDbContext  = "Migrations\IdentityServerConfiguration";
+    IdentityServerPersistedGrantDbContext = "Migrations\IdentityServerGrants";
+    AdminAuditLogDbContext                = "Migrations\AuditLogging";
+    IdentityServerDataProtectionDbContext = "Migrations\DataProtection";
+}
+
+#Initialize the db providers and it's respective projects
+$dpProviders = @{
+    SqlServer  = "..\..\src\$projectName.Admin.EntityFramework.SqlServer\$projectName.Admin.EntityFramework.SqlServer.csproj";
+    PostgreSQL = "..\..\src\$projectName.Admin.EntityFramework.PostgreSQL\$projectName.Admin.EntityFramework.PostgreSQL.csproj";
+    MySql      = "..\..\src\$projectName.Admin.EntityFramework.MySql\$projectName.Admin.EntityFramework.MySql.csproj";
+}
+
+#Fix issue when the tools is not installed and the nuget package does not work see https://github.com/MicrosoftDocs/azure-docs/issues/40048
+Write-Host "Updating donet ef tools"
+$env:Path += "	% USERPROFILE % \.dotnet\tools";
+dotnet tool update --global dotnet-ef
+
+Write-Host "Start migrate projects"
+foreach ($provider in $dpProviders.Keys) {
+
+    if ($migrationProviderName -eq 'All' -or $migrationProviderName -eq $provider) {
+
+        $projectPath = (Get-Item -Path $dpProviders[$provider] -Verbose).FullName;
+        Write-Host "Generate migration for db provider:" $provider ", for project path - " $projectPath
+
+        $providerName = '"ProviderType": "' + $provider + '"'
+
+        $settings = $settings -replace '"ProviderType".*', $providerName
+        $settings | set-content appsettings.json
+        if ((Test-Path $projectPath) -eq $true) {
+            foreach ($context in $targetContexts.Keys) {
+
+                if ($targetContext -eq 'All' -or $context -eq $targetContext) {
+
+                    Write-Host "Migrating context " $context
+                    dotnet ef database update $migration -c $context -p $projectPath
+                }
+            } 
+        }
+
+    }
+}
+
+Remove-Item appsettings.json
+Copy-Item appsettings-backup.json -Destination appsettings.json
+Remove-Item appsettings-backup.json
+Set-Location $currentPath

docker-compose.yml

@@ -93,7 +93,6 @@ services:
       - 'ConnectionStrings__IdentityDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
       - 'ConnectionStrings__DataProtectionDbConnection=Server=db;Database=IdentityServer4Admin;User Id=sa;Password=${DB_PASSWORD:-Password_123};MultipleActiveResultSets=true'
       - 'AdminConfiguration__IdentityAdminBaseUrl=https://admin.skoruba.local'
-      - 'AdvancedConfiguration__PublicOrigin=https://sts.skoruba.local'
       - 'AdvancedConfiguration__IssuerUri=https://sts.skoruba.local'
       - DockerConfiguration__UpdateCaCertificate=true
       - ASPNETCORE_ENVIRONMENT=Development

shared/identityserverdata.json

@@ -61,19 +61,22 @@
                 ]
             }
         ],
+        "ApiScopes": [
+            {
+                "Name": "skoruba_identity_admin_api",
+                "DisplayName": "skoruba_identity_admin_api",
+                "Required": true,
+                "UserClaims": [
+                    "role",
+                    "name"
+                ]
+            }
+        ],
         "ApiResources": [
             {
                 "Name": "skoruba_identity_admin_api",
                 "Scopes": [
-                    {
-                        "Name": "skoruba_identity_admin_api",
-                        "DisplayName": "skoruba_identity_admin_api",
-                        "Required": true,
-                        "UserClaims": [
-                            "role",
-                            "name"
-                        ]
-                    }
+                    "skoruba_identity_admin_api"
                 ]
             }
         ],