支持 jsonp

polaris1119 · polaris1119 · commit f72b22759acf · 2020-03-17T23:00:17.000+08:00
diff --git a/http/controller/base.go b/http/controller/base.go
@@ -64,6 +64,11 @@ func success(ctx echo.Context, data interface{}) error {
 
 	ctx.Response().Header().Add("ETag", newETag)
 
+	callback := ctx.QueryParam("callback")
+	if callback != "" {
+		return ctx.JSONPBlob(http.StatusOK, callback, b)
+	}
+
 	return ctx.JSONBlob(http.StatusOK, b)
 }
 
diff --git a/logic/third_user.go b/logic/third_user.go
@@ -258,8 +258,8 @@ func (self ThirdUserLogic) LoginFromGitea(ctx context.Context, code string) (*mo
 	exists := DefaultUser.EmailOrUsernameExists(ctx, giteaUser.Email, giteaUser.UserName)
 	if exists {
 		// TODO: 考虑改进？
-		objLog.Errorln("LoginFromGithub Github 对应的用户信息被占用")
-		return nil, errors.New("Github 对应的用户信息被占用，可能你注册过本站，用户名密码登录试试！")
+		objLog.Errorln("LoginFromGitea Gitea 对应的用户信息被占用")
+		return nil, errors.New("Gitea 对应的用户信息被占用，可能你注册过本站，用户名密码登录试试！")
 	}
 
 	session := MasterDB.NewSession()

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,11 @@ func success(ctx echo.Context, data interface{}) error {`
`64`	`64`
`65`	`65`	`ctx.Response().Header().Add("ETag", newETag)`
`66`	`66`
	`67`	`+ callback := ctx.QueryParam("callback")`
	`68`	`+ if callback != "" {`
	`69`	`+ return ctx.JSONPBlob(http.StatusOK, callback, b)`
	`70`	`+ }`
	`71`	`+`
`67`	`72`	`return ctx.JSONBlob(http.StatusOK, b)`
`68`	`73`	`}`
`69`	`74`