From: Vincent Vanwaelscappel Date: Fri, 8 Oct 2021 13:12:40 +0000 (+0200) Subject: wip #4765 @0.25 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=76986601b4c75ae2b881678d1764062797a2b4a9;p=odl.git wip #4765 @0.25 --- diff --git a/app/Models/User.php b/app/Models/User.php index 4956a5c..5af6b2c 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,16 +2,8 @@ namespace App\Models; -use Cubist\Backpack\Magic\Models\CubistMagicAuthenticatable; -use Mpyw\NullAuth\NullAuthenticatable; - -class User extends CubistMagicAuthenticatable +class User extends \Cubist\Socialite\User { - protected $table = 'users'; - protected $_options = ['name' => 'users', - 'singular' => 'utilisateur', - 'plural' => 'utilisateurs', - 'oneinstance' => false]; - use NullAuthenticatable; + } diff --git a/composer.lock b/composer.lock index aca7a08..81a63f3 100644 --- a/composer.lock +++ b/composer.lock @@ -1556,13 +1556,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_socialite.git", - "reference": "571d10f4238e9aeeb50e64813e774c651b97f333" + "reference": "24e28869aa4e291b9d6f7db6f1b1c6fe82e51d7a" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/socialite/cubist-socialite-dev-master-9de216.tar", - "reference": "571d10f4238e9aeeb50e64813e774c651b97f333", - "shasum": "110ab3717c9b84168d157d58b93f3aa687d2d529" + "url": "https://composer.cubedesigners.com/dist/cubist/socialite/cubist-socialite-dev-master-d8ac19.tar", + "reference": "24e28869aa4e291b9d6f7db6f1b1c6fe82e51d7a", + "shasum": "74756b5cbb25810f03ba23681a247823804a37cf" }, "require": { "laravel/framework": "~5.8|^6.0|^7.0|^8.0", @@ -1601,7 +1601,7 @@ "cubist", "socialite" ], - "time": "2021-10-07T18:33:55+00:00" + "time": "2021-10-08T13:10:03+00:00" }, { "name": "cubist/util", @@ -6743,16 +6743,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "9.8.0", + "version": "9.8.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "5af16779d63426b5d968a9900a3e8e68b6d29c31" + "reference": "a73cde4f0438e6e6d6ec8f6d6a7258ba1e281a34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/5af16779d63426b5d968a9900a3e8e68b6d29c31", - "reference": "5af16779d63426b5d968a9900a3e8e68b6d29c31", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/a73cde4f0438e6e6d6ec8f6d6a7258ba1e281a34", + "reference": "a73cde4f0438e6e6d6ec8f6d6a7258ba1e281a34", "shasum": "" }, "require": { @@ -6832,7 +6832,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/9.8.0" + "source": "https://github.com/spatie/laravel-medialibrary/tree/9.8.1" }, "funding": [ { @@ -6844,7 +6844,7 @@ "type": "github" } ], - "time": "2021-10-04T15:38:15+00:00" + "time": "2021-10-08T06:36:33+00:00" }, { "name": "spatie/laravel-package-tools", @@ -10261,16 +10261,16 @@ }, { "name": "facade/ignition", - "version": "2.14.0", + "version": "2.14.1", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "c6126e291bd44ad3fe482537a145fc70e3320598" + "reference": "6d89c4c99537f487ad29f646d57ebf107ef714ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/c6126e291bd44ad3fe482537a145fc70e3320598", - "reference": "c6126e291bd44ad3fe482537a145fc70e3320598", + "url": "https://api.github.com/repos/facade/ignition/zipball/6d89c4c99537f487ad29f646d57ebf107ef714ed", + "reference": "6d89c4c99537f487ad29f646d57ebf107ef714ed", "shasum": "" }, "require": { @@ -10333,7 +10333,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, - "time": "2021-10-01T12:58:45+00:00" + "time": "2021-10-08T12:34:52+00:00" }, { "name": "facade/ignition-contracts",