Merge pull request #82 from ristekusdi/81-drop-laravel-versions

Drop Laravel versions and backward compatibility

composer.json

@@ -12,9 +12,9 @@
     "homepage": "https://github.com/ristekusdi/sso-laravel",
     "keywords": ["SSO", "authentication", "authorization"],
     "require": {
-        "php": "^7.2.5|^8.0.2|^8.1|^8.2",
-        "illuminate/support": "^5.6|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
-        "guzzlehttp/guzzle": "^7.0.1|^7.2|^7.8"
+        "php": "^7.4|^8.1|^8.2",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
+        "guzzlehttp/guzzle": "^7.2|^7.8"
     },
     "autoload": {
         "psr-4": {

src/WebGuardServiceProvider.php

@@ -79,17 +79,11 @@ public function boot()
             __DIR__.'/../stubs/routes/web-session.php' => base_path('routes/web-session.php'),
         ], 'sso-laravel-web-session');
 
-        // SSO web route V1
+        // SSO web route
         $this->publishes([
             // Routes
-            __DIR__.'/../stubs/routes/v1/web.php' => base_path('routes/sso-web.php'),
-        ], 'sso-laravel-web-route-v1');
-
-        // SSO web route V2
-        $this->publishes([
-            // Routes
-            __DIR__.'/../stubs/routes/v2/web.php' => base_path('routes/sso-web.php'),
-        ], 'sso-laravel-web-route-v2');
+            __DIR__.'/../stubs/routes/sso-web.php' => base_path('routes/sso-web.php'),
+        ], 'sso-laravel-web-route');
 
         // Web User Provider
         Auth::provider('imissu-web', function($app, array $config) {
@@ -125,21 +119,11 @@ public function register()
             \RistekUSDI\SSO\Laravel\Middleware\Web\Role::class
         );
 
-        // Middleware IMISSU Web Role (backward compatibility)
-        $this->app['router']->aliasMiddleware('imissu-web-role', 
-            \RistekUSDI\SSO\Laravel\Middleware\Web\Role::class
-        );
-
         // Middleware IMISSU Web Permission
         $this->app['router']->aliasMiddleware('imissu-web.permission', 
             \RistekUSDI\SSO\Laravel\Middleware\Web\Permission::class
         );
 
-        // Middleware IMISSU Web Permission (backward compatibility)
-        $this->app['router']->aliasMiddleware('imissu-web-permission', 
-            \RistekUSDI\SSO\Laravel\Middleware\Web\Permission::class
-        );
-
         // Bind for client data
         $this->app->when(SSOService::class)->needs(ClientInterface::class)->give(function() {
             return new Client(config('sso.guzzle_options', []));

stubs/resources/views/advance.blade.php

@@ -46,9 +46,11 @@
     <form action="">
         <select name="roles" id="roles">
             <option value="0">Roles</option>
-            @foreach (auth('imissu-web')->user()->roles as $role)
-            <option value="{{ json_encode($role) }}" {{ (auth('imissu-web')->user()->role->name == $role->name) ? 'selected' : '' }}>{{ $role->name }}</option>
-            @endforeach
+            @if (auth('imissu-web')->user()->roles)
+                @foreach (auth('imissu-web')->user()->roles as $role)
+                    <option value="{{ json_encode($role) }}" {{ (auth('imissu-web')->user()->role->name == $role->name) ? 'selected' : '' }}>{{ $role->name }}</option>
+                @endforeach
+            @endif
         </select>
         <input type="hidden" name="home_url" value="{{ url()->current() }}">
     </form>