Skip to content
This repository was archived by the owner on Nov 23, 2024. It is now read-only.

Commit dbbf9af

Browse files
committed
Fix membership verification API
1 parent 9d81300 commit dbbf9af

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/Web/Web/Controllers/ApiController.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ orderby b.Year ascending
6565
IssuedOn = b.IssueTimestamp
6666
}
6767
);
68+
6869
return Json(new {
6970
user.Id,
7071
user.Name,
7172
user.Surname,
7273
user.Birthday,
7374
PrimaryMail = emails[0],
7475
RegisteredOn = user.RegistrationTimestamp,
75-
IsMember = memberships.ContainsKey(DateTime.UtcNow.Year),
76-
Memberships = memberships
76+
IsMember = memberships.ContainsKey(DateTime.UtcNow.Year)
7777
});
7878
}
7979

src/Web/Web/Startup.cs

+6-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
using Microsoft.AspNetCore.Hosting;
88
using Microsoft.AspNetCore.Http;
99
using Microsoft.AspNetCore.Localization;
10-
using Microsoft.AspNetCore.Mvc;
1110
using Microsoft.EntityFrameworkCore;
1211
using Microsoft.Extensions.Configuration;
1312
using Microsoft.Extensions.DependencyInjection;
1413
using Microsoft.Extensions.FileProviders;
14+
using Microsoft.Extensions.Hosting;
1515
using Microsoft.Net.Http.Headers;
1616

1717
using SameSiteMode = Microsoft.AspNetCore.Http.SameSiteMode;
@@ -92,6 +92,8 @@ public void ConfigureServices(IServiceCollection services) {
9292
opts.AddPolicy(CorsPolicyCodeMooc, builder => {
9393
builder.WithOrigins("https://*.codemooc.net")
9494
.SetIsOriginAllowedToAllowWildcardSubdomains()
95+
.AllowAnyMethod()
96+
.AllowCredentials()
9597
.WithHeaders(HeaderNames.Authorization);
9698
});
9799
});
@@ -115,7 +117,7 @@ public void ConfigureServices(IServiceCollection services) {
115117
});
116118
}
117119

118-
public void Configure(IApplicationBuilder app, IHostingEnvironment env) {
120+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env) {
119121
if (env.IsDevelopment()) {
120122
app.UseDeveloperExceptionPage();
121123
}
@@ -155,9 +157,10 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) {
155157
RequestPath = "/uploads/profiles"
156158
});
157159

160+
app.UseCors(CorsPolicyCodeMooc);
161+
158162
app.UseAuthentication();
159163
app.UseAuthorization();
160-
app.UseCors(CorsPolicyCodeMooc);
161164

162165
app.UseEndpoints(conf => {
163166
conf.MapControllers();

0 commit comments

Comments
 (0)