update

model/api/api.go

@@ -4,10 +4,6 @@ type CheckUserRequest struct {
 	InitData  string `json:"initData"`
 	Platform  string `json:"platform"`
 	VisitorID string `json:"visitorId"`
-	Keystore  string `json:"keystore"`
-	Signature string `json:"signature"`
-	UserId    string `json:"userId"`
-	InviterId string `json:"inviter_id"`
 }
 
 type CheckUserResponse struct {

server/user.go

@@ -20,7 +20,6 @@ func checkUser(c *gin.Context) {
 		c.JSON(200, withError(constant.InvalidParam))
 		return
 	}
-	var platformId string
 	switch req.Platform {
 	case constant.PlatformTelegram:
 		var ok bool
@@ -36,62 +35,46 @@ func checkUser(c *gin.Context) {
 			c.JSON(200, withError("invalid initData"))
 			return
 		}
-		platformId = fmt.Sprintf("%s:%s", botId, userId)
-	case constant.PlatformFingerprint:
-		if len(req.VisitorID) <= 10 {
-			c.JSON(200, withError(constant.InvalidParam))
+		dbId := fmt.Sprintf("%s:%s", botId, userId)
+		ok, uid, keystore, err := srv.CheckUser(constant.PlatformTelegram, dbId)
+		if err != nil {
+			c.JSON(200, withError(constant.InternalError))
 			return
 		}
-		platformId = req.VisitorID
-	default:
-		c.JSON(200, withError(constant.UnsupportedPlatform))
-		return
-	}
-	// 检查签名是否为keystore中的地址
-	address := gjson.Get(req.Keystore, "address").String()
-	binSignature, err := hexutil.Decode(req.Signature)
-	if err != nil || len(binSignature) < 65 {
-		c.JSON(200, withError("invalid signature"))
-		return
-	}
-	binSignature[64] -= 27
-	ecdsaPub, err := crypto.SigToPub(accounts.TextHash([]byte(req.Keystore)), binSignature)
-	if err != nil {
-		c.JSON(200, withError("invalid signature"))
-		return
-	}
-	addr := crypto.PubkeyToAddress(*ecdsaPub)
-	if strings.ToLower(addr.Hex()[2:]) != address {
-		c.JSON(200, withError("invalid signature"))
-		return
-	}
 
-	isExistKeystore, uid, keystore, err := srv.CheckUser(req.Platform, platformId)
-	if err != nil {
-		c.JSON(200, withError(constant.InternalError))
-		return
-	}
+		token := util.GenerateJWT(uid, constant.PlatformTelegram, dbId)
 
-	token := util.GenerateJWT(uid, req.Platform, platformId)
+		resp := &apiModel.CheckUserResponse{
+			IsNewUser: !ok,
+			Keystore:  keystore,
+			Token:     token,
+		}
+		c.JSON(200, withSuccess(resp))
+		return
 
-	resp := &apiModel.CheckUserResponse{
-		IsNewUser: !isExistKeystore,
-		Keystore:  keystore,
-		Token:     token,
-	}
+	case constant.PlatformFingerprint:
+		userId := req.VisitorID
 
-	if !isExistKeystore {
-		_, err = srv.SetKeystore(uid, address, req.Keystore)
+		ok, uid, keystore, err := srv.CheckUser(constant.PlatformFingerprint, userId)
 		if err != nil {
 			c.JSON(200, withError(constant.InternalError))
 			return
 		}
 
-		resp.Keystore = req.Keystore
+		token := util.GenerateJWT(uid, constant.PlatformFingerprint, userId)
+
+		resp := &apiModel.CheckUserResponse{
+			IsNewUser: !ok,
+			Keystore:  keystore,
+			Token:     token,
+		}
+
+		c.JSON(200, withSuccess(resp))
+
+	default:
+		c.JSON(200, withError(constant.UnsupportedPlatform))
+		return
 	}
-	srv.AONServerLogin(address, req.UserId, req.InviterId)
-	c.JSON(200, withSuccess(resp))
-	return
 }
 
 func createUser(c *gin.Context) {
@@ -103,7 +86,6 @@ func createUser(c *gin.Context) {
 
 	uid := c.GetString("jwt-uid")
 
-	// 检查签名是否为keystore中的地址
 	address := gjson.Get(req.Keystore, "address").String()
 	binSignature, err := hexutil.Decode(req.Signature)
 	if err != nil || len(binSignature) < 65 {