🔨 Init check b3 key

88250 · 88250 · commit 231bb705ba54 · 2017-11-12T14:58:00.000+08:00
diff --git a/console/package-lock.json b/console/package-lock.json
diff --git a/controller/initctl.go b/controller/initctl.go
@@ -20,12 +20,15 @@ package controller
 import (
 	"fmt"
 	"net/http"
+	"strings"
 	"text/template"
+	"time"
 
 	"github.com/b3log/pipe/model"
 	"github.com/b3log/pipe/service"
 	"github.com/b3log/pipe/util"
 	"github.com/gin-gonic/gin"
+	"github.com/parnurzeal/gorequest"
 )
 
 func showInitPageAction(c *gin.Context) {
@@ -52,9 +55,51 @@ func initAction(c *gin.Context) {
 		return
 	}
 
+	arg := map[string]interface{}{}
+	if err := c.BindJSON(&arg); nil != err {
+		result.Code = -1
+		result.Msg = "parses init request failed"
+
+		return
+	}
+	b3key := strings.TrimSpace(arg["b3key"].(string))
+	if "" == b3key {
+		result.Code = -1
+		result.Msg = "B3 key cant' be empty"
+
+		return
+	}
+	if 20 < len(b3key) {
+		result.Code = -1
+		result.Msg = "B3 key should less then 20 characters"
+
+		return
+	}
+
+	checkResult := util.NewResult()
+	request := gorequest.New()
+	_, _, errs := request.Post(util.HacPaiURL+"/apis/check-b3key").Send(map[string]interface{}{
+		"userName":  session.UName,
+		"userB3Key": b3key,
+	}).Set("user-agent", util.UserAgent).Timeout(30 * time.Second).EndStruct(checkResult)
+	if nil != errs {
+		logger.Errorf("check b3 key failed: %s", errs)
+		result.Code = -1
+		result.Msg = "check b3 key failed"
+
+		return
+	}
+
+	if 0 != checkResult.Code {
+		result.Code = -1
+		result.Msg = "B3 key is not match"
+
+		return
+	}
+
 	platformAdmin := &model.User{
 		Name:      session.UName,
-		B3Key:     session.UB3Key,
+		B3Key:     b3key,
 		AvatarURL: session.UAvatar,
 	}
 
diff --git a/controller/statusctl.go b/controller/statusctl.go
@@ -78,8 +78,10 @@ func getStatusAction(c *gin.Context) {
 
 		if model.UserRoleNoLogin != session.URole && platformStatus.Inited {
 			ownBlog := service.User.GetOwnBlog(user.ID)
-			data.BlogTitle = ownBlog.Title
-			data.BlogURL = ownBlog.URL
+			if nil != ownBlog {
+				data.BlogTitle = ownBlog.Title
+				data.BlogURL = ownBlog.URL
+			}
 			data.Blogs = service.User.GetUserBlogs(user.ID)
 		}
 	}
diff --git a/service/initsrv.go b/service/initsrv.go
@@ -124,14 +124,7 @@ func (srv *initService) InitBlog(blogAdmin *model.User) error {
 	defer srv.mutex.Unlock()
 
 	user := User.GetUserByName(blogAdmin.Name)
-	if nil != user {
-		return nil
-	}
-
-	adminCount := 0
-	db.Model(&model.Correlation{}).Where("id2 = ? AND type = ? AND int1 = ?", blogAdmin.ID, model.CorrelationBlogUser, model.UserRoleBlogAdmin).
-		Count(&adminCount)
-	if 0 < adminCount {
+	if nil != user && nil != User.GetOwnBlog(user.ID) {
 		return nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,10 @@ func getStatusAction(c *gin.Context) {`
`78`	`78`
`79`	`79`	`if model.UserRoleNoLogin != session.URole && platformStatus.Inited {`
`80`	`80`	`ownBlog := service.User.GetOwnBlog(user.ID)`
`81`		`- data.BlogTitle = ownBlog.Title`
`82`		`- data.BlogURL = ownBlog.URL`
	`81`	`+ if nil != ownBlog {`
	`82`	`+ data.BlogTitle = ownBlog.Title`
	`83`	`+ data.BlogURL = ownBlog.URL`
	`84`	`+ }`
`83`	`85`	`data.Blogs = service.User.GetUserBlogs(user.ID)`
`84`	`86`	`}`
`85`	`87`	`}`