From 238824f965252545285a1e6133ce503078e93cd9 Mon Sep 17 00:00:00 2001
From: Ares <75481906+ice-ares@users.noreply.github.com>
Date: Tue, 22 Oct 2024 20:02:44 +0300
Subject: [PATCH] added claimUserByThirdParty endpoint

---
 cmd/eskimo-hut/api/docs.go      | 2 +-
 cmd/eskimo-hut/api/swagger.json | 2 +-
 cmd/eskimo-hut/api/swagger.yaml | 2 +-
 cmd/eskimo-hut/auth.go          | 4 ++--
 cmd/eskimo-hut/eskimo_hut.go    | 4 ++++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cmd/eskimo-hut/api/docs.go b/cmd/eskimo-hut/api/docs.go
index 493bab2f..1f5ec9be 100644
--- a/cmd/eskimo-hut/api/docs.go
+++ b/cmd/eskimo-hut/api/docs.go
@@ -1130,7 +1130,7 @@ const docTemplate = `{
                 }
             }
         },
-        "/v1w/auth/thirdParty/:thirdParty/claimUser/:username": {
+        "/v1w/auth/thirdParty/{thirdParty}/claimUser/{username}": {
             "post": {
                 "description": "Claims the user",
                 "consumes": [
diff --git a/cmd/eskimo-hut/api/swagger.json b/cmd/eskimo-hut/api/swagger.json
index 7ea9c5b8..5f2de49a 100644
--- a/cmd/eskimo-hut/api/swagger.json
+++ b/cmd/eskimo-hut/api/swagger.json
@@ -1123,7 +1123,7 @@
                 }
             }
         },
-        "/v1w/auth/thirdParty/:thirdParty/claimUser/:username": {
+        "/v1w/auth/thirdParty/{thirdParty}/claimUser/{username}": {
             "post": {
                 "description": "Claims the user",
                 "consumes": [
diff --git a/cmd/eskimo-hut/api/swagger.yaml b/cmd/eskimo-hut/api/swagger.yaml
index d74ce514..e459a929 100644
--- a/cmd/eskimo-hut/api/swagger.yaml
+++ b/cmd/eskimo-hut/api/swagger.yaml
@@ -1579,7 +1579,7 @@ paths:
             $ref: '#/definitions/server.ErrorResponse'
       tags:
       - Auth
-  /v1w/auth/thirdParty/:thirdParty/claimUser/:username:
+  /v1w/auth/thirdParty/{thirdParty}/claimUser/{username}:
     post:
       consumes:
       - application/json
diff --git a/cmd/eskimo-hut/auth.go b/cmd/eskimo-hut/auth.go
index 14c3abbc..142763cd 100644
--- a/cmd/eskimo-hut/auth.go
+++ b/cmd/eskimo-hut/auth.go
@@ -31,7 +31,7 @@ func (s *service) setupAuthRoutes(router *server.Router) {
 		POST("auth/processFaceRecognitionResult", server.RootHandler(s.ProcessFaceRecognitionResult)).
 		POST("auth/getValidUserForPhoneNumberMigration", server.RootHandler(s.GetValidUserForPhoneNumberMigration)).
 		POST("auth/signInWithTelegram", server.RootHandler(s.SignInWithTelegram)).
-		POST("auth/thirdParty/{thirdParty}/claimUser/{username}", server.RootHandler(s.ClaimUserByThirdParty))
+		POST("auth/thirdParty/:thirdParty/claimUser/:username", server.RootHandler(s.ClaimUserByThirdParty))
 }
 
 // SendSignInLinkToEmail godoc
@@ -551,7 +551,7 @@ func (s *service) SignInWithTelegram( //nolint:gocritic // .
 //	@Failure		403			{object}	server.ErrorResponse	"api key invalid"
 //	@Failure		500			{object}	server.ErrorResponse
 //	@Failure		504			{object}	server.ErrorResponse	"if request times out"
-//	@Router			/v1w/auth/thirdParty/:thirdParty/claimUser/:username [POST].
+//	@Router			/v1w/auth/thirdParty/{thirdParty}/claimUser/{username} [POST].
 func (s *service) ClaimUserByThirdParty( //nolint:gocritic // .
 	ctx context.Context,
 	req *server.Request[ClaimUserByThirdPartyRequestArg, any],
diff --git a/cmd/eskimo-hut/eskimo_hut.go b/cmd/eskimo-hut/eskimo_hut.go
index 9760f6d0..4976b066 100644
--- a/cmd/eskimo-hut/eskimo_hut.go
+++ b/cmd/eskimo-hut/eskimo_hut.go
@@ -40,6 +40,10 @@ func main() {
 	if cfg.APIKey == "" {
 		log.Panic("'api-key' is missing")
 	}
+	cfg.ThirdPartyAPIKey = strings.ReplaceAll(cfg.ThirdPartyAPIKey, "\n", "")
+	if cfg.ThirdPartyAPIKey == "" {
+		log.Panic("'api-key' is missing")
+	}
 	nginxPrefix := ""
 	if cfg.Tenant != "" {
 		nginxPrefix = "/" + cfg.Tenant