From ed0b9bb040672e20f5c533c31518d4d6f91f1b0d Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Wed, 1 May 2019 01:51:16 +0300 Subject: [PATCH] Resolves #6. Remove hash field from the project structures --- CHANGELOG.md | 1 + README.md | 1 - http/api.go | 1 - http/api_test.go | 4 ---- http/skin_test.go | 19 +++++++++---------- model/skin.go | 1 - 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1a303c..b177718 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,5 +38,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed - `hash` field from `/textures` response because the game doesn't use it and calculates hash by getting the filename from the textures link instead. +- `hash` field from `POST /api/skins` endpoint. [Unreleased]: https://github.com/elyby/chrly/compare/4.1.1...HEAD diff --git a/README.md b/README.md index 41d3c25..ee90824 100644 --- a/README.md +++ b/README.md @@ -172,7 +172,6 @@ form data. `form-urlencoded` also supported, but, as you may know, it doesn't su | username | string | Username. Case insensitive. | | uuid | uuid | UUID of the user. | | skinId | int | Skin identifier. | -| hash | string | Skin's hash. Algorithm can be any. For example `md5`. | | is1_8 | bool | Does the skin have the new format (64x64). | | isSlim | bool | Does skin have slim arms (Alex model). | | mojangTextures | string | Mojang textures field. It must be a base64 encoded json string. Not required. | diff --git a/http/api.go b/http/api.go index 6cdc8f1..55b949b 100644 --- a/http/api.go +++ b/http/api.go @@ -72,7 +72,6 @@ func (cfg *Config) PostSkin(resp http.ResponseWriter, req *http.Request) { record.Uuid = req.Form.Get("uuid") record.SkinId = skinId - record.Hash = req.Form.Get("hash") record.Is1_8 = is18 record.IsSlim = isSlim record.Url = req.Form.Get("url") diff --git a/http/api_test.go b/http/api_test.go index b2ba5b3..24d9f67 100644 --- a/http/api_test.go +++ b/http/api_test.go @@ -28,7 +28,6 @@ func TestConfig_PostSkin(t *testing.T) { resultModel := createSkinModel("mock_user", false) resultModel.SkinId = 5 - resultModel.Hash = "94a457d92a61460cb9cb5d6f29732d2a" resultModel.Url = "http://ely.by/minecraft/skins/default.png" resultModel.MojangTextures = "" resultModel.MojangSignature = "" @@ -125,7 +124,6 @@ func TestConfig_PostSkin(t *testing.T) { resultModel := createSkinModel("mock_user", false) resultModel.SkinId = 5 - resultModel.Hash = "94a457d92a61460cb9cb5d6f29732d2a" resultModel.Url = "http://textures-server.com/skin.png" resultModel.MojangTextures = "" resultModel.MojangSignature = "" @@ -173,7 +171,6 @@ func TestConfig_PostSkin(t *testing.T) { resultModel := createSkinModel("mock_user", false) resultModel.UserId = 2 resultModel.SkinId = 5 - resultModel.Hash = "94a457d92a61460cb9cb5d6f29732d2a" resultModel.Url = "http://ely.by/minecraft/skins/default.png" resultModel.MojangTextures = "" resultModel.MojangSignature = "" @@ -222,7 +219,6 @@ func TestConfig_PostSkin(t *testing.T) { resultModel := createSkinModel("changed_username", false) resultModel.SkinId = 5 - resultModel.Hash = "94a457d92a61460cb9cb5d6f29732d2a" resultModel.Url = "http://ely.by/minecraft/skins/default.png" resultModel.MojangTextures = "" resultModel.MojangSignature = "" diff --git a/http/skin_test.go b/http/skin_test.go index fbc1da8..4a9fd97 100644 --- a/http/skin_test.go +++ b/http/skin_test.go @@ -24,7 +24,7 @@ type skinsTestCase struct { var skinsTestCases = []*skinsTestCase{ { - Name: "Obtain skin for known username", + Name: "Obtain skin for known username", ExistsInLocalStorage: true, AssertResponse: func(assert *testify.Assertions, resp *http.Response) { assert.Equal(301, resp.StatusCode) @@ -32,28 +32,28 @@ var skinsTestCases = []*skinsTestCase{ }, }, { - Name: "Obtain skin for unknown username that exists in Mojang and has a cape", + Name: "Obtain skin for unknown username that exists in Mojang and has a cape", ExistsInLocalStorage: false, - ExistsInMojang: true, - HasSkinInMojangResp: true, + ExistsInMojang: true, + HasSkinInMojangResp: true, AssertResponse: func(assert *testify.Assertions, resp *http.Response) { assert.Equal(301, resp.StatusCode) assert.Equal("http://mojang/skin.png", resp.Header.Get("Location")) }, }, { - Name: "Obtain skin for unknown username that exists in Mojang, but don't has a cape", + Name: "Obtain skin for unknown username that exists in Mojang, but don't has a cape", ExistsInLocalStorage: false, - ExistsInMojang: true, - HasSkinInMojangResp: false, + ExistsInMojang: true, + HasSkinInMojangResp: false, AssertResponse: func(assert *testify.Assertions, resp *http.Response) { assert.Equal(404, resp.StatusCode) }, }, { - Name: "Obtain skin for unknown username that doesn't exists in Mojang", + Name: "Obtain skin for unknown username that doesn't exists in Mojang", ExistsInLocalStorage: false, - ExistsInMojang: false, + ExistsInMojang: false, AssertResponse: func(assert *testify.Assertions, resp *http.Response) { assert.Equal(404, resp.StatusCode) }, @@ -150,7 +150,6 @@ func createSkinModel(username string, isSlim bool) *model.Skin { Username: username, Uuid: "0f657aa8-bfbe-415d-b700-5750090d3af3", // Use non nil UUID to pass validation in api tests SkinId: 1, - Hash: "00000000000000000000000000000000", Url: "http://chrly/skin.png", MojangTextures: "mocked textures base64", MojangSignature: "mocked signature", diff --git a/model/skin.go b/model/skin.go index ef288e1..95254fd 100644 --- a/model/skin.go +++ b/model/skin.go @@ -8,7 +8,6 @@ type Skin struct { Url string `json:"url"` Is1_8 bool `json:"is1_8"` IsSlim bool `json:"isSlim"` - Hash string `json:"hash"` MojangTextures string `json:"mojangTextures"` MojangSignature string `json:"mojangSignature"` OldUsername string