Return error from NewClientWithAuth

IngmarStein · IngmarStein · commit 5fd48a769bcf · 2024-03-26T20:43:17.000+01:00
Fixes #23
diff --git a/go.mod b/go.mod
@@ -9,10 +9,4 @@ require (
 	google.golang.org/appengine v1.6.8 // indirect
 )
 
-<<<<<<< HEAD
 require google.golang.org/protobuf v1.33.0 // indirect
-||||||| parent of 6a1969b (Update to Go 1.22.0)
-require google.golang.org/protobuf v1.31.0 // indirect
-=======
-require google.golang.org/protobuf v1.32.0 // indirect
->>>>>>> 6a1969b (Update to Go 1.22.0)
diff --git a/go.sum b/go.sum
@@ -39,13 +39,5 @@ google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAs
 google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-<<<<<<< HEAD
 google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
 google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
-||||||| parent of 6a1969b (Update to Go 1.22.0)
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-=======
-google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
->>>>>>> 6a1969b (Update to Go 1.22.0)
diff --git a/miele/miele.go b/miele/miele.go
@@ -33,7 +33,7 @@ type Client struct {
 }
 
 // NewClientWithAuth returns a new Miele API client using the supplied credentials.
-func NewClientWithAuth(clientID, clientSecret, vg, username, password string) *Client {
+func NewClientWithAuth(clientID, clientSecret, vg, username, password string) (*Client, error) {
 	conf := &oauth2.Config{
 		ClientID:     clientID,
 		ClientSecret: clientSecret,
@@ -45,11 +45,11 @@ func NewClientWithAuth(clientID, clientSecret, vg, username, password string) *C
 
 	token, err := conf.PasswordCredentialsToken(ctx, username, password)
 	if err != nil {
-		log.Fatalf("error retrieving Miele token: %v", err)
+		return nil, fmt.Errorf("error retrieving Miele token: %v", err)
 	}
 
 	oauthClient := conf.Client(context.Background(), token)
-	return NewClient(oauthClient)
+	return NewClient(oauthClient), nil
 }
 
 // NewClient returns a new Miele API client. If a nil httpClient is

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type Client struct {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`// NewClientWithAuth returns a new Miele API client using the supplied credentials.`
`36`		`-func NewClientWithAuth(clientID, clientSecret, vg, username, password string) *Client {`
	`36`	`+func NewClientWithAuth(clientID, clientSecret, vg, username, password string) (*Client, error) {`
`37`	`37`	`conf := &oauth2.Config{`
`38`	`38`	`ClientID: clientID,`
`39`	`39`	`ClientSecret: clientSecret,`
`@@ -45,11 +45,11 @@ func NewClientWithAuth(clientID, clientSecret, vg, username, password string) *C`
`45`	`45`
`46`	`46`	`token, err := conf.PasswordCredentialsToken(ctx, username, password)`
`47`	`47`	`if err != nil {`
`48`		`- log.Fatalf("error retrieving Miele token: %v", err)`
	`48`	`+ return nil, fmt.Errorf("error retrieving Miele token: %v", err)`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`oauthClient := conf.Client(context.Background(), token)`
`52`		`- return NewClient(oauthClient)`
	`52`	`+ return NewClient(oauthClient), nil`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// NewClient returns a new Miele API client. If a nil httpClient is`