Eliminate extra preKeys, fail early on key creation if no PNI identity key

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
Scott Nonnenberg 2023-08-21 13:15:10 -07:00 committed by GitHub
parent 0e19255256
commit 3339899684
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 444 additions and 6 deletions

View file

@ -509,14 +509,25 @@ function migrateItems(db: Database, logger: LoggerType): OurServiceIds {
try {
[legacyAci] = JSON.parse(uuidIdJson).value.split('.', 2);
} catch (error) {
logger.warn('updateToSchemaVersion88: failed to parse uuid_id item', error);
if (uuidIdJson) {
logger.warn(
'updateToSchemaVersion88: failed to parse uuid_id item',
error
);
} else {
logger.info('updateToSchemaVersion88: Our UUID not found');
}
}
let legacyPni: string | undefined;
try {
legacyPni = JSON.parse(pniJson).value;
} catch (error) {
logger.warn('updateToSchemaVersion88: failed to parse pni item', error);
if (pniJson) {
logger.warn('updateToSchemaVersion88: failed to parse pni item', error);
} else {
logger.info('updateToSchemaVersion88: Our PNI not found');
}
}
const aci = normalizeAci(legacyAci, 'uuid_id', logger);