Merge branch 'main' of https://github.com/authorizerdev/authorizer into feat/add-email-template-apis

server/db/models/user.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/refs"
 )
 
 // Note: any change here should be reflected in providers/casandra/provider.go as it does not have model support in collection creation
@@ -35,9 +36,6 @@ type User struct {
 func (user *User) AsAPIUser() *model.User {
 	isEmailVerified := user.EmailVerifiedAt != nil
 	isPhoneVerified := user.PhoneNumberVerifiedAt != nil
-	email := user.Email
-	createdAt := user.CreatedAt
-	updatedAt := user.UpdatedAt
 
 	id := user.ID
 	if strings.Contains(id, Collections.WebhookLog+"/") {
@@ -52,7 +50,7 @@ func (user *User) AsAPIUser() *model.User {
 		FamilyName:          user.FamilyName,
 		MiddleName:          user.MiddleName,
 		Nickname:            user.Nickname,
-		PreferredUsername:   &email,
+		PreferredUsername:   refs.NewStringRef(user.Email),
 		Gender:              user.Gender,
 		Birthdate:           user.Birthdate,
 		PhoneNumber:         user.PhoneNumber,
@@ -60,7 +58,7 @@ func (user *User) AsAPIUser() *model.User {
 		Picture:             user.Picture,
 		Roles:               strings.Split(user.Roles, ","),
 		RevokedTimestamp:    user.RevokedTimestamp,
-		CreatedAt:           &createdAt,
-		UpdatedAt:           &updatedAt,
+		CreatedAt:           refs.NewInt64Ref(user.CreatedAt),
+		UpdatedAt:           refs.NewInt64Ref(user.UpdatedAt),
 	}
 }

server/db/models/verification_requests.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/refs"
 )
 
 // Note: any change here should be reflected in providers/casandra/provider.go as it does not have model support in collection creation
@@ -23,28 +24,20 @@ type VerificationRequest struct {
 }
 
 func (v *VerificationRequest) AsAPIVerificationRequest() *model.VerificationRequest {
-	token := v.Token
-	createdAt := v.CreatedAt
-	updatedAt := v.UpdatedAt
-	email := v.Email
-	nonce := v.Nonce
-	redirectURI := v.RedirectURI
-	expires := v.ExpiresAt
-	identifier := v.Identifier
-
 	id := v.ID
 	if strings.Contains(id, Collections.WebhookLog+"/") {
 		id = strings.TrimPrefix(id, Collections.WebhookLog+"/")
 	}
+
 	return &model.VerificationRequest{
 		ID:          id,
-		Token:       &token,
-		Identifier:  &identifier,
-		Expires:     &expires,
-		Email:       &email,
-		Nonce:       &nonce,
-		RedirectURI: &redirectURI,
-		CreatedAt:   &createdAt,
-		UpdatedAt:   &updatedAt,
+		Token:       refs.NewStringRef(v.Token),
+		Identifier:   refs.NewStringRef(v.Identifier),
+		Expires:     refs.NewInt64Ref(v.ExpiresAt),
+		Email:       refs.NewStringRef(v.Email),
+		Nonce:       refs.NewStringRef(v.Nonce),
+		RedirectURI: refs.NewStringRef(v.RedirectURI),
+		CreatedAt:   refs.NewInt64Ref(v.CreatedAt),
+		UpdatedAt:   refs.NewInt64Ref(v.UpdatedAt),
 	}
 }

server/db/models/webhook.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/refs"
 )
 
 // Note: any change here should be reflected in providers/casandra/provider.go as it does not have model support in collection creation
@@ -30,13 +31,14 @@ func (w *Webhook) AsAPIWebhook() *model.Webhook {
 	if strings.Contains(id, Collections.Webhook+"/") {
 		id = strings.TrimPrefix(id, Collections.Webhook+"/")
 	}
+
 	return &model.Webhook{
 		ID:        id,
-		EventName: &w.EventName,
-		Endpoint:  &w.EndPoint,
+		EventName: refs.NewStringRef(w.EventName),
+		Endpoint:  refs.NewStringRef(w.EndPoint),
 		Headers:   headersMap,
-		Enabled:   &w.Enabled,
-		CreatedAt: &w.CreatedAt,
-		UpdatedAt: &w.UpdatedAt,
+		Enabled:   refs.NewBoolRef(w.Enabled),
+		CreatedAt: refs.NewInt64Ref(w.CreatedAt),
+		UpdatedAt: refs.NewInt64Ref(w.UpdatedAt),
 	}
 }

server/db/models/webhook_log.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 
 	"github.com/authorizerdev/authorizer/server/graph/model"
+	"github.com/authorizerdev/authorizer/server/refs"
 )
 
 // Note: any change here should be reflected in providers/casandra/provider.go as it does not have model support in collection creation
@@ -28,11 +29,11 @@ func (w *WebhookLog) AsAPIWebhookLog() *model.WebhookLog {
 	}
 	return &model.WebhookLog{
 		ID:         id,
-		HTTPStatus: &w.HttpStatus,
-		Response:   &w.Response,
-		Request:    &w.Request,
-		WebhookID:  &w.WebhookID,
-		CreatedAt:  &w.CreatedAt,
-		UpdatedAt:  &w.UpdatedAt,
+		HTTPStatus: refs.NewInt64Ref(w.HttpStatus),
+		Response:   refs.NewStringRef(w.Response),
+		Request:    refs.NewStringRef(w.Request),
+		WebhookID:  refs.NewStringRef(w.WebhookID),
+		CreatedAt:  refs.NewInt64Ref(w.CreatedAt),
+		UpdatedAt:  refs.NewInt64Ref(w.UpdatedAt),
 	}
 }