commit 9deff468c01502e66286bfe58c7d5cc4a9c8d061 · dunkirk.sh/thistle

+2 -1

src/components/user-settings.ts

···

       852
       852
        
       			});

     

       853
       853
        
       

     

       854
       854
        
       			if (!response.ok) {

     

       855
       855
       -
       				this.error = "Failed to kill session";

     

       855
       855
       +
       				const data = await response.json();

     

       856
       856
       +
       				this.error = data.error || "Failed to kill session";

     

       856
       857
        
       				return;

     

       857
       858
        
       			}

     

       858
       859

+32

src/index.test.ts

···

       600
       600
        
       

     

       601
       601
        
       			expect(response.status).toBe(404);

     

       602
       602
        
       		});

     

       603
       603
       +
       

     

       604
       604
       +
       		serverTest("should not delete current session", async () => {

     

       605
       605
       +
       			// Register user

     

       606
       606
       +
       			const hashedPassword = await clientHashPassword(

     

       607
       607
       +
       				TEST_USER.email,

     

       608
       608
       +
       				TEST_USER.password,

     

       609
       609
       +
       			);

     

       610
       610
       +
       			const registerResponse = await fetch(`${BASE_URL}/api/auth/register`, {

     

       611
       611
       +
       				method: "POST",

     

       612
       612
       +
       				headers: { "Content-Type": "application/json" },

     

       613
       613
       +
       				body: JSON.stringify({

     

       614
       614
       +
       					email: TEST_USER.email,

     

       615
       615
       +
       					password: hashedPassword,

     

       616
       616
       +
       				}),

     

       617
       617
       +
       			});

     

       618
       618
       +
       			const sessionCookie = extractSessionCookie(registerResponse);

     

       619
       619
       +
       

     

       620
       620
       +
       			// Try to delete own current session

     

       621
       621
       +
       			const response = await authRequest(

     

       622
       622
       +
       				`${BASE_URL}/api/sessions`,

     

       623
       623
       +
       				sessionCookie,

     

       624
       624
       +
       				{

     

       625
       625
       +
       					method: "DELETE",

     

       626
       626
       +
       					headers: { "Content-Type": "application/json" },

     

       627
       627
       +
       					body: JSON.stringify({ sessionId: sessionCookie }),

     

       628
       628
       +
       				},

     

       629
       629
       +
       			);

     

       630
       630
       +
       

     

       631
       631
       +
       			expect(response.status).toBe(400);

     

       632
       632
       +
       			const data = await response.json();

     

       633
       633
       +
       			expect(data.error).toContain("Cannot kill current session");

     

       634
       634
       +
       		});

     

       603
       635
        
       	});

     

       604
       636
        
       });

     

       605
       637

src/index.ts

···

       456
       456
        
       						user_agent: s.user_agent,

     

       457
       457
        
       						created_at: s.created_at,

     

       458
       458
        
       						expires_at: s.expires_at,

     

       459
       459
       +
       						is_current: s.id === sessionId,

     

       459
       460
        
       					})),

     

       460
       461
        
       				});

     

       461
       462
        
       			},

     
···

       473
       474
        
       				if (!targetSessionId) {

     

       474
       475
        
       					return Response.json(

     

       475
       476
        
       						{ error: "Session ID required" },

     

       477
       477
       +
       						{ status: 400 },

     

       478
       478
       +
       					);

     

       479
       479
       +
       				}

     

       480
       480
       +
       				// Prevent deleting current session

     

       481
       481
       +
       				if (targetSessionId === currentSessionId) {

     

       482
       482
       +
       					return Response.json(

     

       483
       483
       +
       						{ error: "Cannot kill current session. Use logout instead." },

     

       476
       484
        
       						{ status: 400 },

     

       477
       485
        
       					);

     

       478
       486
        
       				}