Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REL-4253 - .NET SDK v16.6.4 - Fixed ExpiresOn conversion from UnixTimeMilliseconds #535

Merged
merged 3 commits into from
Sep 26, 2023
Merged

REL-4253 - .NET SDK v16.6.4 - Fixed ExpiresOn conversion from UnixTimeMilliseconds #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a44cc4e
KSM-466 - Fixed ExpiresOn conversion from UnixTimeMilliseconds (#534)
idimov-keeper Sep 26, 2023
1076ceb
Upgrade module versions to 16.6.4
maksimu Sep 26, 2023
622c337
Update README with 16.6.4 dotNet SDK change log
maksimu Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions sdk/dotNet/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

# Change Log

## 16.6.4

* KSM-466 - Fixed ExpiresOn conversion from UnixTimeMilliseconds. Closes [Issue #533]

## 16.6.3

* KSM-462 - Fixed JSON serializer that replaces characters with accents. Closes [Issue #523](https://github.com/Keeper-Security/secrets-manager/issues/523)
Expand Down
2 changes: 1 addition & 1 deletion ...anagement.Keeper/SecretManagement.Keeper.Extension/SecretManagement.Keeper.Extension.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@{
ModuleVersion = '16.6.2'
ModuleVersion = '16.6.4'
RootModule = 'SecretManagement.Keeper.Extension.psm1'
RequiredAssemblies = '../SecretManagement.Keeper.dll'
CompatiblePSEditions = @('Core')
Expand Down
4 changes: 2 additions & 2 deletions sdk/dotNet/SecretManagement.Keeper/SecretManagement.Keeper.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>SecretManagement.Keeper</AssemblyName>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AssemblyVersion>16.6.2</AssemblyVersion>
<FileVersion>16.6.2</FileVersion>
<AssemblyVersion>16.6.4</AssemblyVersion>
<FileVersion>16.6.4</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotNet/SecretManagement.Keeper/SecretManagement.Keeper.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@{
ModuleVersion = '16.6.1'
ModuleVersion = '16.6.4'
CompatiblePSEditions = @('Core')
GUID = '20ab89cb-f0dd-4e8e-b276-f3a7708c1eb2'
Author = 'Sergey Aldoukhov'
Expand Down
6 changes: 3 additions & 3 deletions sdk/dotNet/SecretsManager/SecretsManager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<LangVersion>9</LangVersion>
<Company>Keeper Security Inc.</Company>
<Product>SecretsManager .Net SDK</Product>
<AssemblyVersion>16.6.3</AssemblyVersion>
<FileVersion>16.6.3</FileVersion>
<PackageVersion>16.6.3</PackageVersion>
<AssemblyVersion>16.6.4</AssemblyVersion>
<FileVersion>16.6.4</FileVersion>
<PackageVersion>16.6.4</PackageVersion>
<NeutralLanguage>en-US</NeutralLanguage>
<PackageId>Keeper.SecretsManager</PackageId>
<Authors>Sergey Aldoukhov</Authors>
Expand Down
2 changes: 1 addition & 1 deletion sdk/dotNet/SecretsManager/SecretsManagerClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ private static async Task<Tuple<KeeperSecrets, bool>> FetchAndDecryptSecrets(Sec
var appData = response.appData == null
? null :
JsonUtils.ParseJson<AppData>(CryptoUtils.Decrypt(CryptoUtils.WebSafe64ToBytes(response.appData), appKey));
var secrets = new KeeperSecrets(appData, response.expiresOn == 0 ? null : DateTimeOffset.FromUnixTimeSeconds(response.expiresOn), records.ToArray());
var secrets = new KeeperSecrets(appData, response.expiresOn == 0 ? null : DateTimeOffset.FromUnixTimeMilliseconds(response.expiresOn), records.ToArray());
if (response.warnings is { Length: > 0 })
{
secrets.Warnings = response.warnings;
Expand Down
Loading