Skip to content

feat(oauth): auto-skip consent for recent re-auth, drop prompt URL param #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BK1031 merged 2 commits into from
Jun 5, 2026
Merged

feat(oauth): auto-skip consent for recent re-auth, drop prompt URL param #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aad4b7
feat(oauth): auto-skip consent for recent re-auth, drop prompt URL param
BK1031 Jun 5, 2026
4dd7766
Merge branch 'main' into bk1031/feat-auto-consent-recent-auth
BK1031 Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions oauth/api/authorize.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"errors"
"fmt"
"net/http"
"net/url"
"time"

"github.com/gaucho-racing/sentinel/oauth/pkg/logger"
Expand Down Expand Up @@ -117,25 +118,19 @@ func ValidateAuthorize(c *gin.Context) {
}
}

prompt := c.Query("prompt")
if prompt == "none" && entityID != "" {
// Default to a consent prompt. If the user already authorized this exact
// client+scope set within the last 24h, skip the screen and auto-approve.
prompt := "consent"
if entityID != "" {
q := url.Values{}
q.Set("client_id", clientID)
q.Set("scope", scope)
q.Set("after", time.Now().Add(-24*time.Hour).Format(time.RFC3339))
q.Set("limit", "1")
var logins []map[string]interface{}
err = sentinel.Get(fmt.Sprintf("/api/core/entity/%s/logins?client_id=%s&scope=%s&limit=1", entityID, clientID, scope), &logins)
if err == nil && len(logins) > 0 {
if createdAt, ok := logins[0]["created_at"].(string); ok {
if t, err := time.Parse(time.RFC3339, createdAt); err == nil && time.Since(t) < 7*24*time.Hour {
prompt = "none"
} else {
prompt = "consent"
}
} else {
prompt = "consent"
}
} else {
prompt = "consent"
if err := sentinel.Get(fmt.Sprintf("/api/core/entity/%s/logins?%s", entityID, q.Encode()), &logins); err == nil && len(logins) > 0 {
prompt = "none"
}
} else {
prompt = "consent"
}

c.JSON(http.StatusOK, validateAuthorizeResponse{
Expand Down
8 changes: 3 additions & 5 deletions web/src/pages/oauth/AuthorizePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ export default function AuthorizePage() {
const scope = params.get("scope") ?? ""
const state = params.get("state")
const nonce = params.get("nonce")
const prompt = params.get("prompt") ?? ""

const [busy, setBusy] = useState<Action | null>(null)
const [success, setSuccess] = useState(false)
Expand All @@ -112,15 +111,14 @@ export default function AuthorizePage() {
state ? { ...extra, state } : extra

const validate = useQuery({
queryKey: ["oauth-authorize", clientId, redirectUri, scope, prompt, session?.entityId],
queryKey: ["oauth-authorize", clientId, redirectUri, scope, session?.entityId],
queryFn: async () => {
const search = new URLSearchParams({
client_id: clientId ?? "",
redirect_uri: redirectUri,
scope,
entity_id: session?.entityId ?? "",
})
if (prompt) search.set("prompt", prompt)
const res = await api.get<ValidateResponse>(`/oauth/authorize?${search.toString()}`)
return res.data
},
Expand Down Expand Up @@ -180,8 +178,8 @@ export default function AuthorizePage() {
}
}

// prompt=none means the user recently consented — approve silently without
// flashing the consent screen. The backend resolves the effective prompt.
// Backend signals prompt=none when the user authorized this client+scope
// within the auto-consent window — approve silently without flashing the screen.
useEffect(() => {
if (validate.data?.prompt === "none" && !autoApproved.current) {
autoApproved.current = true
Expand Down
Loading