Merge pull request #19 from lateflip-io/fix-social-loading

Fix social loading
latebitflip-io · Aug 14, 2023 · 84d022d · 84d022d
2 parents 34a964f + a1b9ce9
commit 84d022d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/src/Bulwark.Auth/Bulwark.Auth.csproj b/src/Bulwark.Auth/Bulwark.Auth.csproj
@@ -5,6 +5,7 @@
  <PreserveCompilationContext>true</PreserveCompilationContext>
  <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
  <Version>1.0.0-beta.1</Version>
+
  <Title>Bulwark Auth</Title>
  <Description>A simple JWT authtication system </Description>
  <Copyright>lateflip.io</Copyright>
@@ -41,6 +42,14 @@
  <ItemGroup>
  <Folder Include="Templates\" />
  <Folder Include="Templates\Email\" />
+ <Content Remove="Templates\Email\MagicLink.cshtml" />
+ <AdditionalFiles Include="Templates\Email\MagicLink.cshtml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </AdditionalFiles>
+ <Content Remove="Templates\Email\VerifyAccount.cshtml" />
+ <AdditionalFiles Include="Templates\Email\VerifyAccount.cshtml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </AdditionalFiles>
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\Bulwark.Auth.Core\Bulwark.Auth.Core.csproj">
@@ -55,19 +64,16 @@
  </ItemGroup>
  <ItemGroup>
  <Content Remove="Models\**" />
- <Content Update="Templates\Email\Forgot.cshtml">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Update="Templates\Email\MagicLink.cshtml">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Update="Templates\Email\VerifyAccount.cshtml">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
  </ItemGroup>
  <ItemGroup>
  <None Update=".env">
  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  </None>
  </ItemGroup>
+ <ItemGroup>
+ <Content Remove="Templates\Email\Forgot.cshtml" />
+ <AdditionalFiles Include="Templates\Email\Forgot.cshtml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </AdditionalFiles>
+ </ItemGroup>
 </Project>
diff --git 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
@@ -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"
  }