Delete skin/cape

account.go

@@ -119,6 +119,7 @@ func AccountPlayerNamesToIDs(app *App) func(c echo.Context) error {
 	}
 }
 
+// /user/security/location
 func AccountVerifySecurityLocation(app *App) func(c echo.Context) error {
 	return func(c echo.Context) error {
 		return c.NoContent(http.StatusNoContent)

common.go

@@ -188,6 +188,12 @@ func ValidateCape(app *App, reader io.Reader) (io.Reader, error) {
 }
 
 func SetSkin(app *App, user *User, reader io.Reader) error {
+	oldSkinHash := UnmakeNullString(&user.SkinHash)
+
+	if reader == nil {
+		// handle resetting skin to "no skin"
+		user.SkinHash = MakeNullString(nil)
+	} else {
 		limitedReader := io.LimitReader(reader, 10e6)
 
 		// It's fine to read the whole skin into memory here, they will almost
@@ -207,7 +213,6 @@ func SetSkin(app *App, user *User, reader io.Reader) error {
 			return err
 		}
 
-	oldSkinHash := UnmakeNullString(&user.SkinHash)
 		user.SkinHash = MakeNullString(&hash)
 
 		// TODO deal with race conditions here
@@ -222,14 +227,15 @@ func SetSkin(app *App, user *User, reader io.Reader) error {
 		if err != nil {
 			return err
 		}
+	}
 
-	err = app.DB.Save(&user).Error
+	err := app.DB.Save(&user).Error
 	if err != nil {
 		return err
 	}
 
 	if oldSkinHash != nil {
-		err = DeleteSkin(app, hash)
+		err = DeleteSkinIfUnused(app, *oldSkinHash)
 		if err != nil {
 			return err
 		}
@@ -239,6 +245,12 @@ func SetSkin(app *App, user *User, reader io.Reader) error {
 }
 
 func SetCape(app *App, user *User, reader io.Reader) error {
+	oldCapeHash := UnmakeNullString(&user.CapeHash)
+
+	if reader == nil {
+		// handle resetting cape to "no cape"
+		user.CapeHash = MakeNullString(nil)
+	} else {
 		limitedReader := io.LimitReader(reader, 10e6)
 
 		buf := new(bytes.Buffer)
@@ -256,7 +268,6 @@ func SetCape(app *App, user *User, reader io.Reader) error {
 			return err
 		}
 
-	oldCapeHash := UnmakeNullString(&user.CapeHash)
 		user.CapeHash = MakeNullString(&hash)
 
 		// TODO deal with race conditions here
@@ -271,14 +282,15 @@ func SetCape(app *App, user *User, reader io.Reader) error {
 		if err != nil {
 			return err
 		}
+	}
 
-	err = app.DB.Save(&user).Error
+	err := app.DB.Save(&user).Error
 	if err != nil {
 		return err
 	}
 
 	if oldCapeHash != nil {
-		err = DeleteCape(app, hash)
+		err = DeleteCapeIfUnused(app, *oldCapeHash)
 		if err != nil {
 			return err
 		}
@@ -288,7 +300,7 @@ func SetCape(app *App, user *User, reader io.Reader) error {
 }
 
 // Delete skin if not in use
-func DeleteSkin(app *App, hash string) error {
+func DeleteSkinIfUnused(app *App, hash string) error {
 	var inUse bool
 	err := app.DB.Model(User{}).
 		Select("count(*) > 0").
@@ -307,7 +319,7 @@ func DeleteSkin(app *App, hash string) error {
 }
 
 // Delete cape if not in use
-func DeleteCape(app *App, hash string) error {
+func DeleteCapeIfUnused(app *App, hash string) error {
 	var inUse bool
 	err := app.DB.Model(User{}).
 		Select("count(*) > 0").

front.go

@@ -202,7 +202,9 @@ func FrontUpdate(app *App) func(c echo.Context) error {
 		preferredLanguage := c.FormValue("preferredLanguage")
 		skinModel := c.FormValue("skinModel")
 		skinURL := c.FormValue("skinUrl")
+		deleteSkin := c.FormValue("deleteSkin")
 		capeURL := c.FormValue("capeUrl")
+		deleteCape := c.FormValue("deleteCape")
 
 		if err := ValidatePlayerName(app, playerName); err != nil {
 			setErrorMessage(&c, fmt.Sprintf("Invalid player name: %s", err))
@@ -269,8 +271,13 @@ func FrontUpdate(app *App) func(c echo.Context) error {
 				setErrorMessage(&c, fmt.Sprintf("Error using that skin: %s", err))
 				return c.Redirect(http.StatusSeeOther, returnURL)
 			}
-			err = SetSkin(app, user, validSkinHandle)
 
+			err = SetSkin(app, user, validSkinHandle)
+			if err != nil {
+				return nil
+			}
+		} else if deleteSkin == "on" {
+			err := SetSkin(app, user, nil)
 			if err != nil {
 				return nil
 			}
@@ -308,6 +315,11 @@ func FrontUpdate(app *App) func(c echo.Context) error {
 			}
 			err = SetCape(app, user, validCapeHandle)
 
+			if err != nil {
+				return nil
+			}
+		} else if deleteCape == "on" {
+			err := SetCape(app, user, nil)
 			if err != nil {
 				return nil
 			}
@@ -758,14 +770,14 @@ func FrontDeleteAccount(app *App) func(c echo.Context) error {
 		app.DB.Delete(&user)
 
 		if oldSkinHash != nil {
-			err := DeleteSkin(app, *oldSkinHash)
+			err := DeleteSkinIfUnused(app, *oldSkinHash)
 			if err != nil {
 				return err
 			}
 		}
 
 		if oldCapeHash != nil {
-			err := DeleteCape(app, *oldCapeHash)
+			err := DeleteCapeIfUnused(app, *oldCapeHash)
 			if err != nil {
 				return err
 			}

main.go

@@ -142,6 +142,8 @@ func GetServicesServer(app *App) *echo.Echo {
 	e.Any("/player/attributes", ServicesPlayerAttributes(app))
 	e.Any("/player/certificates", ServicesPlayerCertificates(app))
 	e.POST("/minecraft/profile/skins", ServicesUploadSkin(app))
+	e.DELETE("/minecraft/profile/skins/active", ServicesDeleteSkin(app))
+	e.DELETE("/minecraft/profile/capes/active", ServicesDeleteCape(app))
 	return e
 }
 

services.go

@@ -292,3 +292,27 @@ func ServicesUploadSkin(app *App) func(c echo.Context) error {
 		return c.NoContent(http.StatusOK)
 	})
 }
+
+// /minecraft/profile/skins/active
+func ServicesDeleteSkin(app *App) func(c echo.Context) error {
+	return withBearerAuthentication(app, func(c echo.Context, user *User) error {
+		err := SetSkin(app, user, nil)
+		if err != nil {
+			return err
+		}
+
+		return c.NoContent(http.StatusOK)
+	})
+}
+
+// /minecraft/profile/capes/active
+func ServicesDeleteCape(app *App) func(c echo.Context) error {
+	return withBearerAuthentication(app, func(c echo.Context, user *User) error {
+		err := SetCape(app, user, nil)
+		if err != nil {
+			return err
+		}
+
+		return c.NoContent(http.StatusOK)
+	})
+}

session.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"errors"
-	"fmt"
 	"github.com/labstack/echo/v4"
 	"gorm.io/gorm"
 	"log"

view/profile.html

@@ -75,13 +75,17 @@
 	</p>
 	<h4>Skin</h4>
 	<p>
-		<label for="skinUrl">URL to skin file</label><br>
+		<label for="skin-url">URL to skin file</label><br>
 		<input type="text" name="skinUrl" id="skin-url" placeholder="Leave blank to keep">
 	</p>
 	<p>
-		<label for="skinFile">or instead, upload a skin</label><br>
+		<label for="skin-file">or instead, upload a skin</label><br>
 		<input type="file" name="skinFile" id="skin-file">
 	</p>
+	<p>
+		<label for="delete-skin">or instead, check the box to delete your current skin </label>
+		<input type="checkbox" name="deleteSkin" id="delete-skin">
+	</p>
 	<p>
 		<fieldset>
 			<legend>Skin model</legend>
@@ -100,6 +104,10 @@
 		<label for="capeFile">or instead, upload a cape</label><br>
 		<input type="file" name="capeFile" id="cape-file">
 	</p>
+	<p>
+		<label for="delete-cape">or instead, check the box to delete your current cape </label>
+		<input type="checkbox" name="deleteCape" id="delete-cape">
+	</p>
 	<input type="submit" value="Save Changes">
 </form>
 <p>