Skip to content

#5955 Use .toISOString() in compatibility.ts #5960

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

Merged
merged 8 commits into from
Apr 4, 2025
Merged

#5955 Use .toISOString() in compatibility.ts #5960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f448d2
refactor: use .toISOString() in compatibility.ts
Mar 20, 2025
3bc3c4a
test: fix failing test
Mar 20, 2025
9576558
Merge branch 'master' into issue-5955-compatibility-uses-iso-expirati…
martgil Mar 21, 2025
f6354ed
Merge branch 'master' into issue-5955-compatibility-uses-iso-expirati…
martgil Mar 24, 2025
9b3d6e3
Merge branch 'master' into issue-5955-compatibility-uses-iso-expirati…
martgil Mar 31, 2025
5ea5a96
Merge branch 'master' into issue-5955-compatibility-uses-iso-expirati…
martgil Apr 2, 2025
4112990
test: fix failing test
martgil Apr 2, 2025
44f7011
test: fix failing test
martgil Apr 2, 2025
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
8 changes: 5 additions & 3 deletions extension/js/common/core/crypto/key.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,8 @@ export class KeyUtil {
const opgpresult = await OpenPGPKey.diagnose(key, passphrase);
result = new Map<string, string>([...result, ...opgpresult]);
}
result.set(`expiration`, KeyUtil.formatResult(key.expiration));
const expirationIso = key.expiration ? new Date(key.expiration).toISOString() : undefined;
result.set(`expiration`, KeyUtil.formatResult(expirationIso));
result.set(`internal dateBeforeExpiration`, await KeyUtil.formatResultAsync(async () => KeyUtil.dateBeforeExpirationIfAlreadyExpired(key)));
result.set(`internal usableForEncryption`, KeyUtil.formatResult(key.usableForEncryption));
result.set(`internal usableForSigning`, KeyUtil.formatResult(key.usableForSigning));
Expand All @@ -292,8 +293,9 @@ export class KeyUtil {
}
}

public static formatResult(value: unknown): string {
return `[-] ${String(value)}`;
public static formatResult(value: unknown | undefined): string {
const formattedOutput = value !== undefined ? (value as string) : '-';
return `[-] ${formattedOutput}`;
}

public static async asPublicKey(key: Key): Promise<Key> {
Expand Down
20 changes: 10 additions & 10 deletions test/source/tests/unit-node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,8 +1638,8 @@ ZAvn6PBX7vsaReOVa2zsnuY5g70xCxvzHIwR94POu5cENwRtCkrppFnISALpQ1kA
expect(result.get('SK 0 > SIG 0 > Sig creation time')).to.equal('[-] 1606140328 or 2020-11-23T14:05:28.000Z');
expect(result.get('SK 0 > SIG 0 > Sig expiration time')).to.equal('[-] -');
expect(result.get('SK 0 > SIG 0 > Verify')).to.equal('[-] valid');
expect(result.get('expiration')).to.equal('[-] undefined');
expect(result.get('internal dateBeforeExpiration')).to.equal('[-] undefined');
expect(result.get('expiration')).to.equal('[-] -');
expect(result.get('internal dateBeforeExpiration')).to.equal('[-] -');
expect(result.get('internal usableForEncryptionButExpired')).to.equal('[-] false');
expect(result.get('internal usableForSigningButExpired')).to.equal('[-] false');
t.pass();
Expand Down Expand Up @@ -1676,8 +1676,8 @@ ZAvn6PBX7vsaReOVa2zsnuY5g70xCxvzHIwR94POu5cENwRtCkrppFnISALpQ1kA
expect(result.get('SK 0 > SIG 0 > Sig creation time')).to.equal('[-] 1606140328 or 2020-11-23T14:05:28.000Z');
expect(result.get('SK 0 > SIG 0 > Sig expiration time')).to.equal('[-] -');
expect(result.get('SK 0 > SIG 0 > Verify')).to.equal('[-] valid');
expect(result.get('expiration')).to.equal('[-] undefined');
expect(result.get('internal dateBeforeExpiration')).to.equal('[-] undefined');
expect(result.get('expiration')).to.equal('[-] -');
expect(result.get('internal dateBeforeExpiration')).to.equal('[-] -');
expect(result.get('internal usableForEncryptionButExpired')).to.equal('[-] false');
expect(result.get('internal usableForSigningButExpired')).to.equal('[-] false');
t.pass();
Expand Down Expand Up @@ -1983,8 +1983,8 @@ jA==
expect(result.get('SK 0 > SIG 0 > Sig creation time')).to.equal('[-] 1606140328 or 2020-11-23T14:05:28.000Z');
expect(result.get('SK 0 > SIG 0 > Sig expiration time')).to.equal('[-] -');
expect(result.get('SK 0 > SIG 0 > Verify')).to.equal('[-] valid');
expect(result.get('expiration')).to.equal('[-] undefined');
expect(result.get('internal dateBeforeExpiration')).to.equal('[-] undefined');
expect(result.get('expiration')).to.equal('[-] -');
expect(result.get('internal dateBeforeExpiration')).to.equal('[-] -');
expect(result.get('internal usableForEncryptionButExpired')).to.equal('[-] false');
expect(result.get('internal usableForSigningButExpired')).to.equal('[-] false');
t.pass();
Expand Down Expand Up @@ -2022,8 +2022,8 @@ jA==
expect(result.get('SK 0 > SIG 0 > Sig creation time')).to.equal('[-] 1611140947 or 2021-01-20T11:09:07.000Z');
expect(result.get('SK 0 > SIG 0 > Sig expiration time')).to.equal('[-] -');
expect(result.get('SK 0 > SIG 0 > Verify')).to.equal('[-] valid');
expect(result.get('expiration')).to.equal('[-] undefined');
expect(result.get('internal dateBeforeExpiration')).to.equal('[-] undefined');
expect(result.get('expiration')).to.equal('[-] -');
expect(result.get('internal dateBeforeExpiration')).to.equal('[-] -');
expect(result.get('internal usableForEncryptionButExpired')).to.equal('[-] false');
expect(result.get('internal usableForSigningButExpired')).to.equal('[-] false');
t.pass();
Expand Down Expand Up @@ -2059,8 +2059,8 @@ jA==
expect(result.get('SK 0 > SIG 0 > Sig creation time')).to.equal('[-] 1611500699 or 2021-01-24T15:04:59.000Z');
expect(result.get('SK 0 > SIG 0 > Sig expiration time')).to.equal('[-] -');
expect(result.get('SK 0 > SIG 0 > Verify')).to.equal('[-] valid');
expect(result.get('expiration')).to.equal('[-] undefined');
expect(result.get('internal dateBeforeExpiration')).to.equal('[-] undefined');
expect(result.get('expiration')).to.equal('[-] -');
expect(result.get('internal dateBeforeExpiration')).to.equal('[-] -');
expect(result.get('internal usableForEncryptionButExpired')).to.equal('[-] false');
expect(result.get('internal usableForSigningButExpired')).to.equal('[-] false');
t.pass();
Expand Down