fixes

backend/config/auth.go

@@ -3,8 +3,8 @@ package config
 import m "github.com/garrettladley/mattress"
 
 type AuthSettings struct {
-	AccessKey  *m.Secret[string]
-	RefreshKey *m.Secret[string]
+	AccessKey  *m.Secret[string] `env:"ACCESS_KEY"`
+	RefreshKey *m.Secret[string] `env:"REFRESH_KEY"`
 }
 
 type IntermediateAuthSettings struct {

backend/config/config.go

@@ -5,28 +5,8 @@ import (
 	"github.com/joho/godotenv"
 )
 
-type Settings struct {
-	Application     ApplicationSettings
-	Database        DatabaseSettings
-	SuperUser       SuperUserSettings
-	Auth            AuthSettings
-	AWS             AWSSettings
-	Resend          ResendSettings
-	Calendar        CalendarSettings
-	GoogleSettings  OAuthSettings
-	OutlookSettings OAuthSettings
-}
-
-type intermediateSettings struct {
-	Application ApplicationSettings           `yaml:"application"`
-	Database    intermediateDatabaseSettings  `yaml:"database"`
-	SuperUser   intermediateSuperUserSettings `yaml:"superuser"`
-	Auth        intermediateAuthSettings      `yaml:"authsecret"`
-	Calendar    intermediateCalendarSettings  `yaml:"calendar"`
-}
-
-func (int *intermediateSettings) into() (*Settings, error) {
-	databaseSettings, err := int.Database.into()
+func GetConfiguration(path string) (*Settings, error) {
+	err := godotenv.Load(path)
 	if err != nil {
 		return nil, err
 	}

backend/config/oauth.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	"errors"
-	"os"
 
 	m "github.com/garrettladley/mattress"
 )
@@ -26,26 +25,18 @@ type OAuthResources struct {
 	OutlookOAuthSettings *OAuthSettings
 }
 
-/**
- * GOOGLE
-**/
-func readGoogleOAuthSettings() (*OAuthSettings, error) {
-	clientID := os.Getenv("GOOGLE_OAUTH_CLIENT_ID")
-	if clientID == "" {
-		return nil, errors.New("GOOGLE_OAUTH_CLIENT_ID is not set")
-	}
+type GoogleOAuthSettings struct {
+	ClientId     string `env:"GOOGLE_OAUTH_CLIENT_ID"`
+	ClientSecret string `env:"GOOGLE_OAUTH_CLIENT_SECRET"`
+}
 
-	secretClientID, err := m.NewSecret(clientID)
+func (i *GoogleOAuthSettings) Into() (*OAuthSettings, error) {
+	secretClientID, err := m.NewSecret(i.ClientId)
 	if err != nil {
 		return nil, errors.New("failed to create secret from client ID")
 	}
 
-	clientSecret := os.Getenv("GOOGLE_OAUTH_CLIENT_SECRET")
-	if clientSecret == "" {
-		return nil, errors.New("GOOGLE_OAUTH_CLIENT_SECRET is not set")
-	}
-
-	secretClientSecret, err := m.NewSecret(clientSecret)
+	secretClientSecret, err := m.NewSecret(i.ClientSecret)
 	if err != nil {
 		return nil, errors.New("failed to create secret from client secret")
 	}
@@ -64,26 +55,18 @@ func readGoogleOAuthSettings() (*OAuthSettings, error) {
 	}, nil
 }
 
-/**
- * OUTLOOK
-**/
-func readOutlookOAuthSettings() (*OAuthSettings, error) {
-	clientID := os.Getenv("OUTLOOK_OAUTH_CLIENT_ID")
-	if clientID == "" {
-		return nil, errors.New("OUTLOOK_OAUTH_CLIENT_ID is not set")
-	}
+type OutlookOAuthSettings struct {
+	ClientId     string `env:"OUTLOOK_OAUTH_CLIENT_ID"`
+	ClientSecret string `env:"OUTLOOK_OAUTH_CLIENT_SECRET"`
+}
 
-	secretClientID, err := m.NewSecret(clientID)
+func (i *OutlookOAuthSettings) Into() (*OAuthSettings, error) {
+	secretClientID, err := m.NewSecret(i.ClientId)
 	if err != nil {
 		return nil, errors.New("failed to create secret from client ID")
 	}
 
-	clientSecret := os.Getenv("OUTLOOK_OAUTH_CLIENT_SECRET")
-	if clientSecret == "" {
-		return nil, errors.New("OUTLOOK_OAUTH_CLIENT_SECRET is not set")
-	}
-
-	secretClientSecret, err := m.NewSecret(clientSecret)
+	secretClientSecret, err := m.NewSecret(i.ClientSecret)
 	if err != nil {
 		return nil, errors.New("failed to create secret from client secret")
 	}

backend/config/settings.go

@@ -8,16 +8,20 @@ type Settings struct {
 	AWS         AWSSettings
 	Resend      ResendSettings
 	Calendar    CalendarSettings
+	Google      OAuthSettings
+	Outlook     OAuthSettings
 }
 
 type IntermediateSettings struct {
-	Application ApplicationSettings           `envPrefix:"SAC_APPLICATION_"`
-	Database    IntermediateDatabaseSettings  `envPrefix:"SAC_DB_"`
-	SuperUser   IntermediateSuperUserSettings `envPrefix:"SAC_SUDO_"`
-	Auth        IntermediateAuthSettings      `envPrefix:"SAC_AUTH_"`
-	AWS         IntermediateAWSSettings       `envPrefix:"SAC_AWS_"`
-	Resend      IntermediateResendSettings    `envPrefix:"SAC_RESEND_"`
-	Calendar    IntermediateCalendarSettings  `envPrefix:"SAC_CALENDAR_"`
+	Application     ApplicationSettings           `envPrefix:"SAC_APPLICATION_"`
+	Database        IntermediateDatabaseSettings  `envPrefix:"SAC_DB_"`
+	SuperUser       IntermediateSuperUserSettings `envPrefix:"SAC_SUDO_"`
+	Auth            IntermediateAuthSettings      `envPrefix:"SAC_AUTH_"`
+	AWS             IntermediateAWSSettings       `envPrefix:"SAC_AWS_"`
+	Resend          IntermediateResendSettings    `envPrefix:"SAC_RESEND_"`
+	Calendar        IntermediateCalendarSettings  `envPrefix:"SAC_CALENDAR_"`
+	GoogleSettings  GoogleOAuthSettings           `envPrefix:"SAC_GOOGLE_OAUTH"`
+	OutlookSettings OutlookOAuthSettings          `envPrefix:"SAC_OUTLOOK_OAUTH"`
 }
 
 func (i *IntermediateSettings) Into() (*Settings, error) {
@@ -51,6 +55,16 @@ func (i *IntermediateSettings) Into() (*Settings, error) {
 		return nil, nil
 	}
 
+	google, err := i.GoogleSettings.Into()
+	if err != nil {
+		return nil, nil
+	}
+
+	outlook, err := i.OutlookSettings.Into()
+	if err != nil {
+		return nil, nil
+	}
+
 	return &Settings{
 		Application: i.Application,
 		Database:    *database,
@@ -59,5 +73,7 @@ func (i *IntermediateSettings) Into() (*Settings, error) {
 		AWS:         *aws,
 		Resend:      *resend,
 		Calendar:    *calendar,
+		Google:      *google,
+		Outlook:     *outlook,
 	}, nil
 }