Merge pull request #342 from supertokens/multi-fixes

fix: login methods api and tpless init

Author: rishabhpoddar

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.13.1] - 2023-08-24
+
+-   Fixes login methods API to return empty provider array instead of `null`
+-   Fixes thirdpartypasswordless initialization when there are no static providers configured
+
 ## [0.13.0] - 2023-08-07
 
 ### Added

recipe/multitenancy/api/implementation.go

@@ -27,7 +27,7 @@ func MakeAPIImplementation() multitenancymodels.APIInterface {
 
 		mergedProviders := tpproviders.MergeProvidersFromCoreAndStatic(providerConfigsFromCore, providerInputsFromStatic)
 
-		var finalProviderList []multitenancymodels.TypeThirdPartyProvider
+		var finalProviderList []multitenancymodels.TypeThirdPartyProvider = []multitenancymodels.TypeThirdPartyProvider{}
 
 		for _, providerInput := range mergedProviders {
 			providerInstance, err := tpproviders.FindAndCreateProviderInstance(mergedProviders, providerInput.Config.ThirdPartyId, clientType, userContext)

recipe/thirdpartyemailpassword/loginmethods_test.go

@@ -0,0 +1,55 @@
+package thirdpartyemailpassword
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/supertokens/supertokens-golang/supertokens"
+	"github.com/supertokens/supertokens-golang/test/unittesting"
+)
+
+func TestLoginMethodsReturnEmptyProviderArray(t *testing.T) {
+	configValue := supertokens.TypeInput{
+		Supertokens: &supertokens.ConnectionInfo{
+			ConnectionURI: "http://localhost:8080",
+		},
+		AppInfo: supertokens.AppInfo{
+			APIDomain:     "api.supertokens.io",
+			AppName:       "SuperTokens",
+			WebsiteDomain: "supertokens.io",
+		},
+		RecipeList: []supertokens.Recipe{
+			Init(nil),
+		},
+	}
+
+	BeforeEach()
+	unittesting.StartUpST("localhost", "8080")
+	defer AfterEach()
+	err := supertokens.Init(configValue)
+	if err != nil {
+		t.Error(err.Error())
+	}
+	mux := http.NewServeMux()
+	testServer := httptest.NewServer(supertokens.Middleware(mux))
+	defer testServer.Close()
+
+	resp, err := http.Get(testServer.URL + "/auth/loginmethods")
+	if err != nil {
+		t.Error(err.Error())
+	}
+	assert.Equal(t, http.StatusOK, resp.StatusCode)
+
+	respObj := map[string]interface{}{}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	assert.Nil(t, err)
+	err = json.Unmarshal(respBytes, &respObj)
+	assert.Nil(t, err)
+	providersArr, ok := respObj["thirdParty"].(map[string]interface{})["providers"]
+	assert.True(t, ok)
+	assert.NotNil(t, providersArr)
+}

recipe/thirdpartypasswordless/config_test.go

@@ -83,6 +83,7 @@ func TestMinimumConfigForThirdPartyPasswordlessWithEmailOrPhoneContactMethod(t *
 	thirdPartyPasswordlessRecipe, err := GetRecipeInstanceOrThrowError()
 	assert.NoError(t, err)
 	assert.Equal(t, "USER_INPUT_CODE_AND_MAGIC_LINK", thirdPartyPasswordlessRecipe.Config.FlowType)
+	assert.NotNil(t, thirdPartyPasswordlessRecipe.thirdPartyRecipe) // thirdPartyRecipe must be created always
 }
 
 func TestForThirdPartyPasswordLessCreateAndSendCustomTextMessageWithFlowTypeMagicLinkAndPhoneContactMethod(t *testing.T) {

recipe/thirdpartypasswordless/recipe.go

@@ -107,29 +107,27 @@ func MakeRecipe(recipeId string, appInfo supertokens.NormalisedAppinfo, config t
 		r.passwordlessRecipe = passwordlessInstance
 	}
 
-	if len(verifiedConfig.Providers) > 0 {
-		if thirdPartyInstance == nil {
-			thirdPartyConfig := &tpmodels.TypeInput{
-				SignInAndUpFeature: tpmodels.TypeInputSignInAndUp{
-					Providers: verifiedConfig.Providers,
+	if thirdPartyInstance == nil {
+		thirdPartyConfig := &tpmodels.TypeInput{
+			SignInAndUpFeature: tpmodels.TypeInputSignInAndUp{
+				Providers: verifiedConfig.Providers,
+			},
+			Override: &tpmodels.OverrideStruct{
+				Functions: func(_ tpmodels.RecipeInterface) tpmodels.RecipeInterface {
+					return recipeimplementation.MakeThirdPartyRecipeImplementation(r.RecipeImpl)
 				},
-				Override: &tpmodels.OverrideStruct{
-					Functions: func(_ tpmodels.RecipeInterface) tpmodels.RecipeInterface {
-						return recipeimplementation.MakeThirdPartyRecipeImplementation(r.RecipeImpl)
-					},
-					APIs: func(_ tpmodels.APIInterface) tpmodels.APIInterface {
-						return api.GetThirdPartyIterfaceImpl(r.APIImpl)
-					},
+				APIs: func(_ tpmodels.APIInterface) tpmodels.APIInterface {
+					return api.GetThirdPartyIterfaceImpl(r.APIImpl)
 				},
-			}
-			thirdPartyRecipeinstance, err := thirdparty.MakeRecipe(recipeId, appInfo, thirdPartyConfig, &r.EmailDelivery, onSuperTokensAPIError)
-			if err != nil {
-				return Recipe{}, err
-			}
-			r.thirdPartyRecipe = &thirdPartyRecipeinstance
-		} else {
-			r.thirdPartyRecipe = thirdPartyInstance
+			},
 		}
+		thirdPartyRecipeinstance, err := thirdparty.MakeRecipe(recipeId, appInfo, thirdPartyConfig, &r.EmailDelivery, onSuperTokensAPIError)
+		if err != nil {
+			return Recipe{}, err
+		}
+		r.thirdPartyRecipe = &thirdPartyRecipeinstance
+	} else {
+		r.thirdPartyRecipe = thirdPartyInstance
 	}
 
 	return *r, nil

supertokens/constants.go

@@ -21,7 +21,7 @@ const (
 )
 
 // VERSION current version of the lib
-const VERSION = "0.13.0"
+const VERSION = "0.13.1"
 
 var (
 	cdiSupported = []string{"3.0"}