NO-ISSUE Authorization header is not required in module-attach client

Yang-33 · Yang-33 · commit 5f7c34bf7cf0 · 2023-12-28T23:50:50.000+09:00
diff --git a/generator/src/main/resources/line-bot-sdk-nodejs-generator/api-single.pebble b/generator/src/main/resources/line-bot-sdk-nodejs-generator/api-single.pebble
@@ -21,7 +21,12 @@ import {AxiosResponse} from "axios";
 interface httpClientConfig {
     baseURL?: string;
     {% if authMethods != null -%}
-    channelAccessToken: string;
+      {% for authMethod in authMethods %}
+        {% if authMethod.isBasicBearer %}
+          channelAccessToken: string;
+        {% else %}
+        {% endif %}
+      {% endfor %}
     {% endif -%}
     // TODO support defaultHeaders?
 }
@@ -37,7 +42,12 @@ export class {{operations.classname}} {
         this.httpClient = new HTTPClient({
             defaultHeaders: {
                 {% if authMethods != null -%}
-                Authorization: "Bearer " + config.channelAccessToken,
+                  {% for authMethod in authMethods %}
+                    {% if authMethod.isBasicBearer %}
+                      Authorization: "Bearer " + config.channelAccessToken,
+                    {% else %}
+                    {% endif %}
+                  {% endfor %}
                 {% endif -%}
             },
             responseParser: this.parseHTTPResponse.bind(this),
diff --git a/lib/insight/api/insightClient.ts b/lib/insight/api/insightClient.ts
@@ -30,7 +30,9 @@ import { AxiosResponse } from "axios";
 
 interface httpClientConfig {
   baseURL?: string;
+
   channelAccessToken: string;
+
   // TODO support defaultHeaders?
 }
 
diff --git a/lib/liff/api/liffClient.ts b/lib/liff/api/liffClient.ts
@@ -29,7 +29,9 @@ import { AxiosResponse } from "axios";
 
 interface httpClientConfig {
   baseURL?: string;
+
   channelAccessToken: string;
+
   // TODO support defaultHeaders?
 }
 
diff --git a/lib/manage-audience/api/manageAudienceBlobClient.ts b/lib/manage-audience/api/manageAudienceBlobClient.ts
@@ -26,7 +26,9 @@ import { AxiosResponse } from "axios";
 
 interface httpClientConfig {
   baseURL?: string;
+
   channelAccessToken: string;
+
   // TODO support defaultHeaders?
 }
 
diff --git a/lib/manage-audience/api/manageAudienceClient.ts b/lib/manage-audience/api/manageAudienceClient.ts
@@ -40,7 +40,9 @@ import { AxiosResponse } from "axios";
 
 interface httpClientConfig {
   baseURL?: string;
+
   channelAccessToken: string;
+
   // TODO support defaultHeaders?
 }
 
diff --git a/lib/messaging-api/api/messagingApiBlobClient.ts b/lib/messaging-api/api/messagingApiBlobClient.ts
@@ -26,7 +26,9 @@ import { AxiosResponse } from "axios";
 
 interface httpClientConfig {
   baseURL?: string;
+
   channelAccessToken: string;
+
   // TODO support defaultHeaders?
 }
 
diff --git a/lib/messaging-api/api/messagingApiClient.ts b/lib/messaging-api/api/messagingApiClient.ts
@@ -69,7 +69,9 @@ import { AxiosResponse } from "axios";
 
 interface httpClientConfig {
   baseURL?: string;
+
   channelAccessToken: string;
+
   // TODO support defaultHeaders?
 }
 
diff --git a/lib/module-attach/api/lineModuleAttachClient.ts b/lib/module-attach/api/lineModuleAttachClient.ts
@@ -26,7 +26,7 @@ import { AxiosResponse } from "axios";
 
 interface httpClientConfig {
   baseURL?: string;
-  channelAccessToken: string;
+
   // TODO support defaultHeaders?
 }
 
@@ -38,9 +38,7 @@ export class LineModuleAttachClient {
       config.baseURL = "https://manager.line.biz";
     }
     this.httpClient = new HTTPClient({
-      defaultHeaders: {
-        Authorization: "Bearer " + config.channelAccessToken,
-      },
+      defaultHeaders: {},
       responseParser: this.parseHTTPResponse.bind(this),
       baseURL: config.baseURL,
     });
diff --git a/lib/module/api/lineModuleClient.ts b/lib/module/api/lineModuleClient.ts
@@ -28,7 +28,9 @@ import { AxiosResponse } from "axios";
 
 interface httpClientConfig {
   baseURL?: string;
+
   channelAccessToken: string;
+
   // TODO support defaultHeaders?
 }
 
diff --git a/lib/shop/api/shopClient.ts b/lib/shop/api/shopClient.ts
@@ -26,7 +26,9 @@ import { AxiosResponse } from "axios";
 
 interface httpClientConfig {
   baseURL?: string;
+
   channelAccessToken: string;
+
   // TODO support defaultHeaders?
 }
 
diff --git a/test/libs-moduleAttach.spec.ts b/test/libs-moduleAttach.spec.ts
@@ -0,0 +1,63 @@
+import { moduleAttach } from "../lib";
+import { http, HttpResponse } from "msw";
+import { setupServer } from "msw/node";
+import { deepEqual, equal } from "assert";
+
+const pkg = require("../package.json");
+
+const client = new moduleAttach.LineModuleAttachClient({});
+
+describe("moduleAttach", () => {
+  const server = setupServer();
+  before(() => {
+    server.listen();
+  });
+  after(() => {
+    server.close();
+  });
+  afterEach(() => {
+    server.resetHandlers();
+  });
+
+  it("attachModule", async () => {
+    let requestCount = 0;
+    server.use(
+      http.post(
+        "https://manager.line.biz/module/auth/v1/token",
+        ({ request, params, cookies }) => {
+          requestCount++;
+
+          equal(
+            request.headers.has("Authorization"),
+            false,
+            "Authorization header should not be present"
+          );
+          equal(
+            request.headers.get("User-Agent"),
+            `${pkg.name}/${pkg.version}`,
+          );
+          equal(request.headers.get("content-type"), "application/x-www-form-urlencoded");
+          const body = new URLSearchParams(request.body);
+          equal(body.get("clientId"), "ClientId", "clientId should match");
+
+          return HttpResponse.json({});
+        },
+      ),
+    );
+
+    const res = await client.attachModule(
+      "authorization_code",
+      "Code",
+      "https://example.com",
+      "CodeVerifier",
+      "ClientId",
+      "ClientSecret",
+      "Region",
+      "BasicSearchId",
+      "Scope",
+      "BrandType"
+    );
+    equal(requestCount, 1);
+    deepEqual(res, {});
+  });
+});

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,9 @@ import { AxiosResponse } from "axios";`
`30`	`30`
`31`	`31`	`interface httpClientConfig {`
`32`	`32`	`baseURL?: string;`
	`33`	`+`
`33`	`34`	`channelAccessToken: string;`
	`35`	`+`
`34`	`36`	`// TODO support defaultHeaders?`
`35`	`37`	`}`
`36`	`38`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,9 @@ import { AxiosResponse } from "axios";`
`29`	`29`
`30`	`30`	`interface httpClientConfig {`
`31`	`31`	`baseURL?: string;`
	`32`	`+`
`32`	`33`	`channelAccessToken: string;`
	`34`	`+`
`33`	`35`	`// TODO support defaultHeaders?`
`34`	`36`	`}`
`35`	`37`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ import { AxiosResponse } from "axios";`
`26`	`26`
`27`	`27`	`interface httpClientConfig {`
`28`	`28`	`baseURL?: string;`
	`29`	`+`
`29`	`30`	`channelAccessToken: string;`
	`31`	`+`
`30`	`32`	`// TODO support defaultHeaders?`
`31`	`33`	`}`
`32`	`34`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ import { AxiosResponse } from "axios";`
`40`	`40`
`41`	`41`	`interface httpClientConfig {`
`42`	`42`	`baseURL?: string;`
	`43`	`+`
`43`	`44`	`channelAccessToken: string;`
	`45`	`+`
`44`	`46`	`// TODO support defaultHeaders?`
`45`	`47`	`}`
`46`	`48`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,9 @@ import { AxiosResponse } from "axios";`
`69`	`69`
`70`	`70`	`interface httpClientConfig {`
`71`	`71`	`baseURL?: string;`
	`72`	`+`
`72`	`73`	`channelAccessToken: string;`
	`74`	`+`
`73`	`75`	`// TODO support defaultHeaders?`
`74`	`76`	`}`
`75`	`77`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,9 @@ import { AxiosResponse } from "axios";`
`28`	`28`
`29`	`29`	`interface httpClientConfig {`
`30`	`30`	`baseURL?: string;`
	`31`	`+`
`31`	`32`	`channelAccessToken: string;`
	`33`	`+`
`32`	`34`	`// TODO support defaultHeaders?`
`33`	`35`	`}`
`34`	`36`