Skip to content

X-SaaSus-Trace-Id 自動引継機能の追加 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
takahujikeita wants to merge 1 commit into
base: main
Choose a base branch
from
Open

X-SaaSus-Trace-Id 自動引継機能の追加 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/modules/apilog-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ export class ApiLogClient {
private apiBase: string;
private referer: string;
private xSaaSusReferer: string;
private xSaaSusTraceId: string;

constructor(referer = "", xSaaSusReferer = "") {
constructor(referer = "", xSaaSusReferer = "", xSaaSusTraceId = "") {
this.secret = process.env.SAASUS_SECRET_KEY || "";
this.saasId = process.env.SAASUS_SAAS_ID || "";
this.apiKey = process.env.SAASUS_API_KEY || "";
Expand All @@ -31,8 +32,9 @@ export class ApiLogClient {

this.referer = referer;
this.xSaaSusReferer = xSaaSusReferer;
this.xSaaSusTraceId = xSaaSusTraceId;

this.instance = getAxiosInstance(this.apiBase + "/v1/apilog", this.referer, this.xSaaSusReferer);
this.instance = getAxiosInstance(this.apiBase + "/v1/apilog", this.referer, this.xSaaSusReferer, this.xSaaSusTraceId);

const config = new Configuration({
basePath: this.apiBase + "/v1/apilog",
Expand Down
6 changes: 4 additions & 2 deletions src/modules/auth-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ export class AuthClient {
private apiBase: string;
private referer: string;
private xSaaSusReferer: string;
private xSaaSusTraceId: string;

constructor(referer = "", xSaaSusReferer = "") {
constructor(referer = "", xSaaSusReferer = "", xSaaSusTraceId = "") {
this.secret = process.env.SAASUS_SECRET_KEY || "";
this.saasId = process.env.SAASUS_SAAS_ID || "";
this.apiKey = process.env.SAASUS_API_KEY || "";
Expand All @@ -56,8 +57,9 @@ export class AuthClient {

this.referer = referer;
this.xSaaSusReferer = xSaaSusReferer;
this.xSaaSusTraceId = xSaaSusTraceId;

this.instance = getAxiosInstance(this.apiBase + "/v1/auth", this.referer, this.xSaaSusReferer);
this.instance = getAxiosInstance(this.apiBase + "/v1/auth", this.referer, this.xSaaSusReferer, this.xSaaSusTraceId);

const config = new Configuration({
basePath: this.apiBase + "/v1/auth",
Expand Down
6 changes: 5 additions & 1 deletion src/modules/auth-middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@ export async function AuthMiddleware(
if (req.headers["x-saasus-referer"]) {
xSaaSusReferer = req.headers["x-saasus-referer"] as string;
}
let xSaaSusTraceId = "";
if (req.headers["x-saasus-trace-id"]) {
xSaaSusTraceId = req.headers["x-saasus-trace-id"] as string;
}
Comment on lines +39 to +42
try {
const apiClient = new AuthClient(referer, xSaaSusReferer);
const apiClient = new AuthClient(referer, xSaaSusReferer, xSaaSusTraceId);
const { data } = await apiClient.userInfoApi.getUserInfo(
isAPI()
? req.headers["authorization"]!.split("Bearer ")[1]
Expand Down
6 changes: 4 additions & 2 deletions src/modules/awsmarketplace-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ export class AwsMarketplaceClient {
private apiBase: string;
private referer: string;
private xSaaSusReferer: string;
private xSaaSusTraceId: string;

constructor(referer = "", xSaaSusReferer = "") {
constructor(referer = "", xSaaSusReferer = "", xSaaSusTraceId = "") {
this.secret = process.env.SAASUS_SECRET_KEY || "";
this.saasId = process.env.SAASUS_SAAS_ID || "";
this.apiKey = process.env.SAASUS_API_KEY || "";
Expand All @@ -31,8 +32,9 @@ export class AwsMarketplaceClient {

this.referer = referer;
this.xSaaSusReferer = xSaaSusReferer;
this.xSaaSusTraceId = xSaaSusTraceId;

this.instance = getAxiosInstance(this.apiBase + "/v1/awsmarketplace", this.referer, this.xSaaSusReferer);
this.instance = getAxiosInstance(this.apiBase + "/v1/awsmarketplace", this.referer, this.xSaaSusReferer, this.xSaaSusTraceId);

const config = new Configuration({
basePath: this.apiBase + "/v1/awsmarketplace",
Expand Down
6 changes: 4 additions & 2 deletions src/modules/billing-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ export class BillingClient {
private apiBase: string;
private referer: string;
private xSaaSusReferer: string;
private xSaaSusTraceId: string;

constructor(referer = "", xSaaSusReferer = "") {
constructor(referer = "", xSaaSusReferer = "", xSaaSusTraceId = "") {
this.secret = process.env.SAASUS_SECRET_KEY || "";
this.saasId = process.env.SAASUS_SAAS_ID || "";
this.apiKey = process.env.SAASUS_API_KEY || "";
Expand All @@ -31,12 +32,13 @@ export class BillingClient {

this.referer = referer;
this.xSaaSusReferer = xSaaSusReferer;
this.xSaaSusTraceId = xSaaSusTraceId;

const config = new Configuration({
basePath: this.apiBase + "/v1/billing",
});

this.instance = getAxiosInstance(this.apiBase + "/v1/billing", this.referer, this.xSaaSusReferer);
this.instance = getAxiosInstance(this.apiBase + "/v1/billing", this.referer, this.xSaaSusReferer, this.xSaaSusTraceId);

this.stripeApi = new StripeApi(config, "", this.instance);
}
Expand Down
6 changes: 4 additions & 2 deletions src/modules/communication-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ export class CommunicationClient {
private apiBase: string;
private referer: string;
private xSaaSusReferer: string;
private xSaaSusTraceId: string;

constructor(referer = "", xSaaSusReferer = "") {
constructor(referer = "", xSaaSusReferer = "", xSaaSusTraceId = "") {
this.secret = process.env.SAASUS_SECRET_KEY || "";
this.saasId = process.env.SAASUS_SAAS_ID || "";
this.apiKey = process.env.SAASUS_API_KEY || "";
Expand All @@ -31,8 +32,9 @@ export class CommunicationClient {

this.referer = referer;
this.xSaaSusReferer = xSaaSusReferer;
this.xSaaSusTraceId = xSaaSusTraceId;

this.instance = getAxiosInstance(this.apiBase + "/v1/communication", this.referer, this.xSaaSusReferer);
this.instance = getAxiosInstance(this.apiBase + "/v1/communication", this.referer, this.xSaaSusReferer, this.xSaaSusTraceId);

const config = new Configuration({
basePath: this.apiBase + "/v1/communication",
Expand Down
6 changes: 4 additions & 2 deletions src/modules/integration-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ export class IntegrationClient {
private apiBase: string;
private referer: string;
private xSaaSusReferer: string;
private xSaaSusTraceId: string;

constructor(referer = "", xSaaSusReferer = "") {
constructor(referer = "", xSaaSusReferer = "", xSaaSusTraceId = "") {
this.secret = process.env.SAASUS_SECRET_KEY || "";
this.saasId = process.env.SAASUS_SAAS_ID || "";
this.apiKey = process.env.SAASUS_API_KEY || "";
Expand All @@ -31,8 +32,9 @@ export class IntegrationClient {

this.referer = referer;
this.xSaaSusReferer = xSaaSusReferer;
this.xSaaSusTraceId = xSaaSusTraceId;

this.instance = getAxiosInstance(this.apiBase + "/v1/integration", this.referer, this.xSaaSusReferer);
this.instance = getAxiosInstance(this.apiBase + "/v1/integration", this.referer, this.xSaaSusReferer, this.xSaaSusTraceId);

const config = new Configuration({
basePath: this.apiBase + "/v1/integration",
Expand Down
6 changes: 5 additions & 1 deletion src/modules/interceptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, InternalAxiosRequ
export default function getAxiosInstance(
baseURL: string,
referer?: string,
xSaaSusReferer?: string
xSaaSusReferer?: string,
xSaaSusTraceId?: string
): AxiosInstance {
const requestConfig: AxiosRequestConfig = {
baseURL: baseURL,
Expand Down Expand Up @@ -36,6 +37,9 @@ export default function getAxiosInstance(
if (xSaaSusReferer) {
config.headers!["X-SaaSus-Referer"] = xSaaSusReferer;
}
if (xSaaSusTraceId) {
config.headers!["X-SaaSus-Trace-Id"] = xSaaSusTraceId;
}
Comment on lines +40 to +42
return config;
},
(error: AxiosError) => error
Expand Down
6 changes: 4 additions & 2 deletions src/modules/pricing-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ export class PricingClient {
private apiBase: string;
private referer: string;
private xSaaSusReferer: string;
private xSaaSusTraceId: string;

constructor(referer = "", xSaaSusReferer = "") {
constructor(referer = "", xSaaSusReferer = "", xSaaSusTraceId = "") {
this.secret = process.env.SAASUS_SECRET_KEY || "";
this.saasId = process.env.SAASUS_SAAS_ID || "";
this.apiKey = process.env.SAASUS_API_KEY || "";
Expand All @@ -46,8 +47,9 @@ export class PricingClient {

this.referer = referer;
this.xSaaSusReferer = xSaaSusReferer;
this.xSaaSusTraceId = xSaaSusTraceId;

this.instance = getAxiosInstance(this.apiBase + "/v1/pricing", this.referer, this.xSaaSusReferer);
this.instance = getAxiosInstance(this.apiBase + "/v1/pricing", this.referer, this.xSaaSusReferer, this.xSaaSusTraceId);

this.meteringApi = new MeteringApi(config, "", this.instance);
this.pricingMenusApi = new PricingMenusApi(config, "", this.instance);
Expand Down
Loading