|
30 | 30 | builder.Services |
31 | 31 | .AddOpenShockMemDB(redisOptions) |
32 | 32 | .AddOpenShockDB(databaseOptions) |
33 | | - .AddOpenShockServices(auth => auth |
34 | | - .AddCookie(OAuthConstants.FlowScheme, o => |
35 | | - { |
| 33 | + .AddOpenShockServices(auth => |
| 34 | + { |
| 35 | + auth.AddCookie(OAuthConstants.FlowScheme, o => { |
36 | 36 | o.Cookie.Name = OAuthConstants.FlowCookieName; |
37 | 37 | o.ExpireTimeSpan = TimeSpan.FromMinutes(10); |
38 | 38 | o.SlidingExpiration = false; |
39 | | - }) |
40 | | - .AddDiscord(OAuthConstants.DiscordScheme, o => |
| 39 | + }); |
| 40 | + |
| 41 | + var options = builder.Configuration.GetSection(DiscordOAuthOptions.SectionName).Get<DiscordOAuthOptions>(); |
| 42 | + if (options is not null) |
41 | 43 | { |
42 | | - o.SignInScheme = OAuthConstants.FlowScheme; |
| 44 | + auth.AddDiscord(OAuthConstants.DiscordScheme, o => { |
| 45 | + o.SignInScheme = OAuthConstants.FlowScheme; |
43 | 46 |
|
44 | | - var options = builder.Configuration.GetRequiredSection(DiscordOAuthOptions.SectionName).Get<DiscordOAuthOptions>()!; |
| 47 | + |
45 | 48 |
|
46 | | - o.ClientId = options.ClientId; |
47 | | - o.ClientSecret = options.ClientSecret; |
48 | | - o.CallbackPath = options.CallbackPath; |
49 | | - o.AccessDeniedPath = options.AccessDeniedPath; |
50 | | - foreach (var scope in options.Scopes) o.Scope.Add(scope); |
| 49 | + o.ClientId = options.ClientId; |
| 50 | + o.ClientSecret = options.ClientSecret; |
| 51 | + o.CallbackPath = options.CallbackPath; |
| 52 | + o.AccessDeniedPath = options.AccessDeniedPath; |
| 53 | + foreach (var scope in options.Scopes) o.Scope.Add(scope); |
51 | 54 |
|
52 | | - o.Prompt = "none"; |
53 | | - o.SaveTokens = false; |
| 55 | + o.Prompt = "none"; |
| 56 | + o.SaveTokens = false; |
54 | 57 |
|
55 | | - o.ClaimActions.MapJsonKey(OAuthConstants.ClaimEmailVerified, "verified"); |
56 | | - o.ClaimActions.MapJsonKey(OAuthConstants.ClaimDisplayName, "global_name"); |
| 58 | + o.ClaimActions.MapJsonKey(OAuthConstants.ClaimEmailVerified, "verified"); |
| 59 | + o.ClaimActions.MapJsonKey(OAuthConstants.ClaimDisplayName, "global_name"); |
57 | 60 |
|
58 | | - o.Validate(); |
59 | | - }) |
60 | | - ) |
| 61 | + o.Validate(); |
| 62 | + }); |
| 63 | + } |
| 64 | + }) |
61 | 65 | .AddOpenShockSignalR(redisOptions); |
62 | 66 |
|
63 | 67 | builder.Services.AddScoped<IDeviceService, DeviceService>(); |
|
0 commit comments