Merge remote-tracking branch 'origin/Ticket765'

# Conflicts:
#	src/CredentialIssuer/SimpleIdServer.CredentialIssuer.Startup/appsettings.json
#	src/CredentialIssuer/SimpleIdServer.CredentialIssuer.Website.Startup/appsettings.json
#	src/IdServer/SimpleIdServer.IdServer.Startup/IdServerConfiguration.cs

Author: habarthierry-hue

default.ps1

@@ -189,7 +189,7 @@ task buildTemplate {
 	CopyFolder $CredentialIssuerWebsitePathSource $CredentialIssuerWebsitePathTarget
 }
 
-task pack -depends release, compile {
+task pack -depends release, compile, buildTemplate {
 	exec { dotnet pack $source_dir\IdServer\SimpleIdServer.IdServer.VerifiablePresentation\SimpleIdServer.IdServer.VerifiablePresentation.csproj -c $config --no-build $versionSuffix --output $result_dir }
 	exec { dotnet pack $source_dir\IdServer\SimpleIdServer.IdServer\SimpleIdServer.IdServer.csproj -c $config --no-build $versionSuffix --output $result_dir }
 	exec { dotnet pack $source_dir\IdServer\SimpleIdServer.IdServer.Domains\SimpleIdServer.IdServer.Domains.csproj -c $config --no-build $versionSuffix --output $result_dir }

src/CredentialIssuer/SimpleIdServer.CredentialIssuer.Startup/appsettings.json

@@ -2,7 +2,7 @@
   "Authorization": {
     "ClientId": "CredentialIssuer",
     "ClientSecret": "password",
-    "Issuer": "https://58ed-81-246-134-116.ngrok-free.app/master",
+    "Issuer": "https://3bda-81-246-134-116.ngrok-free.app/master",
     "IgnoreCertificateError": true
   },
   "PublicDid": "did:key:z2dmzD81cgPx8Vki7JbuuMmFYrWPgYoytykUZ3eyqht1j9KbpMAoXtZtunruYnM4gCV65AKAUX2AwEReRhEaf3BRQNJArZPwQdmf9ENZcF8VT13a58WsHeVjJtvAKKPYEibaEfdUxvU7sgxEUTJpjEkq6BJKrRV1JQ1CqhYvGbmJ1WyoUQ"

src/CredentialIssuer/SimpleIdServer.CredentialIssuer.Website.Startup/appsettings.json

@@ -9,7 +9,7 @@
   "forceHttps": false,
   "CredentialIssuerUrl": "https://localhost:5005",
   "DefaultSecurityOptions": {
-    "Issuer": "https://58ed-81-246-134-116.ngrok-free.app/master",
+    "Issuer": "https://3bda-81-246-134-116.ngrok-free.app/master",
     "ClientId": "CredentialIssuer-manager",
     "ClientSecret": "password",
     "Scope": "openid profile",

src/IdServer/SimpleIdServer.Configuration/AutomaticConfigurationProvider.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Primitives;
+using SimpleIdServer.IdServer.Helpers;
 using SimpleIdServer.IdServer.Middlewares;
 using System;
 using System.Collections.Generic;

src/IdServer/SimpleIdServer.IdServer.Domains/Client.cs

@@ -553,7 +553,7 @@ public JsonObject Parameters
         /// </summary>
         [JsonPropertyName(OAuthClientParameters.AccessTokenType)]
         public AccessTokenTypes AccessTokenType { get; set; } = AccessTokenTypes.Jwt;
-        [JsonIgnore]
+        [JsonPropertyName(OAuthClientParameters.Realms)]
         public ICollection<Realm> Realms { get; set; } = new List<Realm>();
         [JsonIgnore]
         public ICollection<DeviceAuthCode> DeviceAuthCodes { get; set; } = new List<DeviceAuthCode>();

src/IdServer/SimpleIdServer.IdServer.Domains/DTOs/OAuthClientParameters.cs

@@ -93,5 +93,6 @@ public class OAuthClientParameters
         public const string IsSelfIssueEnabled = "is_self_issue_enabled";
         public const string ExpirationDateTime = "expiration_datetime";
         public const string ClientRegistrationTypesSupported = "client_registration_types_supported";
+        public const string Realms = "realms";
     }
 }

src/IdServer/SimpleIdServer.IdServer.Domains/DTOs/ScopeNames.cs

@@ -16,4 +16,6 @@ public static class ScopeNames
     public const string UpdateDatetime = "update_datetime";
     public const string Mappers = "mappers";
     public const string IsRole = "is_role";
+    public const string Component = "component";
+    public const string Action = "action";
 }

src/IdServer/SimpleIdServer.IdServer.Domains/Scope.cs

@@ -34,11 +34,15 @@ public Scope(string name) : this()
         public DateTime CreateDateTime { get; set; }
         [JsonPropertyName(ScopeNames.UpdateDatetime)]
         public DateTime UpdateDateTime { get; set; }
+        [JsonPropertyName(ScopeNames.Component)]
+        public string? Component { set; get; } = null;
+        [JsonPropertyName(ScopeNames.Action)]
+        public ComponentActions? Action { get; set; }
         /// <summary>
         /// Array of strings that specifies the claims.
         /// </summary>
         [JsonPropertyName(ScopeNames.Mappers)]
-        public ICollection<ScopeClaimMapper> ClaimMappers { get; set; }= new List<ScopeClaimMapper>();
+        public ICollection<ScopeClaimMapper> ClaimMappers { get; set; } = new List<ScopeClaimMapper>();
         [JsonIgnore]
         public ICollection<ApiResource> ApiResources { get; set; } = new List<ApiResource>();
         [JsonIgnore]
@@ -101,3 +105,9 @@ public enum ScopeProtocols
         OAUTH = 2
     }
 }
+
+public enum ComponentActions
+{
+    Manage = 0,
+    View = 1
+}

src/IdServer/SimpleIdServer.IdServer.Domains/ScopeClaimMapper.cs

@@ -3,6 +3,7 @@
 using SimpleIdServer.IdServer.Domains.DTOs;
 using System.Security.Claims;
 using System.Text.Json.Serialization;
+using System.Xml.Linq;
 
 namespace SimpleIdServer.IdServer.Domains
 {

…ver.IdServer/Middlewares/RealmContext.cs …dServer.IdServer.Helpers/RealmContext.cssrc/IdServer/SimpleIdServer.IdServer/Middlewares/RealmContext.cs renamed to src/IdServer/SimpleIdServer.IdServer.Helpers/RealmContext.cs src/IdServer/SimpleIdServer.IdServer/Middlewares/RealmContext.cs renamed to src/IdServer/SimpleIdServer.IdServer.Helpers/RealmContext.cs

@@ -1,7 +1,7 @@
 // Copyright (c) SimpleIdServer. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 
-namespace SimpleIdServer.IdServer.Middlewares
+namespace SimpleIdServer.IdServer.Helpers
 {
     public class RealmContext
     {