fix: config updated

config.yaml

@@ -20,31 +20,6 @@ roles:
   - name: default
     public: true
 
-providers:
-  email:
-    enabled: ${PROVIDERS_EMAIL_ENABLED|true}
-    jwt:
-      accessSecret: ${PROVIDERS_EMAIL_JWT_ACCESS_SECRET|change-me-please}
-      refreshSecret: ${PROVIDERS_EMAIL_JWT_REFRESH_SECRET|change-me-please}
-    webhooks:
-      recoveryPasswordEvent:
-        url: ${PROVIDERS_EMAIL_WEBHOOKS_RECOVERY_PASSWORD_EVENT|}
-      registerEvent:
-        url: ${PROVIDERS_EMAIL_WEBHOOKS_REGISTER_EVENT|}
-
-<<<<<<< HEAD
-
-<<<<<<< Updated upstream
-mailersend:
-  url: https://web-platform.teleus.minsky.cc/auth/recovery?token=
-  key: Insert MailerSend Key Here
-  template: 7dnvo4doz6g5r86y
-  support: [email protected]
-  name: Bregy
-  user:
-    name: Bregy
-    email: [email protected]
-=======
 providers:
   email:
     enabled: ${PROVIDERS_EMAIL_ENABLED|true}
@@ -59,14 +34,8 @@ providers:
       registerEvent:
         url: ${PROVIDERS_EMAIL_WEBHOOKS_REGISTER_EVENT|}
 
-=======
->>>>>>> 5e9742aa797eb14dbea4e096bd32c5aa8abce663
   magiclink:
     enabled: ${PROVIDERS_MAGICLINK_ENABLED|}
     webhooks:
       loginEvent:
         url: ${PROVIDERS_MAGICLINK_WEBHOOKS_LOGIN_EVENT|}
-<<<<<<< HEAD
->>>>>>> Stashed changes
-=======
->>>>>>> 5e9742aa797eb14dbea4e096bd32c5aa8abce663

config/config.go

@@ -1,10 +1,6 @@
 package config
 
-<<<<<<< HEAD
 type JWT struct {
-=======
-type JWT2 struct {
->>>>>>> 5e9742aa797eb14dbea4e096bd32c5aa8abce663
 	AccessSecret         string         `yaml:"accessSecret"`
 	RefreshSecret        string         `yaml:"refreshSecret"`
 	RefreshOptions       RefreshOptions `yaml:"refreshOptions"`
@@ -57,12 +53,6 @@ type Role struct {
 	Public   bool     `yaml:"public,omitempty"`
 }
 
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-type User struct {
-	Email    string `yaml:"email"`
-	Password string `yaml:"password"`
-=======
 type EmailProvider struct {
 	Enabled  bool          `yaml:"enabled"`
 	JWT      JWT           `yaml:"jwt"`
@@ -93,42 +83,6 @@ type Webhooks struct {
 	MagicLink MagicLinkWebhooks `yaml:"magicLink"`
 }
 
-type EmailWebhooks struct {
-	RecoveryPasswordEvent Webhook `yaml:"recoveryPasswordEvent"`
-	RegisterEvent         Webhook `yaml:"registerEvent"`
->>>>>>> Stashed changes
-=======
-type EmailProvider struct {
-	Enabled  bool          `yaml:"enabled"`
-	JWT      JWT2          `yaml:"jwt"`
-	Webhooks EmailWebhooks `yaml:"webhooks"`
->>>>>>> 5e9742aa797eb14dbea4e096bd32c5aa8abce663
-}
-
-type MagicLinkProvider struct {
-	Enabled  bool              `yaml:"enabled"`
-	Webhooks MagicLinkWebhooks `yaml:"webhooks"`
-}
-
-type Providers struct {
-	Email     EmailProvider     `yaml:"email"`
-	MagicLink MagicLinkProvider `yaml:"magicLink"`
-}
-
-type Config struct {
-	Database  Database  `yaml:"database"`
-	API       API       `yaml:"api"`
-	Admin     Admin     `yaml:"admin"`
-	Roles     []Role    `yaml:"roles,mapstructure"`
-	Providers Providers `yaml:"providers"`
-	Webhooks  Webhooks  `yaml:"webhooks"`
-}
-
-type Webhooks struct {
-	Email     EmailWebhooks     `yaml:"email"`
-	MagicLink MagicLinkWebhooks `yaml:"magicLink"`
-}
-
 type EmailWebhooks struct {
 	RecoveryPasswordEvent Webhook `yaml:"recoveryPasswordEvent"`
 	RegisterEvent         Webhook `yaml:"registerEvent"`