Cleaning config table (LycheeOrg#1491)

losfair · Sep 5, 2022 · e18c16b · e18c16b
1 parent b31d345
commit e18c16b
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 8 deletions.
diff --git a/app/Actions/Diagnostics/Checks/ConfigSanityCheck.php b/app/Actions/Diagnostics/Checks/ConfigSanityCheck.php
@@ -25,7 +25,7 @@ public function check(array &$errors): void
 		$settings = Configs::get();
 
 		$keys_checked = [
-			'username', 'password', 'sorting_photos_col', 'sorting_albums_col',
+			'sorting_photos_col', 'sorting_albums_col',
 			'imagick', 'skip_duplicates', 'check_for_updates', 'version',
 		];
 

diff --git a/app/Models/Configs.php b/app/Models/Configs.php
@@ -298,4 +298,12 @@ public function scopeAdmin(FixedQueryBuilder $query): FixedQueryBuilder
 	{
 		return $query->where('confidentiality', '<=', 3);
 	}
+
+	/**
+	 * Reset the cache.
+	 */
+	public static function invalidateCache(): void
+	{
+		self::$cache = [];
+	}
 }
diff --git a/database/migrations/2020_12_12_203153_migrate_admin_user.php b/database/migrations/2020_12_12_203153_migrate_admin_user.php
@@ -2,6 +2,7 @@
 
 use App\Exceptions\ModelDBException;
 use App\Models\Configs;
+use App\Models\User;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
@@ -17,13 +18,13 @@ class MigrateAdminUser extends Migration
 	 */
 	public function up(): void
 	{
-		DB::table('users')->insert([
-			'id' => 0,
-			'username' => Configs::getValueAsString('username', ''),
-			'password' => Configs::getValueAsString('password', ''),
-			'lock' => false,
-			'upload' => true,
-		]);
+		$user = User::query()->findOrNew(0);
+		$user->incrementing = false; // disable auto-generation of ID
+		$user->id = 0;
+		Configs::invalidateCache();
+		$user->username = Configs::getValueAsString('username', '');
+		$user->password = Configs::getValueAsString('password', '');
+		$user->save();
 	}
 
 	/**

diff --git a/database/migrations/2022_08_27_110209_drop_admin_user_config.php b/database/migrations/2022_08_27_110209_drop_admin_user_config.php
@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+class DropAdminUserConfig extends Migration
+{
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		DB::table('configs')
+			->whereIn('key', ['username', 'password'])
+			->delete();
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		defined('STRING_REQ') or define('STRING_REQ', 'string_required');
+
+		DB::table('configs')->insert([
+			[
+				'key' => 'username',
+				'value' => '',
+				'confidentiality' => '4',
+				'cat' => 'Admin',
+				'type_range' => STRING_REQ,
+			],
+			[
+				'key' => 'password',
+				'value' => '',
+				'confidentiality' => '4',
+				'cat' => 'Admin',
+				'type_range' => STRING_REQ,
+			],
+		]
+		);
+	}
+}
diff --git a/tests/Feature/InstallTest.php b/tests/Feature/InstallTest.php
@@ -12,6 +12,7 @@
 
 namespace Tests\Feature;
 
+use App\Models\Configs;
 use App\Models\User;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -143,6 +144,7 @@ public function testInstall(): void
 		/**
 		 * We now should NOT be redirected.
 		 */
+		Configs::invalidateCache();
 		$response = $this->get('/');
 		$response->assertOk();