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

Message Requests: Add new "Report spam and block" button

Browse source
This commit is contained in:
Evan Hahn 2021-05-27 16:17:05 -04:00 • committed by Scott Nonnenberg
parent 20e501d9f1
commit d4dc9b8e39
33 changed files with 630 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ts/services/senderCertificate.ts
View file

@ -12,6 +12,7 @@ import { assert } from '../util/assert';
import { missingCaseError } from '../util/missingCaseError';
import { waitForOnline } from '../util/waitForOnline';
import * as log from '../logging/log';
import { connectToServerWithStoredCredentials } from '../util/connectToServerWithStoredCredentials';
// We define a stricter storage here that returns `unknown` instead of `any`.
type Storage = {
@ -200,20 +201,7 @@ export class SenderCertificateService {
'Sender certificate service method was called before it was initialized'
);
const username = storage.get('uuid_id') || storage.get('number_id');
const password = storage.get('password');
if (typeof username !== 'string') {
throw new Error(
'Sender certificate service: username in storage was not a string. Cannot connect'
);
}
if (typeof password !== 'string') {
throw new Error(
'Sender certificate service: password in storage was not a string. Cannot connect'
);
}
const server = WebAPI.connect({ username, password });
const server = connectToServerWithStoredCredentials(WebAPI, storage);
const omitE164 = mode === SenderCertificateMode.WithoutE164;
const { certificate } = await server.getSenderCertificate(omitE164);
return certificate;