From 44f3ee7413f27eaba7e1e42033fb1dfa0d5b42cc Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Mon, 15 Apr 2019 00:31:09 +0300 Subject: [PATCH] #1: Improve uuidToTextures method, organize tests --- api/mojang/mojang.go | 9 +- api/mojang/mojang_test.go | 257 ++++++++++++++++++++++---------------- 2 files changed, 156 insertions(+), 110 deletions(-) diff --git a/api/mojang/mojang.go b/api/mojang/mojang.go index c25c61b..1f2f025 100644 --- a/api/mojang/mojang.go +++ b/api/mojang/mojang.go @@ -55,8 +55,13 @@ func UsernamesToUuids(usernames []string) ([]*ProfileInfo, error) { return result, nil } -func UuidToTextures(uuid string) (*SignedTexturesResponse, error) { - request, err := http.NewRequest("GET", "https://sessionserver.mojang.com/session/minecraft/profile/"+uuid, nil) +func UuidToTextures(uuid string, signed bool) (*SignedTexturesResponse, error) { + url := "https://sessionserver.mojang.com/session/minecraft/profile/" + uuid + if signed { + url += "?unsigned=false" + } + + request, err := http.NewRequest("GET", url, nil) if err != nil { panic(err) } diff --git a/api/mojang/mojang_test.go b/api/mojang/mojang_test.go index 83ae2ab..e8a6f14 100644 --- a/api/mojang/mojang_test.go +++ b/api/mojang/mojang_test.go @@ -8,123 +8,164 @@ import ( "gopkg.in/h2non/gock.v1" ) -func TestUsernamesToUuidsCorrectResponse(t *testing.T) { - assert := testify.New(t) +func TestUsernamesToUuids(t *testing.T) { + t.Run("exchange usernames to uuids", func(t *testing.T) { + assert := testify.New(t) - defer gock.Off() - gock.New("https://api.mojang.com"). - Post("/profiles/minecraft"). - JSON([]string{"Thinkofdeath", "maksimkurb"}). - Reply(200). - JSON([]map[string]interface{}{ - { - "id": "4566e69fc90748ee8d71d7ba5aa00d20", - "name": "Thinkofdeath", - "legacy": false, - "demo": true, - }, - { - "id": "0d252b7218b648bfb86c2ae476954d32", - "name": "maksimkurb", - // There is no legacy or demo fields - }, - }) - - client := &http.Client{} - gock.InterceptClient(client) - - HttpClient = client - - result, err := UsernamesToUuids([]string{"Thinkofdeath", "maksimkurb"}) - if assert.NoError(err) { - assert.Len(result, 2) - assert.Equal("4566e69fc90748ee8d71d7ba5aa00d20", result[0].Id) - assert.Equal("Thinkofdeath", result[0].Name) - assert.False(result[0].IsLegacy) - assert.True(result[0].IsDemo) - - assert.Equal("0d252b7218b648bfb86c2ae476954d32", result[1].Id) - assert.Equal("maksimkurb", result[1].Name) - assert.False(result[1].IsLegacy) - assert.False(result[1].IsDemo) - } -} - -func TestUsernamesToUuidsTooManyRequests(t *testing.T) { - assert := testify.New(t) - - defer gock.Off() - gock.New("https://api.mojang.com"). - Post("/profiles/minecraft"). - Reply(429). - JSON(map[string]interface{}{ - "error": "TooManyRequestsException", - "errorMessage": "The client has sent too many requests within a certain amount of time", - }) - - client := &http.Client{} - gock.InterceptClient(client) - - HttpClient = client - - result, err := UsernamesToUuids([]string{"Thinkofdeath", "maksimkurb"}) - assert.Nil(result) - assert.IsType(&TooManyRequestsError{}, err) - assert.EqualError(err, "Too Many Requests") -} - -func TestUuidToTexturesCorrectResponse(t *testing.T) { - assert := testify.New(t) - - defer gock.Off() - gock.New("https://sessionserver.mojang.com"). - Get("/session/minecraft/profile/4566e69fc90748ee8d71d7ba5aa00d20"). - Reply(200). - JSON(map[string]interface{}{ - "id": "4566e69fc90748ee8d71d7ba5aa00d20", - "name": "Thinkofdeath", - "properties": []interface{}{ - map[string]interface{}{ - "name": "textures", - "value": "eyJ0aW1lc3RhbXAiOjE1NDMxMDczMDExODUsInByb2ZpbGVJZCI6IjQ1NjZlNjlmYzkwNzQ4ZWU4ZDcxZDdiYTVhYTAwZDIwIiwicHJvZmlsZU5hbWUiOiJUaGlua29mZGVhdGgiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzRkMWUwOGIwYmI3ZTlmNTkwYWYyNzc1ODEyNWJiZWQxNzc4YWM2Y2VmNzI5YWVkZmNiOTYxM2U5OTExYWU3NSJ9LCJDQVBFIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjBjYzA4ODQwNzAwNDQ3MzIyZDk1M2EwMmI5NjVmMWQ2NWExM2E2MDNiZjY0YjE3YzgwM2MyMTQ0NmZlMTYzNSJ9fX0=", + defer gock.Off() + gock.New("https://api.mojang.com"). + Post("/profiles/minecraft"). + JSON([]string{"Thinkofdeath", "maksimkurb"}). + Reply(200). + JSON([]map[string]interface{}{ + { + "id": "4566e69fc90748ee8d71d7ba5aa00d20", + "name": "Thinkofdeath", + "legacy": false, + "demo": true, }, - }, - }) + { + "id": "0d252b7218b648bfb86c2ae476954d32", + "name": "maksimkurb", + // There is no legacy or demo fields + }, + }) - client := &http.Client{} - gock.InterceptClient(client) + client := &http.Client{} + gock.InterceptClient(client) - HttpClient = client + HttpClient = client - result, err := UuidToTextures("4566e69fc90748ee8d71d7ba5aa00d20") - if assert.NoError(err) { - assert.Equal("4566e69fc90748ee8d71d7ba5aa00d20", result.Id) - assert.Equal("Thinkofdeath", result.Name) - assert.Equal(1, len(result.Props)) - assert.Equal("textures", result.Props[0].Name) - assert.Equal(476, len(result.Props[0].Value)) - } + result, err := UsernamesToUuids([]string{"Thinkofdeath", "maksimkurb"}) + if assert.NoError(err) { + assert.Len(result, 2) + assert.Equal("4566e69fc90748ee8d71d7ba5aa00d20", result[0].Id) + assert.Equal("Thinkofdeath", result[0].Name) + assert.False(result[0].IsLegacy) + assert.True(result[0].IsDemo) + + assert.Equal("0d252b7218b648bfb86c2ae476954d32", result[1].Id) + assert.Equal("maksimkurb", result[1].Name) + assert.False(result[1].IsLegacy) + assert.False(result[1].IsDemo) + } + }) + + t.Run("handle too many requests error", func(t *testing.T) { + assert := testify.New(t) + + defer gock.Off() + gock.New("https://api.mojang.com"). + Post("/profiles/minecraft"). + Reply(429). + JSON(map[string]interface{}{ + "error": "TooManyRequestsException", + "errorMessage": "The client has sent too many requests within a certain amount of time", + }) + + client := &http.Client{} + gock.InterceptClient(client) + + HttpClient = client + + result, err := UsernamesToUuids([]string{"Thinkofdeath", "maksimkurb"}) + assert.Nil(result) + assert.IsType(&TooManyRequestsError{}, err) + assert.EqualError(err, "Too Many Requests") + }) } -func TestUuidToTexturesTooManyRequests(t *testing.T) { - assert := testify.New(t) +func TestUuidToTextures(t *testing.T) { + t.Run("obtain not signed textures", func(t *testing.T) { + assert := testify.New(t) - defer gock.Off() - gock.New("https://sessionserver.mojang.com"). - Get("/session/minecraft/profile/4566e69fc90748ee8d71d7ba5aa00d20"). - Reply(429). - JSON(map[string]interface{}{ - "error": "TooManyRequestsException", - "errorMessage": "The client has sent too many requests within a certain amount of time", - }) + defer gock.Off() + gock.New("https://sessionserver.mojang.com"). + Get("/session/minecraft/profile/4566e69fc90748ee8d71d7ba5aa00d20"). + Reply(200). + JSON(map[string]interface{}{ + "id": "4566e69fc90748ee8d71d7ba5aa00d20", + "name": "Thinkofdeath", + "properties": []interface{}{ + map[string]interface{}{ + "name": "textures", + "value": "eyJ0aW1lc3RhbXAiOjE1NDMxMDczMDExODUsInByb2ZpbGVJZCI6IjQ1NjZlNjlmYzkwNzQ4ZWU4ZDcxZDdiYTVhYTAwZDIwIiwicHJvZmlsZU5hbWUiOiJUaGlua29mZGVhdGgiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzRkMWUwOGIwYmI3ZTlmNTkwYWYyNzc1ODEyNWJiZWQxNzc4YWM2Y2VmNzI5YWVkZmNiOTYxM2U5OTExYWU3NSJ9LCJDQVBFIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjBjYzA4ODQwNzAwNDQ3MzIyZDk1M2EwMmI5NjVmMWQ2NWExM2E2MDNiZjY0YjE3YzgwM2MyMTQ0NmZlMTYzNSJ9fX0=", + }, + }, + }) - client := &http.Client{} - gock.InterceptClient(client) + client := &http.Client{} + gock.InterceptClient(client) - HttpClient = client + HttpClient = client - result, err := UuidToTextures("4566e69fc90748ee8d71d7ba5aa00d20") - assert.Nil(result) - assert.IsType(&TooManyRequestsError{}, err) - assert.EqualError(err, "Too Many Requests") + result, err := UuidToTextures("4566e69fc90748ee8d71d7ba5aa00d20", false) + if assert.NoError(err) { + assert.Equal("4566e69fc90748ee8d71d7ba5aa00d20", result.Id) + assert.Equal("Thinkofdeath", result.Name) + assert.Equal(1, len(result.Props)) + assert.Equal("textures", result.Props[0].Name) + assert.Equal(476, len(result.Props[0].Value)) + assert.Equal("", result.Props[0].Signature) + } + }) + + t.Run("obtain signed textures", func(t *testing.T) { + assert := testify.New(t) + + defer gock.Off() + gock.New("https://sessionserver.mojang.com"). + Get("/session/minecraft/profile/4566e69fc90748ee8d71d7ba5aa00d20"). + MatchParam("unsigned", "false"). + Reply(200). + JSON(map[string]interface{}{ + "id": "4566e69fc90748ee8d71d7ba5aa00d20", + "name": "Thinkofdeath", + "properties": []interface{}{ + map[string]interface{}{ + "name": "textures", + "signature": "signature string", + "value": "eyJ0aW1lc3RhbXAiOjE1NDMxMDczMDExODUsInByb2ZpbGVJZCI6IjQ1NjZlNjlmYzkwNzQ4ZWU4ZDcxZDdiYTVhYTAwZDIwIiwicHJvZmlsZU5hbWUiOiJUaGlua29mZGVhdGgiLCJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvNzRkMWUwOGIwYmI3ZTlmNTkwYWYyNzc1ODEyNWJiZWQxNzc4YWM2Y2VmNzI5YWVkZmNiOTYxM2U5OTExYWU3NSJ9LCJDQVBFIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYjBjYzA4ODQwNzAwNDQ3MzIyZDk1M2EwMmI5NjVmMWQ2NWExM2E2MDNiZjY0YjE3YzgwM2MyMTQ0NmZlMTYzNSJ9fX0=", + }, + }, + }) + + client := &http.Client{} + gock.InterceptClient(client) + + HttpClient = client + + result, err := UuidToTextures("4566e69fc90748ee8d71d7ba5aa00d20", true) + if assert.NoError(err) { + assert.Equal("4566e69fc90748ee8d71d7ba5aa00d20", result.Id) + assert.Equal("Thinkofdeath", result.Name) + assert.Equal(1, len(result.Props)) + assert.Equal("textures", result.Props[0].Name) + assert.Equal(476, len(result.Props[0].Value)) + assert.Equal("signature string", result.Props[0].Signature) + } + }) + + t.Run("handle too many requests error", func(t *testing.T) { + assert := testify.New(t) + + defer gock.Off() + gock.New("https://sessionserver.mojang.com"). + Get("/session/minecraft/profile/4566e69fc90748ee8d71d7ba5aa00d20"). + Reply(429). + JSON(map[string]interface{}{ + "error": "TooManyRequestsException", + "errorMessage": "The client has sent too many requests within a certain amount of time", + }) + + client := &http.Client{} + gock.InterceptClient(client) + + HttpClient = client + + result, err := UuidToTextures("4566e69fc90748ee8d71d7ba5aa00d20", false) + assert.Nil(result) + assert.IsType(&TooManyRequestsError{}, err) + assert.EqualError(err, "Too Many Requests") + }) }