ya cleanup

.gitlab-ci.yml

@@ -1,67 +0,0 @@
-# Please find the full example project here:
-# https://gitlab.com/tobiaskoch/gitlab-ci-example-mono
-
-# see https://hub.docker.com/_/mono/
-image: mono:4.6.2.7
-
-stages:
-  - build
-  - test
-  - deploy
-
-before_script:
-    - . /opt/mono-4.6/mono-env
-    - export GIT_SSL_NO_VERIFY=true 
-    - curl --insecure -sSL https://lua.pschneider.fr/files/Paul/pub/dnx-install.sh  | bash
-    - DNX_USER_HOME=`pwd -P`/dnx . ./dnx/dnvm/dnvm.sh
-    - cd src/OAuth.AspNet.Token && dnu restore --ignore-failed-sources
-    - cd ../OAuth.AspNet.AuthServer && dnu restore --ignore-failed-sources
-    - cd ../Yavsc.Abstract && dnu restore --ignore-failed-sources
-    - cd ../Yavsc.Server && dnu restore --ignore-failed-sources
-    - cd ../Yavsc && dnu restore --ignore-failed-sources
-    - cd ../cli && dnu restore --ignore-failed-sources
-    - cd ../../test/yavscTests && dnu restore --ignore-failed-sources
-    - cd ../..
-
-after_script:
-
-debug:
-  stage: build
-  artifacts:
-    paths:
-      - test/yavscTests/bin
-  script:
-    - cd test/yavscTests
-    - dnu build
-
-non_reg:
-  stage: test
-  artifacts:
-    paths:
-      - test/yavscTests/test-results.xml
-    when: always
-  script:
-    - cd test/yavscTests
-    - cp $yavsc_client_secret_json yavsc-client-secret.json
-    - ASPNET_ENV=Development dnx test -trait ategory=non_reg -maxthreads 1 -xml test-results.xml 
-
-release:
-  stage: deploy
-  only:
-    - vnext
-  artifacts:
-    paths:
-      - binaries/Debug
-  script:
-    - make packages
-
-deploy_staging:
-  stage: deploy
-  script:
-    - echo "Deploy to staging server"
-    - make strip_yavscd
-    - make packages
-    - isn push -s $ISNSOURCE -k $NUGETSOURCEAPIKEY src/Yavsc.Abstract/bin/*/*.nupkg
-  environment:
-    name: staging
-    url: https://yavscpre.pschneider.fr

.nuget/NuGet.Config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <apikeys>
-  </apikeys>
-  <packageSources>
-    <add key="opt" value="/opt/nuget/pkgs/" /> 
-    <add key="Official NuGet Gallery" value="https://www.nuget.org/api/v2/" /> 
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> 
-    <add key="xamarin-forms-ci" value="https://www.myget.org/F/xamarinforms-ci/api/v2" /> 
-  </packageSources>  <activePackageSource>    <add key="myLocal" value="/home/paul/Nupkgs" />  </activePackageSource>
-</configuration>

.nuget/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Machine.Specifications.Runner.Console" version="0.9.0" />
-</packages>

.travis.yml

@@ -1,22 +0,0 @@
-language: csharp
-os: linux
-mono:
-- beta
-sudo: false
-install:
-- curl --insecure -sSL https://lua.pschneider.fr/files/Paul/pub/dnx-install.sh  | bash
-- DNX_USER_HOME=`pwd -P`/dnx . ./dnx/dnvm/dnvm.sh
-- cd src/OAuth.AspNet.Token && dnu restore --ignore-failed-sources
-- cd ../OAuth.AspNet.AuthServer && dnu restore --ignore-failed-sources
-- cd ../Yavsc.Abstract && dnu restore --ignore-failed-sources
-- cd ../Yavsc.Server && dnu restore --ignore-failed-sources
-- cd ../Yavsc && dnu restore --ignore-failed-sources
-- cd ../test
-- make restore
-- make
-- cd ../..
-- make
-
-script:
-- "dnu build"
-

global.json

@@ -1,11 +1,6 @@
 {
-    "projects": [
-        "src",
-        "test"
-    ],
     "sdk": {
       "runtime": "dotnet",
       "version": "8.0.405"
-    },
+    }
-    "packages": "packages"
 }

src/Api/Program.cs

@@ -87,7 +87,8 @@ internal class Program
             app
                 .UseRouting()
                 .UseAuthentication()
-                .UseAuthorization().UseCors("default")
+                .UseAuthorization()
+                .UseCors("default")
                 .UseEndpoints(endpoints =>
                 {
                     endpoints.MapDefaultControllerRoute()
@@ -97,7 +98,8 @@ internal class Program
            
             app.MapGet("/identity", (HttpContext context) =>
                 new JsonResult(context?.User?.Claims.Select(c => new { c.Type, c.Value }))
-        ).RequireAuthorization("ApiScope");
+        );
+
             app.UseSession(); 
             await app.RunAsync();
         };

src/Api/Properties/launchSettings.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "https://localhost:5001",
+      "sslPort": 6001
+    }
+  },
+  "profiles": {
+   
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:6001;",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}

src/Yavsc/Extensions/HostingExtensions.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using System.Globalization;
 using System.Security.Cryptography.X509Certificates;
 using Google.Apis.Util.Store;
@@ -144,10 +145,8 @@ public static class HostingExtensions
             o.EnableDetailedErrors = true;
         });
 
-        AddIdentityDBAndStores(builder).AddDefaultTokenProviders();;
+        AddIdentityDBAndStores(builder).AddDefaultTokenProviders();
-
+        AddIdentityServer(builder);
-        AddIdentityServer(builder).AddProfileService<ProfileService>();
-        //services.AddScoped<IProfileService, ProfileService>();
         
         services.AddSession();
 
@@ -329,14 +328,17 @@ public static class HostingExtensions
             .AddInMemoryClients(Config.Clients)
             .AddInMemoryApiScopes(Config.ApiScopes)
             .AddAspNetIdentity<ApplicationUser>()
-            .AddJwtBearerClientAuthentication();
+            // .AddProfileService<ProfileService>()
+            .AddJwtBearerClientAuthentication()
+           ;
         if (builder.Environment.IsDevelopment())
         {
             identityServerBuilder.AddDeveloperSigningCredential();
         }
         else
         {
-            var key = builder.Configuration["YOUR-KEY-NAME"];
+            var key = builder.Configuration["YavscSigningCert"];
+            Debug.Assert(key != null);
             var pfxBytes = Convert.FromBase64String(key);
             var cert = new X509Certificate2(pfxBytes, (string)null, X509KeyStorageFlags.MachineKeySet);
             identityServerBuilder.AddSigningCredential(cert);

src/Yavsc/Properties/launchSettings.json

@@ -1,27 +1,19 @@
-{
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:30089",
+      "applicationUrl": "https://localhost:5001",
-      "sslPort": 44391
+      "sslPort": 5001
     }
   },
   "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:5172",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "https": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:7062;http://localhost:5172",
+      "applicationUrl": "https://localhost:5001;",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

src/Yavsc/ScaffoldingReadMe.txt

@@ -1,3 +0,0 @@
-Support for ASP.NET Core Identity was added to your project.
-
-For setup and configuration information, see https://go.microsoft.com/fwlink/?linkid=2116645.

src/Yavsc/Views/Shared/Error.cshtml

@@ -12,14 +12,3 @@
         <strong>Request ID:</strong> <code>@Model.RequestId</code>
     </p>
 }
-
-<h3>Development Mode</h3>
-<p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
-</p>
-<p>
-    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
-    It can result in displaying sensitive information from exceptions to end users.
-    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
-    and restarting the app.
-</p>

src/Yavsc/package.json

@@ -1,14 +0,0 @@
-{
-  "name": "yavsc",
-  "version": "1.0.7",
-  "description": "Yet Another Very Small Company",
-  "repository": {
-    "type": "Git",
-    "url": "https://github.com/pazof/yavsc"
-  },
-  "license": "GPL-3.0",
-  "devDependencies": {},
-  "dependencies": {
-    "paypal-permissions-sdk": "^1.0.10"
-  }
-}

src/sampleWebAsWebApiClient/Controllers/HomeController.cs

@@ -71,7 +71,7 @@ namespace testOauthClient.Controllers
             var accessToken = await HttpContext.GetTokenAsync("access_token");
             var client = new HttpClient(new HttpClientHandler(){ AllowAutoRedirect=false });
             client.DefaultRequestHeaders.Add("Accept", "application/json");
-            client.SetBearerToken(accessToken);
+            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
             var content = await client.GetAsync("https://localhost:6001/identity");
             content.EnsureSuccessStatusCode();
             var json = await content.Content.ReadAsStreamAsync();

src/sampleWebAsWebApiClient/Program.cs

@@ -1,19 +1,56 @@
-using Microsoft.AspNetCore.Authentication.OAuth;
+/*
-using Microsoft.AspNetCore.Authentication;
+ Copyright (c) 2024 HigginsSoft, Alexander Higgins - https://github.com/alexhiggins732/ 
-using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
 
-   public class Program
+ Copyright (c) 2018, Brock Allen & Dominick Baier. All rights reserved.
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
 
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
+ Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information. 
-            Host.CreateDefaultBuilder(args)
+ Source code and license this software can be found 
-                .ConfigureWebHostDefaults(webBuilder =>
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+*/
+
+using System.IdentityModel.Tokens.Jwt;
+
+JwtSecurityTokenHandler.DefaultMapInboundClaims = false;
+
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.Services.AddControllersWithViews();
+builder.Services
+    .AddAuthentication(options =>
     {
-                    webBuilder.UseStartup<Startup>();
+        options.DefaultScheme = "Cookies";
+        options.DefaultChallengeScheme = "oidc";
+    })
+    .AddCookie("Cookies")
+    .AddOpenIdConnect("oidc", options =>
+    {
+        options.Authority = "https://localhost:5001";
+
+        options.ClientId = "mvc";
+        options.ClientSecret = "49C1A7E1-0C79-4A89-A3D6-A37998FB86B0";
+        options.ResponseType = "code";
+
+        options.Scope.Add("scope2");
+        
+        options.SaveTokens = true;
     });
+
+
+using (var app = builder.Build())
+{
+    if (app.Environment.IsDevelopment())
+        app.UseDeveloperExceptionPage();
+    else
+        app.UseExceptionHandler("/Home/Error");
+
+    app.UseStaticFiles();
+    app.UseRouting();
+    app.UseAuthentication();
+    app.UseAuthorization();
+    app.MapDefaultControllerRoute().RequireAuthorization();
+
+    await app.RunAsync();
 }

src/sampleWebAsWebApiClient/Startup.cs

@@ -1,76 +0,0 @@
-using IdentityModel;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.IdentityModel.Tokens;
-using System.IdentityModel.Tokens.Jwt;
-using Yavsc;
-
-public class Startup
-{
-    public void ConfigureServices(IServiceCollection services)
-    {
-
-        services.AddControllersWithViews();
-        services
-            .AddAuthentication(options =>
-            {
-                options.DefaultScheme = "Cookies";
-                options.DefaultChallengeScheme = "oidc";
-            })
-            .AddCookie("Cookies")
-            .AddOpenIdConnect("oidc", options =>
-            {
-                options.Authority = "https://localhost:5001";
-
-                options.ClientId = "mvc";
-                options.ClientSecret = "49C1A7E1-0C79-4A89-A3D6-A37998FB86B0";
-                options.ResponseType = "code";
-
-                options.Scope.Add("scope2");
-
-                options.SaveTokens = true;
-
-                options.GetClaimsFromUserInfoEndpoint = true;
-                options.SaveTokens = true;
-                options.ClaimActions.MapUniqueJsonKey(
-                    Constants.RoleClaimName,
-                    Constants.RoleClaimName);
-                options.ClaimActions.MapUniqueJsonKey(
-                    JwtClaimTypes.Scope,
-                    JwtClaimTypes.Scope);
-                options.TokenValidationParameters = new TokenValidationParameters
-                {
-                    NameClaimType = "name",
-                    RoleClaimType = "http://schemas.microsoft.com/ws/2008/06/identity/claims/role"
-                };
-            });
-
-    }
-
-    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-    {
-        if (env.IsDevelopment())
-        {
-            app.UseDeveloperExceptionPage();
-        }
-        else
-        {
-            app.UseExceptionHandler("/Home/Error");
-        }
-
-        app.UseStaticFiles();
-
-        app.UseRouting();
-        app.UseAuthentication();
-        app.UseAuthorization();
-
-        app.UseEndpoints(endpoints =>
-        {
-            endpoints.MapDefaultControllerRoute()
-                .RequireAuthorization();
-        });
-    }
-}

yavsc.code-workspace

@@ -1,38 +0,0 @@
-{
-	"folders": [
-		{
-			"path": ".vscode"
-		},
-		{
-			"path": "."
-		},
-		{
-			"path": "src/test"
-		},
-		{
-			"path": "src/Yavsc"
-		},
-		{
-			"path": "src/cli"
-		},
-		{
-			"path": "src/GoogleCode"
-		},
-		{
-			"path": "src/OAuth.AspNet.AuthServer"
-		},
-		{
-			"path": "src/OAuth.AspNet.Token"
-		},
-		{
-			"path": "src/Yavsc.Abstract"
-		},
-		{
-			"path": "src/Yavsc.Server"
-		}
-	],
-	"settings": {
-		"mocha.enabled": true,
-		"git.ignoreLimitWarning": true
-	}
-}

yavsc.mdw

@@ -1,6 +0,0 @@
-<WorkspaceItem ctype="Workspace">
-  <Items>
-    <Item>ZicMoove.sln</Item>
-    <Item>yagui/yagui.sln</Item>
-  </Items>
-</WorkspaceItem>