Code cleanup

Signed-off-by: Yuan Si <do4suki@gmail.com>

handler/album.go

@@ -4,11 +4,8 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"honoka-chan/config"
-	"honoka-chan/database"
 	"honoka-chan/encrypt"
 	"honoka-chan/model"
-	"honoka-chan/utils"
 	"net/http"
 	"time"
 
@@ -17,39 +14,8 @@ import (
 )
 
 func AlbumSeriesAllHandler(ctx *gin.Context) {
-	reqTime := time.Now().Unix()
-
-	authorizeStr := ctx.Request.Header["Authorize"]
-	authToken, err := utils.GetAuthorizeToken(authorizeStr)
-	if err != nil {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-	userId := ctx.Request.Header[http.CanonicalHeaderKey("User-ID")]
-	if len(userId) == 0 {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-
-	if !database.MatchTokenUid(authToken, userId[0]) {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-
-	nonce, err := utils.GetAuthorizeNonce(authorizeStr)
-	if err != nil {
-		fmt.Println(err)
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-	nonce++
-
-	respTime := time.Now().Unix()
-	newAuthorizeStr := fmt.Sprintf("consumerKey=lovelive_test&timeStamp=%d&version=1.1&token=%s&nonce=%d&user_id=%s&requestTimeStamp=%d", respTime, authToken, nonce, userId[0], reqTime)
-	// fmt.Println(newAuthorizeStr)
-
 	var albumIds []int
-	err = MainEng.Table("album_series_m").Select("album_series_id").Find(&albumIds)
+	err := MainEng.Table("album_series_m").Select("album_series_id").Find(&albumIds)
 	CheckErr(err)
 	// fmt.Println(albumIds)
 
@@ -122,22 +88,20 @@ func AlbumSeriesAllHandler(ctx *gin.Context) {
 		})
 	}
 
-	resp := model.AlbumSeriesResp{
+	albumResp := model.AlbumSeriesResp{
 		ResponseData: albumSeriesAllRes,
 		ReleaseInfo:  []interface{}{},
 		StatusCode:   200,
 	}
-	respb, err := json.Marshal(resp)
+	resp, err := json.Marshal(albumResp)
 	CheckErr(err)
-	// fmt.Println(string(respb))
 
-	xms := encrypt.RSA_Sign_SHA1(respb, "privatekey.pem")
-	xms64 := base64.RawStdEncoding.EncodeToString(xms)
+	nonce := ctx.GetInt("nonce")
+	nonce++
 
-	ctx.Header("Server-Version", config.Conf.Server.VersionNumber)
-	ctx.Header("user_id", userId[0])
-	ctx.Header("authorize", newAuthorizeStr)
-	ctx.Header("X-Message-Sign", xms64)
+	ctx.Header("user_id", ctx.GetString("userid"))
+	ctx.Header("authorize", fmt.Sprintf("consumerKey=lovelive_test&timeStamp=%d&version=1.1&token=%s&nonce=%d&user_id=%s&requestTimeStamp=%d", time.Now().Unix(), ctx.GetString("token"), nonce, ctx.GetString("userid"), ctx.GetInt64("req_time")))
+	ctx.Header("X-Message-Sign", base64.StdEncoding.EncodeToString(encrypt.RSA_Sign_SHA1(resp, "privatekey.pem")))
 
-	ctx.String(http.StatusOK, string(respb))
+	ctx.String(http.StatusOK, string(resp))
 }