diff --git a/.env.example b/.env.example index ec44a12..355194e 100644 --- a/.env.example +++ b/.env.example @@ -1,16 +1,15 @@ -APP_NAME=Laravel +APP_NAME=datatable.directory APP_ENV=local APP_KEY= -APP_DEBUG=true -APP_URL=http://localhost +APP_DEBUG=false +APP_URL=https://datatable.directory/ -LOG_CHANNEL=stack +LOG_CHANNEL=custom -DB_CONNECTION=mysql -DB_HOST=127.0.0.1 -DB_PORT=3306 -DB_DATABASE=homestead -DB_USERNAME=homestead +DB_CONNECTION=pgsql +DB_HOST=postgres +DB_DATABASE=dtbl +DB_USERNAME=dtbl DB_PASSWORD=secret BROADCAST_DRIVER=log @@ -37,3 +36,20 @@ PUSHER_APP_CLUSTER=mt1 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" + + +PRETTY_JSON=true + +OAUTH_GITHUB_ID= +OAUTH_GITHUB_SECRET= +OAUTH_GITHUB_REDIRECT=https://datatable.directory/auth/github/callback + +OAUTH_GOOGLE_ID= +OAUTH_GOOGLE_SECRET= +OAUTH_GOOGLE_REDIRECT=https://datatable.directory/auth/google/callback + +OAUTH_FACEBOOK_ID= +OAUTH_FACEBOOK_SECRET= +OAUTH_FACEBOOK_REDIRECT=https://datatable.directory/auth/facebook/callback + +ALLOW_REGS=true diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 0b877d8..912abdc 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Auth; use App\Models\User; use App\Http\Controllers\Controller; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; use Illuminate\Foundation\Auth\RegistersUsers; @@ -22,7 +23,9 @@ class RegisterController extends Controller | */ - use RegistersUsers; + use RegistersUsers { + RegistersUsers::register as register_orig; + } /** * Where to redirect users after registration. @@ -41,6 +44,15 @@ class RegisterController extends Controller $this->middleware('guest'); } + public function register(Request $request) + { + if (!config('app.allow_regs')) { + abort(403, "Registrations are closed."); + } + + return $this->register_orig($request); + } + /** * Get a validator for an incoming registration request. * diff --git a/config/app.php b/config/app.php index 087f230..13c3b78 100644 --- a/config/app.php +++ b/config/app.php @@ -229,4 +229,6 @@ return [ '_SERVER' => array_keys($_SERVER), '_ENV' => array_keys($_ENV), ], + + 'allow_regs' => env('ALLOW_REGS', true), ]; diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 1b7086d..94659a6 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -23,7 +23,9 @@ diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 9746b87..58fc83f 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,48 +1,56 @@ @extends('layouts.app') @section('content') -
+
-
-
-
-

{{ __('Register') }}

-
+
+
+
+

{{ __('Register') }}

+
-
-
- @csrf + @if(config('app.allow_regs')) - @php(Widget::setLayout(4, 6)) +
+ + @csrf - {!! Widget::text('name', 'Username')->required()->prepend('@') - ->help('This will be part of your vanity URL; only letters, digits and - some symbols are allowed. You can always change this later.') !!} + @php(Widget::setLayout(4, 6)) - {!! Widget::email('email', 'E-Mail Address')->required()->autofocus() - ->help('Used to login and for password resets') !!} + {!! Widget::text('name', 'Username')->required()->prepend('@') + ->help('This will be part of your vanity URL; only letters, digits and + some symbols are allowed. You can always change this later.') !!} - {!! Widget::password('password', 'Password')->required() !!} - {!! Widget::password('password_confirmation', 'Confirm Password')->required() !!} + {!! Widget::email('email', 'E-Mail Address')->required()->autofocus() + ->help('Used to login and for password resets') !!} -
-
- -
-
- -
+ {!! Widget::password('password', 'Password')->required() !!} + {!! Widget::password('password_confirmation', 'Confirm Password')->required() !!} -
- You can also register by logging in with - Google, - GitHub, - or Facebook. -
+
+
+ +
+
+ +
+ +
+ You can also register by logging in with + Google, + GitHub, + or Facebook. +
+ + @else +
+

Registrations are currently closed.

+ @endif
+
-
+
@endsection diff --git a/resources/views/layouts/main-nav.blade.php b/resources/views/layouts/main-nav.blade.php index 373908f..49de2af 100644 --- a/resources/views/layouts/main-nav.blade.php +++ b/resources/views/layouts/main-nav.blade.php @@ -7,13 +7,9 @@ --}}datatable.directory - @@ -28,12 +24,16 @@ {{ __('Login') }} + @if(config('app.allow_regs'))
  • @icon(fa-user-plus pr-1) {{ __('Register') }} + @endif + @else + {{-- Logged in --}} @include('layouts.nav-buttons', ['dropdown' => false])
  • diff --git a/routes/login.php b/routes/login.php index 23168c9..339b4de 100644 --- a/routes/login.php +++ b/routes/login.php @@ -32,6 +32,10 @@ function _loginVia($method) { // update user name first time user logs in if (!$user->exists) { + if (!config('app.allow_regs')) { + abort(403, "Registrations are closed."); + } + $basename = $details->nickname ?: ($details->full_name ?: $details->email); $user->name = $basename; $cnt = 1; diff --git a/sideload/adamwathan/eloquent-oauth/src/Authenticator.php b/sideload/adamwathan/eloquent-oauth/src/Authenticator.php index 8e5cfe6..2e3a34a 100644 --- a/sideload/adamwathan/eloquent-oauth/src/Authenticator.php +++ b/sideload/adamwathan/eloquent-oauth/src/Authenticator.php @@ -43,6 +43,10 @@ class Authenticator return $this->users->findByEmail($details->email); } + if(!config('app.allow_regs', true)) { + abort(403, "Registrations are currently closed."); + } + return $this->users->create(); }