Skip to content

feat: support id_token #33

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
angelo-chan merged 1 commit into from
Mar 26, 2024
Merged

feat: support id_token #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion access.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ type AccessData struct {
// Refresh Token. Can be blank
RefreshToken string

// ID Token. Can be blank
IDToken string

// Token expiration in seconds
ExpiresIn int32

Expand Down Expand Up @@ -121,6 +124,7 @@ func (d *AccessData) ExpireAt() time.Time {
// AccessTokenGen generates access tokens
type AccessTokenGen interface {
GenerateAccessToken(data *AccessData, generaterefresh bool) (accesstoken string, refreshtoken string, err error)
GenerateToken(data *AccessData, generaterefresh bool) (accesstoken, refreshtoken, idToken string, err error)
}

// HandleAccessRequest is the http.HandlerFunc for handling access token requests
Expand Down Expand Up @@ -680,7 +684,7 @@ func (s *Server) FinishAccessRequest(w *Response, r *http.Request, ar *AccessReq
}

// generate access token
ret.AccessToken, ret.RefreshToken, err = s.AccessTokenGen.GenerateAccessToken(ret, ar.GenerateRefresh)
ret.AccessToken, ret.RefreshToken, ret.IDToken, err = s.AccessTokenGen.GenerateToken(ret, ar.GenerateRefresh)
if err != nil {
w.SetError(E_SERVER_ERROR, "")
w.InternalError = err
Expand Down Expand Up @@ -718,6 +722,10 @@ func (s *Server) FinishAccessRequest(w *Response, r *http.Request, ar *AccessReq
AddTokenInCookie(w, ret.RefreshToken, "refresh_token", int64(int32(time.Now().Unix())+ret.RefreshExpireIn), s.Config.CookieDomain)
}
}
if ret.IDToken != "" {
Copy link
Copy Markdown

@angelo-chan angelo-chan Mar 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove the cookie for id token

w.Output["id_token"] = ret.IDToken
}

if ret.Scope != "" {
w.Output["scope"] = ret.Scope
}
Expand Down
13 changes: 13 additions & 0 deletions tokengen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,16 @@ func (a *AccessTokenGenDefault) GenerateAccessToken(data *AccessData, generatere
}
return
}

// GenerateToken generates base64-encoded UUID access and refresh tokens & empty idToken
func (a *AccessTokenGenDefault) GenerateToken(data *AccessData, generaterefresh bool) (accesstoken string, refreshtoken string, idToken string, err error) {
token := uuid.NewRandom()
accesstoken = base64.RawURLEncoding.EncodeToString([]byte(token))
idToken = ""

if generaterefresh {
rtoken := uuid.NewRandom()
refreshtoken = base64.RawURLEncoding.EncodeToString([]byte(rtoken))
}
return
}