socialite fix

This commit is contained in:
Čarodej
2022-03-05 11:18:53 +01:00
parent 2c90db8e04
commit e0e488860d
4 changed files with 12 additions and 10 deletions

View File

@@ -23,7 +23,7 @@
"laravel/fortify": "^1.10.0",
"laravel/framework": "^9.2",
"laravel/sanctum": "^2.14.2",
"laravel/socialite": "^5.4",
"laravel/socialite": "^5.5.1",
"laravel/tinker": "^2.7",
"laravel/ui": "^3.4.2",
"league/flysystem-aws-s3-v3": "^3.0.9",

View File

@@ -14,7 +14,6 @@ use Domain\Browsing\Controllers\BrowseFolderController;
use Domain\Sharing\Controllers\ShareViaEmailController;
use Domain\Folders\Controllers\NavigationTreeController;
use Domain\Items\Controllers\MoveFileOrFolderController;
use App\Socialite\Controllers\SocialiteCallbackController;
use App\Socialite\Controllers\SocialiteRedirectController;
use Domain\Browsing\Controllers\SpotlightSearchController;
use Domain\Items\Controllers\DeleteFileOrFolderController;
@@ -41,11 +40,8 @@ Route::get('/settings', GetSettingsValueController::class);
// Register user
Route::post('/register', RegisterUserController::class);
// Login via socialite
Route::group(['prefix' => 'socialite'], function () {
Route::get('/{provider}/redirect', SocialiteRedirectController::class);
Route::get('/{provider}/callback', SocialiteCallbackController::class);
});
// Socialite
Route::get('/socialite/{provider}/redirect', SocialiteRedirectController::class);
// Password reset
Route::group(['prefix' => 'password'], function () {

View File

@@ -3,9 +3,12 @@
use Domain\Homepage\Controllers\IndexController;
use Domain\Invoices\Controllers\GetInvoiceController;
use Domain\Sharing\Controllers\SharePublicIndexController;
use App\Socialite\Controllers\SocialiteCallbackController;
use Domain\Sharing\Controllers\WebCrawlerOpenGraphController;
use Domain\Localization\Controllers\CurrentLocalizationController;
Route::get('/socialite/{provider}/callback', SocialiteCallbackController::class);
// Translations
Route::get('/translations/{lang}', CurrentLocalizationController::class);

View File

@@ -36,7 +36,7 @@ class SocialiteCallbackController extends Controller
$user->first()
);
return response('User logged in', 201);
return redirect()->to('/platform/files');
}
// Check if account registration is enabled
@@ -56,8 +56,11 @@ class SocialiteCallbackController extends Controller
]);
// Create User
($this->createNewUser)($data);
$user = ($this->createNewUser)($data);
return response('User registered', 201);
// Login user
$this->guard->login($user->first());
return redirect()->to('/platform/files');
}
}