adapt existing functions to possibility that a mytoken is rotated

Author: zachmann

accesstoken.go

@@ -4,11 +4,14 @@ import (
 	"github.com/oidc-mytoken/api/v0"
 )
 
-func (my *MytokenServer) GetAccessToken(mytoken, oidcIssuer string, scopes, audiences []string, comment string) (string, error) {
-	req := NewAccessTokenRequest(oidcIssuer, mytoken, scopes, audiences, comment)
+func (my *MytokenServer) GetAccessToken(mytoken *string, oidcIssuer string, scopes, audiences []string, comment string) (string, error) {
+	req := NewAccessTokenRequest(oidcIssuer, *mytoken, scopes, audiences, comment)
 	var resp api.AccessTokenResponse
 	if err := doHTTPRequest("POST", my.AccessTokenEndpoint, req, &resp); err != nil {
 		return "", err
 	}
+	if resp.TokenUpdate != nil {
+		*mytoken = resp.TokenUpdate.Mytoken
+	}
 	return resp.AccessToken, nil
 }

mytoken.go

@@ -8,15 +8,19 @@ import (
 	"github.com/oidc-mytoken/api/v0"
 )
 
-func (my *MytokenServer) GetMytoken(req interface{}) (string, error) {
+func (my *MytokenServer) GetMytoken(req interface{}) (string, *string, error) {
 	var resp api.MytokenResponse
 	if err := doHTTPRequest("POST", my.MytokenEndpoint, req, &resp); err != nil {
-		return "", err
+		return "", nil, err
+	}
+	var mtUpdate *string
+	if resp.TokenUpdate != nil {
+		mtUpdate = &resp.TokenUpdate.Mytoken
 	}
-	return resp.Mytoken, nil
+	return resp.Mytoken, mtUpdate, nil
 }
 
-func (my *MytokenServer) GetMytokenByMytoken(mytoken, issuer string, restrictions api.Restrictions, capabilities, subtokenCapabilities api.Capabilities, responseType, name string) (string, error) {
+func (my *MytokenServer) GetMytokenByMytoken(mytoken *string, issuer string, restrictions api.Restrictions, capabilities, subtokenCapabilities api.Capabilities, responseType, name string) (string, error) {
 	req := api.MytokenFromMytokenRequest{
 		GeneralMytokenRequest: api.GeneralMytokenRequest{
 			Issuer:               issuer,
@@ -27,17 +31,22 @@ func (my *MytokenServer) GetMytokenByMytoken(mytoken, issuer string, restriction
 			Name:                 name,
 			ResponseType:         responseType,
 		},
-		Mytoken: mytoken,
+		Mytoken: *mytoken,
+	}
+	mt, mtUpdate, err := my.GetMytoken(req)
+	if mtUpdate != nil {
+		*mytoken = *mtUpdate
 	}
-	return my.GetMytoken(req)
+	return mt, err
 }
 
 func (my *MytokenServer) GetMytokenByTransferCode(transferCode string) (string, error) {
 	req := api.ExchangeTransferCodeRequest{
 		GrantType:    api.GrantTypeTransferCode,
 		TransferCode: transferCode,
 	}
-	return my.GetMytoken(req)
+	mt, _, err := my.GetMytoken(req)
+	return mt, err
 }
 
 type PollingCallbacks struct {
@@ -116,7 +125,7 @@ func (my *MytokenServer) PollOnce(pollingCode string) (string, bool, error) {
 		PollingCode: pollingCode,
 	}
 
-	tok, err := my.GetMytoken(req)
+	tok, _, err := my.GetMytoken(req)
 	if err == nil {
 		return tok, true, nil
 	}

revoke.go

@@ -4,7 +4,7 @@ import (
 	"github.com/oidc-mytoken/api/v0"
 )
 
-func (my *MytokenServer) Revoke(mytoken, oidcIssuer string, recursive bool) error {
+func (my *MytokenServer) Revoke(mytoken string, oidcIssuer string, recursive bool) error {
 	req := api.RevocationRequest{
 		Token:      mytoken,
 		Recursive:  recursive,

tokeninfo.go

@@ -15,36 +15,45 @@ func (my *MytokenServer) TokeninfoIntrospect(mytoken string) (*api.TokeninfoIntr
 	}
 	return &resp, nil
 }
-func (my *MytokenServer) TokeninfoHistory(mytoken string) (*api.TokeninfoHistoryResponse, error) {
+func (my *MytokenServer) TokeninfoHistory(mytoken *string) (api.EventHistory, error) {
 	req := api.TokenInfoRequest{
 		Action:  api.TokeninfoActionEventHistory,
-		Mytoken: mytoken,
+		Mytoken: *mytoken,
 	}
 	var resp api.TokeninfoHistoryResponse
 	if err := doHTTPRequest("POST", my.TokeninfoEndpoint, req, &resp); err != nil {
 		return nil, err
 	}
-	return &resp, nil
+	if resp.TokenUpdate != nil {
+		*mytoken = resp.TokenUpdate.Mytoken
+	}
+	return resp.EventHistory, nil
 }
-func (my *MytokenServer) TokeninfoSubtokens(mytoken string) (*api.TokeninfoTreeResponse, error) {
+func (my *MytokenServer) TokeninfoSubtokens(mytoken *string) (*api.MytokenEntryTree, error) {
 	req := api.TokenInfoRequest{
 		Action:  api.TokeninfoActionSubtokenTree,
-		Mytoken: mytoken,
+		Mytoken: *mytoken,
 	}
 	var resp api.TokeninfoTreeResponse
 	if err := doHTTPRequest("POST", my.TokeninfoEndpoint, req, &resp); err != nil {
 		return nil, err
 	}
-	return &resp, nil
+	if resp.TokenUpdate != nil {
+		*mytoken = resp.TokenUpdate.Mytoken
+	}
+	return &resp.Tokens, nil
 }
-func (my *MytokenServer) TokeninfoListMytokens(mytoken string) (*api.TokeninfoListResponse, error) {
+func (my *MytokenServer) TokeninfoListMytokens(mytoken *string) ([]api.MytokenEntryTree, error) {
 	req := api.TokenInfoRequest{
 		Action:  api.TokeninfoActionListMytokens,
-		Mytoken: mytoken,
+		Mytoken: *mytoken,
 	}
 	var resp api.TokeninfoListResponse
 	if err := doHTTPRequest("POST", my.TokeninfoEndpoint, req, &resp); err != nil {
 		return nil, err
 	}
-	return &resp, nil
+	if resp.TokenUpdate != nil {
+		*mytoken = resp.TokenUpdate.Mytoken
+	}
+	return resp.Tokens, nil
 }