From b87660d78fe70ceac78627fe9029766037a7c2fe Mon Sep 17 00:00:00 2001
From: Maxim Lebedev <git@toby3d.me>
Date: Sun, 6 Aug 2023 01:04:16 +0600
Subject: [PATCH] :bug: Fixed invalid CodeChallengeMethod parsing

---
 internal/auth/delivery/http/auth_http.go      |  4 +--
 .../auth/delivery/http/auth_http_schema.go    | 26 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/internal/auth/delivery/http/auth_http.go b/internal/auth/delivery/http/auth_http.go
index c4185e7..88a0c98 100644
--- a/internal/auth/delivery/http/auth_http.go
+++ b/internal/auth/delivery/http/auth_http.go
@@ -166,7 +166,7 @@ func (h *Handler) handleAuthorize(w http.ResponseWriter, r *http.Request) {
 		Client:              client,
 		Me:                  &req.Me,
 		RedirectURI:         &req.RedirectURI,
-		CodeChallengeMethod: *req.CodeChallengeMethod,
+		CodeChallengeMethod: req.CodeChallengeMethod,
 		ResponseType:        req.ResponseType,
 		CodeChallenge:       req.CodeChallenge,
 		State:               req.State,
@@ -207,7 +207,7 @@ func (h *Handler) handleVerify(w http.ResponseWriter, r *http.Request) {
 		ClientID:            req.ClientID,
 		Me:                  req.Me,
 		RedirectURI:         req.RedirectURI.URL,
-		CodeChallengeMethod: *req.CodeChallengeMethod,
+		CodeChallengeMethod: req.CodeChallengeMethod,
 		Scope:               req.Scope,
 		CodeChallenge:       req.CodeChallenge,
 	})
diff --git a/internal/auth/delivery/http/auth_http_schema.go b/internal/auth/delivery/http/auth_http_schema.go
index 314ac1a..426abde 100644
--- a/internal/auth/delivery/http/auth_http_schema.go
+++ b/internal/auth/delivery/http/auth_http_schema.go
@@ -22,7 +22,7 @@ type (
 		Me domain.Me `form:"me"`
 
 		// The hashing method used to calculate the code challenge.
-		CodeChallengeMethod *domain.CodeChallengeMethod `form:"code_challenge_method,omitempty"`
+		CodeChallengeMethod domain.CodeChallengeMethod `form:"code_challenge_method,omitempty"`
 
 		// Indicates to the authorization server that an authorization
 		// code should be returned as the response.
@@ -46,16 +46,16 @@ type (
 	}
 
 	AuthVerifyRequest struct {
-		ClientID            domain.ClientID             `form:"client_id"`
-		Me                  domain.Me                   `form:"me"`
-		RedirectURI         domain.URL                  `form:"redirect_uri"`
-		CodeChallengeMethod *domain.CodeChallengeMethod `form:"code_challenge_method,omitempty"`
-		ResponseType        domain.ResponseType         `form:"response_type"`
-		Authorize           string                      `form:"authorize"`
-		CodeChallenge       string                      `form:"code_challenge,omitempty"`
-		State               string                      `form:"state"`
-		Provider            string                      `form:"provider"`
-		Scope               domain.Scopes               `form:"scope[],omitempty"`
+		ClientID            domain.ClientID            `form:"client_id"`
+		Me                  domain.Me                  `form:"me"`
+		RedirectURI         domain.URL                 `form:"redirect_uri"`
+		CodeChallengeMethod domain.CodeChallengeMethod `form:"code_challenge_method,omitempty"`
+		ResponseType        domain.ResponseType        `form:"response_type"`
+		Authorize           string                     `form:"authorize"`
+		CodeChallenge       string                     `form:"code_challenge,omitempty"`
+		State               string                     `form:"state"`
+		Provider            string                     `form:"provider"`
+		Scope               domain.Scopes              `form:"scope[],omitempty"`
 	}
 
 	AuthExchangeRequest struct {
@@ -95,7 +95,7 @@ func NewAuthAuthorizationRequest() *AuthAuthorizationRequest {
 	return &AuthAuthorizationRequest{
 		ClientID:            domain.ClientID{},
 		CodeChallenge:       "",
-		CodeChallengeMethod: &domain.CodeChallengeMethodUnd,
+		CodeChallengeMethod: domain.CodeChallengeMethodUnd,
 		Me:                  domain.Me{},
 		RedirectURI:         domain.URL{},
 		ResponseType:        domain.ResponseTypeUnd,
@@ -129,7 +129,7 @@ func NewAuthVerifyRequest() *AuthVerifyRequest {
 		Authorize:           "",
 		ClientID:            domain.ClientID{},
 		CodeChallenge:       "",
-		CodeChallengeMethod: &domain.CodeChallengeMethodUnd,
+		CodeChallengeMethod: domain.CodeChallengeMethodUnd,
 		Me:                  domain.Me{},
 		Provider:            "",
 		RedirectURI:         domain.URL{},