Protocol upgrading WIP

This commit is contained in:
Mo Bitar
2020-03-15 18:29:01 -05:00
parent 5a6a41933a
commit 148e840757
15 changed files with 956 additions and 403 deletions

View File

@@ -4,25 +4,25 @@ import { SKAlert } from 'sn-stylekit';
export class AlertService extends SNAlertService {
async alert({
title,
title,
text,
closeButtonText = "OK",
onClose} = {}
) {
return new Promise((resolve, reject) => {
onClose
} = {}) {
return new Promise((resolve) => {
const buttons = [
{
text: closeButtonText,
style: "neutral",
action: async () => {
if(onClose) {
if (onClose) {
this.deviceInterface.timeout(onClose);
}
resolve(true);
}
}
];
const alert = new SKAlert({title, text, buttons});
const alert = new SKAlert({ title, text, buttons });
alert.present();
});
}
@@ -42,7 +42,7 @@ export class AlertService extends SNAlertService {
text: cancelButtonText,
style: "neutral",
action: async () => {
if(onCancel) {
if (onCancel) {
this.deviceInterface.timeout(onCancel);
}
reject(false);
@@ -52,14 +52,14 @@ export class AlertService extends SNAlertService {
text: confirmButtonText,
style: destructive ? "danger" : "info",
action: async () => {
if(onConfirm) {
if (onConfirm) {
this.deviceInterface.timeout(onConfirm);
}
resolve(true);
}
},
];
const alert = new SKAlert({title, text, buttons});
const alert = new SKAlert({ title, text, buttons });
alert.present();
});
}

View File

@@ -1,4 +1,6 @@
import angular from 'angular';
import { challengeToString } from 'snjs';
import { humanReadableList } from '@/utils';
export class GodService {
/* @ngInject */
@@ -13,24 +15,60 @@ export class GodService {
}
async checkForSecurityUpdate() {
if (this.application.noAccount()) {
return false;
}
const updateAvailable = await this.application.protocolUpgradeAvailable();
if (updateAvailable !== this.securityUpdateAvailable) {
this.securityUpdateAvailable = updateAvailable;
this.$rootScope.$broadcast("security-update-status-changed");
}
return this.securityUpdateAvailable;
return this.application.protocolUpgradeAvailable();
}
presentPasswordWizard(type) {
var scope = this.$rootScope.$new(true);
const scope = this.$rootScope.$new(true);
scope.type = type;
var el = this.$compile("<password-wizard type='type'></password-wizard>")(scope);
const el = this.$compile("<password-wizard type='type'></password-wizard>")(scope);
angular.element(document.body).append(el);
}
async promptForChallenges(challenges) {
return new Promise((resolve) => {
const scope = this.$rootScope.$new(true);
scope.challenges = challenges.slice();
scope.onSubmit = (responses) => {
resolve(responses);
};
const el = this.$compile(
"<challenge-modal class='sk-modal' challenges='challenges' on-submit='onSubmit'></challenge-modal>"
)(scope);
angular.element(document.body).append(el);
});
}
async performProtocolUpgrade() {
const errors = await this.application.upgradeProtocolVersion({
requiresChallengeResponses: async (challenges) => {
return this.promptForChallenges(challenges);
},
handleFailedChallengeResponses: async (responses) => {
const names = responses.map((r) => challengeToString(r.challenge));
const formatted = humanReadableList(names);
return new Promise((resolve) => {
this.application.alertService.alert({
text: `Invalid authentication value for ${formatted}. Please try again.`,
onClose: () => {
resolve();
}
});
});
}
});
if (errors.length === 0) {
this.application.alertService.alert({
text: "Success! Your encryption version has been upgraded." +
" You'll be asked to enter your credentials again on other devices you're signed into."
});
} else {
this.application.alertService.alert({
text: "Unable to upgrade encryption version. Please try again."
});
}
}
async presentPrivilegesModal(action, onSuccess, onCancel) {
if (this.authenticationInProgress()) {
onCancel && onCancel();