Fixed #303

Signed-off-by: James Cole <thegrumpydictator@gmail.com>

app/Http/Controllers/Admin/ConfigurationController.php

@@ -12,7 +12,13 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Controllers\Admin;
 
 
+use Config;
 use FireflyIII\Http\Controllers\Controller;
+use FireflyIII\Http\Requests\ConfigurationRequest;
+use FireflyIII\Support\Facades\FireflyConfig;
+use Preferences;
+use Redirect;
+use Session;
 use View;
 
 /**
@@ -42,8 +48,30 @@ class ConfigurationController extends Controller
         $subTitle     = strval(trans('firefly.instance_configuration'));
         $subTitleIcon = 'fa-wrench';
 
-        return view('admin.configuration.index', compact('subTitle', 'subTitleIcon'));
+        // all available configuration and their default value in case
+        // they don't exist yet.
+        $singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
+
+        return view('admin.configuration.index', compact('subTitle', 'subTitleIcon', 'singleUserMode'));
 
     }
 
+    /**
+     * @param ConfigurationRequest $request
+     */
+    public function store(ConfigurationRequest $request)
+    {
+        // get config values:
+        $singleUserMode = intval($request->get('single_user_mode')) === 1 ? true : false;
+
+        // store config values
+        FireflyConfig::set('single_user_mode', $singleUserMode);
+
+        // flash message
+        Session::flash('success', strval(trans('firefly.configuration_updated')));
+        Preferences::mark();
+
+        return Redirect::route('admin.configuration.index');
+    }
+
 }

app/Http/Controllers/Auth/AuthController.php

@@ -12,6 +12,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Http\Controllers\Auth;
 
 use Auth;
+use Config;
 use FireflyIII\Events\UserRegistration;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Http\Controllers\Controller;
@@ -108,6 +109,15 @@ class AuthController extends Controller
      */
     public function register(Request $request)
     {
+        // is allowed to?
+        $singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
+        if ($singleUserMode === true) {
+            $message = 'Registration is currently not available.';
+
+            return view('error', compact('message'));
+        }
+
+
         $validator = $this->validator($request->all());
 
         if ($validator->fails()) {
@@ -145,6 +155,19 @@ class AuthController extends Controller
         return redirect($this->redirectPath());
     }
 
+    /**
+     * Show the application login form.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function showLoginForm()
+    {
+        // is allowed to?
+        $singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
+
+        return view('auth.login', compact('singleUserMode'));
+    }
+
     /**
      * Show the application registration form.
      *
@@ -154,6 +177,14 @@ class AuthController extends Controller
     {
         $showDemoWarning = env('SHOW_DEMO_WARNING', false);
 
+        // is allowed to?
+        $singleUserMode = FireflyConfig::get('single_user_mode', Config::get('firefly.configuration.single_user_mode'))->data;
+        if ($singleUserMode === true) {
+            $message = 'Registration is currently not available.';
+
+            return view('error', compact('message'));
+        }
+
         return view('auth.register', compact('showDemoWarning'));
     }
 

app/Http/Requests/ConfigurationRequest.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * ConfigurationRequest.php
+ * Copyright (C) 2016 thegrumpydictator@gmail.com
+ *
+ * This software may be modified and distributed under the terms
+ * of the MIT license.  See the LICENSE file for details.
+ */
+
+declare(strict_types = 1);
+
+namespace FireflyIII\Http\Requests;
+
+use Auth;
+
+/**
+ * Class ConfigurationRequest
+ *
+ *
+ * @package FireflyIII\Http\Requests
+ */
+class ConfigurationRequest extends Request
+{
+    /**
+     * @return bool
+     */
+    public function authorize()
+    {
+        // Only allow logged in users and admins
+        return Auth::check() && Auth::user()->hasRole('owner');
+    }
+
+    /**
+     * @return array
+     */
+    public function rules()
+    {
+        $rules = [
+            'single_user_mode' => 'between:0,1|numeric',
+        ];
+
+        return $rules;
+    }
+}

app/Http/routes.php

@@ -437,6 +437,7 @@ Route::group(
 
     // FF configuration:
     Route::get('/admin/configuration', ['uses' => 'Admin\ConfigurationController@index', 'as' => 'admin.configuration.index']);
+    Route::post('/admin/configuration', ['uses' => 'Admin\ConfigurationController@store', 'as' => 'admin.configuration.store']);
 
 }
 );

app/Support/FireflyConfig.php

@@ -79,6 +79,17 @@ class FireflyConfig
 
     }
 
+    /**
+     * @param $name
+     * @param $value
+     *
+     * @return Configuration
+     */
+    public function put($name, $value): Configuration
+    {
+        return $this->set($name, $value);
+    }
+
     /**
      * @param        $name
      * @param string $value

config/auth.php

@@ -4,7 +4,6 @@ declare(strict_types = 1);
 
 return [
 
-    'allow_register' => true,
     'defaults'       => [
         'guard'     => 'web',
         'passwords' => 'users',

config/firefly.php

@@ -3,6 +3,12 @@ declare(strict_types = 1);
 
 
 return [
+
+    // default values for editable configuration:
+    'configuration' => [
+        'single_user_mode' => true,
+    ],
+
     'chart'               => 'chartjs',
     'version'             => '3.10.2',
     'csv_import_enabled'  => true,

resources/lang/en_US/firefly.php

@@ -726,6 +726,10 @@ return [
     'instance_configuration'                    => 'Configuration',
     'firefly_instance_configuration'            => 'Configuration options for Firefly III',
 
+    'setting_single_user_mode'         => 'Single user mode',
+    'setting_single_user_mode_explain' => 'By default, Firefly III only accepts one (1) registration: you. This is a security measure, preventing others from using your instance unless you allow them to. Future registrations are blocked. When you uncheck this box, others can use your instance as wel, assuming they can reach it (when it is connected to the internet).',
+    'store_configuration'              => 'Store configuration',
+
     // split a transaction:
     'transaction_meta_data'            => 'Transaction meta-data',
     'transaction_dates'                => 'Transaction dates',
@@ -797,4 +801,6 @@ return [
     'import_with_key'                  => 'Import with key \':key\'',
     'import_finished_report'           => 'The import has finished. Please note any errors in the block above this line. All transactions imported during this particular session have been tagged, and you can check them out below. ',
     'import_finished_link'             => 'The transactions imported can be found in tag <a href=":link" class="label label-success" style="font-size:100%;font-weight:normal;">:tag</a>.',
+
+
 ];

resources/lang/en_US/form.php

@@ -133,6 +133,7 @@ return [
 
     // admin
     'domain'                         => 'Domain',
+    'single_user_mode'               => 'Single user mode',
 
     // import
     'import_file'                    => 'Import file',
@@ -145,5 +146,4 @@ return [
     'csv_import_account'             => 'Default import account',
     'csv_config'                     => 'CSV import configuration',
 
-
 ];

resources/views/admin/configuration/index.twig

@@ -4,8 +4,29 @@
     {{ Breadcrumbs.renderIfExists }}
 {% endblock %}
 {% block content %}
+    <form action="{{ route('admin.configuration.store') }}" method="post" id="store" class="form-horizontal">
+
         <div class="row">
+
+            <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+
+            <!-- single user mode -->
+            <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
+                <div class="box box-default">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'setting_single_user_mode'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        <p class="text-info">
+                            {{ 'setting_single_user_mode_explain'|_ }}
+                        </p>
+                        {{ ExpandedForm.checkbox('single_user_mode','1', singleUserMode) }}
+                    </div>
+                </div>
+            </div>
+
             <!-- configuration setting block -->
+            <!--
             <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
                 <div class="box box-default">
                     <div class="box-header with-border">
@@ -16,5 +37,17 @@
                     </div>
                 </div>
             </div>
+            -->
         </div>
+
+        <div class="row">
+            <div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
+                <button type="submit" class="btn btn-success">
+                    {{ ('store_configuration')|_ }}
+                </button>
+            </div>
+        </div>
+
+    </form>
+
 {% endblock %}

resources/views/auth/login.twig

@@ -53,7 +53,7 @@
                 <!-- /.col -->
             </div>
         </form>
-        {% if Config.get('auth.allow_register') %}
+        {% if not singleUserMode %}
             <a href="{{ URL.to('/register') }}" class="text-center">Register a new account</a><br>
         {% endif %}
         <a href="{{ URL.to('/password/reset') }}">I forgot my password</a>