grassrootseconomics/cic-staff-client
8
0
Fork 0
Code Issues 26 Pull Requests Projects Releases Wiki Activity

Bug fix.

Browse Source 
- Remove unsafe keystore.
- Refactor functionality from unsafe keystore into mutable keystore.
This commit is contained in:
Spencer Ofwiti
2021-02-17 14:13:08 +03:00
parent 458155dc1c
commit c2f257e221
8 changed files with 261 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/_services/auth.service.ts
View File

@@ -1,12 +1,11 @@
import { Injectable } from '@angular/core';
import {MutableKeyStore, MutablePgpKeyStore, UnsafeKeyStore} from '@app/_helpers';
import {MutableKeyStore, MutablePgpKeyStore} from '@app/_helpers';
import { hobaParseChallengeHeader } from '@src/assets/js/hoba.js';
import { signChallenge } from '@src/assets/js/hoba-pgp.js';
import {environment} from '@src/environments/environment';
import {HttpClient} from '@angular/common/http';
const origin = 'http://localhost:4444';
const pgpKeyStore = new UnsafeKeyStore();
@Injectable({
providedIn: 'root'
@@ -53,7 +52,6 @@ export class AuthService {
sendResponse(hobaResponseEncoded): void {
const xhr = new XMLHttpRequest();
// xhr.responseType = 'arraybuffer';
xhr.responseType = 'text';
xhr.open('GET', origin + window.location.search.substring(1));
xhr.setRequestHeader('Authorization', 'HOBA ' + hobaResponseEncoded);
@@ -109,22 +107,21 @@ export class AuthService {
async loginResponse(o): Promise<any> {
const r = await signChallenge(o.challenge, o.realm, origin, pgpKeyStore);
const r = await signChallenge(o.challenge, o.realm, origin, this.mutableKeyStore);
this.sendResponse(r);
}
loginView(): void {
document.getElementById('one').style.display = 'none';
document.getElementById('two').style.display = 'block';
this.setState('click to log in with PGP key ' + pgpKeyStore.keyId().toHex());
this.setState('click to log in with PGP key ' + this.mutableKeyStore.getPrivateKeyId());
}
async setKey(privateKeyArmored): Promise<boolean> {
console.log('settings pk' + privateKeyArmored);
try {
await pgpKeyStore.set(privateKeyArmored);
localStorage.setItem(btoa('CICADA_PRIVATE_KEY'), privateKeyArmored);
await this.mutableKeyStore.importPrivateKey(privateKeyArmored);
localStorage.setItem(btoa('CICADA_PRIVATE_KEY'), privateKeyArmored);
} catch (e) {
console.error('failed setting key', e);
return false;
@@ -140,9 +137,7 @@ export class AuthService {
async getPublicKeys(): Promise<void> {
this.http.get(`${environment.publicKeysUrl}/keys.asc`).subscribe(async res => {
const armoredPublicKeys = res;
await this.mutableKeyStore.loadKeyring();
await this.mutableKeyStore.importPublicKey(armoredPublicKeys);
await this.mutableKeyStore.importPublicKey(res);
}, error => {
console.error('There was an error!', error);
});