Skip to content

Commit

Permalink
Merge pull request #2 from EpicOfficer/FEATURE/Wordle
Browse files Browse the repository at this point in the history
Feature/wordle Start setting up discord auth in Vite
  • Loading branch information
EpicOfficer authored Apr 2, 2024
2 parents aa1a43d + d5da19b commit f40b194
Show file tree
Hide file tree
Showing 36 changed files with 332 additions and 160 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
image: ghcr.io/epicofficer/blink3.web
- dockerfile: ./Blink3.Activity/Dockerfile
image: ghcr.io/epicofficer/blink3.activity

permissions:
contents: read
packages: write
Expand Down
25 changes: 25 additions & 0 deletions .run/Blink3 Backend.run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Blink3 Backend" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="envFilePath" value="" />
<option name="secondarySourceFiles">
<list>
<option value="docker-compose.development.yml" />
</list>
</option>
<option name="services">
<list>
<option value="blink3.api" />
<option value="blink3.bot" />
<option value="blink3.cache" />
<option value="blink3.db" />
</list>
</option>
<option name="sourceFilePath" value="docker-compose.yml" />
</settings>
</deployment>
<EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
<method v="2" />
</configuration>
</component>
26 changes: 0 additions & 26 deletions .run/Compose.run.xml

This file was deleted.

5 changes: 1 addition & 4 deletions Blink3.API/Extensions/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ public static class ServiceCollectionExtensions
/// </summary>
/// <param name="services">The service collection.</param>
/// <param name="appConfig">The application configuration.</param>
/// <returns>The modified service collection.</returns>
public static IServiceCollection AddDiscordAuth(this IServiceCollection services, BlinkConfiguration appConfig)
public static void AddDiscordAuth(this IServiceCollection services, BlinkConfiguration appConfig)
{
services.AddAuthentication(options =>
{
Expand All @@ -33,8 +32,6 @@ public static IServiceCollection AddDiscordAuth(this IServiceCollection services
.AddCookie()
.AddOAuth(DiscordAuthenticationDefaults.AuthenticationScheme,
options => ConfigureOAuthOptions(options, appConfig));

return services;
}

/// <summary>
Expand Down
Loading

0 comments on commit f40b194

Please sign in to comment.