stuff

hacklabto · Jan 31, 2024 · 33fc6e7 · 33fc6e7
1 parent 0899872
commit 33fc6e7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,6 +15,6 @@ jobs:
           # https://github.com/docker/build-push-action/issues/378
           context: .
           file: Dockerfile
-          push: false
+          push: true
           tags: |
             ghcr.io/hacklabto/members-platform:${{ github.sha }}
diff --git a/cmd/web/ui/routes.go b/cmd/web/ui/routes.go
@@ -239,7 +239,7 @@ func registerPasswdRoutes(r chi.Router) {
 				MaybeHtmxComponent(rw, r, "passwd", errReply)
 				return
 			}
-			if err := db.RedisDB.Del(context.Background(), "reset-token:"+token).Err(); err != nil {
+			if err := db.Redis.Del(context.Background(), "reset-token:"+token).Err(); err != nil {
 				errReply.Error = err.Error()
 				MaybeHtmxComponent(rw, r, "passwd", errReply)
 				return

diff --git a/internal/auth/resetpassword.go b/internal/auth/resetpassword.go
@@ -18,11 +18,11 @@ func CreateResetToken(username string) (string, error) {
 		return "", fmt.Errorf("failed to read random bytes: %w", err)
 	}
 	token := base64.RawURLEncoding.EncodeToString(b)
-	return token, db.RedisDB.Set(context.Background(), "reset-token:"+token, username, time.Hour*24).Err()
+	return token, db.Redis.Set(context.Background(), "reset-token:"+token, username, time.Hour*24).Err()
 }
 
 func ValidateResetToken(token string) (string, bool) {
-	v, err := db.RedisDB.Get(context.Background(), "reset-token:"+token).Result()
+	v, err := db.Redis.Get(context.Background(), "reset-token:"+token).Result()
 	switch {
 	case err != nil:
 		log.Println(err)

diff --git a/internal/db/redis.go b/internal/db/redis.go
@@ -9,7 +9,7 @@ import (
 	"github.com/redis/go-redis/v9"
 )
 
-var RedisDB *redis.Client
+var Redis *redis.Client
 
 func ConnectRedis() error {
 	log.Println("connecting to redis")
@@ -22,8 +22,8 @@ func ConnectRedis() error {
 		return err
 	}
 
-	RedisDB = redis.NewClient(opt)
+	Redis = redis.NewClient(opt)
 
-	c := RedisDB.Ping(context.Background())
+	c := Redis.Ping(context.Background())
 	return c.Err()
 }