Skip to content

Commit

Permalink
Rename msgRequestSepa to getSepa, refactor getSepa to use promises
Browse files Browse the repository at this point in the history
  • Loading branch information
@ckosmowski
ckosmowski committed Nov 17, 2018
1 parent 55be1b7 commit 37ae155
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 130 deletions.
210 changes: 92 additions & 118 deletions src/FinTSClient.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,105 +535,83 @@ export class FinTSClient {
}

// SEPA kontoverbindung anfordern HKSPA, HISPA ist die antwort
public msgRequestSepa(forKonto, cb) {
// Vars
let processed = false;
let v1 = null;
let aufsetzpunktLoc = 0;
const sepaList = [];
// Create Segment
if (forKonto) {
v1 = [
[280, forKonto],
];
aufsetzpunktLoc = 2;
} else {
v1 = [];
aufsetzpunktLoc = 1;
}
// Start
const reqSepaOrder = new Order(this);
reqSepaOrder.msg({
type: 'HKSPA',
ki_type: 'HISPA',
aufsetzpunkt_loc: [aufsetzpunktLoc],
send_msg: {
1: v1,
2: v1,
3: v1,
},
recv_msg: reqSepaOrder.helper().vers([1, 2, 3], (segVers, relatedRespSegments, relatedRespMsgs, recvMsg) => {
try {
if (reqSepaOrder.checkMessagesOkay(relatedRespMsgs, true)) {
const HISPA = reqSepaOrder.getSegByName(relatedRespSegments, 'HISPA');
if (HISPA !== null) {
for (let i = 0; i !== HISPA.store.data.length; i += 1) {
const verb = HISPA.getEl(i + 1).data as DatenElementGruppe;
const o = new Konto();
o.isSepa = verb.getEl(1) === 'J';
o.iban = verb.getEl(2);
o.bic = verb.getEl(3);
o.kontoNr = verb.getEl(4);
o.unterKonto = verb.getEl(5);
o.countryCode = verb.getEl(6);
o.blz = verb.getEl(7);
sepaList.push(o);
}
try {
cb(null, recvMsg, sepaList);
} catch (cbError) {
this.gvLog.error(cbError, {
gv: 'HKSPA',
}, 'Unhandled callback Error in HKSPA');
public getSepa(forKonto): Promise<Konto[]> {
return new Promise<Konto[]>((resolve, reject) => {
// Vars
let processed = false;
let v1 = null;
let aufsetzpunktLoc = 0;
const sepaList = [];
// Create Segment
if (forKonto) {
v1 = [
[280, forKonto],
];
aufsetzpunktLoc = 2;
} else {
v1 = [];
aufsetzpunktLoc = 1;
}
// Start
const reqSepaOrder = new Order(this);
reqSepaOrder.msg({
type: 'HKSPA',
ki_type: 'HISPA',
aufsetzpunkt_loc: [aufsetzpunktLoc],
send_msg: {
1: v1,
2: v1,
3: v1,
},
recv_msg: reqSepaOrder.helper().vers([1, 2, 3], (segVers, relatedRespSegments, relatedRespMsgs, recvMsg) => {
try {
if (reqSepaOrder.checkMessagesOkay(relatedRespMsgs, true)) {
const HISPA = reqSepaOrder.getSegByName(relatedRespSegments, 'HISPA');
if (HISPA !== null) {
for (let i = 0; i !== HISPA.store.data.length; i += 1) {
const verb = HISPA.getEl(i + 1).data as DatenElementGruppe;
const o = new Konto();
o.isSepa = verb.getEl(1) === 'J';
o.iban = verb.getEl(2);
o.bic = verb.getEl(3);
o.kontoNr = verb.getEl(4);
o.unterKonto = verb.getEl(5);
o.countryCode = verb.getEl(6);
o.blz = verb.getEl(7);
sepaList.push(o);
}
resolve(sepaList);
} else {
throw new Error('TODO ausführlicherer Error');
}
} else {
throw new Error('TODO ausführlicherer Error');
}
}
} catch (e) {
this.gvLog.error(e, {
gv: 'HKSPA',
msgs: relatedRespMsgs,
segments: relatedRespSegments,
}, 'Exception while parsing HKSPA response');
try {
cb(e, null, null);
} catch (cbError) {
this.gvLog.error(cbError, {
} catch (e) {
this.gvLog.error(e, {
gv: 'HKSPA',
}, 'Unhandled callback Error in HKSPA');
msgs: relatedRespMsgs,
segments: relatedRespSegments,
}, 'Exception while parsing HKSPA response');
reject(e);
}
}
processed = true;
}).done(),
});
reqSepaOrder.done((error, order, recvMsg) => {
if (error && !processed) {
this.gvLog.error(error, {
recvMsg,
gv: 'HKSPA',
}, 'Exception while parsing HKSPA');
try {
cb(error, recvMsg, null);
} catch (cbError) {
this.gvLog.error(cbError, {
processed = true;
}).done(),
});
reqSepaOrder.done((error, order, recvMsg) => {
if (error && !processed) {
this.gvLog.error(error, {
recvMsg,
gv: 'HKSPA',
}, 'Unhandled callback Error in HKSPA');
}
} else if (!processed) {
const ex = new Exceptions.InternalError('HKSPA response was not analysied');
this.gvLog.error(ex, {
recvMsg,
gv: 'HKSPA',
}, 'HKSPA response was not analysied');
try {
cb(ex, recvMsg, null);
} catch (cbError) {
this.gvLog.error(cbError, {
}, 'Exception while parsing HKSPA');
reject(error);
} else if (!processed) {
const ex = new Exceptions.InternalError('HKSPA response was not analysied');
this.gvLog.error(ex, {
recvMsg,
gv: 'HKSPA',
}, 'Unhandled callback Error in HKSPA');
}, 'HKSPA response was not analysied');
reject(ex);
}
}
});
});
}

Expand Down Expand Up @@ -894,7 +872,7 @@ export class FinTSClient {
}

private completeConnection(resolve, reject, originalBpd, originalUpd) {
this.msgInitDialog((error, recvMsg, hasNewUrl) => {
this.msgInitDialog(async (error, recvMsg, hasNewUrl) => {
if (error) {
this.endDialogIfNotCanceled(recvMsg);
reject(error);
Expand All @@ -916,34 +894,30 @@ export class FinTSClient {
this.conEstLog.debug({
step: 3,
}, 'Connection entirely established. Now get the available accounts.');
// 4. Bekomme noch mehr Details zu den Konten über HKSPA
this.msgRequestSepa(null, (error4, recvMsg2, sepaList: Konto[]) => {
if (error4) {
this.conEstLog.error({
step: 3,
}, 'Error getting the available accounts.');
this.endDialogIfNotCanceled(recvMsg);
reject(error4);
} else {
// Erfolgreich die Kontendaten geladen, diese jetzt noch in konto mergen und Fertig!
for (let i = 0; i !== sepaList.length; i += 1) {
for (let j = 0; j !== this.konten.length; j += 1) {
if (this.konten[j].kontoNr === sepaList[i].kontoNr &&
this.konten[j].unterKonto === sepaList[i].unterKonto) {
this.konten[j].sepaData = sepaList[i];
break;
}
try {
const sepaList = await this.getSepa(null);
// Erfolgreich die Kontendaten geladen, diese jetzt noch in konto mergen und Fertig!
for (let i = 0; i !== sepaList.length; i += 1) {
for (let j = 0; j !== this.konten.length; j += 1) {
if (this.konten[j].kontoNr === sepaList[i].kontoNr &&
this.konten[j].unterKonto === sepaList[i].unterKonto) {
this.konten[j].sepaData = sepaList[i];
break;
}
}
// Fertig
this.conEstLog.debug({
step: 3,
recv_sepa_list: sepaList,
}, 'Connection entirely established and got available accounts. Return.');
// Callback
resolve();
}
});
this.conEstLog.debug({
step: 3,
recv_sepa_list: sepaList,
}, 'Connection entirely established and got available accounts. Return.');
resolve();
} catch (err) {
this.conEstLog.error({
step: 3,
}, 'Error getting the available accounts.');
this.endDialogIfNotCanceled(recvMsg);
reject(err);
}
});
}

Expand Down
27 changes: 15 additions & 12 deletions test/FinTSClient.test.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Konto } from '../src';
import { Exceptions } from '../src/Exceptions';
import { FinTSClient } from '../src/FinTSClient';
import { Saldo } from '../src/Saldo';
Expand Down Expand Up @@ -83,29 +84,31 @@ describe('The FinTSClient', () => {

it('requests account information', (done) => {
const client = new FinTSClient(testBlz, testBankUrl, testKundenId, testPin);
client.msgInitDialog(makeCallback(done, (err) => {
client.msgInitDialog(makeCallback(done, async (err) => {
expectClientState(client);
expect(client.konten[0].sepaData).toBe(null);
client.msgRequestSepa(null, makeCallback(done, (error3, recvMsg3, sepaList) => {
expect(Array.isArray(client.konten)).toBe(true);
expect(sepaList[0].iban).toBe('DE111234567800000001');
expect(sepaList[0].bic).toBe('GENODE00TES');
done();
}));
const sepaList = await client.getSepa(null);
expect(Array.isArray(client.konten)).toBe(true);
expect(sepaList[0].iban).toBe('DE111234567800000001');
expect(sepaList[0].bic).toBe('GENODE00TES');
done();
}));
});

it('reports error on failed connection', (done) => {
const client = new FinTSClient(testBlz, testBankUrl, testKundenId, testPin);
client.msgInitDialog(makeCallback(done, (error) => {
client.msgInitDialog(makeCallback(done, async (error) => {
expectClientState(client);
expect(client.konten[0].sepaData).toBe(null);
client.bpd.url = 'http://thiswillnotworkurl';
client.msgRequestSepa(null, (error3) => {
expect(error3).not.toBeNull();
expect(error3).toBeInstanceOf(Exceptions.ConnectionFailedException);
try {
const sepaList = await client.getSepa(null);
done.fail('Should fail with wrong url');
} catch (err) {
expect(err).not.toBeNull();
expect(err).toBeInstanceOf(Exceptions.ConnectionFailedException);
done();
});
}
}));
}, 60000);

Expand Down

0 comments on commit 37ae155

Please sign in to comment.