Fix register_method column not being filled when accounts are creat…

…ed (NamelessMC#3231)
Pepe-tf · Jan 26, 2023 · bfbc88c · bfbc88c
1 parent 7f2b7b9
commit bfbc88c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 6 deletions.
diff --git a/core/installation/includes/upgrade_perform.php b/core/installation/includes/upgrade_perform.php
@@ -499,7 +499,8 @@
                 'tfa_enabled' => $item->tfa_enabled,
                 'tfa_type' => $item->tfa_type,
                 'tfa_secret' => $item->tfa_secret,
-                'tfa_complete' => $item->tfa_complete
+                'tfa_complete' => $item->tfa_complete,
+                'register_method' => 'v1_upgrade',
             ]);
 
             DB::getInstance()->insert('users_groups', [

diff --git a/core/installation/steps/admin_account_setup.php b/core/installation/steps/admin_account_setup.php
@@ -86,6 +86,7 @@ function display_error(string $message) {
                 'last_online' => date('U'),
                 'language_id' => $default_language[0]->id,
                 'timezone' => $_SESSION['install_timezone'],
+                'register_method' => 'nameless',
             ]);
 
             $profile = ProfileUtils::getProfile(Output::getClean(Input::get('username')));

diff --git a/dev/scripts/cli_install.php b/dev/scripts/cli_install.php
@@ -182,6 +182,7 @@ function getEnvVar(string $name, string $fallback = null, array $valid_values =
     'last_online' => date('U'),
     'language_id' => DB::getInstance()->get('languages', ['is_default', 1])->results()[0]->id,
     'timezone' => $_SESSION['install_timezone'],
+    'register_method' => 'nameless',
 ]);
 DB::getInstance()->query('INSERT INTO `nl2_users_groups` (`user_id`, `group_id`, `received`, `expire`) VALUES (?, ?, ?, ?)', [
     1,

diff --git a/dev/scripts/seeder/UserSeeder.php b/dev/scripts/seeder/UserSeeder.php
@@ -22,6 +22,7 @@ public function run(DB $db, \Faker\Generator $faker): void {
             'active' => true,
             'last_online' => date('U'),
             'language_id' => $db->get('languages', ['is_default', '=', 1])->first()->id,
+            'register_method' => 'nameless',
         ]);
         $user_id = $db->lastId();
         $db->query('INSERT INTO `nl2_users_groups` (`user_id`, `group_id`, `received`, `expire`) VALUES (?, ?, ?, ?)', [
@@ -67,6 +68,7 @@ public function run(DB $db, \Faker\Generator $faker): void {
                 'user_title' => $faker->boolean(20) ? $faker->text(60) : null,
                 'night_mode' => $faker->boolean ? 1 : 0,
                 'timezone' => $faker->boolean ? $faker->timezone : 'America/Vancouver',
+                'register_method' => 'nameless',
             ]);
 
             $user_id = $db->lastId();

diff --git a/modules/Core/includes/endpoints/RegisterEndpoint.php b/modules/Core/includes/endpoints/RegisterEndpoint.php
@@ -131,7 +131,8 @@ private function createUser(Nameless2API $api, string $username, string $email,
                     'joined' => date('U'),
                     'lastip' => 'Unknown',
                     'reset_code' => $code,
-                    'last_online' => date('U')
+                    'last_online' => date('U'),
+                    'register_method' => 'api',
                 ]
             );
 

diff --git a/modules/Core/includes/run_mcassoc.php b/modules/Core/includes/run_mcassoc.php
@@ -104,7 +104,8 @@
                     'email' => $_SESSION['mcassoc']['email'],
                     'active' => true,
                     'lastip' => $ip,
-                    'last_online' => date('U')
+                    'last_online' => date('U'),
+                    'register_method' => 'mcassoc',
                 ]);
 
                 $new_user = new User(DB::getInstance()->lastId());

diff --git a/modules/Core/pages/register.php b/modules/Core/pages/register.php
@@ -314,6 +314,13 @@
                             $timezone = $auto_timezone;
                         }
 
+                        $register_method = 'nameless';
+
+                        if (Session::exists('oauth_register_data')) {
+                            $data = json_decode(Session::get('oauth_register_data'), true);
+                            $register_method = 'oauth_' . $data['provider'];
+                        }
+
                         // Create user
                         $user->create([
                             'username' => $username,
@@ -327,6 +334,7 @@
                             'last_online' => $date,
                             'language_id' => $language_id,
                             'timezone' => $timezone,
+                            'register_method' => $register_method,
                         ]);
 
                         // Get user ID
@@ -346,7 +354,9 @@
                                 $data['provider'],
                                 $data['id'],
                             );
-                            $auto_verify_oauth_email = $data['email'] === Input::get('email') && NamelessOAuth::getInstance()->hasVerifiedEmail($data['provider'], $data['data']);
+                            $auto_verify_oauth_email = $data['email'] === Input::get('email')
+                                && NamelessOAuth::getInstance()->hasVerifiedEmail($data['provider'], $data['data'])
+                                && DB::getInstance()->get('users', ['email', $data['email']])->count() === 0;
 
                             Session::delete('oauth_register_data');
                         }
@@ -429,7 +439,7 @@
 $username_value = ((isset($_POST['username']) && $_POST['username']) ? Output::getClean(Input::get('username')) : '');
 $email_value = ((isset($_POST['email']) && $_POST['email']) ? Output::getClean(Input::get('email')) : '');
 
-if ($email === '' && Session::exists('oauth_register_data')) {
+if ($email_value === '' && Session::exists('oauth_register_data')) {
     $email_value = json_decode(Session::get('oauth_register_data'), true)['email'];
 }
 
@@ -471,7 +481,8 @@
         ]),
         'CANCEL' => $language->get('general', 'cancel'),
         'OAUTH_CANCEL_REGISTER_URL' => URL::build('/oauth', 'action=cancel_registration'),
-        'OAUTH_EMAIL_VERIFIED' => NamelessOAuth::getInstance()->hasVerifiedEmail($data['provider'], $data['data']),
+        'OAUTH_EMAIL_VERIFIED' => NamelessOAuth::getInstance()->hasVerifiedEmail($data['provider'], $data['data'])
+            && DB::getInstance()->get('users', ['email', $data['email']])->count() === 0,
         'OAUTH_EMAIL_ORIGINAL' => $data['email'],
         'OAUTH_EMAIL_VERIFIED_MESSAGE' => $language->get('general', 'oauth_email_verified_automatically'),
         'OAUTH_EMAIL_NOT_VERIFIED_MESSAGE' => $language->get('general', 'oauth_email_not_verified_automatically'),