From ce99ac8cf8dd6ba83f035405970cbe3176fe8d8f Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Thu, 1 Feb 2018 23:16:35 +0300
Subject: [PATCH] Removed Ely-specific faces API

---
 http/face.go      | 27 ------------------------
 http/face_test.go | 53 -----------------------------------------------
 http/http.go      |  2 --
 3 files changed, 82 deletions(-)
 delete mode 100644 http/face.go
 delete mode 100644 http/face_test.go

diff --git a/http/face.go b/http/face.go
deleted file mode 100644
index 9578737..0000000
--- a/http/face.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package http
-
-import (
-	"net/http"
-
-	"github.com/gorilla/mux"
-)
-
-const defaultHash = "default"
-
-func (cfg *Config) Face(response http.ResponseWriter, request *http.Request) {
-	cfg.Logger.IncCounter("faces.request", 1)
-	username := parseUsername(mux.Vars(request)["username"])
-	rec, err := cfg.SkinsRepo.FindByUsername(username)
-	var hash string
-	if err != nil || rec.SkinId == 0 {
-		hash = defaultHash
-	} else {
-		hash = rec.Hash
-	}
-
-	http.Redirect(response, request, buildFaceUrl(hash), 301)
-}
-
-func buildFaceUrl(hash string) string {
-	return "http://ely.by/minecraft/skin_buffer/faces/" + hash + ".png"
-}
diff --git a/http/face_test.go b/http/face_test.go
deleted file mode 100644
index 8bb698d..0000000
--- a/http/face_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package http
-
-import (
-	"net/http/httptest"
-	"testing"
-
-	"github.com/golang/mock/gomock"
-	testify "github.com/stretchr/testify/assert"
-
-	"elyby/minecraft-skinsystem/db"
-)
-
-func TestConfig_Face(t *testing.T) {
-	assert := testify.New(t)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	config, mocks := setupMocks(ctrl)
-
-	mocks.Skins.EXPECT().FindByUsername("mock_user").Return(createSkinModel("mock_user", false), nil)
-	mocks.Log.EXPECT().IncCounter("faces.request", int64(1))
-
-	req := httptest.NewRequest("GET", "http://skinsystem.ely.by/skins/mock_user/face.png", nil)
-	w := httptest.NewRecorder()
-
-	config.CreateHandler().ServeHTTP(w, req)
-
-	resp := w.Result()
-	assert.Equal(301, resp.StatusCode)
-	assert.Equal("http://ely.by/minecraft/skin_buffer/faces/55d2a8848764f5ff04012cdb093458bd.png", resp.Header.Get("Location"))
-}
-
-func TestConfig_Face2(t *testing.T) {
-	assert := testify.New(t)
-
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
-
-	config, mocks := setupMocks(ctrl)
-
-	mocks.Skins.EXPECT().FindByUsername("mock_user").Return(nil, &db.SkinNotFoundError{"mock_user"})
-	mocks.Log.EXPECT().IncCounter("faces.request", int64(1))
-
-	req := httptest.NewRequest("GET", "http://skinsystem.ely.by/skins/mock_user/face.png", nil)
-	w := httptest.NewRecorder()
-
-	config.CreateHandler().ServeHTTP(w, req)
-
-	resp := w.Result()
-	assert.Equal(301, resp.StatusCode)
-	assert.Equal("http://ely.by/minecraft/skin_buffer/faces/default.png", resp.Header.Get("Location"))
-}
diff --git a/http/http.go b/http/http.go
index 0020081..41d6662 100644
--- a/http/http.go
+++ b/http/http.go
@@ -55,8 +55,6 @@ func (cfg *Config) CreateHandler() http.Handler {
 	router.HandleFunc("/cloaks/{username}", cfg.Cape).Methods("GET").Name("cloaks")
 	router.HandleFunc("/textures/{username}", cfg.Textures).Methods("GET")
 	router.HandleFunc("/textures/signed/{username}", cfg.SignedTextures).Methods("GET")
-	router.HandleFunc("/skins/{username}/face", cfg.Face).Methods("GET")
-	router.HandleFunc("/skins/{username}/face.png", cfg.Face).Methods("GET")
 	// Legacy
 	router.HandleFunc("/skins", cfg.SkinGET).Methods("GET")
 	router.HandleFunc("/cloaks", cfg.CapeGET).Methods("GET")