## Problem Scraper cookie handling was fragmented across per-platform files with no shared access, httpx scrapers lacked `checking_login` fast paths on login, and several re-auth edge cases (CodeChef submit, CF cookie guard, AtCoder cookie persistence) caused unnecessary full re-logins or silent failures. ## Solution Centralize all cookie storage into a single `cookies.json` via helpers in `base.py`. Add `checking_login` fast paths to `kattis.py` (using the `x-username` response header as a session probe), `usaco.py`, and `cses.py` login flows. Fix `kattis.py` submit to emit `checking_login` only after loading cookies. Remove AtCoder cookie persistence from login entirely — always do a fresh session. Harden CodeChef and CF reauth with consistent status logging and cookie guard checks.
120 lines
3.6 KiB
Lua
120 lines
3.6 KiB
Lua
local M = {}
|
|
|
|
local cache = require('cp.cache')
|
|
local constants = require('cp.constants')
|
|
local logger = require('cp.log')
|
|
local state = require('cp.state')
|
|
|
|
local STATUS_MESSAGES = {
|
|
checking_login = 'Checking existing session...',
|
|
logging_in = 'Logging in...',
|
|
installing_browser = 'Installing browser...',
|
|
}
|
|
|
|
---@param platform string
|
|
---@param display string
|
|
local function prompt_and_login(platform, display)
|
|
vim.ui.input({ prompt = display .. ' username: ' }, function(username)
|
|
if not username or username == '' then
|
|
logger.log('Cancelled', { level = vim.log.levels.WARN })
|
|
return
|
|
end
|
|
vim.fn.inputsave()
|
|
local password = vim.fn.inputsecret(display .. ' password: ')
|
|
vim.fn.inputrestore()
|
|
if not password or password == '' then
|
|
logger.log('Cancelled', { level = vim.log.levels.WARN })
|
|
return
|
|
end
|
|
|
|
local credentials = { username = username, password = password }
|
|
|
|
local scraper = require('cp.scraper')
|
|
scraper.login(platform, credentials, function(ev)
|
|
vim.schedule(function()
|
|
local msg = STATUS_MESSAGES[ev.status] or ev.status
|
|
logger.log(display .. ': ' .. msg, { level = vim.log.levels.INFO, override = true })
|
|
end)
|
|
end, function(result)
|
|
vim.schedule(function()
|
|
if result.success then
|
|
cache.set_credentials(platform, credentials)
|
|
logger.log(
|
|
display .. ' login successful',
|
|
{ level = vim.log.levels.INFO, override = true }
|
|
)
|
|
else
|
|
local err = result.error or 'unknown error'
|
|
logger.log(display .. ' login failed: ' .. err, { level = vim.log.levels.ERROR })
|
|
end
|
|
end)
|
|
end)
|
|
end)
|
|
end
|
|
|
|
---@param platform string?
|
|
function M.login(platform)
|
|
platform = platform or state.get_platform()
|
|
if not platform then
|
|
logger.log(
|
|
'No platform specified. Usage: :CP <platform> login',
|
|
{ level = vim.log.levels.ERROR }
|
|
)
|
|
return
|
|
end
|
|
|
|
local display = constants.PLATFORM_DISPLAY_NAMES[platform] or platform
|
|
|
|
cache.load()
|
|
local existing = cache.get_credentials(platform) or {}
|
|
|
|
if existing.username and existing.password then
|
|
local scraper = require('cp.scraper')
|
|
scraper.login(platform, existing, function(ev)
|
|
vim.schedule(function()
|
|
local msg = STATUS_MESSAGES[ev.status] or ev.status
|
|
logger.log(display .. ': ' .. msg, { level = vim.log.levels.INFO, override = true })
|
|
end)
|
|
end, function(result)
|
|
vim.schedule(function()
|
|
if result.success then
|
|
logger.log(
|
|
display .. ' login successful',
|
|
{ level = vim.log.levels.INFO, override = true }
|
|
)
|
|
else
|
|
prompt_and_login(platform, display)
|
|
end
|
|
end)
|
|
end)
|
|
return
|
|
end
|
|
|
|
prompt_and_login(platform, display)
|
|
end
|
|
|
|
---@param platform string?
|
|
function M.logout(platform)
|
|
platform = platform or state.get_platform()
|
|
if not platform then
|
|
logger.log(
|
|
'No platform specified. Usage: :CP <platform> logout',
|
|
{ level = vim.log.levels.ERROR }
|
|
)
|
|
return
|
|
end
|
|
local display = constants.PLATFORM_DISPLAY_NAMES[platform] or platform
|
|
cache.load()
|
|
cache.clear_credentials(platform)
|
|
local cookie_file = constants.COOKIE_FILE
|
|
if vim.fn.filereadable(cookie_file) == 1 then
|
|
local ok, data = pcall(vim.fn.json_decode, vim.fn.readfile(cookie_file, 'b'))
|
|
if ok and type(data) == 'table' then
|
|
data[platform] = nil
|
|
vim.fn.writefile({ vim.fn.json_encode(data) }, cookie_file)
|
|
end
|
|
end
|
|
logger.log(display .. ' credentials cleared', { level = vim.log.levels.INFO, override = true })
|
|
end
|
|
|
|
return M
|