Skip to content

chore: clean up destinationInfo from refreshTokenParams #5897

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
merged 2 commits into from
May 27, 2025
Merged

chore: clean up destinationInfo from refreshTokenParams #5897

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
9418478
chore: clean up destinationInfo from refreshTokenParams
May 26, 2025
cf1815c
Merge branch 'master' into chore/refactorRefreshTokenParams
ItsSudip May 26, 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
13 changes: 4 additions & 9 deletions router/batchrouter/asyncdestinationmanager/bing-ads/common/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,11 @@ type TokenSource struct {
// authentication related utils

func (ts *TokenSource) GenerateTokenV2() (*SecretStruct, error) {
destination := oauthv2.DestinationInfo{
WorkspaceID: ts.WorkspaceID,
DefinitionName: ts.DestinationDefName,
ID: ts.DestinationID,
}
refreshTokenParams := oauthv2.RefreshTokenParams{
WorkspaceID: ts.WorkspaceID,
DestDefName: ts.DestinationDefName,
AccountID: ts.AccountID,
Destination: &destination,
WorkspaceID: ts.WorkspaceID,
DestDefName: ts.DestinationDefName,
AccountID: ts.AccountID,
DestinationID: ts.DestinationID,
}
statusCode, authResponse, err := ts.OauthClientV2.FetchToken(&refreshTokenParams)
if err != nil && authResponse != nil {
Expand Down
10 changes: 5 additions & 5 deletions services/oauth/v2/http/transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func (t *OAuthTransport) postRoundTrip(rts *roundTripState) *http.Response {
return rts.res
}
rts.refreshTokenParams.Secret = oldSecret
rts.refreshTokenParams.Destination = rts.destination
rts.refreshTokenParams.DestinationID = rts.destination.ID
_, authResponse, refErr := t.oauthHandler.RefreshToken(rts.refreshTokenParams)
if refErr != nil {
interceptorResp.Response = refErr.Error()
Expand Down Expand Up @@ -289,10 +289,10 @@ func (t *OAuthTransport) RoundTrip(req *http.Request) (*http.Response, error) {
return httpResponseCreator(http.StatusInternalServerError, []byte(err.Error())), nil
}
rts.refreshTokenParams = &oauth.RefreshTokenParams{
AccountID: rts.accountID,
WorkspaceID: rts.destination.WorkspaceID,
DestDefName: rts.destination.DefinitionName,
Destination: rts.destination,
AccountID: rts.accountID,
WorkspaceID: rts.destination.WorkspaceID,
DestDefName: rts.destination.DefinitionName,
DestinationID: rts.destination.ID,
}
rts.req = req
preRoundTripStartTime := time.Now()
Expand Down
2 changes: 1 addition & 1 deletion services/oauth/v2/oauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ func (h *OAuthHandler) GetTokenInfo(refTokenParams *RefreshTokenParams, logTypeN
log := h.Logger.Withn(
logger.NewStringField("Call Type", logTypeName),
logger.NewStringField("AccountId", refTokenParams.AccountID),
obskit.DestinationID(refTokenParams.Destination.ID),
obskit.DestinationID(refTokenParams.DestinationID),
obskit.WorkspaceID(refTokenParams.WorkspaceID),
obskit.DestinationType(refTokenParams.DestDefName),
)
Expand Down
Loading
Loading