PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #10920 from vector-im/dbkr/fix_originmigrator_electron6_2

Browse source 
Fix origin migrator for SSO logins
This commit is contained in:
David Baker 2019-09-19 17:46:57 +01:00 committed by GitHub
commit 0e406c5440
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
electron_app/src/originMigrator.js
View file

@ -33,7 +33,11 @@ async function migrateFromOldOrigin() {
webgl: false, webgl: false,
}, },
}); });
ipcMain.on('origin_migration_complete', (e, success, sentSummary, storedSummary) => { const onOriginMigrationComplete = (e, success, sentSummary, storedSummary) => {
// we use once but we'll only get one of these events,
// so remove the listener for the other one
ipcMain.removeListener('origin_migration_nodata', onOriginMigrationNoData);
if (success) { if (success) {
console.log("Origin migration completed successfully!"); console.log("Origin migration completed successfully!");
} else { } else {
@ -43,12 +47,18 @@ async function migrateFromOldOrigin() {
console.error("Data stored", storedSummary); console.error("Data stored", storedSummary);
migrateWindow.close(); migrateWindow.close();
resolve(); resolve();
}); };
ipcMain.on('origin_migration_nodata', (e) => { const onOriginMigrationNoData = (e, success, sentSummary, storedSummary) => {
ipcMain.removeListener('origin_migration_complete', onOriginMigrationComplete);
console.log("No session to migrate from old origin"); console.log("No session to migrate from old origin");
migrateWindow.close(); migrateWindow.close();
resolve(); resolve();
}); };
ipcMain.once('origin_migration_complete', onOriginMigrationComplete);
ipcMain.once('origin_migration_nodata', onOriginMigrationNoData);
// Normalise the path because in the distribution, __dirname will be inside the // Normalise the path because in the distribution, __dirname will be inside the
// electron asar. // electron asar.
const sourcePagePath = path.normalize(__dirname + '/../../origin_migrator/source.html'); const sourcePagePath = path.normalize(__dirname + '/../../origin_migrator/source.html');