Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:vector-im/riot-web into t3chguy/e2eedefault

pull/13914/head
Michael Telatynski 2020-06-03 22:19:03 +01:00
commit cd829d3c1c
2 changed files with 29 additions and 1 deletions

View File

@ -500,4 +500,30 @@ export default class ElectronPlatform extends VectorBasePlatform {
return handled; return handled;
} }
async getPickleKey(userId: string, deviceId: string): Promise<string | null> {
try {
return await this._ipcCall('getPickleKey', userId, deviceId);
} catch (e) {
// if we can't connect to the password storage, assume there's no
// pickle key
return null;
}
}
async createPickleKey(userId: string, deviceId: string): Promise<string | null> {
try {
return await this._ipcCall('createPickleKey', userId, deviceId);
} catch (e) {
// if we can't connect to the password storage, assume there's no
// pickle key
return null;
}
}
async destroyPickleKey(userId: string, deviceId: string): Promise<void> {
try {
await this._ipcCall('destroyPickleKey', userId, deviceId);
} catch (e) {}
}
} }

View File

@ -589,8 +589,10 @@ describe('loading:', function() {
describe('Token login:', function() { describe('Token login:', function() {
it('logs in successfully', function() { it('logs in successfully', function() {
localStorage.setItem("mx_hs_url", "https://homeserver");
localStorage.setItem("mx_is_url", "https://idserver");
loadApp({ loadApp({
queryString: "?loginToken=secretToken&homeserver=https%3A%2F%2Fhomeserver&identityServer=https%3A%2F%2Fidserver", queryString: "?loginToken=secretToken",
}); });
return sleep(1).then(() => { return sleep(1).then(() => {