diff --git a/src/Bulwark.Auth/Bulwark.Auth.csproj b/src/Bulwark.Auth/Bulwark.Auth.csproj index acb6fbd..fe24281 100644 --- a/src/Bulwark.Auth/Bulwark.Auth.csproj +++ b/src/Bulwark.Auth/Bulwark.Auth.csproj @@ -5,6 +5,7 @@ true Linux 1.0.0-beta.1 + Bulwark Auth A simple JWT authtication system lateflip.io @@ -41,6 +42,14 @@ + + + Always + + + + Always + @@ -55,19 +64,16 @@ - - Always - - - Always - - - Always - Always + + + + Always + + diff --git a/src/Bulwark.Auth/Program.cs b/src/Bulwark.Auth/Program.cs index 653bb6a..144adfc 100644 --- a/src/Bulwark.Auth/Program.cs +++ b/src/Bulwark.Auth/Program.cs @@ -15,7 +15,7 @@ using MongoDB.Driver; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -//trigger build: 1 +//trigger build: 2 //Inject var applicationBuilder = WebApplication.CreateBuilder(args); DotEnv.Load(options: new DotEnvOptions(overwriteExistingVars: false)); @@ -92,16 +92,14 @@ //social startup var socialValidators = new ValidatorStrategies(); -if (Environment.GetEnvironmentVariable(Environment - .GetEnvironmentVariable("GOOGLE_CLIENT_ID")) != null) +if (Environment.GetEnvironmentVariable("GOOGLE_CLIENT_ID") != null) { var googleValidator = new GoogleValidator(Environment .GetEnvironmentVariable("GOOGLE_CLIENT_ID")); socialValidators.Add(googleValidator); } -if (Environment.GetEnvironmentVariable(Environment - .GetEnvironmentVariable("MICROSOFT_CLIENT_ID")) != null && +if (Environment.GetEnvironmentVariable("MICROSOFT_CLIENT_ID") != null && Environment.GetEnvironmentVariable("MICROSOFT_TENANT_ID") != null) { var microSoftValidator = new MicrosoftValidator(Environment @@ -110,8 +108,7 @@ socialValidators.Add(microSoftValidator); } -if (Environment.GetEnvironmentVariable(Environment - .GetEnvironmentVariable("GITHUB_APP_NAME")) != null ) +if (Environment.GetEnvironmentVariable("GITHUB_APP_NAME") != null) { var gitHubValidator = new GithubValidator(Environment .GetEnvironmentVariable("GITHUB_APP_NAME")); diff --git a/src/Bulwark.Auth/Properties/launchSettings.json b/src/Bulwark.Auth/Properties/launchSettings.json index 2eda786..fd75060 100644 --- a/src/Bulwark.Auth/Properties/launchSettings.json +++ b/src/Bulwark.Auth/Properties/launchSettings.json @@ -4,8 +4,8 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:14631", - "sslPort": 44332 + "applicationUrl": "http://localhost:8080", + "sslPort": 443 } }, "profiles": { @@ -20,7 +20,7 @@ "Bulwark": { "commandName": "Project", "launchBrowser": true, - "applicationUrl": "http://localhost:7988", + "applicationUrl": "http://localhost:8080", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }