fix: providers (#326)

Author: sattvikc

recipe/thirdparty/providers/activeDirectory.go

@@ -18,13 +18,6 @@ func ActiveDirectory(input tpmodels.ProviderInput) *tpmodels.TypeProvider {
 		input.Config.Name = "Active Directory"
 	}
 
-	if input.Config.UserInfoMap.FromUserInfoAPI.UserId == "" {
-		input.Config.UserInfoMap.FromUserInfoAPI.UserId = "sub"
-	}
-	if input.Config.UserInfoMap.FromUserInfoAPI.Email == "" {
-		input.Config.UserInfoMap.FromUserInfoAPI.Email = "email"
-	}
-
 	oOverride := input.Override
 
 	input.Override = func(originalImplementation *tpmodels.TypeProvider) *tpmodels.TypeProvider {

recipe/thirdparty/providers/custom.go

@@ -28,6 +28,8 @@ func NewProvider(input tpmodels.ProviderInput) *tpmodels.TypeProvider {
 		ID: input.Config.ThirdPartyId,
 	}
 
+	// These are safe defaults common to most providers. Each provider implementations override these
+	// as necessary
 	if input.Config.UserInfoMap.FromIdTokenPayload.UserId == "" {
 		input.Config.UserInfoMap.FromIdTokenPayload.UserId = "sub"
 	}
@@ -37,6 +39,15 @@ func NewProvider(input tpmodels.ProviderInput) *tpmodels.TypeProvider {
 	if input.Config.UserInfoMap.FromIdTokenPayload.EmailVerified == "" {
 		input.Config.UserInfoMap.FromIdTokenPayload.EmailVerified = "email_verified"
 	}
+	if input.Config.UserInfoMap.FromUserInfoAPI.UserId == "" {
+		input.Config.UserInfoMap.FromUserInfoAPI.UserId = "sub"
+	}
+	if input.Config.UserInfoMap.FromUserInfoAPI.Email == "" {
+		input.Config.UserInfoMap.FromUserInfoAPI.Email = "email"
+	}
+	if input.Config.UserInfoMap.FromUserInfoAPI.EmailVerified == "" {
+		input.Config.UserInfoMap.FromUserInfoAPI.EmailVerified = "email_verified"
+	}
 
 	if input.Config.GenerateFakeEmail == nil {
 		input.Config.GenerateFakeEmail = func(thirdPartyUserId string, tenantId string, userContext supertokens.UserContext) string {

recipe/thirdparty/providers/facebook.go

@@ -41,14 +41,6 @@ func Facebook(input tpmodels.ProviderInput) *tpmodels.TypeProvider {
 		input.Config.UserInfoMap.FromUserInfoAPI.UserId = "id"
 	}
 
-	if input.Config.UserInfoMap.FromUserInfoAPI.Email == "" {
-		input.Config.UserInfoMap.FromUserInfoAPI.Email = "email"
-	}
-
-	if input.Config.UserInfoMap.FromUserInfoAPI.EmailVerified == "" {
-		input.Config.UserInfoMap.FromUserInfoAPI.EmailVerified = "email_verified"
-	}
-
 	oOverride := input.Override
 
 	input.Override = func(originalImplementation *tpmodels.TypeProvider) *tpmodels.TypeProvider {

recipe/thirdparty/providers/google.go

@@ -14,17 +14,6 @@ func Google(input tpmodels.ProviderInput) *tpmodels.TypeProvider {
 		input.Config.OIDCDiscoveryEndpoint = "https://accounts.google.com/"
 	}
 
-	if input.Config.UserInfoMap.FromUserInfoAPI.UserId == "" {
-		input.Config.UserInfoMap.FromUserInfoAPI.UserId = "id"
-	}
-	if input.Config.UserInfoMap.FromUserInfoAPI.Email == "" {
-		input.Config.UserInfoMap.FromUserInfoAPI.Email = "email"
-	}
-
-	if input.Config.UserInfoMap.FromUserInfoAPI.EmailVerified == "" {
-		input.Config.UserInfoMap.FromUserInfoAPI.EmailVerified = "email_verified"
-	}
-
 	if input.Config.AuthorizationEndpointQueryParams == nil {
 		input.Config.AuthorizationEndpointQueryParams = map[string]interface{}{}
 	}

recipe/thirdparty/providers/okta.go

@@ -17,16 +17,6 @@ func Okta(input tpmodels.ProviderInput) *tpmodels.TypeProvider {
 		input.Config.Name = "Okta"
 	}
 
-	if input.Config.UserInfoMap.FromUserInfoAPI.UserId == "" {
-		input.Config.UserInfoMap.FromUserInfoAPI.UserId = "sub"
-	}
-	if input.Config.UserInfoMap.FromUserInfoAPI.Email == "" {
-		input.Config.UserInfoMap.FromUserInfoAPI.Email = "email"
-	}
-	if input.Config.UserInfoMap.FromUserInfoAPI.EmailVerified == "" {
-		input.Config.UserInfoMap.FromUserInfoAPI.EmailVerified = "email_verified"
-	}
-
 	oOverride := input.Override
 
 	input.Override = func(originalImplementation *tpmodels.TypeProvider) *tpmodels.TypeProvider {