kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Expand some code for Spectre import.

Browse Source
This commit is contained in:
James Cole
2018-01-10 16:49:32 +01:00
parent 2e495c38d1
commit 87dae6ea18
5 changed files with 81 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Import/Configuration/SpectreConfigurator.php
View File

@@ -130,6 +130,7 @@ class SpectreConfigurator implements ConfiguratorInterface
switch ($stage) {
case 'has-token':
// redirect to Spectre.
Log::info('User is being redirected to Spectre.');
return 'import.spectre.redirect';
break;
case 'have-accounts':

8
app/Import/Routine/SpectreRoutine.php
View File

@@ -315,7 +315,12 @@ class SpectreRoutine implements RoutineInterface
}
}
if (is_null($final)) {
throw new FireflyException('No valid login attempt found.');
Log::error('Could not find a valid login for this user.');
$this->repository->addError($this->job, 0, 'Spectre connection failed. Did you use invalid credentials, press Cancel or failed the 2FA challenge?');
$this->repository->setTotalSteps($this->job, 1);
$this->repository->setStepsDone($this->job, 1);
$this->repository->setStatus($this->job,'error');
return;
}
// add some steps done
@@ -457,6 +462,7 @@ class SpectreRoutine implements RoutineInterface
// update job:
$this->job->status = 'finished';
$this->job->save();
return;
}