Update access token after exchange to fix usage reports

Author: EyalDelarea

common/commands/config.go

@@ -236,7 +236,8 @@ func exchangeOidcTokenAndSetAccessToken(cc *ConfigCommand) error {
 		SetJobId(cc.oidcSetupParams.JobId).
 		SetRunId(cc.oidcSetupParams.RunId)
 
-	err := Exec(accessTokenCreateCmd)
+	// Usage report will be sent only after execution in order to have valid token
+	err := ExecAndReportUsage(accessTokenCreateCmd)
 	if err != nil {
 		return err
 	}

general/token/oidctokenexchange.go

@@ -150,6 +150,8 @@ func (otc *OidcTokenExchangeCommand) Run() (err error) {
 	if err != nil {
 		return err
 	}
+	// Update server details with the exchanged access token
+	otc.serverDetails.AccessToken = otc.response.AccessToken
 	return
 }