refactor: remove the need of the logger in the create oidc client cmd

than stdlib)

cmd/tinyauth/create_oidc_client.go

@@ -0,0 +1,43 @@
+package main
+
+import (
+	"errors"
+	"fmt"
+	"regexp"
+
+	"github.com/google/uuid"
+	"github.com/steveiliop56/tinyauth/internal/utils"
+	"github.com/traefik/paerser/cli"
+)
+
+func createOidcClientCmd() *cli.Command {
+	return &cli.Command{
+		Name:          "create",
+		Description:   "Create a new OIDC Client",
+		Configuration: nil,
+		Resources:     nil,
+		AllowArg:      true,
+		Run: func(args []string) error {
+			if len(args) == 0 {
+				return errors.New("client name is required. use tinyauth oidc create <name>")
+			}
+
+			clientName := args[0]
+
+			match, err := regexp.MatchString("^[a-zA-Z0-9-]*$", clientName)
+
+			if !match || err != nil {
+				return errors.New("client name can only contain alphanumeric characters and hyphens")
+			}
+
+			uuid := uuid.New()
+			clientId := uuid.String()
+			clientSecret := "ta-" + utils.GenerateString(61)
+
+			fmt.Printf("Client Name: %s\n", clientName)
+			fmt.Printf("Client ID: %s\n", clientId)
+			fmt.Printf("Client Secret: %s\n", clientSecret)
+			return nil
+		},
+	}
+}

cmd/tinyauth/tinyauth.go

@@ -23,7 +23,7 @@ func main() {
 
 	cmdTinyauth := &cli.Command{
 		Name:          "tinyauth",
-		Description:   "The simplest way to protect your apps with a login screen.",
+		Description:   "The simplest way to protect your apps with a login screen",
 		Configuration: tConfig,
 		Resources:     loaders,
 		Run: func(_ []string) error {
@@ -33,12 +33,17 @@ func main() {
 
 	cmdUser := &cli.Command{
 		Name:        "user",
-		Description: "Utilities for creating and verifying Tinyauth users.",
+		Description: "Manage Tinyauth users",
 	}
 
 	cmdTotp := &cli.Command{
 		Name:        "totp",
-		Description: "Utilities for creating Tinyauth TOTP users.",
+		Description: "Manage Tinyauth TOTP users",
+	}
+
+	cmdOidc := &cli.Command{
+		Name:        "oidc",
+		Description: "Manage Tinyauth OIDC clients",
 	}
 
 	err := cmdTinyauth.AddCommand(versionCmd())
@@ -71,6 +76,12 @@ func main() {
 		log.Fatal().Err(err).Msg("Failed to add create command")
 	}
 
+	err = cmdOidc.AddCommand(createOidcClientCmd())
+
+	if err != nil {
+		log.Fatal().Err(err).Msg("Failed to add create command")
+	}
+
 	err = cmdTinyauth.AddCommand(cmdUser)
 
 	if err != nil {
@@ -83,6 +94,12 @@ func main() {
 		log.Fatal().Err(err).Msg("Failed to add totp command")
 	}
 
+	err = cmdTinyauth.AddCommand(cmdOidc)
+
+	if err != nil {
+		log.Fatal().Err(err).Msg("Failed to add oidc command")
+	}
+
 	err = cli.Execute(cmdTinyauth)
 
 	if err != nil {

cmd/tinyauth/verify_user.go

@@ -40,7 +40,7 @@ func verifyUserCmd() *cli.Command {
 
 	return &cli.Command{
 		Name:          "verify",
-		Description:   "Verify a user is set up correctly.",
+		Description:   "Verify a user is set up correctly",
 		Configuration: tCfg,
 		Resources:     loaders,
 		Run: func(_ []string) error {

cmd/tinyauth/version.go

@@ -11,7 +11,7 @@ import (
 func versionCmd() *cli.Command {
 	return &cli.Command{
 		Name:          "version",
-		Description:   "Print the version number of Tinyauth.",
+		Description:   "Print the version number of Tinyauth",
 		Configuration: nil,
 		Resources:     nil,
 		Run: func(_ []string) error {

internal/controller/oidc_controller.go

@@ -1,7 +1,6 @@
 package controller
 
 import (
-	"crypto/rand"
 	"errors"
 	"fmt"
 	"net/http"
@@ -145,7 +144,7 @@ func (controller *OIDCController) Authorize(c *gin.Context) {
 
 	// WARNING: Since Tinyauth is stateless, we cannot have a sub that never changes. We will just create a uuid out of the username and client name which remains stable, but if username or client name changes then sub changes too.
 	sub := utils.GenerateUUID(fmt.Sprintf("%s:%s", userContext.Username, client.ID))
-	code := rand.Text()
+	code := utils.GenerateString(32)
 
 	// Before storing the code, delete old session
 	err = controller.oidc.DeleteOldSession(c, sub)

internal/service/oidc_service.go

@@ -403,8 +403,8 @@ func (service *OIDCService) GenerateAccessToken(c *gin.Context, client config.OI
 		return TokenResponse{}, err
 	}
 
-	accessToken := rand.Text()
+	accessToken := utils.GenerateString(32)
-	refreshToken := rand.Text()
+	refreshToken := utils.GenerateString(32)
 
 	tokenExpiresAt := time.Now().Add(time.Duration(service.config.SessionExpiry) * time.Second).Unix()
 
@@ -464,8 +464,8 @@ func (service *OIDCService) RefreshAccessToken(c *gin.Context, refreshToken stri
 		return TokenResponse{}, err
 	}
 
-	accessToken := rand.Text()
+	accessToken := utils.GenerateString(32)
-	newRefreshToken := rand.Text()
+	newRefreshToken := utils.GenerateString(32)
 
 	tokenExpiresAt := time.Now().Add(time.Duration(service.config.SessionExpiry) * time.Second).Unix()
 	refrshTokenExpiresAt := time.Now().Add(time.Duration(service.config.SessionExpiry*2) * time.Second).Unix()

internal/utils/security_utils.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"crypto/rand"
 	"encoding/base64"
 	"errors"
 	"net"
@@ -105,3 +106,9 @@ func GenerateUUID(str string) string {
 	uuid := uuid.NewSHA1(uuid.NameSpaceURL, []byte(str))
 	return uuid.String()
 }
+
+func GenerateString(length int) string {
+	src := make([]byte, length)
+	rand.Read(src)
+	return base64.RawURLEncoding.EncodeToString(src)[:length]
+}