Skip to content

SaaSus API リクエストへの trace_id 自動引継 #12

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 2 commits into
base: main
Choose a base branch
from
Open

SaaSus API リクエストへの trace_id 自動引継 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8877823
contextにX-SaaSus-Trace-Idを追加
Apr 7, 2026
1c782de
SaaSus APIを呼ぶ時SDK内部がtrace_idを読み取りリクエストに自動的に付与する機能を追加
Apr 21, 2026
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
8 changes: 4 additions & 4 deletions billing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ func getPricingPlans(c echo.Context) error {
}

// 料金プラン一覧を取得
plansResp, err := pricingClient.GetPricingPlansWithResponse(context.Background())
plansResp, err := pricingClient.GetPricingPlansWithResponse(c.Request().Context())
if err != nil {
c.Logger().Errorf("failed to get pricing plans: %v", err)
return c.String(http.StatusInternalServerError, "internal server error")
Expand Down Expand Up @@ -646,7 +646,7 @@ func getTaxRates(c echo.Context) error {
}

// 税率一覧を取得
taxRatesResp, err := pricingClient.GetTaxRatesWithResponse(context.Background())
taxRatesResp, err := pricingClient.GetTaxRatesWithResponse(c.Request().Context())
if err != nil {
c.Logger().Errorf("failed to get tax rates: %v", err)
return c.String(http.StatusInternalServerError, "internal server error")
Expand Down Expand Up @@ -713,7 +713,7 @@ func updateTenantPlan(c echo.Context) error {
updateTenantPlanParam.UsingNextPlanFrom = &usingNextPlanFromInt
}

resp, err := authClient.UpdateTenantPlanWithResponse(context.Background(), tenantId, updateTenantPlanParam)
resp, err := authClient.UpdateTenantPlanWithResponse(c.Request().Context(), tenantId, updateTenantPlanParam)
if err != nil {
c.Logger().Errorf("failed to update tenant plan: %v", err)
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to update tenant plan"})
Expand Down Expand Up @@ -757,7 +757,7 @@ func getTenantPlanInfo(c echo.Context) error {
}

// テナント詳細情報を取得
tenantDetailResp, err := authClient.GetTenantWithResponse(context.Background(), authapi.TenantId(tenantId))
tenantDetailResp, err := authClient.GetTenantWithResponse(c.Request().Context(), authapi.TenantId(tenantId))
if err != nil {
c.Logger().Errorf("Failed to retrieve tenant detail: %v", err)
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to retrieve tenant detail"})
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
github.com/saasus-platform/saasus-sdk-go v1.10.19 h1:Ig9fvZMl8B/czXkNCkBiSCMOjsSs6XIJk0tjGLkzufk=
github.com/saasus-platform/saasus-sdk-go v1.10.19/go.mod h1:r28Mtxqs8BfkZ4thqh0QYmr/Hui7xpMXxmsm9ynqbto=
github.com/saasus-platform/saasus-sdk-go v1.12.2-0.20260402081234-19417bc4028d h1:XD+/sG3w2TP3LuQ+8WPHmUhm2J9//i5vVc/Flxb/8N0=
github.com/saasus-platform/saasus-sdk-go v1.12.2-0.20260402081234-19417bc4028d/go.mod h1:r28Mtxqs8BfkZ4thqh0QYmr/Hui7xpMXxmsm9ynqbto=
github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
Expand Down
68 changes: 43 additions & 25 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,17 @@ func run() error {
"Content-Type",
"X-Access-Token", // カスタムヘッダーを許可
"x-saasus-referer",
"X-Access-Token",
"X-Saasus-Trace-Id",
},
MaxAge: 86400,
}),
)
// Add extractRefere2rEcho to get referer from request header.
// This middleware allows you to set the Referer to requests in saasus-sdk.
e.Use(extractRefererEcho())
// Add extractTraceIdEcho to get trace_id from request header.
// This middleware allows you to propagate trace_id to SaaSus SDK requests.
e.Use(extractTraceIdEcho())

// 一時コードからトークンを取得する
e.GET("/credentials", getCredentials)
Expand Down Expand Up @@ -172,7 +175,7 @@ func refresh(c echo.Context) error {
}
c.Logger().Errorf("SaaSusRefreshToken: %v", token.Value)

credentials, err := credential.GetAuthCredentialsWithRefreshTokenAuth(context.Background(), token.Value)
credentials, err := credential.GetAuthCredentialsWithRefreshTokenAuth(c.Request().Context(), token.Value)
if err != nil {
return c.String(http.StatusInternalServerError, "internal server error")
}
Expand Down Expand Up @@ -211,6 +214,21 @@ func extractRefererEcho() echo.MiddlewareFunc {
}
}

// extractTraceIdEcho extracts X-Saasus-Trace-Id from request header and sets it to context.
// The SDK will automatically propagate this trace_id to outgoing SaaSus API requests.
func extractTraceIdEcho() echo.MiddlewareFunc {
return func(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error {
traceId := c.Request().Header.Get("X-Saasus-Trace-Id")
if traceId != "" {
ctx := context.WithValue(c.Request().Context(), ctxlib.XSaaSusTraceIdKey, traceId)
c.SetRequest(c.Request().WithContext(ctx))
}
return next(c)
}
}
}

// getMe is a function for /me route.
// userInfo Set to context via middleware.AuthMiddlewareEcho
func getMe(c echo.Context) error {
Expand Down Expand Up @@ -294,14 +312,14 @@ func getTenantAttributes(c echo.Context) error {
}

// テナント属性の取得
tenantAttributesResp, err := authClient.GetTenantAttributesWithResponse(context.Background())
tenantAttributesResp, err := authClient.GetTenantAttributesWithResponse(c.Request().Context())
if err != nil {
c.Logger().Errorf("failed to get tenant attributes: %v", err)
return c.String(http.StatusInternalServerError, "internal server error")
}

// テナント情報の取得
tenantInfoResp, err := authClient.GetTenantWithResponse(context.Background(), tenantId)
tenantInfoResp, err := authClient.GetTenantWithResponse(c.Request().Context(), tenantId)
if err != nil {
c.Logger().Errorf("failed to get tenant: %v", err)
return c.String(http.StatusInternalServerError, "internal server error")
Expand Down Expand Up @@ -344,7 +362,7 @@ func belongingTenant(tenants []authapi.UserAvailableTenant, tenantId authapi.Uui
// getUserAttributes is a function for /user_attributes route.
func getUserAttributes(c echo.Context) error {
// ユーザー属性の取得
userAttributesResp, err := authClient.GetUserAttributesWithResponse(context.Background())
userAttributesResp, err := authClient.GetUserAttributesWithResponse(c.Request().Context())
if err != nil {
c.Logger().Errorf("failed to get tenant attributes: %v", err)
return c.String(http.StatusInternalServerError, "internal server error")
Expand Down Expand Up @@ -377,7 +395,7 @@ func getPricingPlan(c echo.Context) error {
}

// ユーザー属性の取得
planResp, err := pricingClient.GetPricingPlanWithResponse(context.Background(), planId)
planResp, err := pricingClient.GetPricingPlanWithResponse(c.Request().Context(), planId)
if err != nil {
c.Logger().Errorf("failed to get tenant attributes: %v", err)
return c.String(http.StatusInternalServerError, "internal server error")
Expand Down Expand Up @@ -425,7 +443,7 @@ func userRegister(c echo.Context) error {
}

// ユーザー属性の取得
userAttributesResp, err := authClient.GetUserAttributesWithResponse(context.Background())
userAttributesResp, err := authClient.GetUserAttributesWithResponse(c.Request().Context())
if err != nil {
c.Logger().Errorf("failed to get tenant attributes: %v", err)
return c.String(http.StatusInternalServerError, "internal server error")
Expand Down Expand Up @@ -456,7 +474,7 @@ func userRegister(c echo.Context) error {
Password: &password,
}

_, err = authClient.CreateSaasUser(context.Background(), createSaasUserParam)
_, err = authClient.CreateSaasUser(c.Request().Context(), createSaasUserParam)
if err != nil {
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to create SaaS user"})
}
Expand All @@ -466,12 +484,12 @@ func userRegister(c echo.Context) error {
Attributes: userAttributeValues,
}

tenantUser, err := authClient.CreateTenantUserWithResponse(context.Background(), tenantID, createTenantUserParam)
tenantUser, err := authClient.CreateTenantUserWithResponse(c.Request().Context(), tenantID, createTenantUserParam)
if err != nil {
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to create tenant user"})
}

rolesResp, err := authClient.GetRolesWithResponse(context.Background())
rolesResp, err := authClient.GetRolesWithResponse(c.Request().Context())
if err != nil {
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to get roles"})
}
Expand All @@ -488,7 +506,7 @@ func userRegister(c echo.Context) error {
RoleNames: []string{addRole},
}

_, err = authClient.CreateTenantUserRolesWithResponse(context.Background(), tenantID, tenantUser.JSON201.Id, 3, createTenantUserRolesParam)
_, err = authClient.CreateTenantUserRolesWithResponse(c.Request().Context(), tenantID, tenantUser.JSON201.Id, 3, createTenantUserRolesParam)
if err != nil {
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to assign roles"})
}
Expand Down Expand Up @@ -554,13 +572,13 @@ func userDelete(c echo.Context) error {

// ユーザー削除処理
// SaaSusからユーザー情報を取得
deleteUser, err := authClient.GetTenantUserWithResponse(context.Background(), tenantId, userId)
deleteUser, err := authClient.GetTenantUserWithResponse(c.Request().Context(), tenantId, userId)
if err != nil {
return c.JSON(http.StatusInternalServerError, map[string]string{"detail": err.Error()})
}

// ユーザー削除
authClient.DeleteTenantUser(context.Background(), tenantId, userId)
authClient.DeleteTenantUser(c.Request().Context(), tenantId, userId)

// ユーザー削除ログをデータベースに登録
deleteUserLog := DeleteUserLog{
Expand Down Expand Up @@ -630,7 +648,7 @@ func getDeleteUserLogs(c echo.Context) error {
}

func getTenantAttributesList(c echo.Context) error {
tenantAttributesResp, err := authClient.GetTenantAttributesWithResponse(context.Background())
tenantAttributesResp, err := authClient.GetTenantAttributesWithResponse(c.Request().Context())
if err != nil {
c.Logger().Errorf("Failed to retrieve tenant attributes: %v", err)
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to retrieve tenant attributes"})
Expand Down Expand Up @@ -674,7 +692,7 @@ func selfSignup(c echo.Context) error {
userAttributeValues := request.UserAttributeValues

// テナント属性を取得する
tenantAttributesResp, err := authClient.GetTenantAttributesWithResponse(context.Background())
tenantAttributesResp, err := authClient.GetTenantAttributesWithResponse(c.Request().Context())
if err != nil {
c.Logger().Errorf("Failed to retrieve tenant attributes: %v", err)
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to retrieve tenant attributes"})
Expand Down Expand Up @@ -706,7 +724,7 @@ func selfSignup(c echo.Context) error {
BackOfficeStaffEmail: userInfo.Email,
}

tenantResp, err := authClient.CreateTenantWithResponse(context.Background(), tenantProps)
tenantResp, err := authClient.CreateTenantWithResponse(c.Request().Context(), tenantProps)
if err != nil {
c.Logger().Errorf("Failed to create tenant: %v", err)
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to create tenant"})
Expand All @@ -715,7 +733,7 @@ func selfSignup(c echo.Context) error {
tenantID := tenantResp.JSON201.Id

// ユーザー属性を取得する
userAttributesResp, err := authClient.GetUserAttributesWithResponse(context.Background())
userAttributesResp, err := authClient.GetUserAttributesWithResponse(c.Request().Context())
if err != nil {
c.Logger().Errorf("Failed to retrieve user attributes: %v", err)
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to retrieve user attributes"})
Expand Down Expand Up @@ -746,7 +764,7 @@ func selfSignup(c echo.Context) error {
Attributes: userAttributeValues,
}

tenantUserResp, err := authClient.CreateTenantUserWithResponse(context.Background(), tenantID, createTenantUserParam)
tenantUserResp, err := authClient.CreateTenantUserWithResponse(c.Request().Context(), tenantID, createTenantUserParam)
if err != nil {
c.Logger().Errorf("Failed to create tenant user: %v", err)
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to create tenant user"})
Expand All @@ -757,7 +775,7 @@ func selfSignup(c echo.Context) error {
RoleNames: []string{"admin"},
}

_, err = authClient.CreateTenantUserRolesWithResponse(context.Background(), tenantID, tenantUserResp.JSON201.Id, 3, createTenantUserRolesParam)
_, err = authClient.CreateTenantUserRolesWithResponse(c.Request().Context(), tenantID, tenantUserResp.JSON201.Id, 3, createTenantUserRolesParam)
if err != nil {
c.Logger().Errorf("Failed to assign roles: %v", err)
return c.JSON(http.StatusInternalServerError, echo.Map{"error": "Failed to assign roles"})
Expand All @@ -776,7 +794,7 @@ func getMfaStatus(c echo.Context) error {
}

// SaaSus の API を使用してユーザーの MFA 設定を取得
response, err := authClient.GetUserMfaPreferenceWithResponse(context.Background(), userInfo.Id)
response, err := authClient.GetUserMfaPreferenceWithResponse(c.Request().Context(), userInfo.Id)
if err != nil || response.JSON200 == nil {
c.Logger().Errorf("failed to get MFA status: %v", err)
return c.JSON(http.StatusInternalServerError, map[string]string{"error": "Failed to retrieve MFA status"})
Expand Down Expand Up @@ -804,7 +822,7 @@ func getMfaSetup(c echo.Context) error {
}

// SaaSus API を使用して 認証アプリケーション登録用のシークレットコードを作成
response, err := authClient.CreateSecretCodeWithResponse(context.Background(), userInfo.Id, authapi.CreateSecretCodeJSONRequestBody{
response, err := authClient.CreateSecretCodeWithResponse(c.Request().Context(), userInfo.Id, authapi.CreateSecretCodeJSONRequestBody{
AccessToken: accessToken,
})
if err != nil || response.JSON201 == nil {
Expand Down Expand Up @@ -849,7 +867,7 @@ func verifyMfa(c echo.Context) error {
}

// SaaSus API を使用して 認証アプリケーションを登録
response, err := authClient.UpdateSoftwareTokenWithResponse(context.Background(), userInfo.Id, authapi.UpdateSoftwareTokenJSONRequestBody{
response, err := authClient.UpdateSoftwareTokenWithResponse(c.Request().Context(), userInfo.Id, authapi.UpdateSoftwareTokenJSONRequestBody{
AccessToken: accessToken,
VerificationCode: requestBody.VerificationCode,
})
Expand Down Expand Up @@ -877,7 +895,7 @@ func enableMfa(c echo.Context) error {
}

// SaaSus API を使用して MFA を有効化
_, err := authClient.UpdateUserMfaPreferenceWithResponse(context.Background(), userInfo.Id, requestBody)
_, err := authClient.UpdateUserMfaPreferenceWithResponse(c.Request().Context(), userInfo.Id, requestBody)
if err != nil {
c.Logger().Errorf("Failed to enable MFA: %v", err)
return c.JSON(http.StatusInternalServerError, map[string]string{"error": "Failed to enable MFA"})
Expand All @@ -902,7 +920,7 @@ func disableMfa(c echo.Context) error {
}

// SaaSus API を使用して MFA を無効化
_, err := authClient.UpdateUserMfaPreferenceWithResponse(context.Background(), userInfo.Id, requestBody)
_, err := authClient.UpdateUserMfaPreferenceWithResponse(c.Request().Context(), userInfo.Id, requestBody)
if err != nil {
c.Logger().Errorf("Failed to disable MFA: %v", err)
return c.JSON(http.StatusInternalServerError, map[string]string{"error": "Failed to disable MFA"})
Expand Down Expand Up @@ -983,7 +1001,7 @@ func userInvitation(c echo.Context) error {
}

// テナントへの招待を作成
authClient.CreateTenantInvitation(context.Background(), tenantID, createTenantInvitationJSONRequestBody)
authClient.CreateTenantInvitation(c.Request().Context(), tenantID, createTenantInvitationJSONRequestBody)

return c.JSON(http.StatusOK, echo.Map{"message": "Create tenant user invitation successfully"})
}
Expand Down