Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix social loading #19

Merged
merged 6 commits into from
Aug 14, 2023
Merged

Fix social loading #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c2ce06
fix: email template publish
ontehfritz Aug 9, 2023
63bced6
Merge pull request #18 from lateflip-io/fix-email-template
ontehfritz Aug 9, 2023
3716493
chore(release): 1.0.11-beta.2 [skip ci]
semantic-release-bot Aug 9, 2023
38f10c5
chore: change default launching port to 8080
ontehfritz Aug 14, 2023
1f0be4c
fix: loading social validators
ontehfritz Aug 14, 2023
a1b9ce9
Merge branch 'beta' into fix-social-loading
ontehfritz Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions src/Bulwark.Auth/Bulwark.Auth.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand All @@ -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>
11 changes: 4 additions & 7 deletions src/Bulwark.Auth/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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
Expand All @@ -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"));
Expand Down
6 changes: 3 additions & 3 deletions src/Bulwark.Auth/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:14631",
"sslPort": 44332
"applicationUrl": "http://localhost:8080",
"sslPort": 443
}
},
"profiles": {
Expand All @@ -20,7 +20,7 @@
"Bulwark": {
"commandName": "Project",
"launchBrowser": true,
"applicationUrl": "http://localhost:7988",
"applicationUrl": "http://localhost:8080",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
Expand Down
Loading