Added disable user sign up feature

pkg/api/api.go

@@ -18,7 +18,7 @@ func Register(r *macaron.Macaron) {
 
 	// not logged in views
 	r.Get("/", reqSignedIn, Index)
-	r.Post("/logout", LogoutPost)
+	r.Get("/logout", Logout)
 	r.Post("/login", bind(dtos.LoginCommand{}), LoginPost)
 	r.Get("/login/:name", OAuthLogin)
 	r.Get("/login", LoginView)

pkg/api/login.go

@@ -25,6 +25,7 @@ func LoginView(c *middleware.Context) {
 	settings := c.Data["Settings"].(map[string]interface{})
 	settings["googleAuthEnabled"] = setting.OAuthService.Google
 	settings["githubAuthEnabled"] = setting.OAuthService.GitHub
+	settings["disableUserSignUp"] = setting.DisableUserSignUp
 
 	// Check auto-login.
 	uname := c.GetCookie(setting.CookieUserName)
@@ -122,9 +123,9 @@ func loginUserWithUser(user *m.User, c *middleware.Context) {
 	c.Session.Set(middleware.SESS_KEY_USERID, user.Id)
 }
 
-func LogoutPost(c *middleware.Context) {
+func Logout(c *middleware.Context) {
 	c.SetCookie(setting.CookieUserName, "", -1, setting.AppSubUrl+"/")
 	c.SetCookie(setting.CookieRememberName, "", -1, setting.AppSubUrl+"/")
 	c.Session.Destory(c.Context)
-	c.JsonOK("logged out")
+	c.Redirect(setting.AppSubUrl + "/login")
 }

pkg/api/login_oauth.go

@@ -56,6 +56,11 @@ func OAuthLogin(ctx *middleware.Context) {
 
 	// create account if missing
 	if err == m.ErrUserNotFound {
+		if setting.DisableUserSignUp {
+			ctx.Redirect(setting.AppSubUrl + "/login")
+			return
+		}
+
 		cmd := m.CreateUserCommand{
 			Login:   userInfo.Email,
 			Email:   userInfo.Email,

pkg/api/signup.go

@@ -4,10 +4,15 @@ import (
 	"github.com/torkelo/grafana-pro/pkg/bus"
 	"github.com/torkelo/grafana-pro/pkg/middleware"
 	m "github.com/torkelo/grafana-pro/pkg/models"
+	"github.com/torkelo/grafana-pro/pkg/setting"
 )
 
 // POST /api/user/signup
 func SignUp(c *middleware.Context, cmd m.CreateUserCommand) {
+	if setting.DisableUserSignUp {
+		c.JsonApiErr(401, "User signup is disabled", nil)
+		return
+	}
 
 	cmd.Login = cmd.Email