generator-folklore 3.0.10 → 3.0.12

package/lib/generators/laravel-panneau/templates/app/Panneau/Composers/AppComposer.php

@@ -42,6 +42,8 @@ class AppComposer
             'user' => !is_null($user) ? new UserResource($user) : null,
             'isPanneau' => true,
             'statusCode' => $view->statusCode,
+            'baseUrl' => config('app.url'),
+            'tusUrl' => null,
             'pubnubNamespace' => config('services.pubnub.namespace'),
             'pubnubPublishKey' => config('services.pubnub.publish_key'),
             'pubnubSubscribeKey' => config('services.pubnub.subscribe_key'),

package/lib/generators/laravel-panneau/templates/app/Panneau/Http/Controllers/UploadController.php

@@ -4,10 +4,12 @@ namespace App\Panneau\Http\Controllers;
 
 use App\Panneau\Http\Requests\UploadRequest;
 use Folklore\Contracts\Repositories\Medias as MediasRepository;
-use Folklore\Http\Resources\Medias\MediaResource;
+use Folklore\Http\Resources\MediaResource;
 
 class UploadController extends Controller
 {
+    protected $medias;
+
     public function __construct(MediasRepository $medias)
     {
         $this->medias = $medias;

package/lib/generators/laravel-project/templates/laravel/app/Actions/Fortify/PasswordValidationRules.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Actions\Fortify;
+
+use Laravel\Fortify\Rules\Password;
+
+trait PasswordValidationRules
+{
+    /**
+     * Get the validation rules used to validate passwords.
+     *
+     * @return array
+     */
+    protected function passwordRules()
+    {
+        return ['required', 'string', new Password, 'confirmed'];
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Http/Responses/LoginResponse.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Http\Responses;
+
+use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
+use Laravel\Fortify\Fortify;
+use App\Http\Resources\UserResource;
+use App\Panneau\Http\Resources\UserResource as PanneauUserResource;
+
+class LoginResponse implements LoginResponseContract
+{
+    /**
+     * Create an HTTP response that represents the object.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function toResponse($request)
+    {
+        if ($request->wantsJson()) {
+            return $request->isPanneau()
+                ? new PanneauUserResource($request->user())
+                : new UserResource($request->participant());
+        }
+        return redirect()->intended(Fortify::redirects('login'));
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Http/Responses/LoginViewResponse.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Responses;
+
+use Laravel\Fortify\Contracts\LoginViewResponse as LoginViewResponseContract;
+
+class LoginViewResponse implements LoginViewResponseContract
+{
+    /**
+     * Create an HTTP response that represents the object.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function toResponse($request)
+    {
+        return $request->isPanneau() ? view('panneau::app') : view('app');
+    }
+}

package/lib/generators/laravel-project/templates/laravel/app/Providers/FortifyServiceProvider.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Providers;
+
+use App\Actions\Fortify\CreateNewUser;
+use App\Actions\Fortify\ResetUserPassword;
+use App\Actions\Fortify\UpdateUserPassword;
+use App\Actions\Fortify\UpdateUserProfileInformation;
+use App\Http\Responses\LoginResponse;
+use App\Http\Responses\LoginViewResponse;
+use Illuminate\Cache\RateLimiting\Limit;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\ServiceProvider;
+use Laravel\Fortify\Fortify;
+use Laravel\Fortify\Contracts\LoginResponse as LoginResponseContract;
+use Laravel\Fortify\Contracts\LoginViewResponse as LoginViewResponseContract;
+
+class FortifyServiceProvider extends ServiceProvider
+{
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $this->app->bind(LoginResponseContract::class, LoginResponse::class);
+        $this->app->bind(LoginViewResponseContract::class, LoginViewResponse::class);
+    }
+
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        Fortify::createUsersUsing(CreateNewUser::class);
+        Fortify::updateUserProfileInformationUsing(UpdateUserProfileInformation::class);
+        Fortify::updateUserPasswordsUsing(UpdateUserPassword::class);
+        Fortify::resetUserPasswordsUsing(ResetUserPassword::class);
+
+        RateLimiter::for('login', function (Request $request) {
+            $email = (string) $request->email;
+
+            return Limit::perMinute(5)->by($email . $request->ip());
+        });
+
+        RateLimiter::for('two-factor', function (Request $request) {
+            return Limit::perMinute(5)->by($request->session()->get('login.id'));
+        });
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.10",
+    "version": "3.0.12",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -40,5 +40,5 @@
         "yeoman-generator": "^5.7.0",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "1d7f2e259b004828e208b643fb2d123aad8cc5ec"
+    "gitHead": "0dfd991ecfcba97bced8e4b8dde631e54f2ed684"
 }