Skip to content

Commit 07ce1be

Browse files
authored
Merge pull request #12 from Gml-Launcher/GML-53
Added texture protocol from request
2 parents 77cde17 + 1a0b797 commit 07ce1be

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/Gml.Web.Skin.Service/Core/Requests/TextureRequests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ internal static async Task<IResult> LoadSkin(HttpRequest request, [FromForm] IFo
2929
await file.CopyToAsync(fileStream);
3030
}
3131

32-
var texture = SkinHelper.Create($"http://{request.Host.Value}", userName);
32+
var texture = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);
3333
return Results.Ok(mapper.Map<UserTextureReadDto>(texture));
3434
}
3535
catch (Exception ex)
@@ -74,7 +74,7 @@ internal static async Task<IResult> LoadCloak(HttpRequest request, [FromForm] IF
7474
await file.CopyToAsync(fileStream);
7575
}
7676

77-
var texture = SkinHelper.Create($"http://{request.Host.Value}", userName);
77+
var texture = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);
7878
return Results.Ok(mapper.Map<UserTextureReadDto>(texture));
7979
}
8080
catch (Exception ex)
@@ -97,14 +97,14 @@ internal static async Task<IResult> DeleteCloak(HttpRequest request, IMapper map
9797

9898
internal static Task<IResult> GetSkin(HttpRequest request, string userName, string? uuid)
9999
{
100-
var user = SkinHelper.Create($"http://{request.Host.Value}", userName.Substring(2, userName.Length - 2));
100+
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName.Substring(2, userName.Length - 2));
101101

102102
return Task.FromResult(Results.File(user.SkinFullPath, "image/png"));
103103
}
104104

105105
internal static Task<IResult> GetUserTexture(HttpRequest request, IMapper mapper, string userName)
106106
{
107-
var texture = SkinHelper.Create($"http://{request.Host.Value}", userName);
107+
var texture = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);
108108

109109
return Task.FromResult(Results.Ok(mapper.Map<UserTextureReadDto>(texture)));
110110
}
@@ -128,7 +128,7 @@ internal static async Task<IResult> RefreshCache(HttpRequest request, IMapper ma
128128

129129
internal static Task<IResult> GetCloak(HttpRequest request, string userName, int? size = 128)
130130
{
131-
var user = SkinHelper.Create($"http://{request.Host.Value}", userName);
131+
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);
132132

133133
if (!user.HasCloak) return Task.FromResult(Results.NotFound("Cloak not exists"));
134134

@@ -139,7 +139,7 @@ internal static Task<IResult> GetCloak(HttpRequest request, string userName, int
139139

140140
internal static Task<IResult> GetCloakTexture(HttpRequest request, string userName)
141141
{
142-
var user = SkinHelper.Create($"http://{request.Host.Value}", userName.Substring(2, userName.Length - 2));
142+
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName.Substring(2, userName.Length - 2));
143143

144144
if (!user.HasCloak) return Task.FromResult(Results.NotFound("Cloak not exists"));
145145

@@ -148,7 +148,7 @@ internal static Task<IResult> GetCloakTexture(HttpRequest request, string userNa
148148

149149
internal static Task<IResult> GetSkinHead(HttpRequest request, string userName, int size = 128)
150150
{
151-
var user = SkinHelper.Create($"http://{request.Host.Value}", userName);
151+
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);
152152

153153
var image = SkinViewer.SkinViewer.GetHead(user.SkinFullPath, user, size);
154154

@@ -157,7 +157,7 @@ internal static Task<IResult> GetSkinHead(HttpRequest request, string userName,
157157

158158
internal static Task<IResult> GetSkinFront(HttpRequest request, string userName, int size = 128)
159159
{
160-
var user = SkinHelper.Create($"http://{request.Host.Value}", userName);
160+
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);
161161

162162
var image = SkinViewer.SkinViewer.GetFront(user.SkinFullPath, user, size);
163163

@@ -166,7 +166,7 @@ internal static Task<IResult> GetSkinFront(HttpRequest request, string userName,
166166

167167
internal static Task<IResult> GetSkinBack(HttpRequest request, string userName, int size = 128)
168168
{
169-
var user = SkinHelper.Create($"http://{request.Host.Value}", userName);
169+
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);
170170

171171
var image = SkinViewer.SkinViewer.GetBack(user, size);
172172

@@ -175,7 +175,7 @@ internal static Task<IResult> GetSkinBack(HttpRequest request, string userName,
175175

176176
internal static Task<IResult> GetSkinAndCloakBack(HttpRequest request, string userName, int size = 128)
177177
{
178-
var user = SkinHelper.Create($"http://{request.Host.Value}", userName);
178+
var user = SkinHelper.Create($"{request.Scheme}://{request.Host.Value}", userName);
179179

180180
var image = SkinViewer.SkinViewer.GetBack(user, size, true);
181181

0 commit comments

Comments
 (0)