fix: address carlos comments

charmbracelet · Jul 27, 2023 · 63baf48 · 63baf48
1 parent e4408d3
commit 63baf48
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/server/backend/user.go b/server/backend/user.go
@@ -166,7 +166,6 @@ func (d *Backend) UserByAccessToken(ctx context.Context, token string) (proto.Us
 	token = HashToken(token)
 
 	if err := d.db.TransactionContext(ctx, func(tx *db.Tx) error {
-		var err error
 		t, err := d.store.GetAccessTokenByToken(ctx, tx, token)
 		if err != nil {
 			return db.WrapError(err)

diff --git a/server/ssh/cmd/token.go b/server/ssh/cmd/token.go
@@ -94,7 +94,7 @@ func tokenCommand() *cobra.Command {
 			return tablewriter.Render(
 				cmd.OutOrStdout(),
 				tokens,
-				[]string{"ID", "Name", "Expires In", "Created At"},
+				[]string{"ID", "Name", "Created At", "Expires In"},
 				func(t proto.AccessToken) ([]string, error) {
 					expiresAt := "-"
 					if !t.ExpiresAt.IsZero() {
@@ -108,8 +108,8 @@ func tokenCommand() *cobra.Command {
 					return []string{
 						strconv.FormatInt(t.ID, 10),
 						t.Name,
-						expiresAt,
 						humanize.Time(t.CreatedAt),
+						expiresAt,
 					}, nil
 				},
 			)

diff --git a/server/store/database/access_token.go b/server/store/database/access_token.go
@@ -15,19 +15,18 @@ var _ store.AccessTokenStore = (*accessTokenStore)(nil)
 
 // CreateAccessToken implements store.AccessTokenStore.
 func (s *accessTokenStore) CreateAccessToken(ctx context.Context, h db.Handler, name string, userID int64, token string, expiresAt time.Time) (models.AccessToken, error) {
-	query := `INSERT INTO access_tokens (name, user_id, token,`
-	vquery := `VALUES (?, ?, ?,`
+	queryWithoutExpires := `INSERT INTO access_tokens (name, user_id, token, created_at, updated_at)
+	VALUES (?, ?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)`
+	queryWithExpires := `INSERT INTO access_tokens (name, user_id, token, expires_at, created_at, updated_at)
+	VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)`
+
+	query := queryWithoutExpires
 	values := []interface{}{name, userID, token}
 	if !expiresAt.IsZero() {
-		query += ` expires_at,`
-		vquery += ` ?,`
+		query = queryWithExpires
 		values = append(values, expiresAt)
 	}
 
-	query += ` created_at, updated_at)`
-	vquery += ` CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)`
-	query = h.Rebind(query + " " + vquery)
-
 	result, err := h.ExecContext(ctx, query, values...)
 	if err != nil {
 		return models.AccessToken{}, err

diff --git a/server/web/git.go b/server/web/git.go
@@ -382,7 +382,7 @@ func serviceRpc(w http.ResponseWriter, r *http.Request) {
 	}
 
 	user := proto.UserFromContext(ctx)
-	cmd.Env = append(cmd.Env, cfg.Environ()...)
+	cmd.Env = cfg.Environ()
 	cmd.Env = append(cmd.Env, []string{
 		"SOFT_SERVE_REPO_NAME=" + repoName,
 		"SOFT_SERVE_REPO_PATH=" + dir,
@@ -478,7 +478,7 @@ func getInfoRefs(w http.ResponseWriter, r *http.Request) {
 		}
 
 		user := proto.UserFromContext(ctx)
-		cmd.Env = append(cmd.Env, cfg.Environ()...)
+		cmd.Env = cfg.Environ()
 		cmd.Env = append(cmd.Env, []string{
 			"SOFT_SERVE_REPO_NAME=" + repoName,
 			"SOFT_SERVE_REPO_PATH=" + dir,