diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj index a04a493f..28597015 100644 --- a/src/Api/Api.csproj +++ b/src/Api/Api.csproj @@ -5,6 +5,7 @@ enable - + + diff --git a/src/Yavsc/ApiControllers/Blogspot/BlogApiController.cs b/src/Api/Controllers/Blogspot/BlogApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Blogspot/BlogApiController.cs rename to src/Api/Controllers/Blogspot/BlogApiController.cs diff --git a/src/Yavsc/ApiControllers/Blogspot/BlogTagsApiController.cs b/src/Api/Controllers/Blogspot/BlogTagsApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Blogspot/BlogTagsApiController.cs rename to src/Api/Controllers/Blogspot/BlogTagsApiController.cs diff --git a/src/Yavsc/ApiControllers/Blogspot/CommentsApiController.cs b/src/Api/Controllers/Blogspot/CommentsApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Blogspot/CommentsApiController.cs rename to src/Api/Controllers/Blogspot/CommentsApiController.cs diff --git a/src/Yavsc/ApiControllers/Blogspot/FileSystemApiController.cs b/src/Api/Controllers/Blogspot/FileSystemApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Blogspot/FileSystemApiController.cs rename to src/Api/Controllers/Blogspot/FileSystemApiController.cs diff --git a/src/Yavsc/ApiControllers/Blogspot/FileSystemStream.cs b/src/Api/Controllers/Blogspot/FileSystemStream.cs similarity index 100% rename from src/Yavsc/ApiControllers/Blogspot/FileSystemStream.cs rename to src/Api/Controllers/Blogspot/FileSystemStream.cs diff --git a/src/Yavsc/ApiControllers/Blogspot/MoveFileQuery.cs b/src/Api/Controllers/Blogspot/MoveFileQuery.cs similarity index 100% rename from src/Yavsc/ApiControllers/Blogspot/MoveFileQuery.cs rename to src/Api/Controllers/Blogspot/MoveFileQuery.cs diff --git a/src/Yavsc/ApiControllers/Blogspot/PostTagsApiController.cs b/src/Api/Controllers/Blogspot/PostTagsApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Blogspot/PostTagsApiController.cs rename to src/Api/Controllers/Blogspot/PostTagsApiController.cs diff --git a/src/Yavsc/ApiControllers/Blogspot/TagsApiController.cs b/src/Api/Controllers/Blogspot/TagsApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Blogspot/TagsApiController.cs rename to src/Api/Controllers/Blogspot/TagsApiController.cs diff --git a/src/Yavsc/ApiControllers/Blogspot/TestApiController.cs b/src/Api/Controllers/Blogspot/TestApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Blogspot/TestApiController.cs rename to src/Api/Controllers/Blogspot/TestApiController.cs diff --git a/src/Yavsc/ApiControllers/Business/ActivityApiController.cs b/src/Api/Controllers/Business/ActivityApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Business/ActivityApiController.cs rename to src/Api/Controllers/Business/ActivityApiController.cs diff --git a/src/Yavsc/ApiControllers/Business/BillingController.cs b/src/Api/Controllers/Business/BillingController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Business/BillingController.cs rename to src/Api/Controllers/Business/BillingController.cs diff --git a/src/Yavsc/ApiControllers/Business/BookQueryApiController.cs b/src/Api/Controllers/Business/BookQueryApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Business/BookQueryApiController.cs rename to src/Api/Controllers/Business/BookQueryApiController.cs diff --git a/src/Yavsc/ApiControllers/Business/EstimateApiController.cs b/src/Api/Controllers/Business/EstimateApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Business/EstimateApiController.cs rename to src/Api/Controllers/Business/EstimateApiController.cs diff --git a/src/Yavsc/ApiControllers/Business/EstimateTemplatesApiController.cs b/src/Api/Controllers/Business/EstimateTemplatesApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Business/EstimateTemplatesApiController.cs rename to src/Api/Controllers/Business/EstimateTemplatesApiController.cs diff --git a/src/Yavsc/ApiControllers/Business/FrontOfficeApiController.cs b/src/Api/Controllers/Business/FrontOfficeApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Business/FrontOfficeApiController.cs rename to src/Api/Controllers/Business/FrontOfficeApiController.cs diff --git a/src/Yavsc/ApiControllers/Business/PaymentApiController.cs b/src/Api/Controllers/Business/PaymentApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Business/PaymentApiController.cs rename to src/Api/Controllers/Business/PaymentApiController.cs diff --git a/src/Yavsc/ApiControllers/Business/PerformersApiController.cs b/src/Api/Controllers/Business/PerformersApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Business/PerformersApiController.cs rename to src/Api/Controllers/Business/PerformersApiController.cs diff --git a/src/Yavsc/ApiControllers/Business/ProductApiController.cs b/src/Api/Controllers/Business/ProductApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Business/ProductApiController.cs rename to src/Api/Controllers/Business/ProductApiController.cs diff --git a/src/Yavsc/ApiControllers/DimissClicksApiController.cs b/src/Api/Controllers/DimissClicksApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/DimissClicksApiController.cs rename to src/Api/Controllers/DimissClicksApiController.cs diff --git a/src/Yavsc/ApiControllers/HairCut/BursherProfilesApiController.cs b/src/Api/Controllers/HairCut/BursherProfilesApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/HairCut/BursherProfilesApiController.cs rename to src/Api/Controllers/HairCut/BursherProfilesApiController.cs diff --git a/src/Yavsc/ApiControllers/HairCut/HairCutController.cs b/src/Api/Controllers/HairCut/HairCutController.cs similarity index 100% rename from src/Yavsc/ApiControllers/HairCut/HairCutController.cs rename to src/Api/Controllers/HairCut/HairCutController.cs diff --git a/src/Yavsc/ApiControllers/HyperLinkApiController.cs b/src/Api/Controllers/HyperLinkApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/HyperLinkApiController.cs rename to src/Api/Controllers/HyperLinkApiController.cs diff --git a/src/Yavsc/ApiControllers/IT/GitRefsApiController.cs b/src/Api/Controllers/IT/GitRefsApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/IT/GitRefsApiController.cs rename to src/Api/Controllers/IT/GitRefsApiController.cs diff --git a/src/Yavsc/ApiControllers/MailTemplatingApiController.cs b/src/Api/Controllers/MailTemplatingApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/MailTemplatingApiController.cs rename to src/Api/Controllers/MailTemplatingApiController.cs diff --git a/src/Yavsc/ApiControllers/MailingTemplateApiController.cs b/src/Api/Controllers/MailingTemplateApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/MailingTemplateApiController.cs rename to src/Api/Controllers/MailingTemplateApiController.cs diff --git a/src/Yavsc/ApiControllers/Musical/DjProfileApiController.cs b/src/Api/Controllers/Musical/DjProfileApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Musical/DjProfileApiController.cs rename to src/Api/Controllers/Musical/DjProfileApiController.cs diff --git a/src/Yavsc/ApiControllers/Musical/MusicalPreferencesApiController.cs b/src/Api/Controllers/Musical/MusicalPreferencesApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Musical/MusicalPreferencesApiController.cs rename to src/Api/Controllers/Musical/MusicalPreferencesApiController.cs diff --git a/src/Yavsc/ApiControllers/Musical/MusicalTendenciesApiController.cs b/src/Api/Controllers/Musical/MusicalTendenciesApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Musical/MusicalTendenciesApiController.cs rename to src/Api/Controllers/Musical/MusicalTendenciesApiController.cs diff --git a/src/Yavsc/ApiControllers/Musical/PodcastController.cs b/src/Api/Controllers/Musical/PodcastController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Musical/PodcastController.cs rename to src/Api/Controllers/Musical/PodcastController.cs diff --git a/src/Yavsc/ApiControllers/NativeConfidentialController.cs b/src/Api/Controllers/NativeConfidentialController.cs similarity index 100% rename from src/Yavsc/ApiControllers/NativeConfidentialController.cs rename to src/Api/Controllers/NativeConfidentialController.cs diff --git a/src/Yavsc/ApiControllers/PostRateApiController.cs b/src/Api/Controllers/PostRateApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/PostRateApiController.cs rename to src/Api/Controllers/PostRateApiController.cs diff --git a/src/Yavsc/ApiControllers/ProfileApiController.cs b/src/Api/Controllers/ProfileApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/ProfileApiController.cs rename to src/Api/Controllers/ProfileApiController.cs diff --git a/src/Yavsc/ApiControllers/Relationship/BlackListApiController.cs b/src/Api/Controllers/Relationship/BlackListApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Relationship/BlackListApiController.cs rename to src/Api/Controllers/Relationship/BlackListApiController.cs diff --git a/src/Yavsc/ApiControllers/Relationship/BlogAclApiController.cs b/src/Api/Controllers/Relationship/BlogAclApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Relationship/BlogAclApiController.cs rename to src/Api/Controllers/Relationship/BlogAclApiController.cs diff --git a/src/Yavsc/ApiControllers/Relationship/ChatApiController.cs b/src/Api/Controllers/Relationship/ChatApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Relationship/ChatApiController.cs rename to src/Api/Controllers/Relationship/ChatApiController.cs diff --git a/src/Yavsc/ApiControllers/Relationship/ChatRoomAccessApiController.cs b/src/Api/Controllers/Relationship/ChatRoomAccessApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Relationship/ChatRoomAccessApiController.cs rename to src/Api/Controllers/Relationship/ChatRoomAccessApiController.cs diff --git a/src/Yavsc/ApiControllers/Relationship/ChatRoomApiController.cs b/src/Api/Controllers/Relationship/ChatRoomApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Relationship/ChatRoomApiController.cs rename to src/Api/Controllers/Relationship/ChatRoomApiController.cs diff --git a/src/Yavsc/ApiControllers/Relationship/CircleApiController.cs b/src/Api/Controllers/Relationship/CircleApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Relationship/CircleApiController.cs rename to src/Api/Controllers/Relationship/CircleApiController.cs diff --git a/src/Yavsc/ApiControllers/Relationship/ContactsApiController.cs b/src/Api/Controllers/Relationship/ContactsApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Relationship/ContactsApiController.cs rename to src/Api/Controllers/Relationship/ContactsApiController.cs diff --git a/src/Yavsc/ApiControllers/ServiceApiController.cs b/src/Api/Controllers/ServiceApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/ServiceApiController.cs rename to src/Api/Controllers/ServiceApiController.cs diff --git a/src/Yavsc/ApiControllers/Survey/BugApiController.cs b/src/Api/Controllers/Survey/BugApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/Survey/BugApiController.cs rename to src/Api/Controllers/Survey/BugApiController.cs diff --git a/src/Yavsc/ApiControllers/accounting/AccountController.cs b/src/Api/Controllers/accounting/AccountController.cs similarity index 98% rename from src/Yavsc/ApiControllers/accounting/AccountController.cs rename to src/Api/Controllers/accounting/AccountController.cs index c174c179..f958c5a7 100644 --- a/src/Yavsc/ApiControllers/accounting/AccountController.cs +++ b/src/Api/Controllers/accounting/AccountController.cs @@ -30,7 +30,7 @@ namespace Yavsc.WebApi.Controllers UserManager = userManager; this.roleManager = roleManager; _signInManager = signInManager; - _logger = loggerFactory.CreateLogger("ApiAuth"); + _logger = loggerFactory.CreateLogger(nameof(ApiAccountController)); _dbContext = dbContext; } @@ -154,7 +154,7 @@ namespace Yavsc.WebApi.Controllers return Ok(user); } - [HttpGet("~/api/myhost")] + [HttpGet("myhost")] public IActionResult MyHost () { return Ok(new { host = Request.ForHost() }); @@ -165,7 +165,7 @@ namespace Yavsc.WebApi.Controllers /// /// MyUpdate containing the new user name /// Ok when all is ok. - [HttpPut("~/api/me")] + [HttpPut("me")] public async Task UpdateMe(UserInfo me) { if (!ModelState.IsValid) return new BadRequestObjectResult( diff --git a/src/Yavsc/ApiControllers/accounting/ApplicationUserApiController.cs b/src/Api/Controllers/accounting/ApplicationUserApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/accounting/ApplicationUserApiController.cs rename to src/Api/Controllers/accounting/ApplicationUserApiController.cs diff --git a/src/Yavsc/ApiControllers/accounting/ProfileApiController.cs b/src/Api/Controllers/accounting/ProfileApiController.cs similarity index 100% rename from src/Yavsc/ApiControllers/accounting/ProfileApiController.cs rename to src/Api/Controllers/accounting/ProfileApiController.cs diff --git a/src/Api/Program.cs b/src/Api/Program.cs index 9daf30a5..c98df80f 100644 --- a/src/Api/Program.cs +++ b/src/Api/Program.cs @@ -44,7 +44,7 @@ internal class Program .AllowAnyMethod(); }); }) - .AddControllers(); + .AddControllersWithViews(); // accepts any access token issued by identity server var authenticationBuilder = services.AddAuthentication() @@ -64,14 +64,22 @@ internal class Program app .UseRouting() .UseAuthentication() - .UseAuthorization() - .UseCors("default"); - + .UseAuthorization().UseCors("default") + .UseEndpoints(endpoints => + { + endpoints.MapDefaultControllerRoute() + .RequireAuthorization(); + }); + app.MapGet("/identity", (HttpContext context) => new JsonResult(context?.User?.Claims.Select(c => new { c.Type, c.Value })) ).RequireAuthorization("ApiScope"); - + await app.RunAsync(); - } + }; + + + + } } diff --git a/src/Yavsc/Extensions/HostingExtensions.cs b/src/Yavsc/Extensions/HostingExtensions.cs index 50087ac7..cf472bc5 100644 --- a/src/Yavsc/Extensions/HostingExtensions.cs +++ b/src/Yavsc/Extensions/HostingExtensions.cs @@ -341,19 +341,13 @@ internal static class HostingExtensions }) .AddCors(options => { - options.AddPolicy("CorsPolicy", builder => + options.AddPolicy("default", builder => { _ = builder.WithOrigins("*") .AllowAnyHeader() .AllowAnyMethod(); }); - options.AddPolicy("default", policy => - { - policy.WithOrigins("https://localhost:5003") - .AllowAnyHeader() - .AllowAnyMethod(); - }); }); services.AddSingleton(); @@ -379,6 +373,7 @@ internal static class HostingExtensions app.UseRouting(); app.UseIdentityServer(); app.UseAuthorization(); + app.UseCors("default"); app.MapControllerRoute( name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); @@ -399,7 +394,7 @@ internal static class HostingExtensions payPalSettings, googleAuthSettings, localization, loggerFactory, app.Environment.EnvironmentName); app.ConfigureFileServerApp(); - + return app; } diff --git a/src/Yavsc/Yavsc.csproj b/src/Yavsc/Yavsc.csproj index c2891a1a..8b5af2ad 100644 --- a/src/Yavsc/Yavsc.csproj +++ b/src/Yavsc/Yavsc.csproj @@ -17,20 +17,20 @@ - - - - - + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + diff --git a/src/sampleWebAsWebApiClient/Controllers/AuthenticationController.cs b/src/sampleWebAsWebApiClient/Controllers/AuthenticationController.cs index bcc78dfc..9b893fca 100644 --- a/src/sampleWebAsWebApiClient/Controllers/AuthenticationController.cs +++ b/src/sampleWebAsWebApiClient/Controllers/AuthenticationController.cs @@ -12,13 +12,13 @@ using Microsoft.AspNetCore.Mvc; // But, this redirect URI doesn't need to match the OAuth parameter, it's serialized in the query state, // to be used once the identification ends. var properties = new AuthenticationProperties { RedirectUri = returnUrl }; - return new ChallengeResult("Yavsc", properties); + return new ChallengeResult("oidc", properties); } [HttpGet("~/signout")] public async Task SignOut(string returnUrl="/") { - return SignOut("Cookies", "Yavsc"); + return SignOut("Cookies", "oidc"); } } diff --git a/src/sampleWebAsWebApiClient/Controllers/HomeController.cs b/src/sampleWebAsWebApiClient/Controllers/HomeController.cs index 8dcd1bab..e5c03da0 100755 --- a/src/sampleWebAsWebApiClient/Controllers/HomeController.cs +++ b/src/sampleWebAsWebApiClient/Controllers/HomeController.cs @@ -57,7 +57,7 @@ namespace testOauthClient.Controllers var client = new HttpClient(new HttpClientHandler(){ AllowAutoRedirect=false }); client.DefaultRequestHeaders.Add("Accept", "application/json"); client.SetBearerToken(accessToken); - var content = await client.GetAsync("https://localhost:5001/api/account/me"); + var content = await client.GetAsync("https://localhost:6001/api/account/me"); content.EnsureSuccessStatusCode(); var json = await content.Content.ReadAsStreamAsync(); var obj = JsonSerializer.Deserialize(json); diff --git a/src/sampleWebAsWebApiClient/Properties/launchSettings.json b/src/sampleWebAsWebApiClient/Properties/launchSettings.json index e12a4be3..ce15bf7d 100644 --- a/src/sampleWebAsWebApiClient/Properties/launchSettings.json +++ b/src/sampleWebAsWebApiClient/Properties/launchSettings.json @@ -4,25 +4,17 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:5002", + "applicationUrl": "https://localhost:5003", "sslPort": 5003 } }, "profiles": { - "http": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "applicationUrl": "http://localhost:5002", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, + "https": { "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, - "applicationUrl": "https://localhost:5003;http://localhost:5002", + "applicationUrl": "https://localhost:5003;", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/sampleWebAsWebApiClient/Startup.cs b/src/sampleWebAsWebApiClient/Startup.cs index 161e5a20..9abcab39 100644 --- a/src/sampleWebAsWebApiClient/Startup.cs +++ b/src/sampleWebAsWebApiClient/Startup.cs @@ -10,43 +10,43 @@ public class Startup { public void ConfigureServices(IServiceCollection services) { + services.AddControllersWithViews(); - - JwtSecurityTokenHandler.DefaultMapInboundClaims = false; - - services.AddAuthentication(options => - { - options.DefaultScheme = "Cookies"; - options.DefaultChallengeScheme = "Yavsc"; - }) - .AddCookie("Cookies") - .AddOpenIdConnect("Yavsc", options => - { - options.Authority = "https://localhost:5001"; - options.ClientId = "mvc"; - options.ClientSecret = "49C1A7E1-0C79-4A89-A3D6-A37998FB86B0"; - options.ResponseType = "code"; - options.UsePkce = true; - options.Scope.Clear(); - options.Scope.Add("openid"); - options.Scope.Add("profile"); - options.Scope.Add("email"); - options.Scope.Add("offline_access"); - options.Scope.Add("scope2"); - - options.GetClaimsFromUserInfoEndpoint = true; - options.SaveTokens = true; - options.ClaimActions.MapUniqueJsonKey("http://schemas.microsoft.com/ws/2008/06/identity/claims/role", "http://schemas.microsoft.com/ws/2008/06/identity/claims/role"); - - options.ClaimActions.MapUniqueJsonKey("role", "http://schemas.microsoft.com/ws/2008/06/identity/claims/role"); - options.ClaimActions.MapUniqueJsonKey("roles", "http://schemas.microsoft.com/ws/2008/06/identity/claims/role"); - options.TokenValidationParameters = new TokenValidationParameters + services + .AddAuthentication(options => { - NameClaimType = "name", - RoleClaimType = "http://schemas.microsoft.com/ws/2008/06/identity/claims/role" - }; + 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( + "http://schemas.microsoft.com/ws/2008/06/identity/claims/role", + "http://schemas.microsoft.com/ws/2008/06/identity/claims/role"); + options.ClaimActions.MapUniqueJsonKey("role", + "http://schemas.microsoft.com/ws/2008/06/identity/claims/role"); + options.ClaimActions.MapUniqueJsonKey("roles", + "http://schemas.microsoft.com/ws/2008/06/identity/claims/role"); + options.TokenValidationParameters = new TokenValidationParameters + { + NameClaimType = "name", + RoleClaimType = "http://schemas.microsoft.com/ws/2008/06/identity/claims/role" + }; + }); - }); } public void Configure(IApplicationBuilder app, IWebHostEnvironment env) diff --git a/src/sampleWebAsWebApiClient/appsettings.json b/src/sampleWebAsWebApiClient/appsettings.json index 0abe7ebb..405c9bc0 100755 --- a/src/sampleWebAsWebApiClient/appsettings.json +++ b/src/sampleWebAsWebApiClient/appsettings.json @@ -9,9 +9,6 @@ "Kestrel": { "Endpoints": { - "Http": { - "Url": "http://localhost:5002" - }, "Https": { "Url": "https://localhost:5003" } diff --git a/src/sampleWebAsWebApiClient/sampleWebAsWebApiClient.csproj b/src/sampleWebAsWebApiClient/sampleWebAsWebApiClient.csproj index 54e29a22..439bb179 100644 --- a/src/sampleWebAsWebApiClient/sampleWebAsWebApiClient.csproj +++ b/src/sampleWebAsWebApiClient/sampleWebAsWebApiClient.csproj @@ -2,7 +2,7 @@ - + diff --git a/test/yavscTests/Mandatory/Remoting.cs b/test/yavscTests/Mandatory/Remoting.cs index e4e44d0b..1bbb9434 100644 --- a/test/yavscTests/Mandatory/Remoting.cs +++ b/test/yavscTests/Mandatory/Remoting.cs @@ -78,26 +78,6 @@ namespace yavscTests throw; } } - - public static IEnumerable GetLoginIntentData(int numTests) - { - - var allData = new List(); - - - allData.Add(new object[] { "blouh", "profile", - "http://localhost:5000/authorize", "http://localhost:5000/oauth/success", - "http://localhost:5000/token", "http://localhost:5000/authorize"}); - - - - allData.Add(new object[] { "blouh", "profile", - "http://localhost:5000/authorize", "http://localhost:5000/oauth/success", - "http://localhost:5000/token", "http://localhost:5000/authorize"}); - - return allData.Take(numTests);; - - } } }