diff --git a/src/services/storage-refresh-token-repo.ts b/src/services/storage-refresh-token-repo.ts index 9e962c2..d387c43 100644 --- a/src/services/storage-refresh-token-repo.ts +++ b/src/services/storage-refresh-token-repo.ts @@ -28,13 +28,6 @@ export async function getRefreshTokenRecord( db: D1Database, refreshTokenKey: RefreshTokenKeyFn, maybeCleanupExpiredRefreshTokens: CleanupExpiredFn, - saveRefreshTokenRecord: ( - token: string, - userId: string, - expiresAtMs?: number, - deviceIdentifier?: string | null, - deviceSessionStamp?: string | null - ) => Promise, deleteRefreshTokenRecord: (token: string) => Promise, token: string ): Promise { @@ -42,39 +35,11 @@ export async function getRefreshTokenRecord( await maybeCleanupExpiredRefreshTokens(now); const tokenKey = await refreshTokenKey(token); - let row = await db + const row = await db .prepare('SELECT user_id, expires_at, device_identifier, device_session_stamp FROM refresh_tokens WHERE token = ?') .bind(tokenKey) .first<{ user_id: string; expires_at: number; device_identifier: string | null; device_session_stamp: string | null }>(); - if (!row) { - const legacyRow = await db - .prepare('SELECT user_id, expires_at, device_identifier, device_session_stamp FROM refresh_tokens WHERE token = ?') - .bind(token) - .first<{ user_id: string; expires_at: number; device_identifier: string | null; device_session_stamp: string | null }>(); - - if (legacyRow) { - if (legacyRow.expires_at && legacyRow.expires_at < now) { - await deleteRefreshTokenRecord(token); - return null; - } - await saveRefreshTokenRecord( - token, - legacyRow.user_id, - legacyRow.expires_at, - legacyRow.device_identifier ?? null, - legacyRow.device_session_stamp ?? null - ); - await db.prepare('DELETE FROM refresh_tokens WHERE token = ?').bind(token).run(); - return { - userId: legacyRow.user_id, - expiresAt: legacyRow.expires_at, - deviceIdentifier: legacyRow.device_identifier ?? null, - deviceSessionStamp: legacyRow.device_session_stamp ?? null, - }; - } - } - if (!row) return null; if (row.expires_at && row.expires_at < now) { await deleteRefreshTokenRecord(token); diff --git a/src/services/storage.ts b/src/services/storage.ts index 6b55743..6cf1208 100644 --- a/src/services/storage.ts +++ b/src/services/storage.ts @@ -485,7 +485,6 @@ export class StorageService { this.db, this.refreshTokenKey.bind(this), this.maybeCleanupExpiredRefreshTokens.bind(this), - this.saveRefreshToken.bind(this), this.deleteRefreshToken.bind(this), token );