b6d3df03e3
## Problem Kattis and USACO login and submit were broken in multiple ways discovered during manual end-to-end testing. Neither platform could successfully authenticate or submit through the plugin. ## Solution **Kattis:** switch login from `POST /login/email` (requires CSRF fetch) to `POST /login` with `script=true` (200 = success, 403 = bad credentials); remove `_check_kattis_login` entirely since Kattis blocks all GET requests from httpx; add submit retry on `"Request validation failed"` to handle expired sessions; fix language ID `"C++17"` → `"C++"`. **USACO:** fix login field `user` → `uname`; fix success check to `code==1`; fix submit endpoint to `submit-solution.php`, file field to `sourcefile`, hidden field extraction off-by-one (`group(2)` → `group(1)`); fix `_pick_lang_option` loop order (keywords outer, options inner) so specific keywords like `"c++17"` match before broad ones like `"c++"`. **`submit.lua`:** absolutize source file path via `fnamemodify(..., ':p')` before passing to the scraper — Python is spawned with `cwd=plugin_path` so relative paths silently fail with `FileNotFoundError`. **Both platforms:** remove cookie fast path from `login` subcommand so credentials are always validated, preventing stale cookies from masking wrong credentials.
92 lines
2.7 KiB
Lua
92 lines
2.7 KiB
Lua
local M = {}
|
|
|
|
local cache = require('cp.cache')
|
|
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
|
|
|
|
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')
|
|
|
|
prompt_credentials(platform, function(creds)
|
|
vim.cmd.update()
|
|
vim.notify('[cp.nvim] Submitting...', vim.log.levels.INFO)
|
|
|
|
require('cp.scraper').submit(
|
|
platform,
|
|
contest_id,
|
|
problem_id,
|
|
language,
|
|
source_file,
|
|
creds,
|
|
function(ev)
|
|
vim.schedule(function()
|
|
vim.notify('[cp.nvim] ' .. (STATUS_MSGS[ev.status] or ev.status), vim.log.levels.INFO)
|
|
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
|