refact!: change packages to more consistent naming scheme

README.md

@@ -62,8 +62,8 @@ on how to obtain an API token and how to get started with the API.
 ## Example
 
 ```go
-req := project.ListProjectsRequest{
-	CustomerId: pointer.To("2ef23459-beb1-4ac2-9a38-d3a9df62bf93"),
+req := projectclientv2.ListProjectsRequest{
+	CustomerID: pointer.To("2ef23459-beb1-4ac2-9a38-d3a9df62bf93"),
 	Limit: pointer.To(100),
 }
 

mittwaldv2/client_example_test.go

@@ -3,8 +3,9 @@ package mittwaldv2_test
 import (
 	"context"
 	"fmt"
+
 	"github.com/mittwald/api-client-go/mittwaldv2"
-	"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/user"
+	"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/userclientv2"
 )
 
 func ExampleNew_accessTokenFromEnvironment() {
@@ -15,7 +16,7 @@ func ExampleNew_accessTokenFromEnvironment() {
 		panic(err)
 	}
 
-	me, _, err := client.User().GetUser(ctx, user.GetUserRequest{UserID: "self"})
+	me, _, err := client.User().GetUser(ctx, userclientv2.GetUserRequest{UserID: "self"})
 	if err != nil {
 		panic(err)
 	}

mittwaldv2/client_opt_auth.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	generatedv2 "github.com/mittwald/api-client-go/mittwaldv2/generated/clients"
-	"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/marketplace"
-	"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/user"
+	"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/marketplaceclientv2"
+	"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/userclientv2"
 	"github.com/mittwald/api-client-go/pkg/httpclient"
 )
 
@@ -43,8 +43,8 @@ func WithAccessTokenAndRefresh(token, refreshToken string, expiration time.Time)
 	return func(ctx context.Context, inner httpclient.RequestRunner) (httpclient.RequestRunner, error) {
 		refreshToken := refreshToken
 		refreshFunc := func() (string, time.Time, error) {
-			req := user.RefreshSessionRequest{
-				Body: user.RefreshSessionRequestBody{
+			req := userclientv2.RefreshSessionRequest{
+				Body: userclientv2.RefreshSessionRequestBody{
 					RefreshToken: refreshToken,
 				},
 			}
@@ -79,8 +79,8 @@ func WithAccessTokenAndRefreshFunc(token string, expiration time.Time, refreshFu
 // it is recommended to use API tokens, instead of username+password.
 func WithUsernamePassword(email, password string) ClientOption {
 	return func(ctx context.Context, inner httpclient.RequestRunner) (httpclient.RequestRunner, error) {
-		req := user.AuthenticateRequest{
-			Body: user.AuthenticateRequestBody{
+		req := userclientv2.AuthenticateRequest{
+			Body: userclientv2.AuthenticateRequestBody{
 				Email:    email,
 				Password: password,
 			},
@@ -110,8 +110,8 @@ func WithUsernamePassword(email, password string) ClientOption {
 // [1]: https://developer.mittwald.de/docs/v2/contribution/overview/concepts/authentication/
 func WithAccessTokenRetrievalKey(userID string, accessTokenRetrievalKey string) ClientOption {
 	return func(ctx context.Context, inner httpclient.RequestRunner) (httpclient.RequestRunner, error) {
-		req := user.AuthenticateWithAccessTokenRetrievalKeyRequest{
-			Body: user.AuthenticateWithAccessTokenRetrievalKeyRequestBody{
+		req := userclientv2.AuthenticateWithAccessTokenRetrievalKeyRequest{
+			Body: userclientv2.AuthenticateWithAccessTokenRetrievalKeyRequestBody{
 				AccessTokenRetrievalKey: accessTokenRetrievalKey,
 				UserId:                  userID,
 			},
@@ -133,9 +133,9 @@ func WithAccessTokenRetrievalKey(userID string, accessTokenRetrievalKey string)
 func WithExtensionSecret(extensionInstanceID string, extensionSecret string) ClientOption {
 	return func(ctx context.Context, inner httpclient.RequestRunner) (httpclient.RequestRunner, error) {
 		refreshFunc := func() (string, time.Time, error) {
-			req := marketplace.AuthenticateInstanceRequest{
+			req := marketplaceclientv2.AuthenticateInstanceRequest{
 				ExtensionInstanceID: extensionInstanceID,
-				Body: marketplace.AuthenticateInstanceRequestBody{
+				Body: marketplaceclientv2.AuthenticateInstanceRequestBody{
 					ExtensionInstanceSecret: extensionSecret,
 				},
 			}

mittwaldv2/client_opt_auth_test.go

@@ -2,13 +2,14 @@ package mittwaldv2_test
 
 import (
 	"context"
+	"net/http"
+	"os"
+
 	"github.com/mittwald/api-client-go/mittwaldv2"
-	"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/user"
+	"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/userclientv2"
 	"github.com/mittwald/api-client-go/pkg/httpclient_mock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"net/http"
-	"os"
 )
 
 var _ = Describe("Client authentication", func() {
@@ -23,7 +24,7 @@ var _ = Describe("Client authentication", func() {
 
 			Expect(err).NotTo(HaveOccurred())
 
-			_, _, err = client.User().GetUser(ctx, user.GetUserRequest{UserID: "self"})
+			_, _, err = client.User().GetUser(ctx, userclientv2.GetUserRequest{UserID: "self"})
 
 			Expect(err).NotTo(HaveOccurred())
 			Expect(runner.Requests).To(HaveLen(1))
@@ -44,7 +45,7 @@ var _ = Describe("Client authentication", func() {
 
 			Expect(err).NotTo(HaveOccurred())
 
-			_, _, err = client.User().GetUser(ctx, user.GetUserRequest{UserID: "self"})
+			_, _, err = client.User().GetUser(ctx, userclientv2.GetUserRequest{UserID: "self"})
 
 			Expect(err).NotTo(HaveOccurred())
 			Expect(runner.Requests).To(HaveLen(1))
@@ -64,7 +65,7 @@ var _ = Describe("Client authentication", func() {
 
 			Expect(err).NotTo(HaveOccurred())
 
-			_, _, err = client.User().GetUser(ctx, user.GetUserRequest{UserID: "self"})
+			_, _, err = client.User().GetUser(ctx, userclientv2.GetUserRequest{UserID: "self"})
 
 			Expect(err).NotTo(HaveOccurred())
 			Expect(runner.Requests).To(HaveLen(2))