feat: go oauth

Author: manisha1997

client/client.go

@@ -5,8 +5,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/golang-jwt/jwt"
-	"github.com/twilio/twilio-go"
 	"net/http"
 	"net/url"
 	"regexp"
@@ -15,6 +13,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/golang-jwt/jwt"
 	"github.com/pkg/errors"
 	"github.com/twilio/twilio-go/client/form"
 )
@@ -44,8 +43,6 @@ type Client struct {
 	accountSid          string
 	UserAgentExtensions []string
 	BearerToken         string
-	*twilio.OrgTokenManager
-	*twilio.ClientTokenManager
 }
 
 // default http Client should not follow redirects and return the most recent response.
@@ -193,7 +190,6 @@ func (c *Client) SendRequest(method string, rawURL string, data url.Values,
 		if !CheckTokenExpiry(c.BearerToken) {
 			req.Header.Add("Authorization", "Bearer "+c.BearerToken)
 		} else {
-
 		}
 	} else if c.Username != "" {
 		req.SetBasicAuth(c.basicAuth())

twilio.go

@@ -130,16 +130,6 @@ type Meta struct {
 	URL             *string `json:"url"`
 }
 
-type ClientParams struct {
-	Username                    string
-	Password                    string
-	AccountSid                  string
-	Client                      client.BaseClient
-	OrgClientCredentialProvider *OrgClientCredentialProvider
-	ClientCredentialProvider    *ClientCredentialProvider
-}
-
-// CredentialProvider for Oauth Applications
 type CredentialProvider struct {
 	AuthType string
 }
@@ -181,7 +171,7 @@ type ClientTokenManager struct {
 	Scope        string
 }
 
-func GetOrgAccessToken(manager OrgTokenManager, apiService *PreviewIamTemp.ApiService) (*PreviewIamTemp.OauthV1Token, error) {
+func GetOrgAccessToken(manager OrgTokenManager) (*PreviewIamTemp.OauthV1Token, error) {
 	params := &PreviewIamTemp.CreateTokenParams{}
 	params.SetGrantType(manager.GrantType)
 	params.SetClientId(manager.ClientId)
@@ -192,15 +182,15 @@ func GetOrgAccessToken(manager OrgTokenManager, apiService *PreviewIamTemp.ApiSe
 	params.SetRefreshToken(manager.RefreshToken)
 	params.SetScope(manager.Scope)
 
-	token, err := apiService.CreateToken(params)
+	token, err := PreviewIamTemp.NewApiService(NewRestClient().RequestHandler).CreateToken(params)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get access token: %w", err)
 	}
 
 	return token, nil
 }
 
-func GetClientAccessToken(manager ClientTokenManager, apiService *PreviewIamTemp.ApiService) (*PreviewIamTemp.OauthV1Token, error) {
+func GetClientAccessToken(manager ClientTokenManager) (*PreviewIamTemp.OauthV1Token, error) {
 	params := &PreviewIamTemp.CreateTokenParams{}
 	params.SetGrantType(manager.GrantType)
 	params.SetClientId(manager.ClientId)
@@ -211,14 +201,23 @@ func GetClientAccessToken(manager ClientTokenManager, apiService *PreviewIamTemp
 	params.SetRefreshToken(manager.RefreshToken)
 	params.SetScope(manager.Scope)
 
-	token, err := apiService.CreateToken(params)
+	token, err := PreviewIamTemp.NewApiService(NewRestClient().RequestHandler).CreateToken(params)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get access token: %w", err)
 	}
 
 	return token, nil
 }
 
+type ClientParams struct {
+	Username                    string
+	Password                    string
+	AccountSid                  string
+	Client                      client.BaseClient
+	OrgClientCredentialProvider *OrgClientCredentialProvider
+	ClientCredentialProvider    *ClientCredentialProvider
+}
+
 // NewRestClientWithParams provides an initialized Twilio RestClient with params.
 func NewRestClientWithParams(params ClientParams) *RestClient {
 	requestHandler := client.NewRequestHandler(params.Client)
@@ -257,19 +256,19 @@ func NewRestClientWithParams(params ClientParams) *RestClient {
 			RefreshToken: "",
 			Scope:        ""}
 
-		token, err := GetOrgAccessToken(orgTokenManager, NewRestClient().PreviewIamToken)
+		token, err := GetOrgAccessToken(orgTokenManager)
 		//fmt.Println(*token.AccessToken)
 		if err != nil {
 		}
-		fmt.Println(token)
+		fmt.Println(token.AccessToken)
 
 		defaultClient := &client.Client{
 			Credentials: client.NewCredentials("", ""),
 		}
 		if params.AccountSid != "" {
 			defaultClient.SetAccountSid(params.AccountSid)
 		}
-		defaultClient.SetBearerToken("eyJhbGciOiJSUzI1NiIsImtpZCI6InVmQXhySkZ5VmNSNkdnQmZNQ29BTFoiLCJ0eXAiOiJKV1QifQ.eyJhdWQiOiJodHRwczovL2FwaS50d2lsaW8uY29tL3YyIiwiYXpwIjoiT1EwYmFkOWI1Yjc5ODEzNjhkOGI2NDFkNWFiY2MwOThjZCIsImlhdCI6MTczOTQ0OTIwMCwiZXhwIjoxNzM5NDUyODAwLCJpc3MiOiJodHRwczovL3ByZXZpZXctaWFtLnR3aWxpby5jb20iLCJzdWIiOiJPUTBiYWQ5YjViNzk4MTM2OGQ4YjY0MWQ1YWJjYzA5OGNkIiwiZ3R5IjoiY2xpZW50X2NyZWRlbnRpYWxzIiwiaHR0cDovL3R3aWxpby9hY3QiOnsic3ViIjoiQUM1NmM5YTA0ZDJlNjM5OTE1NWM3YzRhNTJmMDQ0YzEwNSJ9LCJodHRwOi8vdHdpbGlvL3R5cCI6InZuZC50d2lsaW8ub2F1dGguYXQrand0OyIsImh0dHA6Ly90d2lsaW8vc3ViIjoiT1EwYmFkOWI1Yjc5ODEzNjhkOGI2NDFkNWFiY2MwOThjZCIsImh0dHA6Ly90d2lsaW8vdmFsaWRyZWdpb25zIjoidXMxIn0.ColuyOS-CDSLmS0E16GU6GXHEt8Y5qxj4383S1r2j9YDI3swSKNfjpWvacevLJQBqxtBMZoawV7fyxZk-X0HmmlVJN_DUtwIY04u93BdM114chiKdL4rO49kxdzxdC6tViulWlFQzpvAg3hC1W-pgBIb8v48Z6SwpotZT3HM8VGVgEYPeFb3I6aQOpvNM9o1fNGFb4GWs6V78d9XvvjhvRsB58TfoFWEyfEwZZt-yWp__fmE-VaC5acnm3ATQ6TGInUiGzH6GqaDMtluj_TW0kefcawL7mJYjWFig9Mj27THk9ESa9H8JKm1-c0tJj0yVivp-UHN0ZfvcuDiHdhcEw")
+		defaultClient.SetBearerToken("")
 		requestHandler = client.NewRequestHandler(defaultClient)
 	} else if params.ClientCredentialProvider != nil {
 		// get AccessToken
@@ -284,19 +283,19 @@ func NewRestClientWithParams(params ClientParams) *RestClient {
 			RefreshToken: "",
 			Scope:        ""}
 
-		token, err := GetClientAccessToken(clientTokenManager, NewRestClient().PreviewIamToken)
+		token, err := GetClientAccessToken(clientTokenManager)
 		//fmt.Println(*token.AccessToken)
 		if err != nil {
 		}
-		fmt.Println(token)
+		fmt.Println(token.AccessToken)
 
 		defaultClient := &client.Client{
 			Credentials: client.NewCredentials("", ""),
 		}
 		if params.AccountSid != "" {
 			defaultClient.SetAccountSid(params.AccountSid)
 		}
-		defaultClient.SetBearerToken("eyJhbGciOiJSUzI1NiIsImtpZCI6InVmQXhySkZ5VmNSNkdnQmZNQ29BTFoiLCJ0eXAiOiJKV1QifQ.eyJhdWQiOiJodHRwczovL2FwaS50d2lsaW8uY29tL3YyIiwiYXpwIjoiT1EwYmFkOWI1Yjc5ODEzNjhkOGI2NDFkNWFiY2MwOThjZCIsImlhdCI6MTczOTQ0OTIwMCwiZXhwIjoxNzM5NDUyODAwLCJpc3MiOiJodHRwczovL3ByZXZpZXctaWFtLnR3aWxpby5jb20iLCJzdWIiOiJPUTBiYWQ5YjViNzk4MTM2OGQ4YjY0MWQ1YWJjYzA5OGNkIiwiZ3R5IjoiY2xpZW50X2NyZWRlbnRpYWxzIiwiaHR0cDovL3R3aWxpby9hY3QiOnsic3ViIjoiQUM1NmM5YTA0ZDJlNjM5OTE1NWM3YzRhNTJmMDQ0YzEwNSJ9LCJodHRwOi8vdHdpbGlvL3R5cCI6InZuZC50d2lsaW8ub2F1dGguYXQrand0OyIsImh0dHA6Ly90d2lsaW8vc3ViIjoiT1EwYmFkOWI1Yjc5ODEzNjhkOGI2NDFkNWFiY2MwOThjZCIsImh0dHA6Ly90d2lsaW8vdmFsaWRyZWdpb25zIjoidXMxIn0.ColuyOS-CDSLmS0E16GU6GXHEt8Y5qxj4383S1r2j9YDI3swSKNfjpWvacevLJQBqxtBMZoawV7fyxZk-X0HmmlVJN_DUtwIY04u93BdM114chiKdL4rO49kxdzxdC6tViulWlFQzpvAg3hC1W-pgBIb8v48Z6SwpotZT3HM8VGVgEYPeFb3I6aQOpvNM9o1fNGFb4GWs6V78d9XvvjhvRsB58TfoFWEyfEwZZt-yWp__fmE-VaC5acnm3ATQ6TGInUiGzH6GqaDMtluj_TW0kefcawL7mJYjWFig9Mj27THk9ESa9H8JKm1-c0tJj0yVivp-UHN0ZfvcuDiHdhcEw")
+		defaultClient.SetBearerToken("")
 		requestHandler = client.NewRequestHandler(defaultClient)
 	}
 
@@ -355,30 +354,6 @@ func NewRestClientWithParams(params ClientParams) *RestClient {
 	return c
 }
 
-func NewRestClientWithClientCredentials(params ClientCredentialProvider) {
-	// get AccessToken
-	// set accessToken in client
-	clientTokenManager := ClientTokenManager{
-		GrantType:    params.GrantType,
-		ClientId:     params.ClientId,
-		ClientSecret: params.ClientSecret,
-		Code:         "",
-		RedirectUri:  "",
-		Audience:     "",
-		RefreshToken: "",
-		Scope:        ""}
-
-	token, err := GetClientAccessToken(clientTokenManager, NewRestClient().PreviewIamToken)
-	fmt.Println(*token.AccessToken)
-	if err != nil {
-	}
-
-	defaultClient := &client.Client{
-		Credentials: client.NewCredentials("", ""),
-	}
-	defaultClient.SetBearerToken(*token.AccessToken)
-}
-
 // NewRestClient provides an initialized Twilio RestClient.
 func NewRestClient() *RestClient {
 	return NewRestClientWithParams(ClientParams{})