aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Http/Controllers/UserController.php67
-rw-r--r--app/Http/Middleware/Authenticate.php45
-rw-r--r--app/Http/routes.php56
-rw-r--r--app/Observers/UserObserver.php34
-rw-r--r--app/Providers/AppServiceProvider.php25
-rw-r--r--app/Providers/AuthServiceProvider.php39
-rw-r--r--app/User.php82
7 files changed, 319 insertions, 29 deletions
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
new file mode 100644
index 0000000..7036439
--- /dev/null
+++ b/app/Http/Controllers/UserController.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * HebrewParseTrainer - practice Hebrew verbs
+ * Copyright (C) 2015 Camil Staps <info@camilstaps.nl>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+use Laravel\Lumen\Routing\Controller as BaseController;
+
+use HebrewParseTrainer\User;
+
+class UserController extends BaseController {
+
+ public function createForm(Request $request) {
+ $messages = [];
+
+ if ($request->isMethod('post')) {
+ $validator = Validator::make($request->input(), [
+ 'email' => 'required|unique:users|email',
+ 'name' => 'required|unique:users',
+ 'password' => 'required|confirmed|min:8',
+ ]);
+
+ if ($validator->fails()) {
+ foreach ($validator->errors()->all() as $error) {
+ $messages[] = ['danger', $error];
+ }
+ } else {
+ $user = new User;
+ $user->name = $request->input('name');
+ $user->email = $request->input('email');
+ $user->password = $request->input('password');
+ if ($user->save()) {
+ $messages[] = ['success', 'Your account has been created.'];
+ } else {
+ $messages[] = ['danger', 'Your account could not be created.'];
+ }
+ }
+ }
+
+ return view('user.create',
+ [
+ 'messages' => $messages,
+ 'form' => [
+ 'email' => $request->input('email'),
+ 'name' => $request->input('name')
+ ]
+ ]);
+ }
+
+}
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
new file mode 100644
index 0000000..6db8bb0
--- /dev/null
+++ b/app/Http/Middleware/Authenticate.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Contracts\Auth\Factory as Auth;
+
+class Authenticate
+{
+ /**
+ * The authentication guard factory instance.
+ *
+ * @var \Illuminate\Contracts\Auth\Factory
+ */
+ protected $auth;
+
+ /**
+ * Create a new middleware instance.
+ *
+ * @param \Illuminate\Contracts\Auth\Factory $auth
+ * @return void
+ */
+ public function __construct(Auth $auth)
+ {
+ $this->auth = $auth;
+ }
+
+ /**
+ * Handle an incoming request.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param \Closure $next
+ * @param string|null $guard
+ * @return mixed
+ */
+ public function handle($request, Closure $next, $guard = null)
+ {
+ if ($this->auth->guard($guard)->guest()) {
+ return response('Unauthorized.', 401)
+ ->header('WWW-Authenticate', 'Basic realm="Please enter your email and password"');
+ }
+
+ return $next($request);
+ }
+}
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 67b661b..9cf12b4 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -28,24 +28,40 @@
|
*/
-$app->group(['prefix' => parse_url(env('APP_URL'), PHP_URL_PATH)], function ($app) {
-
- $app->get('/', function () use ($app) {
- return view('trainer');
- });
-
- $app->get('/stem', function () use ($app) {
- return \HebrewParseTrainer\Stem::all();
- });
-
- $app->get('/tense', function () use ($app) {
- return \HebrewParseTrainer\Tense::all();
- });
-
- $app->get('/verb/random', 'App\Http\Controllers\RandomVerbController@show');
-
- $app->get('/stats', function () use ($app) {
- return view('stats');
- });
-
+$app->group(
+ ['prefix' => parse_url(env('APP_URL'), PHP_URL_PATH)],
+ function ($app) {
+
+ $app->get('/', function () use ($app) {
+ return view('trainer');
+ });
+
+ $app->get('/stem', function () use ($app) {
+ return \HebrewParseTrainer\Stem::all();
+ });
+
+ $app->get('/tense', function () use ($app) {
+ return \HebrewParseTrainer\Tense::all();
+ });
+
+ $app->get('/logout', function () use ($app) {
+ return response('Unauthorized.', 401)
+ ->header('WWW-Authenticate', 'Basic realm="Please click OK, then Cancel to logout."');
+ });
+
+ $app->get('/verb/random', 'App\Http\Controllers\RandomVerbController@show');
+
+ $app->get('/user/create', 'App\Http\Controllers\UserController@createForm');
+ $app->post('/user/create', 'App\Http\Controllers\UserController@createForm');
+
+ $app->group(
+ ['middleware' => 'auth:basic-http'],
+ function ($app) {
+
+ $app->get('/stats', function () use ($app) {
+ return view('stats');
+ });
+
+ });
+
});
diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php
new file mode 100644
index 0000000..0989bb2
--- /dev/null
+++ b/app/Observers/UserObserver.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * HebrewParseTrainer - practice Hebrew verbs
+ * Copyright (C) 2015 Camil Staps <info@camilstaps.nl>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace App\Observers;
+
+use Illuminate\Support\Facades\Mail;
+
+use HebrewParseTrainer\User;
+
+class UserObserver {
+
+ public function created(User $user) {
+ Mail::plain('mails.user.create', ['user' => $user], function ($msg) {
+ $msg->to(['info@camilstaps.nl']);
+ $msg->from(['test@camilstaps.nl']);
+ });
+ }
+
+}
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index ddec046..9bc5fd1 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -3,16 +3,23 @@
namespace App\Providers;
use Illuminate\Support\ServiceProvider;
+use App\Observers\UserObserver;
+use HebrewParseTrainer\User;
class AppServiceProvider extends ServiceProvider
{
- /**
- * Register any application services.
- *
- * @return void
- */
- public function register()
- {
- //
- }
+ /**
+ * Register any application services.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ $this->app->singleton('mailer', function ($app) {
+ $app->configure('services');
+ return $app->loadComponent('mail', 'Illuminate\Mail\MailServiceProvider', 'mailer');
+ });
+
+ User::observe(UserObserver::class);
+ }
}
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
new file mode 100644
index 0000000..7cf4b27
--- /dev/null
+++ b/app/Providers/AuthServiceProvider.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Providers;
+
+use App\User;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\ServiceProvider;
+
+class AuthServiceProvider extends ServiceProvider
+{
+ /**
+ * Register any application services.
+ *
+ * @return void
+ */
+ public function register()
+ {
+ //
+ }
+
+ /**
+ * Boot the authentication services for the application.
+ *
+ * @return void
+ */
+ public function boot()
+ {
+ // Here you may define how you wish users to be authenticated for your Lumen
+ // application. The callback which receives the incoming request instance
+ // should return either a User instance or null. You're free to obtain
+ // the User instance via an API token or any other method necessary.
+ Auth::viaRequest('api', function ($request) {
+ if ($request->input('api_token')) {
+ return User::where('api_token', $request->input('api_token'))->first();
+ }
+ });
+ }
+}
diff --git a/app/User.php b/app/User.php
new file mode 100644
index 0000000..3c1799d
--- /dev/null
+++ b/app/User.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * HebrewParseTrainer - practice Hebrew verbs
+ * Copyright (C) 2015 Camil Staps <info@camilstaps.nl>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace HebrewParseTrainer;
+
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Hash;
+
+class User extends Model implements Authenticatable {
+
+ protected $table = 'users';
+ public $timestamps = false;
+ protected $fillable = ['email', 'name'];
+
+ public function changePoints($kind, $change, $verb = null) {
+ $change = new PointChange;
+ $change->user = $this->id;
+ $change->change = $change;
+ $change->kind = $kind;
+ $change->verb = is_null($verb) ? null : $verb->id;
+ $change->save();
+
+ $this->points += $change;
+ $this->save();
+ }
+
+ public function setPasswordAttribute($pass) {
+ $this->attributes['password'] = Hash::make($pass);
+ }
+
+ public function verifyPassword($pass) {
+ if (!Hash::check($pass, $this->password))
+ return false;
+
+ if (Hash::needsRehash($this->password)) {
+ $this->password = $pass;
+ $this->save();
+ }
+
+ return true;
+ }
+
+ public function getAuthIdentifierName() {
+ return $this->email;
+ }
+
+ public function getAuthIdentifier() {
+ return $this->id;
+ }
+
+ public function getAuthPassword() {
+ return $this->password;
+ }
+
+ public function getRememberToken() {
+ return null;
+ }
+
+ public function setRememberToken($token) {
+ }
+
+ public function getRememberTokenName() {
+ return null;
+ }
+
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-12 16:01:33 +0000