Merge 50e6fd1 into f530088

line · Nov 22, 2023 · 283d9e2 · 283d9e2
2 parents f530088 + 50e6fd1
commit 283d9e2
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 22 deletions.
diff --git a/generator/src/main/resources/line-bot-sdk-go-generator/api.pebble b/generator/src/main/resources/line-bot-sdk-go-generator/api.pebble
@@ -88,8 +88,9 @@ func (client *{{ classname }}) Do(req *http.Request) (*http.Response, error) {
 }
 
 func (client *{{ classname }}) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }
 

diff --git a/linebot/channel_access_token/api_channel_access_token.go b/linebot/channel_access_token/api_channel_access_token.go
@@ -78,8 +78,9 @@ func (client *ChannelAccessTokenAPI) Do(req *http.Request) (*http.Response, erro
 }
 
 func (client *ChannelAccessTokenAPI) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }
 

diff --git a/linebot/insight/api_insight.go b/linebot/insight/api_insight.go
@@ -88,8 +88,9 @@ func (client *InsightAPI) Do(req *http.Request) (*http.Response, error) {
 }
 
 func (client *InsightAPI) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }
 

diff --git a/linebot/liff/api_liff.go b/linebot/liff/api_liff.go
@@ -89,8 +89,9 @@ func (client *LiffAPI) Do(req *http.Request) (*http.Response, error) {
 }
 
 func (client *LiffAPI) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }
 

diff --git a/linebot/manage_audience/api_manage_audience.go b/linebot/manage_audience/api_manage_audience.go
@@ -90,8 +90,9 @@ func (client *ManageAudienceAPI) Do(req *http.Request) (*http.Response, error) {
 }
 
 func (client *ManageAudienceAPI) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }
 

diff --git a/linebot/manage_audience/api_manage_audience_blob.go b/linebot/manage_audience/api_manage_audience_blob.go
@@ -91,8 +91,9 @@ func (client *ManageAudienceBlobAPI) Do(req *http.Request) (*http.Response, erro
 }
 
 func (client *ManageAudienceBlobAPI) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }
 

diff --git a/linebot/messaging_api/api_messaging_api.go b/linebot/messaging_api/api_messaging_api.go
@@ -89,8 +89,9 @@ func (client *MessagingApiAPI) Do(req *http.Request) (*http.Response, error) {
 }
 
 func (client *MessagingApiAPI) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }
 

diff --git a/linebot/messaging_api/api_messaging_api_blob.go b/linebot/messaging_api/api_messaging_api_blob.go
@@ -89,8 +89,9 @@ func (client *MessagingApiBlobAPI) Do(req *http.Request) (*http.Response, error)
 }
 
 func (client *MessagingApiBlobAPI) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }
 

diff --git a/linebot/messaging_api/tests/handwritten/calling_api_twice_test.go b/linebot/messaging_api/tests/handwritten/calling_api_twice_test.go
@@ -0,0 +1,50 @@
+package tests
+
+import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/line/line-bot-sdk-go/v8/linebot/messaging_api"
+)
+
+func TestCallingAPITwice(t *testing.T) {
+	server := httptest.NewServer(
+		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			if r.URL.Path != "/v2/bot/message/push" {
+				t.Errorf("Expected path '/v2/bot/message/push', but got '%s'", r.URL.Path)
+			}
+			w.Header().Add("X-Line-Request-Id", "1234567890")
+			w.Write([]byte(`{}`))
+		}),
+	)
+	client, err := messaging_api.NewMessagingApiAPI(
+		"channelToken",
+		messaging_api.WithEndpoint(server.URL),
+	)
+	if err != nil {
+		t.Fatalf("Failed to create client: %v", err)
+	}
+	_, err = client.PushMessage(&messaging_api.PushMessageRequest{
+		Messages: []messaging_api.MessageInterface{
+			&messaging_api.TextMessage{
+				Text: "Hello, world",
+			},
+		},
+	}, "")
+	if err != nil {
+		t.Fatalf("Failed to get response: %v", err)
+	}
+
+	// call again
+	_, err = client.PushMessage(&messaging_api.PushMessageRequest{
+		Messages: []messaging_api.MessageInterface{
+			&messaging_api.TextMessage{
+				Text: "Hello, world",
+			},
+		},
+	}, "")
+	if err != nil {
+		t.Fatalf("Failed to get response: %v", err)
+	}
+}
diff --git a/linebot/module/api_line_module.go b/linebot/module/api_line_module.go
@@ -89,8 +89,9 @@ func (client *LineModuleAPI) Do(req *http.Request) (*http.Response, error) {
 }
 
 func (client *LineModuleAPI) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }
 

diff --git a/linebot/module_attach/api_line_module_attach.go b/linebot/module_attach/api_line_module_attach.go
@@ -88,8 +88,9 @@ func (client *LineModuleAttachAPI) Do(req *http.Request) (*http.Response, error)
 }
 
 func (client *LineModuleAttachAPI) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }
 

diff --git a/linebot/shop/api_shop.go b/linebot/shop/api_shop.go
@@ -88,8 +88,9 @@ func (client *ShopAPI) Do(req *http.Request) (*http.Response, error) {
 }
 
 func (client *ShopAPI) Url(endpointPath string) string {
-	u := client.endpoint
-	u.Path = path.Join(u.Path, endpointPath)
+	newPath := path.Join(client.endpoint.Path, endpointPath)
+	u := *client.endpoint
+	u.Path = newPath
 	return u.String()
 }