Merge pull request #794 from bakaphp/feat-user-confirmation

feat : User Enums

Author: kaioken

src/Auth/Auth.php

@@ -10,9 +10,11 @@
 use Baka\Hashing\Keys;
 use Baka\Hashing\Password;
 use Baka\Support\Random;
+use Canvas\Enums\App;
+use Canvas\Enums\State;
+use Canvas\Enums\UserStatus;
 use Canvas\Models\Sessions;
 use Canvas\Models\Users;
-use Canvas\Models\Companies;
 use Exception;
 use Lcobucci\JWT\Token;
 use stdClass;
@@ -81,25 +83,25 @@ public static function login(string $email, string $password, int $autologin = 1
      */
     public static function signUp(UserInterface $user) : UserInterface
     {
-        $user->sex = 'U';
+        $user->sex = App::DEFAULT_SEX;
         $user->firstname = $user->firstname ?? ' ';
         $user->lastname = $user->lastname ?? ' ';
         $user->displayname = $user->displayname ?? Random::generateDisplayName($user->email);
         $user->dob = date('Y-m-d');
         $user->lastvisit = date('Y-m-d H:i:s');
         $user->registered = date('Y-m-d H:i:s');
-        $user->timezone = 'America/New_York';
-        $user->user_level = 3;
-        $user->user_active = 1;
-        $user->status = 1;
-        $user->banned = 'N';
+        $user->timezone = App::DEFAULT_TIMEZONE;
+        $user->user_level = App::DEFAULT_USER_LEVEL;
+        $user->user_active = UserStatus::ACTIVE;
+        $user->status = UserStatus::ACTIVE;
+        $user->banned = State::NO_STRING;
         $user->user_login_tries = 0;
         $user->user_last_login_try = 0;
         $user->default_company = $user->default_company ?? 0;
         $user->session_time = time();
         $user->session_page = time();
         $user->password = Password::make($user->password);
-        $user->language = $user->language ?: 'EN';
+        $user->language = $user->language ?: App::DEFAULT_LANGUAGE;
         $user->user_activation_key = Keys::make();
 
         //if you need to run any extra feature with the data we get from the request
@@ -127,6 +129,7 @@ protected static function loginAttemptsValidation(UserInterface $user) : bool
         $config = new stdClass();
         $config->login_reset_time = getenv('AUTH_MAX_AUTOLOGIN_TIME');
         $config->max_login_attempts = getenv('AUTH_MAX_AUTOLOGIN_ATTEMPS');
+        //$config->max_login_attempts = getenv('AUTH_MAX_AUTOLOGIN_ATTEMPTS');
 
         // If the last login is more than x minutes ago, then reset the login tries/time
         if ($user->user_last_login_try && $config->login_reset_time && $user->user_last_login_try < (time() - ($config->login_reset_time * 60))) {

src/Enums/App.php

@@ -15,4 +15,9 @@ class App
     public const DEFAULT_ROLE_SETTING = 'default_admin_role';
     public const DEFAULT_COUNTRY = 'default_user_country';
     public const VERSION = 0.3;
+    public const DEFAULT_TIMEZONE = 'America/New_York';
+    public const DEFAULT_SEX = 'U';
+    public const DEFAULT_USER_LEVEL = 3;
+    public const DEFAULT_LANGUAGE = 'EN';
+    public const DEFAULT_ROLE_ID = 2;
 }

src/Enums/State.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Canvas\Enums;
+
+class State
+{
+    public const ON = 1;
+    public const OFF = 0;
+    public const YES = 1;
+    public const NO = 0;
+    public const ON_STRING = 'Y';
+    public const YES_STRING = 'Y';
+    public const OFF_STRING = 'N';
+    public const NO_STRING = 'N';
+    public const EMPTY_STRING = '';
+}

src/Enums/UserStatus.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Canvas\Enums;
+
+class UserStatus
+{
+    public const ACTIVE = 1;
+    public const INACTIVE = 0;
+    public const INVITED = 2;
+}