back round 0 view raw

Fix crashes in Postgres OAuth session adapter #5

merged

opened by

danabra.mov 1 month ago targeting main from danabra.mov/slices: fix-postgres

Fixes https://tangled.org/@slices.network/slices/issues/11

I don't know if it's a complete fix but it does get OAuth working for me with pg.

Verified by patching the fix into my app. Previously it would instacrash, but now I'm able to log in properly.

options

unified split

Changed files

+11 -11

packages

session

src

adapters

postgres.ts

+11 -11

packages/session/src/adapters/postgres.ts

···

       6
       6
        
         user_id: string;

     

       7
       7
        
         handle: string | null;

     

       8
       8
        
         is_authenticated: boolean;

     

       9
       9
       -
         data: string | null;

     

       10
       10
       -
         created_at: Date;

     

       11
       11
       -
         expires_at: Date;

     

       12
       12
       -
         last_accessed_at: Date;

     

       9
       9
       +
         data: Record<string, unknown> | null;

     

       10
       10
       +
         created_at: number;

     

       11
       11
       +
         expires_at: number;

     

       12
       12
       +
         last_accessed_at: number;

     

       13
       13
        
       }

     

       14
       14
        
       

     

       15
       15
        
       export class PostgresAdapter implements SessionAdapter {

     
···

       100
       100
        
                 data.userId,

     

       101
       101
        
                 data.handle || null,

     

       102
       102
        
                 data.isAuthenticated,

     

       103
       103
       -
                 data.data ? JSON.stringify(data.data) : null,

     

       103
       103
       +
                 data.data || null,

     

       104
       104
        
                 data.createdAt,

     

       105
       105
        
                 data.expiresAt,

     

       106
       106
        
                 data.lastAccessedAt,

     
···

       116
       116
        
           updates: Partial<SessionData>

     

       117
       117
        
         ): Promise<boolean> {

     

       118
       118
        
           const setParts: string[] = [];

     

       119
       119
       -
           const values: (string | number | boolean | null)[] = [];

     

       119
       119
       +
           const values: (string | number | boolean | null | Record<string, unknown>)[] = [];

     

       120
       120
        
           let paramIndex = 1;

     

       121
       121
        
       

     

       122
       122
        
           if (updates.userId !== undefined) {

     
···

       136
       136
        
       

     

       137
       137
        
           if (updates.data !== undefined) {

     

       138
       138
        
             setParts.push(`data = $${paramIndex++}`);

     

       139
       139
       -
             values.push(updates.data ? JSON.stringify(updates.data) : null);

     

       139
       139
       +
             values.push(updates.data || null);

     

       140
       140
        
           }

     

       141
       141
        
       

     

       142
       142
        
           if (updates.expiresAt !== undefined) {

     
···

       226
       226
        
             userId: row.user_id,

     

       227
       227
        
             handle: row.handle || undefined,

     

       228
       228
        
             isAuthenticated: row.is_authenticated,

     

       229
       229
       -
             data: row.data ? JSON.parse(row.data) : undefined,

     

       230
       230
       -
             createdAt: row.created_at.getTime(),

     

       231
       231
       -
             expiresAt: row.expires_at.getTime(),

     

       232
       232
       -
             lastAccessedAt: row.last_accessed_at.getTime(),

     

       229
       229
       +
             data: row.data || undefined,

     

       230
       230
       +
             createdAt: row.created_at,

     

       231
       231
       +
             expiresAt: row.expires_at,

     

       232
       232
       +
             lastAccessedAt: row.last_accessed_at,

     

       233
       233
        
           };

     

       234
       234
        
         }

     

       235
       235