fix: Fix phoenix app prefix and TokenService test

HeyPuter · May 13, 2024 · afb9d86 · afb9d86
1 parent 7dc5929
commit afb9d86
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/packages/backend/src/services/auth/TokenService.js b/packages/backend/src/services/auth/TokenService.js
@@ -186,7 +186,7 @@ class TokenService extends BaseService {
     _test ({ assert }) {
         const U1 = '843f1d83-3c30-48c7-8964-62aff1a912d0';
         const U2 = '42e9c36b-8a53-4c3e-8e18-fe549b10a44d';
-        const U3 = 'c22ef816-edb6-47c5-8c41-31c6520fa9e6';
+        const U3 = 'app-c22ef816-edb6-47c5-8c41-31c6520fa9e6';
         // Test compression
         {
             const context = this.compression.auth;
@@ -198,20 +198,20 @@ class TokenService extends BaseService {
             };
 
             const compressed = this._compress_payload(context, payload);
-            assert(() => compressed.u === uuid_compression.encode(U1));
+            assert(() => compressed.u === uuid_compression().encode(U1));
             assert(() => compressed.t === 's');
-            assert(() => compressed.uu === uuid_compression.encode(U2));
-            assert(() => compressed.au === uuid_compression.encode(U3));
+            assert(() => compressed.uu === uuid_compression().encode(U2));
+            assert(() => compressed.au === uuid_compression('app-').encode(U3));
         }
 
         // Test decompression
         {
             const context = this.compression.auth;
             const payload = {
-                u: uuid_compression.encode(U1),
+                u: uuid_compression().encode(U1),
                 t: 's',
-                uu: uuid_compression.encode(U2),
-                au: uuid_compression.encode(U3),
+                uu: uuid_compression().encode(U2),
+                au: uuid_compression('app-').encode(U3),
             };
 
             const decompressed = this._decompress_payload(context, payload);

diff --git a/packages/backend/src/services/database/SqliteDatabaseAccessService.js b/packages/backend/src/services/database/SqliteDatabaseAccessService.js
@@ -42,7 +42,7 @@ class SqliteDatabaseAccessService extends BaseDatabaseAccessService {
         this.db = new Database(this.config.path);
 
         // Database upgrade logic
-        const TARGET_VERSION = 6;
+        const TARGET_VERSION = 7;
 
         if ( do_setup ) {
             this.log.noticeme(`SETUP: creating database at ${this.config.path}`);
@@ -55,6 +55,7 @@ class SqliteDatabaseAccessService extends BaseDatabaseAccessService {
                 '0006_update-apps.sql',
                 '0007_sessions.sql',
                 '0008_otp.sql',
+                '0009_app-prefix-fix',
             ].map(p => path_.join(__dirname, 'sqlite_setup', p));
             const fs = require('fs');
             for ( const filename of sql_files ) {
@@ -95,6 +96,10 @@ class SqliteDatabaseAccessService extends BaseDatabaseAccessService {
             upgrade_files.push('0008_otp.sql');
         }
 
+        if ( user_version <= 6 ) {
+            upgrade_files.push('0009_app-prefix-fix.sql');
+        }
+
         if ( upgrade_files.length > 0 ) {
             this.log.noticeme(`Database out of date: ${this.config.path}`);
             this.log.noticeme(`UPGRADING DATABASE: ${user_version} -> ${TARGET_VERSION}`);

diff --git a/packages/backend/src/services/database/sqlite_setup/0009_app-prefix-fix.sql b/packages/backend/src/services/database/sqlite_setup/0009_app-prefix-fix.sql
@@ -0,0 +1 @@
+UPDATE `apps` SET `uid` = 'app-129e4bfb-4c8a-47e0-bec2-0279c21ace06' WHERE `name` = 'phoenix';