Merge pull request #334 from supertokens/fixes-from-docs

Fixes from docs

Author: rishabhpoddar

CHANGELOG.md

@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -   Only supporting FDI 1.17
 -   Core must be upgraded to 6.0
+-   For consistency, all `UnknownUserIDError` have been renamed to `UnknownUserIdError`
 -   `getUsersOldestFirst` & `getUsersNewestFirst` has mandatory parameter `tenantId`. Pass `'public'` if not using multitenancy.
 -   Added mandatory field `tenantId` to `EmailDeliveryInterface` and `SmsDeliveryInterface`. Pass `'public'` if not using multitenancy.
 -   Removed deprecated config `createAndSendCustomEmail` and `createAndSendCustomTextMessage`.

recipe/multitenancy/main.go

@@ -70,7 +70,7 @@ func ListAllTenants(userContext ...supertokens.UserContext) (multitenancymodels.
 }
 
 // Third party provider management
-func CreateOrUpdateThirdPartyConfig(tenantId string, config tpmodels.ProviderConfig, skipValidation bool, userContext ...supertokens.UserContext) (multitenancymodels.CreateOrUpdateThirdPartyConfigResponse, error) {
+func CreateOrUpdateThirdPartyConfig(tenantId string, config tpmodels.ProviderConfig, skipValidation *bool, userContext ...supertokens.UserContext) (multitenancymodels.CreateOrUpdateThirdPartyConfigResponse, error) {
 	instance, err := GetRecipeInstanceOrThrowError()
 	if err != nil {
 		return multitenancymodels.CreateOrUpdateThirdPartyConfigResponse{}, err

recipe/multitenancy/multitenancymodels/recipeInterface.go

@@ -30,7 +30,7 @@ type RecipeInterface struct {
 	ListAllTenants       *func(userContext supertokens.UserContext) (ListAllTenantsResponse, error)
 
 	// Third party provider management
-	CreateOrUpdateThirdPartyConfig *func(tenantId string, config tpmodels.ProviderConfig, skipValidation bool, userContext supertokens.UserContext) (CreateOrUpdateThirdPartyConfigResponse, error)
+	CreateOrUpdateThirdPartyConfig *func(tenantId string, config tpmodels.ProviderConfig, skipValidation *bool, userContext supertokens.UserContext) (CreateOrUpdateThirdPartyConfigResponse, error)
 	DeleteThirdPartyConfig         *func(tenantId string, thirdPartyId string, userContext supertokens.UserContext) (DeleteThirdPartyConfigResponse, error)
 
 	// User tenant association

recipe/multitenancy/recipeimplementation.go

@@ -123,16 +123,19 @@ func makeRecipeImplementation(querier supertokens.Querier, config multitenancymo
 		return result, nil
 	}
 
-	createOrUpdateThirdPartyConfig := func(tenantId string, config tpmodels.ProviderConfig, skipValidation bool, userContext supertokens.UserContext) (multitenancymodels.CreateOrUpdateThirdPartyConfigResponse, error) {
+	createOrUpdateThirdPartyConfig := func(tenantId string, config tpmodels.ProviderConfig, skipValidation *bool, userContext supertokens.UserContext) (multitenancymodels.CreateOrUpdateThirdPartyConfigResponse, error) {
 		configMap, err := supertokens.StructToMap(config)
 		if err != nil {
 			return multitenancymodels.CreateOrUpdateThirdPartyConfigResponse{}, err
 		}
 
-		response, err := querier.SendPutRequest(fmt.Sprintf("/%s/recipe/multitenancy/config/thirdparty", tenantId), map[string]interface{}{
-			"config":         configMap,
-			"skipValidation": skipValidation,
-		})
+		requestBody := map[string]interface{}{
+			"config": configMap,
+		}
+		if skipValidation != nil {
+			requestBody["skipValidation"] = *skipValidation
+		}
+		response, err := querier.SendPutRequest(fmt.Sprintf("/%s/recipe/multitenancy/config/thirdparty", tenantId), requestBody)
 		if err != nil {
 			return multitenancymodels.CreateOrUpdateThirdPartyConfigResponse{}, err
 		}

recipe/multitenancy/tenants_crud_test.go

@@ -283,7 +283,7 @@ func TestCreateThirdPartyConfig(t *testing.T) {
 				ClientID: "abcd",
 			},
 		},
-	}, false)
+	}, nil)
 	assert.Nil(t, err)
 	assert.True(t, res.OK.CreatedNew)
 
@@ -335,7 +335,7 @@ func TestDeleteThirdPartyConfig(t *testing.T) {
 				ClientID: "abcd",
 			},
 		},
-	}, false)
+	}, nil)
 	assert.Nil(t, err)
 	assert.True(t, res.OK.CreatedNew)
 
@@ -394,7 +394,7 @@ func TestUpdateThirdPartyConfig(t *testing.T) {
 				ClientID: "abcd",
 			},
 		},
-	}, false)
+	}, nil)
 	assert.Nil(t, err)
 	assert.True(t, res.OK.CreatedNew)
 
@@ -412,7 +412,7 @@ func TestUpdateThirdPartyConfig(t *testing.T) {
 				ClientID: "efgh",
 			},
 		},
-	}, false)
+	}, nil)
 	assert.Nil(t, err)
 	assert.False(t, res.OK.CreatedNew)
 

recipe/thirdparty/multitenancy_test.go

@@ -162,29 +162,29 @@ func TestGetProvider(t *testing.T) {
 	multitenancy.CreateOrUpdateThirdPartyConfig("t1", tpmodels.ProviderConfig{
 		ThirdPartyId: "google",
 		Clients:      []tpmodels.ProviderClientConfig{{ClientID: "a"}},
-	}, false)
+	}, nil)
 	multitenancy.CreateOrUpdateThirdPartyConfig("t1", tpmodels.ProviderConfig{
 		ThirdPartyId: "facebook",
 		Clients:      []tpmodels.ProviderClientConfig{{ClientID: "a"}},
-	}, false)
+	}, nil)
 
 	multitenancy.CreateOrUpdateThirdPartyConfig("t2", tpmodels.ProviderConfig{
 		ThirdPartyId: "discord",
 		Clients:      []tpmodels.ProviderClientConfig{{ClientID: "a"}},
-	}, false)
+	}, nil)
 	multitenancy.CreateOrUpdateThirdPartyConfig("t2", tpmodels.ProviderConfig{
 		ThirdPartyId: "facebook",
 		Clients:      []tpmodels.ProviderClientConfig{{ClientID: "a"}},
-	}, false)
+	}, nil)
 
 	multitenancy.CreateOrUpdateThirdPartyConfig("t3", tpmodels.ProviderConfig{
 		ThirdPartyId: "discord",
 		Clients:      []tpmodels.ProviderClientConfig{{ClientID: "a"}},
-	}, false)
+	}, nil)
 	multitenancy.CreateOrUpdateThirdPartyConfig("t3", tpmodels.ProviderConfig{
 		ThirdPartyId: "linkedin",
 		Clients:      []tpmodels.ProviderClientConfig{{ClientID: "a"}},
-	}, false)
+	}, nil)
 
 	provider, err := GetProvider("t1", "google", nil)
 	assert.Nil(t, err)
@@ -255,7 +255,7 @@ func TestGetProviderMergesConfigFromStaticAndCore(t *testing.T) {
 		Clients: []tpmodels.ProviderClientConfig{
 			{ClientID: "coreclientid", ClientSecret: "coreclientsecret"},
 		},
-	}, false)
+	}, nil)
 
 	provider, err := GetProvider("t1", "google", nil)
 	assert.Nil(t, err)

recipe/thirdparty/tpmodels/models.go

@@ -56,17 +56,15 @@ const (
 	FromUserInfoAPI    TypeFrom = "userInfoAPI"
 )
 
+type TypeUserInfoMapFields struct {
+	UserId        string `json:"userId,omitempty"`
+	Email         string `json:"email,omitempty"`
+	EmailVerified string `json:"emailVerified,omitempty"`
+}
+
 type TypeUserInfoMap struct {
-	FromIdTokenPayload struct {
-		UserId        string `json:"userId,omitempty"`
-		Email         string `json:"email,omitempty"`
-		EmailVerified string `json:"emailVerified,omitempty"`
-	} `json:"fromIdTokenPayload,omitempty"`
-	FromUserInfoAPI struct {
-		UserId        string `json:"userId,omitempty"`
-		Email         string `json:"email,omitempty"`
-		EmailVerified string `json:"emailVerified,omitempty"`
-	} `json:"fromUserInfoAPI,omitempty"`
+	FromIdTokenPayload TypeUserInfoMapFields `json:"fromIdTokenPayload,omitempty"`
+	FromUserInfoAPI    TypeUserInfoMapFields `json:"fromUserInfoAPI,omitempty"`
 }
 
 type User struct {

recipe/userroles/recipeimplementation.go

@@ -83,7 +83,7 @@ func makeRecipeImplementation(querier supertokens.Querier, config userrolesmodel
 	}
 
 	getUsersThatHaveRole := func(role string, tenantId string, userContext supertokens.UserContext) (userrolesmodels.GetUsersThatHaveRoleResponse, error) {
-		response, err := querier.SendGetRequest("/recipe/role/users", map[string]string{
+		response, err := querier.SendGetRequest(tenantId+"/recipe/role/users", map[string]string{
 			"role": role,
 		})
 		if err != nil {