mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Compute provisioning URL in separate function

Browse source
This commit is contained in:
Evan Hahn 2021-06-07 11:27:02 -05:00 • committed by GitHub
parent 6e2d0ff2ae
commit eaf4036fc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ts/textsecure/AccountManager.ts
View file

@ -1,4 +1,4 @@
// Copyright 2020 Signal Messenger, LLC
// Copyright 2020-2021 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
/* eslint-disable @typescript-eslint/no-explicit-any */
@ -29,6 +29,7 @@ import {
} from '../Curve';
import { isMoreRecentThan, isOlderThan } from '../util/timestamp';
import { ourProfileKeyService } from '../services/ourProfileKey';
import { getProvisioningUrl } from '../util/getProvisioningUrl';
const ARCHIVE_AGE = 30 * 24 * 60 * 60 * 1000;
const PREKEY_ROTATION_AGE = 24 * 60 * 60 * 1000;
@ -222,12 +223,11 @@ export default class AccountManager extends EventTarget {
const proto = window.textsecure.protobuf.ProvisioningUuid.decode(
request.body
);
const url = [
'tsdevice:/?uuid=',
proto.uuid,
'&pub_key=',
encodeURIComponent(btoa(utils.getString(pubKey))),
].join('');
const { uuid } = proto;
if (!uuid) {
throw new Error('registerSecondDevice: expected a UUID');
}
const url = getProvisioningUrl(uuid, pubKey);
if (window.CI) {
window.CI.setProvisioningURL(url);