eb0dea777e
## Problem On CSES, Kattis, and USACO, `:CP <platform> login` always prompted for credentials and ran a full web login even when a valid session was already cached. Submit also had weak stale-session detection. ## Solution `credentials.lua` now tries cached credentials first before prompting, delegating fast-path detection to each scraper. CSES `login()` checks the cached API token and returns immediately if valid. USACO `login()` and `submit()` call `_check_usaco_login()` upfront. Kattis `submit()` emits `checking_login` consistently and also triggers re-auth on HTTP 400/403, not just on the `"Request validation failed"` text match. The premature `Submitting...` log emitted by Lua before the scraper started is removed — Python's own status events are sufficient.
115 lines
3.5 KiB
Lua
115 lines
3.5 KiB
Lua
local M = {}
|
|
|
|
local cache = require('cp.cache')
|
|
local config = require('cp.config')
|
|
local constants = require('cp.constants')
|
|
local logger = require('cp.log')
|
|
local state = require('cp.state')
|
|
|
|
local STATUS_MSGS = {
|
|
installing_browser = 'Installing browser (first time setup)...',
|
|
checking_login = 'Checking login...',
|
|
logging_in = 'Logging in...',
|
|
submitting = 'Submitting...',
|
|
}
|
|
|
|
local function prompt_credentials(platform, callback)
|
|
local saved = cache.get_credentials(platform)
|
|
if saved and saved.username and saved.password then
|
|
callback(saved)
|
|
return
|
|
end
|
|
vim.ui.input({ prompt = platform .. ' username: ' }, function(username)
|
|
if not username or username == '' then
|
|
logger.log('Submit cancelled', { level = vim.log.levels.WARN })
|
|
return
|
|
end
|
|
vim.fn.inputsave()
|
|
local password = vim.fn.inputsecret(platform .. ' password: ')
|
|
vim.fn.inputrestore()
|
|
vim.cmd.redraw()
|
|
if not password or password == '' then
|
|
logger.log('Submit cancelled', { level = vim.log.levels.WARN })
|
|
return
|
|
end
|
|
local creds = { username = username, password = password }
|
|
cache.set_credentials(platform, creds)
|
|
callback(creds)
|
|
end)
|
|
end
|
|
|
|
---@param opts { language?: string }?
|
|
function M.submit(opts)
|
|
local platform = state.get_platform()
|
|
local contest_id = state.get_contest_id()
|
|
local problem_id = state.get_problem_id()
|
|
local language = (opts and opts.language) or state.get_language()
|
|
if not platform or not contest_id or not problem_id or not language then
|
|
logger.log(
|
|
'No active problem. Use :CP <platform> <contest> first.',
|
|
{ level = vim.log.levels.ERROR }
|
|
)
|
|
return
|
|
end
|
|
|
|
local source_file = state.get_source_file()
|
|
if not source_file or vim.fn.filereadable(source_file) ~= 1 then
|
|
logger.log('Source file not found', { level = vim.log.levels.ERROR })
|
|
return
|
|
end
|
|
source_file = vim.fn.fnamemodify(source_file, ':p')
|
|
|
|
local submit_language = language
|
|
local cfg = config.get_config()
|
|
local plat_effective = cfg.runtime and cfg.runtime.effective and cfg.runtime.effective[platform]
|
|
local eff = plat_effective and plat_effective[language]
|
|
if eff then
|
|
if eff.submit_id then
|
|
submit_language = eff.submit_id or submit_language
|
|
else
|
|
local ver = eff.version or constants.DEFAULT_VERSIONS[language]
|
|
if ver then
|
|
local versions = (constants.LANGUAGE_VERSIONS[platform] or {})[language]
|
|
if versions and versions[ver] then
|
|
submit_language = versions[ver] or submit_language
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
prompt_credentials(platform, function(creds)
|
|
vim.cmd.update()
|
|
|
|
require('cp.scraper').submit(
|
|
platform,
|
|
contest_id,
|
|
problem_id,
|
|
submit_language,
|
|
source_file,
|
|
creds,
|
|
function(ev)
|
|
vim.schedule(function()
|
|
logger.log(
|
|
STATUS_MSGS[ev.status] or ev.status,
|
|
{ level = vim.log.levels.INFO, override = true }
|
|
)
|
|
end)
|
|
end,
|
|
function(result)
|
|
vim.schedule(function()
|
|
if result and result.success then
|
|
logger.log('Submitted successfully', { level = vim.log.levels.INFO, override = true })
|
|
else
|
|
local err = result and result.error or 'unknown error'
|
|
if err:match('^Login failed') then
|
|
cache.clear_credentials(platform)
|
|
end
|
|
logger.log('Submit failed: ' .. err, { level = vim.log.levels.ERROR })
|
|
end
|
|
end)
|
|
end
|
|
)
|
|
end)
|
|
end
|
|
|
|
return M
|