Skip to content

Commit d11fc0b

Browse files
timokoesslertimokoessler
committed
v1.7.0
1 parent f578277 commit d11fc0b

File tree

18 files changed

+136
-60
lines changed

18 files changed

+136
-60
lines changed

‎Guard.CLI/Guard.CLI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
88
<ApplicationIcon>totp.ico</ApplicationIcon>
99
<Title>2FAGuard CLI</Title>
10-
<Version>1.6.3</Version>
10+
<Version>1.7.0</Version>
1111
<Authors>Timo Kössler and Open Source Contributors</Authors>
1212
<Copyright>$(Authors)</Copyright>
1313
<RepositoryType>git</RepositoryType>

‎Guard.CLI/packages.lock.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
"version": 1,
33
"dependencies": {
44
"net10.0-windows10.0.22621": {
5+
"Microsoft.NET.ILLink.Tasks": {
6+
"type": "Direct",
7+
"requested": "[10.0.1, )",
8+
"resolved": "10.0.1",
9+
"contentHash": "ISahzLHsHY7vrwqr2p1YWZ+gsxoBRtH7gWRDK8fDUst9pp2He0GiesaqEfeX0V8QMCJM3eNEHGGpnIcPjFo2NQ=="
10+
},
511
"Spectre.Console": {
612
"type": "Direct",
713
"requested": "[0.54.0, )",

‎Guard.Core/Guard.Core.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<DebugType>embedded</DebugType>
88
<Authors>Timo Kössler and Open Source Contributors</Authors>
99
<Title>Guard.Core</Title>
10-
<Version>1.6.3</Version>
10+
<Version>1.7.0</Version>
1111
<Copyright>$(Authors)</Copyright>
1212
<PackageProjectUrl>https://2faguard.app</PackageProjectUrl>
1313
<FileVersion>$(Version)</FileVersion>

‎Guard.Core/packages.lock.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
"resolved": "5.0.21",
2424
"contentHash": "ykJ7ffFl7P9YQKR/PLci6zupiLrsSCNkOTiw6OtzntH7d2kCYp5L1+3a/pksKgTEHcJBoPXFtg7VZSGVBseN9w=="
2525
},
26+
"Microsoft.NET.ILLink.Tasks": {
27+
"type": "Direct",
28+
"requested": "[10.0.1, )",
29+
"resolved": "10.0.1",
30+
"contentHash": "ISahzLHsHY7vrwqr2p1YWZ+gsxoBRtH7gWRDK8fDUst9pp2He0GiesaqEfeX0V8QMCJM3eNEHGGpnIcPjFo2NQ=="
31+
},
2632
"NSec.Cryptography": {
2733
"type": "Direct",
2834
"requested": "[25.4.0, )",
@@ -78,6 +84,13 @@
7884
"resolved": "1.0.20.1",
7985
"contentHash": "pkiceEqJDQFHjbga3k/oPfTVX9g+GKJZ1VrkuiLhaymt9YNw1Dr7cX9hNuZuNaWcr9WD0moW55k4pMwzQ7JaZQ=="
8086
}
87+
},
88+
"net10.0-windows10.0.22621/win-x64": {
89+
"libsodium": {
90+
"type": "Transitive",
91+
"resolved": "1.0.20.1",
92+
"contentHash": "pkiceEqJDQFHjbga3k/oPfTVX9g+GKJZ1VrkuiLhaymt9YNw1Dr7cX9hNuZuNaWcr9WD0moW55k4pMwzQ7JaZQ=="
93+
}
8194
}
8295
}
8396
}

‎Guard.Package/Guard.Package.wapproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
6767
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
6868
<EntryPointProjectUniqueName>..\Guard.WPF\Guard.WPF.csproj</EntryPointProjectUniqueName>
69-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
69+
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
7070
</PropertyGroup>
7171
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
7272
<DefaultLanguage>en</DefaultLanguage>
@@ -169,7 +169,7 @@
169169
</ItemGroup>
170170
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
171171
<ItemGroup>
172-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" PrivateAssets="all" />
172+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7463" PrivateAssets="all" />
173173
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
174174
</ItemGroup>
175175
<ItemGroup>

‎Guard.Package/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
Name="TimoKssler.2FAGuard"
1313
Publisher="CN=F9CCA312-A05F-45A0-B7A8-E28C9DA26188"
1414
ProcessorArchitecture="x64"
15-
Version="1.6.3.0" />
15+
Version="1.7.0.0" />
1616

1717
<Properties>
1818
<DisplayName>2FAGuard</DisplayName>

‎Guard.Package/packages.lock.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"UAP,Version=v10.0.18362": {
55
"Microsoft.Windows.SDK.BuildTools": {
66
"type": "Direct",
7-
"requested": "[10.0.26100.7175, )",
8-
"resolved": "10.0.26100.7175",
9-
"contentHash": "8Ln51aKMOhnjOAIehd2EGBOL2+ZIsT96OUd7YVA/+9fYiAbzFI/u6kJMYX+XtW1FUsMLGsF4Fba3cBXlCKHV+w=="
7+
"requested": "[10.0.26100.7463, )",
8+
"resolved": "10.0.26100.7463",
9+
"contentHash": "JQYm1B9VS6QDlonYJOglgp2GNl+w1LM2TfEzGOGHPY1UICcuFr20ljxaO1drwj21exbhA7pu23w1N2Tbg4mYvw=="
1010
},
1111
"System.Private.Uri": {
1212
"type": "Direct",
@@ -20,8 +20,8 @@
2020
},
2121
"Google.Protobuf": {
2222
"type": "Transitive",
23-
"resolved": "3.33.2",
24-
"contentHash": "vZXVbrZgBqUkP5iWQi0CS6pucIS2MQdEYPS1duWCo8fGrrt4th6HTiHfLFX2RmAWAQl1oUnzGgyDBsfq7fHQJA==",
23+
"resolved": "3.33.3",
24+
"contentHash": "ZkghmDjhnSS26gL1GbaMpl/8Uj/azE24xZunN36pGplYIj2xI6OBZUCe5LVoj18D2mcMJBBjUSjJMceyAPybNQ==",
2525
"dependencies": {
2626
"System.Memory": "4.5.3",
2727
"System.Runtime.CompilerServices.Unsafe": "4.5.2"
@@ -572,8 +572,8 @@
572572
"2FAGuard": {
573573
"type": "Project",
574574
"dependencies": {
575-
"Google.Protobuf": "[3.33.2, )",
576-
"Guard.Core": "[1.6.3, )",
575+
"Google.Protobuf": "[3.33.3, )",
576+
"Guard.Core": "[1.7.0, )",
577577
"Konscious.Security.Cryptography.Argon2": "[1.3.1, )",
578578
"Microsoft.Security.Extensions": "[1.4.0, )",
579579
"NSec.Cryptography": "[25.4.0, )",

‎Guard.Test/packages.lock.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
},
3838
"Google.Protobuf": {
3939
"type": "Transitive",
40-
"resolved": "3.33.2",
41-
"contentHash": "vZXVbrZgBqUkP5iWQi0CS6pucIS2MQdEYPS1duWCo8fGrrt4th6HTiHfLFX2RmAWAQl1oUnzGgyDBsfq7fHQJA=="
40+
"resolved": "3.33.3",
41+
"contentHash": "ZkghmDjhnSS26gL1GbaMpl/8Uj/azE24xZunN36pGplYIj2xI6OBZUCe5LVoj18D2mcMJBBjUSjJMceyAPybNQ=="
4242
},
4343
"GuerrillaNtp": {
4444
"type": "Transitive",
@@ -232,8 +232,8 @@
232232
"2FAGuard": {
233233
"type": "Project",
234234
"dependencies": {
235-
"Google.Protobuf": "[3.33.2, )",
236-
"Guard.Core": "[1.6.3, )",
235+
"Google.Protobuf": "[3.33.3, )",
236+
"Guard.Core": "[1.7.0, )",
237237
"Konscious.Security.Cryptography.Argon2": "[1.3.1, )",
238238
"Microsoft.Security.Extensions": "[1.4.0, )",
239239
"NSec.Cryptography": "[25.4.0, )",
@@ -261,4 +261,4 @@
261261
}
262262
}
263263
}
264-
}
264+
}

‎Guard.WPF/Assets/Icons/si.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎Guard.WPF/Core/TokenManager.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Guard.Core;
22
using Guard.Core.Models;
3+
using Guard.Core.Security;
34
using Guard.Core.Storage;
45

56
namespace Guard.WPF.Core
@@ -14,6 +15,10 @@ internal static async Task LoadDataInBackground()
1415
await bgLoadSemaphore.WaitAsync();
1516
await Task.Run(() =>
1617
{
18+
if (!Auth.IsLoggedIn())
19+
{
20+
return;
21+
}
1722
try
1823
{
1924
List<DBTOTPToken> dbTokens = Database.GetAllTokens();

0 commit comments

Comments
 (0)