Merge pull request #18 from tellusxdp/feat/add-v2

プロバイダ名・商品識別コード・商品ラベルを廃止して、商品IDに移行
tellusxdp · Dec 24, 2020 · 3240fd0 · 3240fd0
2 parents bd794ad + f726ac8
commit 3240fd0
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -20,14 +20,12 @@ config.ymlにて以下の項目を設定します
 | upsteram.url                | 認証後に接続するサーバ             | https://www.example.com/         |
 | upstream.headers            | プロキシ先に付与するリクエストヘッダ | {"Authorization": "Bearer token"} |
 | private_key_url | JWTを検証する公開鍵をダウンロードするURL | https://sdk.tellusxdp.com/api/manager/v1/auth/public_keys |
+| counter_url | APIリクエストのメータリング情報を登録するURL | https://sdk.tellusxdp.com/api/manager/v1/items/counts |
 | upstream          | 認証後に接続するサーバ             | https://www.example.com/                            |
-| provider_id     | プロバイダ名                    | provider-a                                           |
-| tool_id           | 商品ID                    | 1_9ffc0bb13148c605795b5bc22143b7b00c30ad            |
 | api_key           | 集計用APIキー              | fa3a3293-d1be-41cf-9b6a-70d4d75c41ba             |
-| tool_label        | 商品ラベル                 | product01                                           |
+| product_id     | 商品ID                    | 366bbedd-8bc3-4374-9253-cd07f763f2bc                          |
 | allowed_auth_types | 許可認証方式                | ["password", "apikey"] |
 
-
 ### Example
 
 ```yaml
@@ -45,11 +43,9 @@ upstream:
 
 private_key_url: https://sdk.tellusxdp.com/api/manager/v1/auth/public_keys
 counter_url: https://sdk.tellusxdp.com/api/manager/v1/items/counts
-api_key: b424a335-ea26-4ff1-bdf8-168469778499
 
-provider_id: acmeinc
-tool_label: owesome-api
-tool_id: 1_e849acf73765b19fd700af9374ab0fa2
+api_key: fa3a3293-d1be-41cf-9b6a-70d4d75c41ba
+product_id: 366bbedd-8bc3-4374-9253-cd07f763f2bc
 allowed_auth_types:
   - apikey
   - password

diff --git a/config.yml b/config.yml
@@ -3,16 +3,14 @@ http:
 
 private_key_url: https://sdk.tellusxdp.com/api/manager/v1/auth/public_keys
 counter_url: https://sdk.tellusxdp.com/api/manager/v1/items/counts
-api_key: 7b4d73b1-425b-4082-897c-ba3c81962272
 
 upstream: 
   url: https://www.sakura.ad.jp
   headers:
     X-Test-Header: hogetan
 
-provider_id: fukuyoshi-jiro
-tool_label: weather-api
-tool_id: 1_9ffc0bb13148c605795b5bc22143b7b00c30ad
+product_id: 9dc372e2-5819-4953-a696-5a599e760dc3
+api_key: 7b4d73b1-425b-4082-897c-ba3c81962272
 allowed_auth_types:
   - apikey
   - password
diff --git a/config/config.go b/config/config.go
@@ -31,9 +31,7 @@ type Config struct {
 	CounterURL       string   `yaml:"counter_url"`
 	APIKey           string   `yaml:"api_key"`
 	Upstream         Upstream `yaml:"upstream"`
-	ProviderID	     string   `yaml:"provider_id"`
-	ToolLabel        string   `yaml:"tool_label"`
-	ToolID           string   `yaml:"tool_id"`
+	ProductID        string   `yaml:"product_id"`
 	AllowedAuthTypes []string `yaml:"allowed_auth_types"`
 }
 

diff --git a/files/config.yml b/files/config.yml
@@ -11,10 +11,8 @@ counter_url: https://sdk.tellusxdp.com/api/manager/v1/items/counts
 upstream: 
   url: http://127.0.0.1:3000
 
-provider_name: providername
-tool_label: toollabel
-tool_id: toolid
-api_key: apikey
+product_id: 商品ID
+api_key: 集計用APIキー
 allowed_auth_types:
   - apikey
   - password
diff --git a/server/counter.go b/server/counter.go
@@ -9,7 +9,7 @@ import (
 )
 
 type CountRequest struct {
-	ToolID    string `json:"tool_id"`
+	ProductID string `json:"product_id"`
 	UserID    string `json:"user_id"`
 	Token     string `json:"token"`
 	RequestID string `json:"request_id"`

diff --git a/server/server.go b/server/server.go
@@ -38,7 +38,7 @@ func New(cfg *config.Config) (*Server, error) {
 	s := &Server{
 		Config:   cfg,
 		Upstream: u,
-		Logger:   log.WithField("tool_id", cfg.ToolID),
+		Logger:   log.WithField("product_id", cfg.ProductID),
 	}
 	s.CounterChan = s.StartCountRequestLoop()
 	return s, nil
@@ -119,15 +119,11 @@ func (s *Server) configHandler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(200)
 
 	type configResponse struct {
-		ProviderID       string   `yaml:"provider_id"`
-		ToolLabel        string   `yaml:"tool_label"`
-		ToolID           string   `yaml:"tool_id"`
+		ProductID        string   `yaml:"product_id"`
 		AllowedAuthTypes []string `yaml:"allowed_auth_types"`
 	}
 	resp := &configResponse{
-		ProviderID:       s.Config.ProviderID,
-		ToolLabel:        s.Config.ToolLabel,
-		ToolID:           s.Config.ToolID,
+		ProductID:        s.Config.ProductID,
 		AllowedAuthTypes: s.Config.AllowedAuthTypes,
 	}
 
@@ -176,9 +172,9 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if claim.ToolID != s.Config.ToolID {
-		s.Logger.Debugf("Invalid tool id %s", claim.ToolID)
-		writeError(w, http.StatusUnauthorized, "Unauthorized (invalid tool)")
+	if claim.ProductID != s.Config.ProductID {
+		s.Logger.Debugf("Invalid product id %s", claim.ProductID)
+		writeError(w, http.StatusUnauthorized, "Unauthorized (invalid product)")
 		return
 	}
 
@@ -229,7 +225,7 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		// 有効なレスポンス
 		go func() {
 			c := CountRequest{
-				ToolID:    s.Config.ToolID,
+				ProductID: s.Config.ProductID,
 				UserID:    claim.Subject,
 				Token:     jwtToken,
 				RequestID: requestID,

diff --git a/token/token.go b/token/token.go
@@ -116,12 +116,12 @@ func ValidateToken(tokenString string, publicKeysURL string) (*JWTPayload, error
 	}
 
 	t := &JWTPayload{
-		Audience: claims["aud"].(string),
-		ID:       claims["jti"].(string),
-		Issuer:   claims["iss"].(string),
-		Subject:  claims["sub"].(string),
-		ToolID:   claims["tool_id"].(string),
-		AuthType: claims["auth_type"].(string),
+		Audience:  claims["aud"].(string),
+		ID:        claims["jti"].(string),
+		Issuer:    claims["iss"].(string),
+		Subject:   claims["sub"].(string),
+		ProductID: claims["product_id"].(string),
+		AuthType:  claims["auth_type"].(string),
 	}
 	return t, nil
 }
diff --git a/token/type.go b/token/type.go
@@ -1,10 +1,10 @@
 package token
 
 type JWTPayload struct {
-	Audience string `json:"aud,omitempty"`
-	ID       string `json:"jti,omitempty"`
-	Issuer   string `json:"iss,omitempty"`
-	Subject  string `json:"sub,omitempty"`
-	ToolID   string `json:"tool_id"`
-	AuthType string `json:"auth_type"`
+	Audience  string `json:"aud,omitempty"`
+	ID        string `json:"jti,omitempty"`
+	Issuer    string `json:"iss,omitempty"`
+	Subject   string `json:"sub,omitempty"`
+	ProductID string `json:"product_id"`
+	AuthType  string `json:"auth_type"`
 }
diff --git a/tools/test.py b/tools/test.py
@@ -3,8 +3,8 @@
 
 def get_tool_token(token):
     resp = requests.post(
-        "https://sdk.tellusxdp.com/api/manager/v1/auth/api_access_token/token",
-        json={"provider_id": "fukuyoshi-jiro", "tool_label": "weather-api"},
+        "https://sdk.tellusxdp.com/api/manager/v2/auth/token/",
+        json={"product_id": "2f59c093-4e80-419a-8584-dcee6589d3d2"},
         headers={"Authorization": "Bearer {}".format(token)}
     )
     resp.raise_for_status()