Skip to content

cmd/ausoceantv: if there is no refresh token, prompt consent #523

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
trekhopton merged 3 commits into from
Mar 28, 2025
Merged

cmd/ausoceantv: if there is no refresh token, prompt consent #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d317f78
cmd/ausoceantv: if there is no refresh token, preompt consent
trekhopton Mar 26, 2025
e58035e
cmd/ausoceantv: bump verison
trekhopton Mar 26, 2025
d0f2cdb
gauth: only check fro refresh token if session loads without error
trekhopton Mar 28, 2025
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
4 changes: 3 additions & 1 deletion cmd/ausoceantv/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
AUTHORS
Alan Noble <alan@ausocean.org>
David Sutton <david@ausocean.org>
Trek Hopton <trek@ausocean.org>

LICENSE
Copyright (C) 2024 the Australian Ocean Lab (AusOcean)
Expand Down Expand Up @@ -55,7 +57,7 @@ const (
projectID = "ausoceantv"
oauthClientID = "1005382600755-7st09cc91eqcqveviinitqo091dtcmf0.apps.googleusercontent.com"
oauthMaxAge = 60 * 60 * 24 * 7 // 7 days.
version = "v0.5.7"
version = "v0.5.8"
)

// service defines the properties of our web service.
Expand Down
18 changes: 17 additions & 1 deletion gauth/userauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,24 @@ func (ua *UserAuth) LoginHandler(h backend.Handler) error {
return fmt.Errorf("could not save session %s: %w", sessID, err)
}

// Check for refresh token in the user's main session.
hasRefreshToken := false
mainSession, err := h.LoadSession(ua.SessionID)
if err == nil {
tok := &oauth2.Token{}
if err := mainSession.Get(oauthTokenSessionKey, &tok); err == nil && tok != nil && tok.RefreshToken != "" {
hasRefreshToken = true
}
}

// Build auth URL.
opts := []oauth2.AuthCodeOption{oauth2.AccessTypeOffline}
if !hasRefreshToken {
opts = append(opts, oauth2.SetAuthURLParam("prompt", "consent"))
}

// NB: Offline access is required to obtain a refresh token.
url := ua.cfg.AuthCodeURL(sessID, oauth2.AccessTypeOffline)
url := ua.cfg.AuthCodeURL(sessID, opts...)
return h.Redirect(url, http.StatusFound)
}

Expand Down
Loading