push

app/Models/User.php

@@ -49,9 +49,12 @@ class User extends Authenticatable implements MustVerifyEmail
         'two_factor_enabled',
         'two_factor_secret',
         'two_factor_backup_code',
+<<<<<<< HEAD
         'authentik_id',
 	    'authentik_token',
 	    'authentik_refresh_token',
+=======
+>>>>>>> upstream/master
     ];
 
     protected $encrypted = [

app/Providers/EventServiceProvider.php

@@ -26,9 +26,12 @@ class EventServiceProvider extends ServiceProvider
         ],
         LoginFailed::class => [
             SendIncorrectOtpNotification::class,
+<<<<<<< HEAD
 	],
 	\SocialiteProviders\Manager\SocialiteWasCalled::class => [
             \SocialiteProviders\Authentik\AuthentikExtendSocialite::class.'@handle',
+=======
+>>>>>>> upstream/master
         ],
     ];
 

composer.json

@@ -21,8 +21,12 @@
         "mews/captcha": "^3.0.0",
         "php-mime-mail-parser/php-mime-mail-parser": "^8.0",
         "pragmarx/google2fa-laravel": "^2.0.0",
+<<<<<<< HEAD
         "ramsey/uuid": "^4.0",
         "socialiteproviders/authentik": "^5.0"
+=======
+        "ramsey/uuid": "^4.0"
+>>>>>>> upstream/master
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",

composer.lock

@@ -4,7 +4,11 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
+<<<<<<< HEAD
     "content-hash": "5454ff48d1393072eb005864d181e150",
+=======
+    "content-hash": "9157f77755c349a041b1255e99adc1aa",
+>>>>>>> upstream/master
     "packages": [
         {
             "name": "asbiin/laravel-webauthn",
@@ -2200,6 +2204,7 @@
             "time": "2023-01-30T18:31:20+00:00"
         },
         {
+<<<<<<< HEAD
             "name": "laravel/socialite",
             "version": "v5.6.3",
             "source": {
@@ -2270,6 +2275,8 @@
             "time": "2023-06-06T13:42:43+00:00"
         },
         {
+=======
+>>>>>>> upstream/master
             "name": "laravel/tinker",
             "version": "v2.8.1",
             "source": {
@@ -2856,6 +2863,7 @@
             "time": "2022-04-17T13:12:02+00:00"
         },
         {
+<<<<<<< HEAD
             "name": "league/oauth1-client",
             "version": "v1.10.1",
             "source": {
@@ -2932,6 +2940,8 @@
             "time": "2022-04-15T14:02:14+00:00"
         },
         {
+=======
+>>>>>>> upstream/master
             "name": "maatwebsite/excel",
             "version": "3.1.48",
             "source": {
@@ -5116,6 +5126,7 @@
             "time": "2023-04-15T23:01:58+00:00"
         },
         {
+<<<<<<< HEAD
             "name": "socialiteproviders/authentik",
             "version": "5.0.0",
             "source": {
@@ -5240,6 +5251,8 @@
             "time": "2023-01-26T23:11:27+00:00"
         },
         {
+=======
+>>>>>>> upstream/master
             "name": "spomky-labs/cbor-php",
             "version": "3.0.2",
             "source": {

config/app.php

@@ -175,7 +175,10 @@ return [
         App\Providers\RouteServiceProvider::class,
         App\Providers\HelperServiceProvider::class,
         App\Providers\CustomMailServiceProvider::class,
+<<<<<<< HEAD
 	\SocialiteProviders\Manager\ServiceProvider::class,
+=======
+>>>>>>> upstream/master
 
     ])->toArray(),
 

config/services.php

@@ -41,6 +41,7 @@ return [
         ],
     ],
 
+<<<<<<< HEAD
     'authentik' => [
         'base_url' => env('AUTHENTIK_BASE_URL'),
         'client_id' => env('AUTHENTIK_CLIENT_ID'),
@@ -51,4 +52,6 @@ return [
     ],
 
 
+=======
+>>>>>>> upstream/master
 ];

routes/web.php

@@ -30,7 +30,10 @@ use App\Http\Controllers\ShowRuleController;
 use App\Http\Controllers\ShowUsernameController;
 use App\Http\Controllers\StoreFailedDeliveryController;
 use App\Http\Controllers\UseReplyToController;
+<<<<<<< HEAD
 use App\Http\Controllers\AuthentikController;
+=======
+>>>>>>> upstream/master
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
 
@@ -45,6 +48,7 @@ use Illuminate\Support\Facades\Route;
 |
 */
 
+<<<<<<< HEAD
 #Auth::routes(['verify' => true, 'register' => config('anonaddy.enable_registration')]);
 Route::get('/auth/redirect', function () {
     return Socialite::driver('authentik')->redirect();
@@ -54,6 +58,9 @@ Route::get('/auth/callback', [AuthentikController::class, 'callback']);
 
 Route::post('/auth/logout', [AuthentikController::class, 'logout'])->name('logout');
 
+=======
+Auth::routes(['verify' => true, 'register' => config('anonaddy.enable_registration')]);
+>>>>>>> upstream/master
 
 // Get API access token
 Route::post('api/auth/login', [ApiAuthenticationController::class, 'login']);

storage/app/.gitignore

@@ -0,0 +1,3 @@
+*
+!public/
+!.gitignore