Merge branch 'main' into discours

server/resolvers/env.go

@@ -176,6 +176,12 @@ func EnvResolver(ctx context.Context) (*model.Env, error) {
 	if val, ok := store[constants.EnvKeyTwitchClientSecret]; ok {
 		res.TwitchClientSecret = refs.NewStringRef(val.(string))
 	}
+	if val, ok := store[constants.EnvKeyRobloxClientID]; ok {
+		res.RobloxClientID = refs.NewStringRef(val.(string))
+	}
+	if val, ok := store[constants.EnvKeyRobloxClientSecret]; ok {
+		res.RobloxClientSecret = refs.NewStringRef(val.(string))
+	}
 	if val, ok := store[constants.EnvKeyOrganizationName]; ok {
 		res.OrganizationName = refs.NewStringRef(val.(string))
 	}

server/resolvers/meta.go

@@ -101,6 +101,30 @@ func MetaResolver(ctx context.Context) (*model.Meta, error) {
 		microsoftClientSecret = ""
 	}
 
+	twitchClientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyTwitchClientID)
+	if err != nil {
+		log.Debug("Failed to get Twitch Client ID from environment variable", err)
+		microsoftClientID = ""
+	}
+
+	twitchClientSecret, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyTwitchClientSecret)
+	if err != nil {
+		log.Debug("Failed to get Twitch Client Secret from environment variable", err)
+		microsoftClientSecret = ""
+	}
+
+	robloxClientID, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyRobloxClientID)
+	if err != nil {
+		log.Debug("Failed to get Roblox Client ID from environment variable", err)
+		microsoftClientID = ""
+	}
+
+	robloxClientSecret, err := memorystore.Provider.GetStringStoreEnvVariable(constants.EnvKeyRobloxClientSecret)
+	if err != nil {
+		log.Debug("Failed to get Roblox Client Secret from environment variable", err)
+		microsoftClientSecret = ""
+	}
+
 	isBasicAuthDisabled, err := memorystore.Provider.GetBoolStoreEnvVariable(constants.EnvKeyDisableBasicAuthentication)
 	if err != nil {
 		log.Debug("Failed to get Disable Basic Authentication from environment variable", err)
@@ -165,6 +189,8 @@ func MetaResolver(ctx context.Context) (*model.Meta, error) {
 		IsMultiFactorAuthEnabled:           !isMultiFactorAuthenticationEnabled,
 		IsMobileBasicAuthenticationEnabled: !isMobileBasicAuthDisabled,
 		IsPhoneVerificationEnabled:         !isMobileVerificationDisabled,
+		IsTwitchLoginEnabled:               twitchClientID != "" && twitchClientSecret != "",
+		IsRobloxLoginEnabled:               robloxClientID != "" && robloxClientSecret != "",
 	}
 	return &metaInfo, nil
 }

server/resolvers/test_endpoint.go

@@ -5,7 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"time"
 
@@ -90,7 +90,7 @@ func TestEndpointResolver(ctx context.Context, params model.TestEndpointRequest)
 	}
 	defer resp.Body.Close()
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		log.Debug("error reading response: ", err)
 		return nil, err