Skip to content

Commit 96134b7

Browse files
nerocuinerocui
authored
Nero/update dependencies (#64)
* refreshed some dependencies * updated octokit version to latest
1 parent 01d7d88 commit 96134b7

File tree

129 files changed

+2941
-2731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+2941
-2731
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,5 +432,6 @@ $RECYCLE.BIN/
432432
!.vscode/launch.json
433433
!.vscode/extensions.json
434434
appsettings.json
435+
appsettings.development.json
435436
**/dist
436437
**/output

‎JitHub.Auth/GithubAuth.cs‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using Microsoft.Azure.Functions.Worker.Http;
33
using Microsoft.Extensions.Logging;
44
using Octokit;
5+
using System.Net;
56

67
namespace JitHub.Auth;
78

@@ -79,22 +80,49 @@ public string ProcessRequest(HttpRequestData req)
7980
}
8081

8182
[Function("GithubCodeToToken")]
82-
public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get")] HttpRequestData req)
83+
public async Task<HttpResponseData> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "options")] HttpRequestData req)
8384
{
85+
// Handle CORS preflight in dev
86+
#if DEBUG
87+
if (string.Equals(req.Method, "OPTIONS", StringComparison.OrdinalIgnoreCase))
88+
{
89+
var preflight = req.CreateResponse(HttpStatusCode.NoContent);
90+
AddDevCorsHeaders(preflight, req);
91+
return preflight;
92+
}
93+
#endif
94+
8495
try
8596
{
8697
string code = ProcessRequest(req);
8798
var token = await Detokenize(code);
88-
var response = req.CreateResponse(System.Net.HttpStatusCode.OK);
99+
var response = req.CreateResponse(HttpStatusCode.OK);
89100
await response.WriteStringAsync(token.AccessToken);
101+
#if DEBUG
102+
AddDevCorsHeaders(response, req);
103+
#endif
90104
return response;
91105
}
92-
93106
catch (Exception ex)
94107
{
95-
var response = req.CreateResponse(System.Net.HttpStatusCode.BadRequest);
108+
var response = req.CreateResponse(HttpStatusCode.BadRequest);
96109
await response.WriteAsJsonAsync(new ErrorMessage { Message = ex.Message});
110+
#if DEBUG
111+
AddDevCorsHeaders(response, req);
112+
#endif
97113
return response;
98114
}
99115
}
116+
117+
#if DEBUG
118+
private static void AddDevCorsHeaders(HttpResponseData response, HttpRequestData req)
119+
{
120+
var origin = req.Headers.TryGetValues("Origin", out var values) ? values.FirstOrDefault() : "*";
121+
response.Headers.Add("Access-Control-Allow-Origin", string.IsNullOrEmpty(origin) || origin == "null" ? "*" : origin);
122+
response.Headers.Add("Vary", "Origin");
123+
response.Headers.Add("Access-Control-Allow-Methods", "GET, OPTIONS");
124+
response.Headers.Add("Access-Control-Allow-Headers", "*, Authorization, Content-Type");
125+
response.Headers.Add("Access-Control-Max-Age", "86400");
126+
}
127+
#endif
100128
}

‎JitHub.Auth/JitHub.Auth.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
1212
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.10.0" />
1313
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
14-
<PackageReference Include="Octokit" Version="5.1.0" />
14+
<PackageReference Include="Octokit" Version="14.0.0" />
1515
<PackageReference Include="ThrottlingTroll.AzureFunctions" Version="2.0.1" />
1616
</ItemGroup>
1717
<ItemGroup>

‎JitHub.Auth/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
}
3131
};
3232
});
33+
34+
// CORS is handled in individual functions in Debug mode
3335
})
3436
.Build();
3537

‎JitHub.Controls.Editor/JitHub.Controls.Editor.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>JitHub.Controls.Editor</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22000.0</TargetPlatformVersion>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>

‎JitHub.Web/Pages/Authorize.razor‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@
6767
{
6868
try
6969
{
70-
string code = ProcessRequest();
70+
string? code = ProcessRequest();
7171

7272
if (String.IsNullOrWhiteSpace(code))
7373
{
7474
OnAuthFail();
7575
return;
7676
}
7777

78-
await ExchangeToken(code);
78+
await ExchangeToken(code!);
7979
RedirectJitHub();
8080
}
8181
catch
@@ -102,7 +102,10 @@
102102
{
103103
try
104104
{
105-
var response = await Http.GetAsync($"/api/GithubCodeToToken?tempCode={code}");
105+
// Use relative URL so HttpClient.BaseAddress determines the host/port.
106+
// BaseAddress is configured in Program.cs from appsettings (API_Prefix) in Development,
107+
// and falls back to same-origin in other environments.
108+
var response = await Http.GetAsync($"api/GithubCodeToToken?tempCode={Uri.EscapeDataString(code)}");
106109

107110
if (response.IsSuccessStatusCode)
108111
{
@@ -129,7 +132,7 @@
129132
}
130133
}
131134

132-
private string ProcessRequest()
135+
private string? ProcessRequest()
133136
{
134137
try
135138
{

‎JitHub.sln‎

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ VisualStudioVersion = 17.2.32630.192
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JitHub", "JitHub\JitHub.csproj", "{452E051F-938D-4F26-9D54-4598A97F8BEF}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JitHub.Controls.Editor", "JitHub.Controls.Editor\JitHub.Controls.Editor.csproj", "{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markdig.UWP", "Markdig.UWP\Markdig.UWP.csproj", "{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}"
11-
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markdig.Client.Markdig", "Markdig.Client.Markdig\Markdig.Client.Markdig.csproj", "{6C59FA04-F6B7-440C-9E25-0F336783E2E8}"
13-
EndProject
148
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Json.Viewer", "System.Text.Json.Viewer\System.Text.Json.Viewer.csproj", "{77FEF6A4-49A6-46D9-9144-97D876B4130C}"
159
EndProject
1610
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JitHub.Services.GitHub.Contributions", "JitHub.Services.GitHub.Contributions\JitHub.Services.GitHub.Contributions.csproj", "{F178EB94-CB1E-4F0A-9C61-82FD5C1B6624}"
@@ -19,8 +13,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utilities.Common", "Utiliti
1913
EndProject
2014
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JitHub.Utilities.SVG", "JitHub.Utilities.SVG\JitHub.Utilities.SVG.csproj", "{ACE52FF0-0A75-4B14-8D0F-464C9B09B85F}"
2115
EndProject
22-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JitHub.WebView", "JitHub.WebView\JitHub.WebView.csproj", "{3BED258E-DF3F-4BD8-982A-5AD2C941C897}"
23-
EndProject
2416
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JitHub.Web", "JitHub.Web\JitHub.Web.csproj", "{64B790F5-C60E-46BB-BCC6-79ABADEC979F}"
2517
EndProject
2618
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JitHub.Auth", "JitHub.Auth\JitHub.Auth.csproj", "{2E4915B9-5BD3-4A50-87EF-068E37140213}"
@@ -65,76 +57,6 @@ Global
6557
{452E051F-938D-4F26-9D54-4598A97F8BEF}.Release|x86.ActiveCfg = Release|x86
6658
{452E051F-938D-4F26-9D54-4598A97F8BEF}.Release|x86.Build.0 = Release|x86
6759
{452E051F-938D-4F26-9D54-4598A97F8BEF}.Release|x86.Deploy.0 = Release|x86
68-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
69-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
70-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Debug|ARM.ActiveCfg = Debug|ARM
71-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Debug|ARM.Build.0 = Debug|ARM
72-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Debug|ARM64.ActiveCfg = Debug|ARM64
73-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Debug|ARM64.Build.0 = Debug|ARM64
74-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Debug|x64.ActiveCfg = Debug|x64
75-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Debug|x64.Build.0 = Debug|x64
76-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Debug|x86.ActiveCfg = Debug|x86
77-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Debug|x86.Build.0 = Debug|x86
78-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
79-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Release|Any CPU.Build.0 = Release|Any CPU
80-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Release|ARM.ActiveCfg = Release|ARM
81-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Release|ARM.Build.0 = Release|ARM
82-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Release|ARM64.ActiveCfg = Release|ARM64
83-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Release|ARM64.Build.0 = Release|ARM64
84-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Release|x64.ActiveCfg = Release|x64
85-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Release|x64.Build.0 = Release|x64
86-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Release|x86.ActiveCfg = Release|x86
87-
{A0DEDBBB-E297-45F8-9D99-85EF175CB7F0}.Release|x86.Build.0 = Release|x86
88-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
89-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Debug|Any CPU.Build.0 = Debug|Any CPU
90-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Debug|ARM.ActiveCfg = Debug|ARM
91-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Debug|ARM.Build.0 = Debug|ARM
92-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Debug|ARM64.ActiveCfg = Debug|ARM64
93-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Debug|ARM64.Build.0 = Debug|ARM64
94-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Debug|x64.ActiveCfg = Debug|x64
95-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Debug|x64.Build.0 = Debug|x64
96-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Debug|x86.ActiveCfg = Debug|x86
97-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Debug|x86.Build.0 = Debug|x86
98-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Release|Any CPU.ActiveCfg = Release|Any CPU
99-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Release|Any CPU.Build.0 = Release|Any CPU
100-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Release|ARM.ActiveCfg = Release|ARM
101-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Release|ARM.Build.0 = Release|ARM
102-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Release|ARM64.ActiveCfg = Release|ARM64
103-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Release|ARM64.Build.0 = Release|ARM64
104-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Release|x64.ActiveCfg = Release|x64
105-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Release|x64.Build.0 = Release|x64
106-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Release|x86.ActiveCfg = Release|x86
107-
{76BB207B-5175-4E9C-AF8C-ADD0EA67AD18}.Release|x86.Build.0 = Release|x86
108-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|Any CPU.ActiveCfg = Debug|x64
109-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|Any CPU.Build.0 = Debug|x64
110-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|Any CPU.Deploy.0 = Debug|x64
111-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|ARM.ActiveCfg = Debug|ARM
112-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|ARM.Build.0 = Debug|ARM
113-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|ARM.Deploy.0 = Debug|ARM
114-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|ARM64.ActiveCfg = Debug|ARM64
115-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|ARM64.Build.0 = Debug|ARM64
116-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|ARM64.Deploy.0 = Debug|ARM64
117-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|x64.ActiveCfg = Debug|x64
118-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|x64.Build.0 = Debug|x64
119-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|x64.Deploy.0 = Debug|x64
120-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|x86.ActiveCfg = Debug|x86
121-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|x86.Build.0 = Debug|x86
122-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Debug|x86.Deploy.0 = Debug|x86
123-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|Any CPU.ActiveCfg = Release|x64
124-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|Any CPU.Build.0 = Release|x64
125-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|Any CPU.Deploy.0 = Release|x64
126-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|ARM.ActiveCfg = Release|ARM
127-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|ARM.Build.0 = Release|ARM
128-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|ARM.Deploy.0 = Release|ARM
129-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|ARM64.ActiveCfg = Release|ARM64
130-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|ARM64.Build.0 = Release|ARM64
131-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|ARM64.Deploy.0 = Release|ARM64
132-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|x64.ActiveCfg = Release|x64
133-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|x64.Build.0 = Release|x64
134-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|x64.Deploy.0 = Release|x64
135-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|x86.ActiveCfg = Release|x86
136-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|x86.Build.0 = Release|x86
137-
{6C59FA04-F6B7-440C-9E25-0F336783E2E8}.Release|x86.Deploy.0 = Release|x86
13860
{77FEF6A4-49A6-46D9-9144-97D876B4130C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13961
{77FEF6A4-49A6-46D9-9144-97D876B4130C}.Debug|Any CPU.Build.0 = Debug|Any CPU
14062
{77FEF6A4-49A6-46D9-9144-97D876B4130C}.Debug|ARM.ActiveCfg = Debug|ARM
@@ -215,26 +137,6 @@ Global
215137
{ACE52FF0-0A75-4B14-8D0F-464C9B09B85F}.Release|x64.Build.0 = Release|x64
216138
{ACE52FF0-0A75-4B14-8D0F-464C9B09B85F}.Release|x86.ActiveCfg = Release|x86
217139
{ACE52FF0-0A75-4B14-8D0F-464C9B09B85F}.Release|x86.Build.0 = Release|x86
218-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
219-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Debug|Any CPU.Build.0 = Debug|Any CPU
220-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Debug|ARM.ActiveCfg = Debug|ARM
221-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Debug|ARM.Build.0 = Debug|ARM
222-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Debug|ARM64.ActiveCfg = Debug|ARM64
223-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Debug|ARM64.Build.0 = Debug|ARM64
224-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Debug|x64.ActiveCfg = Debug|x64
225-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Debug|x64.Build.0 = Debug|x64
226-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Debug|x86.ActiveCfg = Debug|x86
227-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Debug|x86.Build.0 = Debug|x86
228-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Release|Any CPU.ActiveCfg = Release|Any CPU
229-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Release|Any CPU.Build.0 = Release|Any CPU
230-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Release|ARM.ActiveCfg = Release|ARM
231-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Release|ARM.Build.0 = Release|ARM
232-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Release|ARM64.ActiveCfg = Release|ARM64
233-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Release|ARM64.Build.0 = Release|ARM64
234-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Release|x64.ActiveCfg = Release|x64
235-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Release|x64.Build.0 = Release|x64
236-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Release|x86.ActiveCfg = Release|x86
237-
{3BED258E-DF3F-4BD8-982A-5AD2C941C897}.Release|x86.Build.0 = Release|x86
238140
{64B790F5-C60E-46BB-BCC6-79ABADEC979F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
239141
{64B790F5-C60E-46BB-BCC6-79ABADEC979F}.Debug|Any CPU.Build.0 = Debug|Any CPU
240142
{64B790F5-C60E-46BB-BCC6-79ABADEC979F}.Debug|ARM.ActiveCfg = Debug|Any CPU

0 commit comments

Comments
 (0)