+
+endForm();
\ No newline at end of file
diff --git a/kernel/modules/module_shop_client/views/login_at_module_shop.php b/kernel/modules/module_shop_client/views/login_at_module_shop.php
new file mode 100644
index 0000000..b635740
--- /dev/null
+++ b/kernel/modules/module_shop_client/views/login_at_module_shop.php
@@ -0,0 +1,34 @@
+run();
+
+echo \kernel\helpers\Html::h(2, "Форма авторизации/регистрации");
+
+$form = new ActiveForm();
+$form->beginForm("/admin/module_shop_client/auth/");
+
+$form->field(\itguild\forms\inputs\TextInput::class, 'email', [
+ 'class' => "form-control",
+ 'placeholder' => 'Email',
+])
+ ->setLabel("Email")
+ ->render();
+?>
+
+
+ field(\itguild\forms\inputs\Button::class, name: "btn-submit", params: [
+ 'class' => "btn btn-primary ",
+ 'value' => 'Отправить',
+ 'typeInput' => 'submit'
+ ])
+ ->render();
+ ?>
+
+
+
+
+endForm();
\ No newline at end of file
diff --git a/kernel/modules/module_shop_client/views/module_shop_error_connection.php b/kernel/modules/module_shop_client/views/module_shop_error_connection.php
new file mode 100644
index 0000000..bf31edd
--- /dev/null
+++ b/kernel/modules/module_shop_client/views/module_shop_error_connection.php
@@ -0,0 +1,6 @@
+run();
+?>
+
+
+ field(\itguild\forms\inputs\Button::class, name: "btn-submit", params: [
+ 'class' => "btn btn-primary ",
+ 'value' => 'Отправить',
+ 'typeInput' => 'submit'
+ ])
+ ->render();
+ ?>
+
+
+Ошибка подключения к сервису
+ diff --git a/kernel/modules/module_shop_client/views/success_login.php b/kernel/modules/module_shop_client/views/success_login.php new file mode 100644 index 0000000..927f680 --- /dev/null +++ b/kernel/modules/module_shop_client/views/success_login.php @@ -0,0 +1,9 @@ +run(); + +echo \kernel\helpers\Html::h(2, "Авторизация прошла успешно"); +echo \kernel\helpers\Html::a("/admin", ['class' => 'btm btm-primary']); + diff --git a/kernel/modules/secure/controllers/SecureController.php b/kernel/modules/secure/controllers/SecureController.php index bdea8ab..8498c77 100644 --- a/kernel/modules/secure/controllers/SecureController.php +++ b/kernel/modules/secure/controllers/SecureController.php @@ -4,11 +4,19 @@ namespace kernel\modules\secure\controllers; use JetBrains\PhpStorm\NoReturn; use kernel\AdminController; +use kernel\App; use kernel\Flash; use kernel\helpers\Debug; +use kernel\Mailing; +use kernel\modules\secure\models\forms\LoginEmailForm; use kernel\modules\secure\models\forms\LoginForm; use kernel\modules\secure\models\forms\RegisterForm; +use kernel\modules\secure\services\SecureService; +use kernel\modules\user\models\User; use kernel\modules\user\service\UserService; +use kernel\Request; +use PHPMailer\PHPMailer\Exception; +use Random\RandomException; class SecureController extends AdminController { @@ -24,7 +32,12 @@ class SecureController extends AdminController public function actionLogin(): void { - $this->cgView->render('login.php'); + $this->cgView->render(match (App::$secure['web_auth_type']) { + "login_password" => "login.php", + "email_code" => "email_login.php", + }); + +// $this->cgView->render('login.php'); } #[NoReturn] public function actionAuth(): void @@ -54,14 +67,83 @@ class SecureController extends AdminController } } + /** + * @throws RandomException + * @throws Exception + */ + public function actionEmailAuth(): void + { + $mailing = new Mailing(); + + $loginForm = new LoginEmailForm(); + $loginForm->load($_REQUEST); + + $email = $loginForm->getItem("email"); + $user = $this->userService->getByField('email', $email); + + if (!$user){ + $password = bin2hex(random_bytes(8)); + + UserService::createUserByEmailAndPassword($email, $password); + $user = $this->userService->getByField('email', $email); + + SecureService::createSecretCode($user); + $secretCode = SecureService::getByField("user_id", $user->id); + + + $mailing->send_html("register_by_code.php", ['code' => $secretCode->code, 'password' => $password], [ + 'address' => $email, + 'subject' => "Код регистрации", + "from_name" => $_ENV['APP_NAME'] + ]); + } else { + SecureService::updateSecretCode($user); + $secretCode = SecureService::getByField("user_id", $user->id); + $mailing->send_html("login_by_code.php", ['code' => $secretCode->code], [ + 'address' => $email, + 'subject' => "Код авторизации", + "from_name" => $_ENV['APP_NAME'] + ]); + } + + setcookie('user_email', $email, time()+60*15, '/', $_SERVER['SERVER_NAME'], false); + $this->cgView->render("enter_code.php", ['email' => $email]); + } + + /** + * @throws Exception + */ + public function actionCodeCheck(): void + { + $request = new Request(); + + if (isset($_COOKIE['user_email'])) { + $user = User::where('email', $_COOKIE["user_email"])->first(); + if (!$user) { + throw new exception("User not found."); + } + $code = $request->post("code"); + $secretCode = SecureService::getByField("user_id", $user->id); + if ($secretCode->code == $code && time() <= strtotime($secretCode->code_expires_at)) { + setcookie('user_id', $user->id, time() + 60 * 60 * 24, '/', $_SERVER['SERVER_NAME'], false); + $this->redirect("/admin", code: 302); + } else { + Flash::setMessage("error", "Wrong code."); + $this->cgView->render("enter_code.php", ['email' => $_COOKIE["user_email"]]); + } + + } + } + #[NoReturn] public function actionLogout(): void { unset($_COOKIE['user_id']); setcookie('user_id', "", -1, '/', ".".$_SERVER['SERVER_NAME'], false); + setcookie('user_email', "", -1, '/', ".".$_SERVER['SERVER_NAME'], false); $this->redirect("/", code: 302); } - public function actionRegister() + public function actionRegister(): void { $this->cgView->render('register.php'); } diff --git a/kernel/modules/secure/controllers/SecureRestController.php b/kernel/modules/secure/controllers/SecureRestController.php index 42ede4a..7e82699 100644 --- a/kernel/modules/secure/controllers/SecureRestController.php +++ b/kernel/modules/secure/controllers/SecureRestController.php @@ -7,10 +7,15 @@ use Firebase\JWT\Key; use JetBrains\PhpStorm\NoReturn; use kernel\App; use kernel\helpers\Debug; +use kernel\Mailing; +use kernel\modules\secure\models\SecretCode; +use kernel\modules\secure\services\SecureService; use kernel\modules\user\models\User; +use kernel\modules\user\service\UserService; use kernel\Request; use kernel\RestController; use kernel\services\TokenService; +use PHPMailer\PHPMailer\Exception; use Random\RandomException; class SecureRestController extends RestController @@ -51,4 +56,75 @@ class SecureRestController extends RestController $this->renderApi($res); } -} \ No newline at end of file + /** + * @throws Exception + * @throws RandomException + */ + #[NoReturn] public function actionEmailAuth(): void + { + $mailing = new Mailing(); + $request = new Request(); + $data = $request->post(); + $model = $this->model->where('email', $data['email'])->first(); + + if (!$model) { + $password = bin2hex(random_bytes(8)); + + UserService::createUserByEmailAndPassword($data['email'], $password); + $model = UserService::getByField('email', $data['email']); + + SecureService::createSecretCode($model); + $secretCode = SecureService::getByField("user_id", $model->id); + + + $mailing->send_html("register_by_code.php", ['code' => $secretCode->code, 'password' => $password], [ + 'address' => $data['email'], + 'subject' => "Код регистрации", + "from_name" => $_ENV['APP_NAME'] + ]); + } else { + SecureService::updateSecretCode($model); + $secretCode = SecureService::getByField("user_id", $model->id); + + $mailing->send_html("login_by_code.php", ['code' => $secretCode->code], [ + 'address' => $data['email'], + 'subject' => "Код авторизации", + "from_name" => $_ENV['APP_NAME'] + ]); + } + + $res = [ + "status" => "success", + "code_expires_at" => $secretCode->code_expires_at, + ]; + + setcookie('user_email', $data['email'], time()+60*15, '/', $_SERVER['SERVER_NAME'], false); + $this->renderApi($res); + } + + /** + * @throws Exception + */ + #[NoReturn] public function actionCodeCheck(): void + { + $request = new Request(); + $code = $request->post("code"); + + $model = SecretCode::where("code", $code)->first(); + if (time() <= strtotime($model->code_expires_at)) { + $user = $this->model->where("id", $model->user_id)->first(); + if ($user){ + $user->access_token_expires_at = date("Y-m-d H:i:s", strtotime(App::$secure['token_expired_time'])); + $user->access_token = SecureService::generateAccessToken(); + $user->save(); + $this->renderApi([ + "access_token" => $user->access_token, + "access_token_expires_at" => $user->access_token_expires_at, + ]); + } + } + + $this->renderApi(['status' => 'error', 'message' => 'incorrect code']); + } + +} diff --git a/kernel/modules/secure/migrations/2024_12_09_081420_create_secret_code_table.php b/kernel/modules/secure/migrations/2024_12_09_081420_create_secret_code_table.php new file mode 100644 index 0000000..c5acce1 --- /dev/null +++ b/kernel/modules/secure/migrations/2024_12_09_081420_create_secret_code_table.php @@ -0,0 +1,31 @@ +schema->create('secret_code', function (Blueprint $table) { + $table->increments('id'); + $table->integer('user_id'); + $table->integer('code'); + $table->dateTime('code_expires_at')->nullable(true); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + \kernel\App::$db->schema->dropIfExists('secret_code'); + + } +}; diff --git a/kernel/modules/secure/models/SecretCode.php b/kernel/modules/secure/models/SecretCode.php new file mode 100644 index 0000000..0caaa60 --- /dev/null +++ b/kernel/modules/secure/models/SecretCode.php @@ -0,0 +1,25 @@ + 'Пользователь', + 'code' => 'Код', + 'code_expires_at' => 'Срок жизни кода', + ]; + } + +} diff --git a/kernel/modules/secure/models/forms/LoginEmailForm.php b/kernel/modules/secure/models/forms/LoginEmailForm.php new file mode 100644 index 0000000..201817a --- /dev/null +++ b/kernel/modules/secure/models/forms/LoginEmailForm.php @@ -0,0 +1,17 @@ + 'required|string|email|max255', + ]; + } + +} \ No newline at end of file diff --git a/kernel/modules/secure/routs/secure.php b/kernel/modules/secure/routs/secure.php index 0377475..be041d8 100644 --- a/kernel/modules/secure/routs/secure.php +++ b/kernel/modules/secure/routs/secure.php @@ -14,13 +14,17 @@ App::$collector->group(["prefix" => "admin"], function (RouteCollector $router){ App::$collector->get('/login', [\kernel\modules\secure\controllers\SecureController::class, 'actionLogin']); App::$collector->get('/logout', [\kernel\modules\secure\controllers\SecureController::class, 'actionLogout']); App::$collector->post('/auth', [\kernel\modules\secure\controllers\SecureController::class, 'actionAuth']); + App::$collector->post('/email_auth', [\kernel\modules\secure\controllers\SecureController::class, 'actionEmailAuth']); App::$collector->get('/register', [\kernel\modules\secure\controllers\SecureController::class, 'actionRegister']); App::$collector->post('/registration', [\kernel\modules\secure\controllers\SecureController::class, 'actionRegistration']); + App::$collector->post('/code_check', [\kernel\modules\secure\controllers\SecureController::class, 'actionCodeCheck']); }); App::$collector->group(["prefix" => "api"], function (CgRouteCollector $router){ App::$collector->group(["prefix" => "secure"], function (CgRouteCollector $router) { App::$collector->post('/auth', [\kernel\modules\secure\controllers\SecureRestController::class, 'actionAuth']); + App::$collector->post('/email_auth', [\kernel\modules\secure\controllers\SecureRestController::class, 'actionEmailAuth']); + App::$collector->post('/code_check', [\kernel\modules\secure\controllers\SecureRestController::class, 'actionCodeCheck']); }); }); diff --git a/kernel/modules/secure/services/SecureService.php b/kernel/modules/secure/services/SecureService.php new file mode 100644 index 0000000..b47f4d4 --- /dev/null +++ b/kernel/modules/secure/services/SecureService.php @@ -0,0 +1,54 @@ +user_id = $user->id; + $secretCode->code = mt_rand(100000, 999999); + $secretCode->code_expires_at = date("Y-m-d H:i:s", strtotime("+5 minutes"));; + $secretCode->save(); + } + + public static function updateSecretCode(User $user): void + { + $secretCode = SecretCode::where('user_id', $user->id)->first(); + $secretCode->code = mt_rand(100000, 999999); + $secretCode->code_expires_at = date("Y-m-d H:i:s", strtotime("+5 minutes"));; + $secretCode->save(); + } + + public static function getCodeByUserId(int $user_id) + { + return SecretCode::where('user_id', $user_id)->one()->code; + } + + public static function getByField(string $field, mixed $value) + { + return SecretCode::where($field, $value)->first(); + } + + public static function generateAccessToken(): string + { + return match (App::$secure['token_type']) { + "JWT" => TokenService::JWT($_ENV['SECRET_KEY'], 'HS256'), + "md5" => TokenService::md5(), + "crypt" => TokenService::crypt(), + "hash" => TokenService::hash('sha256'), + default => TokenService::random_bytes(20), + }; + } + +} \ No newline at end of file diff --git a/kernel/modules/secure/views/email_login.php b/kernel/modules/secure/views/email_login.php new file mode 100644 index 0000000..eadc71b --- /dev/null +++ b/kernel/modules/secure/views/email_login.php @@ -0,0 +1,48 @@ + +
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ Форма авторизации/регистрации
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Введите код, отправленный на почту ""
++ Код подтверждения: +
++ Если вы не запрашивали код, проигнорируйте данное письмо. +
\ No newline at end of file diff --git a/kernel/views/mailing/register_by_code.php b/kernel/views/mailing/register_by_code.php new file mode 100644 index 0000000..4dc6a54 --- /dev/null +++ b/kernel/views/mailing/register_by_code.php @@ -0,0 +1,15 @@ + + +
+ Код подтверждения:
+ Ваш пароль:
+
+ Если вы не запрашивали код, проигнорируйте данное письмо. +
\ No newline at end of file diff --git a/kernel/views/module/index.php b/kernel/views/module/index.php index 52c6bcb..d7c1158 100644 --- a/kernel/views/module/index.php +++ b/kernel/views/module/index.php @@ -75,7 +75,7 @@ $table->addAction(function ($row) use ($moduleService){ return false; }); -if ($moduleService->isActive('module_shop_client') && $moduleService->isServerAvailable()) { +if ($moduleService->isActive('module_shop_client')) { ModuleTabsWidget::create()->run(); } diff --git a/views/widgets/admin/action_button.php b/views/widgets/admin/action_button.php index 32dee23..edd9968 100644 --- a/views/widgets/admin/action_button.php +++ b/views/widgets/admin/action_button.php @@ -6,4 +6,4 @@ */ ?> -"