Skip to content

Commit e8816d2

Browse files
ITHitBuildITHitBuild
committed
v11.2.10474
1 parent e15a266 commit e8816d2

File tree

105 files changed

+561
-398
lines changed

Some content is hidden

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

105 files changed

+561
-398
lines changed

‎CS/CalDAVServer.FileSystemStorage.AspNetCore/BasicAuthMiddleware.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public async Task Invoke(HttpContext context)
4242
if(IsAuthorizationPresent(context.Request))
4343
{
4444
ClaimsPrincipal userPrincipal = AuthenticateRequest(context.Request);
45-
if (userPrincipal.Identity != null)
45+
if (userPrincipal.Identity != null && !string.IsNullOrEmpty(userPrincipal.Identity.Name))
4646
{
4747
// Authenticated succesfully.
4848
context.User = userPrincipal;

‎CS/CalDAVServer.FileSystemStorage.AspNetCore/CalDAVServer.FileSystemStorage.AspNetCore.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
4-
<VersionPrefix>11.2.10451</VersionPrefix>
4+
<VersionPrefix>11.2.10474</VersionPrefix>
55
<AssemblyName>CalDAVServer.FileSystemStorage.AspNetCore</AssemblyName>
66
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<LangVersion>8.0</LangVersion>
@@ -19,10 +19,10 @@
1919
</Content>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<PackageReference Include="ITHit.Server" Version="11.2.10451" />
23-
<PackageReference Include="ITHit.Server.Core" Version="11.2.10451" />
24-
<PackageReference Include="ITHit.WebDAV.Server" Version="11.2.10451" />
25-
<PackageReference Include="ITHit.GSuite.Server" Version="11.2.10451" />
22+
<PackageReference Include="ITHit.Server" Version="11.2.10474" />
23+
<PackageReference Include="ITHit.Server.Core" Version="11.2.10474" />
24+
<PackageReference Include="ITHit.WebDAV.Server" Version="11.2.10474" />
25+
<PackageReference Include="ITHit.GSuite.Server" Version="11.2.10474" />
2626
<PackageReference Include="System.Data.OleDb" Version="4.7.0" />
2727
</ItemGroup>
2828
<ItemGroup>

‎CS/CalDAVServer.FileSystemStorage.AspNetCore/Config/GSuiteEngineConfig.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,10 @@ public class GSuiteEngineConfig : DavEngineConfig
1616
/// </summary>
1717
public string GoogleServicePrivateKey { get; set; }
1818

19+
/// <summary>
20+
/// Relative Url of "Webhook" callback. It handles the API notification messages that are triggered when a resource changes.
21+
/// </summary>
22+
public string GoogleNotificationsRelativeUrl { get; set; }
23+
1924
}
2025
}

‎CS/CalDAVServer.FileSystemStorage.AspNetCore/GSuiteEngineCore.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public class GSuiteEngineCore : GSuiteEngineAsync
2525
/// <param name="gSuiteConf">GSuite Engine configuration.</param>
2626
/// <param name="logger">Logger instance.</param>
2727
public GSuiteEngineCore(IOptions<GSuiteEngineConfig> gSuiteConf,
28-
ILogger logger) : base(gSuiteConf.Value.GoogleServiceAccountID, gSuiteConf.Value.GoogleServicePrivateKey)
28+
ILogger logger) : base(gSuiteConf.Value.GoogleServiceAccountID, gSuiteConf.Value.GoogleServicePrivateKey,
29+
gSuiteConf.Value.GoogleNotificationsRelativeUrl)
2930
{
3031
GSuiteEngineConfig config = gSuiteConf.Value;
3132

‎CS/CalDAVServer.FileSystemStorage.AspNetCore/appsettings.webdav.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535
"GoogleServiceAccountID": "",
3636

3737
// Google Service private key (private_key field from JSON file).
38-
"GoogleServicePrivateKey": ""
38+
"GoogleServicePrivateKey": "",
39+
40+
// Relative Url of "Webhook" callback. It handles the API notification messages that are triggered when a resource changes.
41+
"GoogleNotificationsRelativeUrl": "/GNotifications"
3942
},
4043

4144
// WebDAV and G Suite Context configuration.

‎CS/CalDAVServer.SqlStorage.AspNetCore/BasicAuthMiddleware.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public async Task Invoke(HttpContext context)
4242
if(IsAuthorizationPresent(context.Request))
4343
{
4444
ClaimsPrincipal userPrincipal = AuthenticateRequest(context.Request);
45-
if (userPrincipal.Identity != null)
45+
if (userPrincipal.Identity != null && !string.IsNullOrEmpty(userPrincipal.Identity.Name))
4646
{
4747
// Authenticated succesfully.
4848
context.User = userPrincipal;

‎CS/CalDAVServer.SqlStorage.AspNetCore/CalDAVServer.SqlStorage.AspNetCore.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
<Project Sdk="Microsoft.NET.Sdk.Web">
33
<PropertyGroup>
4-
<VersionPrefix>11.2.10451</VersionPrefix>
4+
<VersionPrefix>11.2.10474</VersionPrefix>
55
<AssemblyName>CalDAVServer.SqlStorage.AspNetCore</AssemblyName>
66
<TargetFramework>netcoreapp3.1</TargetFramework>
77
<LangVersion>8.0</LangVersion>
@@ -22,10 +22,10 @@
2222
</Content>
2323
</ItemGroup>
2424
<ItemGroup>
25-
<PackageReference Include="ITHit.Server" Version="11.2.10451" />
26-
<PackageReference Include="ITHit.Server.Core" Version="11.2.10451" />
27-
<PackageReference Include="ITHit.WebDAV.Server" Version="11.2.10451" />
28-
<PackageReference Include="ITHit.GSuite.Server" Version="11.2.10451" />
25+
<PackageReference Include="ITHit.Server" Version="11.2.10474" />
26+
<PackageReference Include="ITHit.Server.Core" Version="11.2.10474" />
27+
<PackageReference Include="ITHit.WebDAV.Server" Version="11.2.10474" />
28+
<PackageReference Include="ITHit.GSuite.Server" Version="11.2.10474" />
2929
<PackageReference Include="System.Data.SqlClient" Version="4.8.1" />
3030
</ItemGroup>
3131
<ItemGroup>

‎CS/CalDAVServer.SqlStorage.AspNetCore/Config/GSuiteEngineConfig.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,10 @@ public class GSuiteEngineConfig : DavEngineConfig
1616
/// </summary>
1717
public string GoogleServicePrivateKey { get; set; }
1818

19+
/// <summary>
20+
/// Relative Url of "Webhook" callback. It handles the API notification messages that are triggered when a resource changes.
21+
/// </summary>
22+
public string GoogleNotificationsRelativeUrl { get; set; }
23+
1924
}
2025
}

‎CS/CalDAVServer.SqlStorage.AspNetCore/GSuiteEngineCore.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public class GSuiteEngineCore : GSuiteEngineAsync
2525
/// <param name="gSuiteConf">GSuite Engine configuration.</param>
2626
/// <param name="logger">Logger instance.</param>
2727
public GSuiteEngineCore(IOptions<GSuiteEngineConfig> gSuiteConf,
28-
ILogger logger) : base(gSuiteConf.Value.GoogleServiceAccountID, gSuiteConf.Value.GoogleServicePrivateKey)
28+
ILogger logger) : base(gSuiteConf.Value.GoogleServiceAccountID, gSuiteConf.Value.GoogleServicePrivateKey,
29+
gSuiteConf.Value.GoogleNotificationsRelativeUrl)
2930
{
3031
GSuiteEngineConfig config = gSuiteConf.Value;
3132

‎CS/CalDAVServer.SqlStorage.AspNetCore/appsettings.webdav.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@
3535
"GoogleServiceAccountID": "",
3636

3737
// Google Service private key (private_key field from JSON file).
38-
"GoogleServicePrivateKey": ""
38+
"GoogleServicePrivateKey": "",
39+
40+
// Relative Url of "Webhook" callback. It handles the API notification messages that are triggered when a resource changes.
41+
"GoogleNotificationsRelativeUrl": "/GNotifications"
3942
},
4043

4144
// WebDAV and G Suite Context configuration.

0 commit comments

Comments
 (0)