authentik

app/Models/User.php

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

composer.json

@@ -21,12 +21,9 @@
         "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"
-=======
+        "socialiteproviders/authentik": "^5.0",
         "ramsey/uuid": "^4.0"
->>>>>>> upstream/master
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",

config/app.php

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

config/services.php

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

routes/web.php

@@ -30,10 +30,7 @@ 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;
 
@@ -48,7 +45,6 @@ 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();
@@ -58,9 +54,6 @@ 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']);