Merge branch 'fix/webclient' into release/1.0.0

src/Yavsc.Server/Config.cs

@@ -47,8 +47,8 @@ public static class Config
     public static IEnumerable<ApiScope> ApiScopes =>
         new ApiScope[]
         {
-            new ApiScope("scope1"),
-            new ApiScope("scope2"),
+            new ApiScope("scope1",new string[] {"scope1"}),
+            new ApiScope("scope2",new string[] {"scope2"}),
         };
 
     public static IEnumerable<Client> Clients =>
@@ -73,6 +73,7 @@ public static class Config
                 ClientSecrets = { new Secret("49C1A7E1-0C79-4A89-A3D6-A37998FB86B0".Sha256()) },
 
                 AllowedGrantTypes = GrantTypes.Code,
+                AlwaysIncludeUserClaimsInIdToken = true,
 
                 RedirectUris = { "https://localhost:5003/signin-oidc",
                 "http://localhost:5002/signin-oidc"  },
@@ -80,7 +81,6 @@ public static class Config
                     "http://localhost:5002/signout-callback-oidc",
                     "https://localhost:5003/signout-callback-oidc" },
 
-                AllowOfflineAccess = true,
 
                 AllowedScopes = { 
                     IdentityServerConstants.StandardScopes.OpenId,

src/Yavsc.Server/Helpers/BillingHelpers.cs

@@ -1,10 +1,7 @@
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Linq;
-using Yavsc.Abstract.FileSystem;
 using Yavsc.Billing;
 using Yavsc.Models.Billing;
+using Yavsc.Server.Helpers;
 using Yavsc.Services;
 
 namespace Yavsc.Helpers

src/Yavsc.Server/Helpers/FileSystemHelpers.cs

@@ -11,8 +11,9 @@ using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
 using Microsoft.AspNetCore.Http;
 using Yavsc.Exceptions;
-
-namespace Yavsc.Helpers
+using Yavsc.Helpers;
+using Yavsc.Abstract.Helpers;
+namespace Yavsc.Server.Helpers
 {
     public static class FileSystemHelpers 
     {

src/Yavsc.Server/Helpers/RequestHelpers.cs

@@ -1,28 +0,0 @@
-using System.Collections.Generic;
-
-using Microsoft.Extensions.Logging;
-using Microsoft.AspNetCore.Http;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Yavsc.ViewModels;
-using Yavsc.Models;
-using System.Linq;
-
-namespace Yavsc.Helpers
-{
-    public static class RequestHelpers
-    {
-        // Check for some apache proxy header, if any
-        public static string ForHost(this HttpRequest request) {
-            string host = request.Headers["X-Forwarded-For"];
-            if (string.IsNullOrEmpty(host)) {
-                host = request.Host.Value;
-            } else { // Using X-Forwarded-For last address
-                host = host.Split(',')
-                    .Last()
-                    .Trim();
-            }
-            return host;
-        }
-    }
-}

src/Yavsc.Server/Helpers/UserHelpers.cs

@@ -9,7 +9,6 @@ namespace Yavsc.Helpers
 {
     public static class UserHelpers
     {
-
         public static string GetUserId(this ClaimsPrincipal user)
         {
             return user.FindFirstValue("sub");

src/Yavsc.Server/Services/ProfileService.cs

@@ -9,16 +9,17 @@ using Yavsc.Models;
 
 namespace Yavsc.Services
 {
-    public class ProfileService : DefaultProfileService, IProfileService
+    public class ProfileService : IProfileService
     {
         private readonly UserManager<ApplicationUser> _userManager;
         public ProfileService(
-            UserManager<ApplicationUser> userManager, ILogger<DefaultProfileService> logger) : base(logger)
+            UserManager<ApplicationUser> userManager, 
+            ILogger<DefaultProfileService> logger) 
         {
             _userManager = userManager;
         }
 
-        public async Task<List<Claim>> GetClaimsFromUserAsync(
+        private async Task<List<Claim>> GetClaimsFromUserAsync(
             ProfileDataRequestContext context,
             ApplicationUser user)
         {
@@ -30,9 +31,11 @@ namespace Yavsc.Services
 
             foreach (var scope in context.RequestedResources.ParsedScopes)
             {
-                claims.Add(new Claim(JwtClaimTypes.Scope, scope.ParsedName));
-                claimAdds.Add(scope.ParsedName);
-                // TODO scope has a ParsedParameter
+                if (context.Client.AllowedScopes.Contains(scope.ParsedName))
+                {
+                    claims.Add(new Claim(JwtClaimTypes.Scope, scope.ParsedName));
+                    claimAdds.Add(scope.ParsedName);
+                }
             }
 
             if (claimAdds.Contains(JwtClaimTypes.Profile))
@@ -54,13 +57,13 @@ namespace Yavsc.Services
                 var roles = await this._userManager.GetRolesAsync(user);
                 if (roles.Count()>0)
                 {
-                    claims.Add(new Claim("http://schemas.microsoft.com/ws/2008/06/identity/claims/role",String.Join(" ",roles)));
+                    claims.AddRange(roles.Select(r => new Claim(Constants.RoleClaimName, r)));
                 }
             }
             return claims;
         }
 
-        override public async Task GetProfileDataAsync(ProfileDataRequestContext context)
+         public async Task GetProfileDataAsync(ProfileDataRequestContext context)
         {
             var subjectId = GetSubjectId(context.Subject);
             if (subjectId==null) return;
@@ -69,7 +72,7 @@ namespace Yavsc.Services
             context.IssuedClaims = await GetClaimsFromUserAsync(context, user);
         }
 
-        override public async Task IsActiveAsync(IsActiveContext context)
+         public async Task IsActiveAsync(IsActiveContext context)
         {
             string? subjectId = GetSubjectId(context.Subject);
             if (subjectId == null)

src/Yavsc.Server/ViewModels/LiveCastHandler.cs

@@ -10,6 +10,7 @@ using Newtonsoft.Json;
 using Yavsc.Helpers;
 using Yavsc.Models;
 using Yavsc.Models.FileSystem;
+using Yavsc.Server.Helpers;
 
 namespace Yavsc.ViewModels.Streaming
 {