jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use `assert` in `normalizeUuid`

This commit is contained in:
Fedor Indutny 2021-06-22 16:08:55 -07:00 committed by GitHub
parent 9db19283ac
commit c9b1ce6655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ts/test-both/util/normalizeUuid_test.ts
View File

@ -12,4 +12,11 @@ describe('normalizeUuid', () => {
assert.strictEqual(normalizeUuid(uuid, 'context 1'), uuid);
assert.strictEqual(normalizeUuid(uuid.toUpperCase(), 'context 2'), uuid);
});
it("throws if passed a string that's not a UUID", () => {
assert.throws(
() => normalizeUuid('not-uuid-at-all', 'context 3'),
'Normalizing invalid uuid: not-uuid-at-all in context "context 3"'
);
});
});

10
ts/util/normalizeUuid.ts
View File

@ -1,14 +1,14 @@
// Copyright 2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
import { assert } from './assert';
import { isValidGuid } from './isValidGuid';
export function normalizeUuid(uuid: string, context: string): string {
if (!isValidGuid(uuid)) {
window.log.warn(
`Normalizing invalid uuid: ${uuid} in context "${context}"`
);
}
assert(
isValidGuid(uuid),
`Normalizing invalid uuid: ${uuid} in context "${context}"`
);
return uuid.toLowerCase();
}