Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 08:26:00 +01:00
Code Issues Projects Releases Wiki Activity

Stash box validation bugfix (#5831)

Browse source 
* Remove accidental copypaste error

The apiKey ref was accidentally associated with the max_requests_per_minute field which made the "Test Credentials" button error out every time

* Fix error messages in stash-box validation

The message from err.Error() can start with any number of errors like NetworkError
so we can check for substrings instead
This commit is contained in:
Maista 2025-06-02 07:47:03 +02:00 committed by GitHub
parent 155c4ec72a
commit af34829f38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
internal/api/resolver_query_configuration.go
View file

@ -249,18 +249,19 @@ func (r *queryResolver) ValidateStashBoxCredentials(ctx context.Context, input c
if valid { if valid {
status = fmt.Sprintf("Successfully authenticated as %s", user.Me.Name) status = fmt.Sprintf("Successfully authenticated as %s", user.Me.Name)
} else { } else {
errorStr := strings.ToLower(err.Error())
switch { switch {
case strings.Contains(strings.ToLower(err.Error()), "doctype"): case strings.Contains(errorStr, "doctype"):
// Index file returned rather than graphql // Index file returned rather than graphql
status = "Invalid endpoint" status = "Invalid endpoint"
case strings.Contains(err.Error(), "request failed"): case strings.Contains(errorStr, "request failed"):
status = "No response from server" status = "No response from server"
case strings.HasPrefix(err.Error(), "invalid character") || case strings.Contains(errorStr, "invalid character") ||
strings.HasPrefix(err.Error(), "illegal base64 data") || strings.Contains(errorStr, "illegal base64 data") ||
err.Error() == "unexpected end of JSON input" || strings.Contains(errorStr, "unexpected end of json input") ||
err.Error() == "token contains an invalid number of segments": strings.Contains(errorStr, "token contains an invalid number of segments"):
status = "Malformed API key." status = "Malformed API key."
case err.Error() == "" || err.Error() == "signature is invalid": case strings.Contains(errorStr, "signature is invalid"):
status = "Invalid or expired API key." status = "Invalid or expired API key."
default: default:
status = fmt.Sprintf("Unknown error: %s", err) status = fmt.Sprintf("Unknown error: %s", err)

1
ui/v2.5/src/components/Settings/StashBoxConfiguration.tsx
View file

@ -139,7 +139,6 @@ export const StashBoxModal: React.FC<IStashBoxModal> = ({ value, close }) => {
max_requests_per_minute: parseInt(e.currentTarget.value), max_requests_per_minute: parseInt(e.currentTarget.value),
}) })
} }
ref={apiKey}
/> />
<div className="sub-heading"> <div className="sub-heading">
<FormattedMessage <FormattedMessage