IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated Docker files and double check the login provider.

Browse Source
This commit is contained in:
James Cole 2018-10-19 09:51:58 +02:00
parent 8f00d2b616
commit dd0cc2d173
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@ -59,7 +59,7 @@ class ForgotPasswordController extends Controller
*/ */
public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository) public function sendResetLinkEmail(Request $request, UserRepositoryInterface $repository)
{ {
$loginProvider = env('LOGIN_PROVIDER','eloquent'); $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
if ('eloquent' !== $loginProvider) { if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider); $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
Log::error($message); Log::error($message);
@ -98,7 +98,7 @@ class ForgotPasswordController extends Controller
*/ */
public function showLinkRequestForm() public function showLinkRequestForm()
{ {
$loginProvider = env('LOGIN_PROVIDER','eloquent'); $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
if ('eloquent' !== $loginProvider) { if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider); $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);

2
app/Http/Controllers/Auth/LoginController.php
View File

@ -130,7 +130,7 @@ class LoginController extends Controller
public function showLoginForm(Request $request) public function showLoginForm(Request $request)
{ {
$count = DB::table('users')->count(); $count = DB::table('users')->count();
$loginProvider = env('LOGIN_PROVIDER','eloquent'); $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
if (0 === $count && 'eloquent' === $loginProvider) { if (0 === $count && 'eloquent' === $loginProvider) {
return redirect(route('register')); // @codeCoverageIgnore return redirect(route('register')); // @codeCoverageIgnore
} }

4
app/Http/Controllers/Auth/RegisterController.php
View File

@ -72,7 +72,7 @@ class RegisterController extends Controller
{ {
// is allowed to? // is allowed to?
$allowRegistration = true; $allowRegistration = true;
$loginProvider = env('LOGIN_PROVIDER','eloquent'); $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count(); $userCount = User::count();
if (true === $singleUserMode && $userCount > 0 && 'eloquent' === $loginProvider) { if (true === $singleUserMode && $userCount > 0 && 'eloquent' === $loginProvider) {
@ -113,7 +113,7 @@ class RegisterController extends Controller
public function showRegistrationForm(Request $request) public function showRegistrationForm(Request $request)
{ {
$allowRegistration = true; $allowRegistration = true;
$loginProvider = env('LOGIN_PROVIDER','eloquent'); $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
$isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data;
$singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data; $singleUserMode = FireflyConfig::get('single_user_mode', config('firefly.configuration.single_user_mode'))->data;
$userCount = User::count(); $userCount = User::count();

4
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@ -71,7 +71,7 @@ class ResetPasswordController extends Controller
*/ */
public function showResetForm(Request $request, $token = null) public function showResetForm(Request $request, $token = null)
{ {
$loginProvider = env('LOGIN_PROVIDER','eloquent'); $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
if ('eloquent' !== $loginProvider) { if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider); $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);
@ -103,7 +103,7 @@ class ResetPasswordController extends Controller
*/ */
public function reset(Request $request) public function reset(Request $request)
{ {
$loginProvider = env('LOGIN_PROVIDER','eloquent'); $loginProvider = envNonEmpty('LOGIN_PROVIDER','eloquent');
if ('eloquent' !== $loginProvider) { if ('eloquent' !== $loginProvider) {
$message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider); $message = sprintf('Cannot reset password when authenticating over "%s".', $loginProvider);

2
app/Providers/FireflyServiceProvider.php
View File

@ -71,6 +71,7 @@ use FireflyIII\Validation\FireflyValidator;
use Illuminate\Foundation\Application; use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Twig; use Twig;
use Twig_Extension_Debug;
use TwigBridge\Extension\Loader\Functions; use TwigBridge\Extension\Loader\Functions;
use Validator; use Validator;
@ -105,6 +106,7 @@ class FireflyServiceProvider extends ServiceProvider
Twig::addExtension(new Transaction); Twig::addExtension(new Transaction);
Twig::addExtension(new Rule); Twig::addExtension(new Rule);
Twig::addExtension(new AmountFormat); Twig::addExtension(new AmountFormat);
Twig::addExtension(new Twig_Extension_Debug);
} }
/** /**

2
docker-compose.yml
View File

@ -14,7 +14,7 @@ services:
- FF_DB_CONNECTION=pgsql - FF_DB_CONNECTION=pgsql
- TZ=Europe/Amsterdam - TZ=Europe/Amsterdam
- APP_LOG_LEVEL=debug - APP_LOG_LEVEL=debug
image: jc5x/firefly-iii:develop image: jc5x/firefly-iii
links: links:
- firefly_iii_db - firefly_iii_db
networks: networks: