Skip to content

Commit b89a4c5

Browse files
refact!: change packages to more consistent naming scheme
1 parent 670692b commit b89a4c5

File tree

2,094 files changed

+4767
-4765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,094 files changed

+4767
-4765
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ on how to obtain an API token and how to get started with the API.
6262
## Example
6363

6464
```go
65-
req := project.ListProjectsRequest{
66-
CustomerId: pointer.To("2ef23459-beb1-4ac2-9a38-d3a9df62bf93"),
65+
req := projectclientv2.ListProjectsRequest{
66+
CustomerID: pointer.To("2ef23459-beb1-4ac2-9a38-d3a9df62bf93"),
6767
Limit: pointer.To(100),
6868
}
6969

mittwaldv2/client_example_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ package mittwaldv2_test
33
import (
44
"context"
55
"fmt"
6+
67
"github.com/mittwald/api-client-go/mittwaldv2"
7-
"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/user"
8+
"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/userclientv2"
89
)
910

1011
func ExampleNew_accessTokenFromEnvironment() {
@@ -15,7 +16,7 @@ func ExampleNew_accessTokenFromEnvironment() {
1516
panic(err)
1617
}
1718

18-
me, _, err := client.User().GetUser(ctx, user.GetUserRequest{UserID: "self"})
19+
me, _, err := client.User().GetUser(ctx, userclientv2.GetUserRequest{UserID: "self"})
1920
if err != nil {
2021
panic(err)
2122
}

mittwaldv2/client_opt_auth.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"time"
88

99
generatedv2 "github.com/mittwald/api-client-go/mittwaldv2/generated/clients"
10-
"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/marketplace"
11-
"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/user"
10+
"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/marketplaceclientv2"
11+
"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/userclientv2"
1212
"github.com/mittwald/api-client-go/pkg/httpclient"
1313
)
1414

@@ -43,8 +43,8 @@ func WithAccessTokenAndRefresh(token, refreshToken string, expiration time.Time)
4343
return func(ctx context.Context, inner httpclient.RequestRunner) (httpclient.RequestRunner, error) {
4444
refreshToken := refreshToken
4545
refreshFunc := func() (string, time.Time, error) {
46-
req := user.RefreshSessionRequest{
47-
Body: user.RefreshSessionRequestBody{
46+
req := userclientv2.RefreshSessionRequest{
47+
Body: userclientv2.RefreshSessionRequestBody{
4848
RefreshToken: refreshToken,
4949
},
5050
}
@@ -79,8 +79,8 @@ func WithAccessTokenAndRefreshFunc(token string, expiration time.Time, refreshFu
7979
// it is recommended to use API tokens, instead of username+password.
8080
func WithUsernamePassword(email, password string) ClientOption {
8181
return func(ctx context.Context, inner httpclient.RequestRunner) (httpclient.RequestRunner, error) {
82-
req := user.AuthenticateRequest{
83-
Body: user.AuthenticateRequestBody{
82+
req := userclientv2.AuthenticateRequest{
83+
Body: userclientv2.AuthenticateRequestBody{
8484
Email: email,
8585
Password: password,
8686
},
@@ -110,8 +110,8 @@ func WithUsernamePassword(email, password string) ClientOption {
110110
// [1]: https://developer.mittwald.de/docs/v2/contribution/overview/concepts/authentication/
111111
func WithAccessTokenRetrievalKey(userID string, accessTokenRetrievalKey string) ClientOption {
112112
return func(ctx context.Context, inner httpclient.RequestRunner) (httpclient.RequestRunner, error) {
113-
req := user.AuthenticateWithAccessTokenRetrievalKeyRequest{
114-
Body: user.AuthenticateWithAccessTokenRetrievalKeyRequestBody{
113+
req := userclientv2.AuthenticateWithAccessTokenRetrievalKeyRequest{
114+
Body: userclientv2.AuthenticateWithAccessTokenRetrievalKeyRequestBody{
115115
AccessTokenRetrievalKey: accessTokenRetrievalKey,
116116
UserId: userID,
117117
},
@@ -133,9 +133,9 @@ func WithAccessTokenRetrievalKey(userID string, accessTokenRetrievalKey string)
133133
func WithExtensionSecret(extensionInstanceID string, extensionSecret string) ClientOption {
134134
return func(ctx context.Context, inner httpclient.RequestRunner) (httpclient.RequestRunner, error) {
135135
refreshFunc := func() (string, time.Time, error) {
136-
req := marketplace.AuthenticateInstanceRequest{
136+
req := marketplaceclientv2.AuthenticateInstanceRequest{
137137
ExtensionInstanceID: extensionInstanceID,
138-
Body: marketplace.AuthenticateInstanceRequestBody{
138+
Body: marketplaceclientv2.AuthenticateInstanceRequestBody{
139139
ExtensionInstanceSecret: extensionSecret,
140140
},
141141
}

mittwaldv2/client_opt_auth_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ package mittwaldv2_test
22

33
import (
44
"context"
5+
"net/http"
6+
"os"
7+
58
"github.com/mittwald/api-client-go/mittwaldv2"
6-
"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/user"
9+
"github.com/mittwald/api-client-go/mittwaldv2/generated/clients/userclientv2"
710
"github.com/mittwald/api-client-go/pkg/httpclient_mock"
811
. "github.com/onsi/ginkgo/v2"
912
. "github.com/onsi/gomega"
10-
"net/http"
11-
"os"
1213
)
1314

1415
var _ = Describe("Client authentication", func() {
@@ -23,7 +24,7 @@ var _ = Describe("Client authentication", func() {
2324

2425
Expect(err).NotTo(HaveOccurred())
2526

26-
_, _, err = client.User().GetUser(ctx, user.GetUserRequest{UserID: "self"})
27+
_, _, err = client.User().GetUser(ctx, userclientv2.GetUserRequest{UserID: "self"})
2728

2829
Expect(err).NotTo(HaveOccurred())
2930
Expect(runner.Requests).To(HaveLen(1))
@@ -44,7 +45,7 @@ var _ = Describe("Client authentication", func() {
4445

4546
Expect(err).NotTo(HaveOccurred())
4647

47-
_, _, err = client.User().GetUser(ctx, user.GetUserRequest{UserID: "self"})
48+
_, _, err = client.User().GetUser(ctx, userclientv2.GetUserRequest{UserID: "self"})
4849

4950
Expect(err).NotTo(HaveOccurred())
5051
Expect(runner.Requests).To(HaveLen(1))
@@ -64,7 +65,7 @@ var _ = Describe("Client authentication", func() {
6465

6566
Expect(err).NotTo(HaveOccurred())
6667

67-
_, _, err = client.User().GetUser(ctx, user.GetUserRequest{UserID: "self"})
68+
_, _, err = client.User().GetUser(ctx, userclientv2.GetUserRequest{UserID: "self"})
6869

6970
Expect(err).NotTo(HaveOccurred())
7071
Expect(runner.Requests).To(HaveLen(2))

0 commit comments

Comments
 (0)