AccessTokenByNameExists() return error too

Author: 6543

models/token.go

@@ -78,9 +78,8 @@ func GetAccessTokenBySHA(token string) (*AccessToken, error) {
 }
 
 // AccessTokenByNameExists checks if a token name has been used already by a user.
-func AccessTokenByNameExists(token *AccessToken) bool {
-	exists, _ := x.Table("access_token").Where("name = ?", token.Name).And("uid = ?", token.UID).Exist()
-	return exists
+func AccessTokenByNameExists(token *AccessToken) (bool, error) {
+	return x.Table("access_token").Where("name = ?", token.Name).And("uid = ?", token.UID).Exist()
 }
 
 // ListAccessTokens returns a list of access tokens belongs to given user.

models/token_test.go

@@ -38,14 +38,18 @@ func TestAccessTokenByNameExists(t *testing.T) {
 	}
 
 	// Check to make sure it doesn't exists already
-	assert.False(t, AccessTokenByNameExists(token))
+	exist, err := AccessTokenByNameExists(token)
+	assert.NoError(t, err)
+	assert.False(t, exist)
 
 	// Save it to the database
 	assert.NoError(t, NewAccessToken(token))
 	AssertExistsAndLoadBean(t, token)
 
 	// This token must be found by name in the DB now
-	assert.True(t, AccessTokenByNameExists(token))
+	exist, err = AccessTokenByNameExists(token)
+	assert.NoError(t, err)
+	assert.True(t, exist)
 
 	user4Token := &AccessToken{
 		UID:  4,
@@ -54,7 +58,9 @@ func TestAccessTokenByNameExists(t *testing.T) {
 
 	// Name matches but different user ID, this shouldn't exists in the
 	// database
-	assert.False(t, AccessTokenByNameExists(user4Token))
+	exist, err = AccessTokenByNameExists(user4Token)
+	assert.NoError(t, err)
+	assert.False(t, exist)
 }
 
 func TestGetAccessTokenBySHA(t *testing.T) {

routers/api/v1/user/app.go

@@ -91,7 +91,12 @@ func CreateAccessToken(ctx *context.APIContext, form api.CreateAccessTokenOption
 		Name: form.Name,
 	}
 
-	if models.AccessTokenByNameExists(t) {
+	exist, err := models.AccessTokenByNameExists(t)
+	if err != nil {
+		ctx.InternalServerError(err)
+		return
+	}
+	if exist {
 		ctx.Error(http.StatusBadRequest, "AccessTokenByNameExists", errors.New("access token name has been used already"))
 		return
 	}

routers/user/setting/applications.go

@@ -44,7 +44,12 @@ func ApplicationsPost(ctx *context.Context, form auth.NewAccessTokenForm) {
 		Name: form.Name,
 	}
 
-	if models.AccessTokenByNameExists(t) {
+	exist, err := models.AccessTokenByNameExists(t)
+	if err != nil {
+		ctx.ServerError("AccessTokenByNameExists", err)
+		return
+	}
+	if exist {
 		ctx.Flash.Error(ctx.Tr("settings.generate_token_name_duplicate", t.Name))
 		ctx.Redirect(setting.AppSubURL + "/user/settings/applications")
 		return