instances added god may help
This commit is contained in:
@@ -1,11 +1,14 @@
|
||||
<?php
|
||||
|
||||
use MintyPHP\Router;
|
||||
use MintyPHP\Service\Auth\AuthServicesFactory;
|
||||
use MintyPHP\Support\Flash;
|
||||
use MintyPHP\Service\Auth\AuthService;
|
||||
use MintyPHP\Service\Auth\MicrosoftOidcService;
|
||||
use MintyPHP\Service\Auth\SsoUserLinkService;
|
||||
use MintyPHP\Service\Auth\TenantSsoService;
|
||||
|
||||
$authServicesFactory = new AuthServicesFactory();
|
||||
$authService = $authServicesFactory->createAuthService();
|
||||
$ssoUserLinkService = $authServicesFactory->createSsoUserLinkService();
|
||||
$tenantSsoService = $authServicesFactory->createTenantSsoService();
|
||||
$microsoftOidcService = $authServicesFactory->createMicrosoftOidcService();
|
||||
|
||||
$state = trim((string) ($_GET['state'] ?? ''));
|
||||
$code = trim((string) ($_GET['code'] ?? ''));
|
||||
@@ -17,7 +20,7 @@ if ($error !== '') {
|
||||
return;
|
||||
}
|
||||
|
||||
$callbackResult = MicrosoftOidcService::handleCallback($state, $code);
|
||||
$callbackResult = $microsoftOidcService->handleCallback($state, $code);
|
||||
if (!($callbackResult['ok'] ?? false)) {
|
||||
Flash::error(t('Microsoft login failed'), 'login', 'microsoft_login_failed');
|
||||
Router::redirect('login');
|
||||
@@ -31,12 +34,12 @@ if (!is_array($tenant)) {
|
||||
return;
|
||||
}
|
||||
|
||||
$linkResult = SsoUserLinkService::linkOrProvisionMicrosoftUser(
|
||||
$linkResult = $ssoUserLinkService->linkOrProvisionMicrosoftUser(
|
||||
$tenant,
|
||||
is_array($callbackResult['claims'] ?? null) ? $callbackResult['claims'] : []
|
||||
);
|
||||
if (!($linkResult['ok'] ?? false)) {
|
||||
$tenantSlug = TenantSsoService::tenantLoginSlug($tenant);
|
||||
$tenantSlug = $tenantSsoService->tenantLoginSlug($tenant);
|
||||
$loginTarget = $tenantSlug !== '' ? ('login?tenant=' . rawurlencode($tenantSlug)) : 'login';
|
||||
Flash::error(t('Microsoft login is not allowed for this account'), $loginTarget, 'microsoft_login_not_allowed');
|
||||
Router::redirect($loginTarget);
|
||||
@@ -45,9 +48,9 @@ if (!($linkResult['ok'] ?? false)) {
|
||||
|
||||
$userId = (int) ($linkResult['user_id'] ?? 0);
|
||||
$tenantId = (int) ($tenant['id'] ?? 0);
|
||||
$loginResult = AuthService::loginUserById($userId, $tenantId, 'microsoft');
|
||||
$loginResult = $authService->loginUserById($userId, $tenantId, 'microsoft');
|
||||
if (!($loginResult['ok'] ?? false)) {
|
||||
$tenantSlug = TenantSsoService::tenantLoginSlug($tenant);
|
||||
$tenantSlug = $tenantSsoService->tenantLoginSlug($tenant);
|
||||
$loginTarget = $tenantSlug !== '' ? ('login?tenant=' . rawurlencode($tenantSlug)) : 'login';
|
||||
Flash::error(t('Microsoft login failed'), $loginTarget, 'microsoft_login_failed');
|
||||
Router::redirect($loginTarget);
|
||||
|
||||
Reference in New Issue
Block a user