moves tests around and removes tpep folder

supertokens · Apr 9, 2024 · edcc793 · edcc793
1 parent 8f65e8e
commit edcc793
Show file tree

Hide file tree

Showing 34 changed files with 610 additions and 4,000 deletions.
diff --git a/frontendDriverInterfaceSupported.json b/frontendDriverInterfaceSupported.json
@@ -1,6 +1,7 @@
 {
         "_comment": "contains a list of frontend-driver interfaces branch names that this core supports",
         "versions": [
-                "1.17"
+                "1.17",
+                "2.0"
         ]
 }
diff --git a/recipe/dashboard/api/userdetails/userPasswordPut.go b/recipe/dashboard/api/userdetails/userPasswordPut.go
@@ -22,7 +22,6 @@ import (
 	"github.com/supertokens/supertokens-golang/recipe/dashboard/dashboardmodels"
 	"github.com/supertokens/supertokens-golang/recipe/emailpassword"
 	"github.com/supertokens/supertokens-golang/recipe/emailpassword/epmodels"
-	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
 
@@ -69,66 +68,14 @@ func UserPasswordPut(apiInterface dashboardmodels.APIInterface, tenantId string,
 		recipeToUse = "emailpassword"
 	}
 
-	if recipeToUse == "none" {
-		tpepInstance := thirdpartyemailpassword.GetRecipeInstance()
-
-		if tpepInstance != nil {
-			recipeToUse = "thirdpartyemailpassword"
-		}
-	}
-
 	if recipeToUse == "none" {
 		// This means that neither emailpassword or thirdpartyemailpassword is initialised
 		return userPasswordPutResponse{}, errors.New("Should never come here")
 	}
 
-	if recipeToUse == "emailpassword" {
-		var passwordField epmodels.NormalisedFormField
-
-		for _, value := range emailPasswordInstance.Config.SignUpFeature.FormFields {
-			if value.ID == "password" {
-				passwordField = value
-			}
-		}
-
-		validationError := passwordField.Validate(*readBody.NewPassword, tenantId)
-
-		if validationError != nil {
-			return userPasswordPutResponse{
-				Status: "INVALID_PASSWORD_ERROR",
-				Error:  *validationError,
-			}, nil
-		}
-
-		passwordResetToken, resetTokenErr := emailpassword.CreateResetPasswordToken(tenantId, *readBody.UserId, userContext)
-
-		if resetTokenErr != nil {
-			return userPasswordPutResponse{}, resetTokenErr
-		}
-
-		if passwordResetToken.UnknownUserIdError != nil {
-			// Techincally it can but its an edge case so we assume that it wont
-			return userPasswordPutResponse{}, errors.New("Should never come here")
-		}
-
-		passwordResetResponse, passwordResetErr := emailpassword.ResetPasswordUsingToken(tenantId, passwordResetToken.OK.Token, *readBody.NewPassword, userContext)
-
-		if passwordResetErr != nil {
-			return userPasswordPutResponse{}, passwordResetErr
-		}
-
-		if passwordResetResponse.ResetPasswordInvalidTokenError != nil {
-			return userPasswordPutResponse{}, errors.New("Should never come here")
-		}
-
-		return userPasswordPutResponse{
-			Status: "OK",
-		}, nil
-	}
-
 	var passwordField epmodels.NormalisedFormField
 
-	for _, value := range thirdpartyemailpassword.GetRecipeInstance().GetEmailPasswordRecipe().Config.SignUpFeature.FormFields {
+	for _, value := range emailPasswordInstance.Config.SignUpFeature.FormFields {
 		if value.ID == "password" {
 			passwordField = value
 		}
@@ -143,7 +90,7 @@ func UserPasswordPut(apiInterface dashboardmodels.APIInterface, tenantId string,
 		}, nil
 	}
 
-	passwordResetToken, resetTokenErr := thirdpartyemailpassword.CreateResetPasswordToken(tenantId, *readBody.UserId, userContext)
+	passwordResetToken, resetTokenErr := emailpassword.CreateResetPasswordToken(tenantId, *readBody.UserId, userContext)
 
 	if resetTokenErr != nil {
 		return userPasswordPutResponse{}, resetTokenErr
@@ -154,7 +101,7 @@ func UserPasswordPut(apiInterface dashboardmodels.APIInterface, tenantId string,
 		return userPasswordPutResponse{}, errors.New("Should never come here")
 	}
 
-	passwordResetResponse, passwordResetErr := thirdpartyemailpassword.ResetPasswordUsingToken(tenantId, passwordResetToken.OK.Token, *readBody.NewPassword, userContext)
+	passwordResetResponse, passwordResetErr := emailpassword.ResetPasswordUsingToken(tenantId, passwordResetToken.OK.Token, *readBody.NewPassword, userContext)
 
 	if passwordResetErr != nil {
 		return userPasswordPutResponse{}, passwordResetErr

diff --git a/recipe/dashboard/api/userdetails/userPut.go b/recipe/dashboard/api/userdetails/userPut.go
@@ -25,7 +25,6 @@ import (
 	"github.com/supertokens/supertokens-golang/recipe/emailpassword"
 	"github.com/supertokens/supertokens-golang/recipe/emailpassword/epmodels"
 	"github.com/supertokens/supertokens-golang/recipe/passwordless"
-	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
 	"github.com/supertokens/supertokens-golang/recipe/thirdpartypasswordless"
 	"github.com/supertokens/supertokens-golang/recipe/usermetadata"
 	"github.com/supertokens/supertokens-golang/supertokens"
@@ -95,46 +94,6 @@ func updateEmailForRecipeId(recipeId string, userId string, email string, tenant
 		}, nil
 	}
 
-	if recipeId == "thirdpartyemailpassword" {
-		var emailField epmodels.NormalisedFormField
-
-		for _, value := range thirdpartyemailpassword.GetRecipeInstance().GetEmailPasswordRecipe().Config.SignUpFeature.FormFields {
-			if value.ID == "email" {
-				emailField = value
-			}
-		}
-
-		validationError := emailField.Validate(email, tenantId)
-
-		if validationError != nil {
-			return updateEmailResponse{
-				Status: "INVALID_EMAIL_ERROR",
-				Error:  *validationError,
-			}, nil
-		}
-
-		tenantId := "public"
-		updateResponse, err := thirdpartyemailpassword.UpdateEmailOrPassword(userId, &email, nil, nil, &tenantId, userContext)
-
-		if err != nil {
-			return updateEmailResponse{}, err
-		}
-
-		if updateResponse.EmailAlreadyExistsError != nil {
-			return updateEmailResponse{
-				Status: "EMAIL_ALREADY_EXISTS_ERROR",
-			}, nil
-		}
-
-		if updateResponse.UnknownUserIdError != nil {
-			return updateEmailResponse{}, errors.New("Should never come here")
-		}
-
-		return updateEmailResponse{
-			Status: "OK",
-		}, nil
-	}
-
 	if recipeId == "passwordless" {
 		isValidEmail := true
 		validationError := ""

diff --git a/recipe/dashboard/api/utils.go b/recipe/dashboard/api/utils.go
@@ -7,7 +7,6 @@ import (
 	"github.com/supertokens/supertokens-golang/recipe/emailpassword"
 	"github.com/supertokens/supertokens-golang/recipe/passwordless"
 	"github.com/supertokens/supertokens-golang/recipe/thirdparty"
-	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
 	"github.com/supertokens/supertokens-golang/recipe/thirdpartypasswordless"
 	"github.com/supertokens/supertokens-golang/supertokens"
 )
@@ -45,21 +44,6 @@ func GetUserForRecipeId(userId string, recipeId string, userContext supertokens.
 
 			recipeToReturn = emailpassword.RECIPE_ID
 		}
-
-		if reflect.DeepEqual(userToReturn, dashboardmodels.UserType{}) {
-			tpepResponse, tpepError := thirdpartyemailpassword.GetUserById(userId, userContext)
-
-			if tpepError == nil && tpepResponse != nil {
-				userToReturn.Id = tpepResponse.ID
-				userToReturn.TimeJoined = tpepResponse.TimeJoined
-				userToReturn.FirstName = ""
-				userToReturn.LastName = ""
-				userToReturn.Email = tpepResponse.Email
-				userToReturn.TenantIds = tpepResponse.TenantIds
-
-				recipeToReturn = thirdpartyemailpassword.RECIPE_ID
-			}
-		}
 	} else if recipeId == thirdparty.RECIPE_ID {
 		response, error := thirdparty.GetUserByID(userId, userContext)
 
@@ -76,23 +60,6 @@ func GetUserForRecipeId(userId string, recipeId string, userContext supertokens.
 			userToReturn.TenantIds = response.TenantIds
 		}
 
-		if reflect.DeepEqual(userToReturn, dashboardmodels.UserType{}) {
-			tpepResponse, tpepError := thirdpartyemailpassword.GetUserById(userId, userContext)
-
-			if tpepError == nil && tpepResponse != nil {
-				userToReturn.Id = tpepResponse.ID
-				userToReturn.TimeJoined = tpepResponse.TimeJoined
-				userToReturn.FirstName = ""
-				userToReturn.LastName = ""
-				userToReturn.Email = tpepResponse.Email
-				userToReturn.ThirdParty = &dashboardmodels.ThirdParty{
-					Id:     tpepResponse.ThirdParty.ID,
-					UserId: tpepResponse.ThirdParty.UserID,
-				}
-				userToReturn.TenantIds = tpepResponse.TenantIds
-			}
-		}
-
 		if reflect.DeepEqual(userToReturn, dashboardmodels.UserType{}) {
 			tpplessResponse, tpplessError := thirdpartypasswordless.GetUserById(userId, userContext)
 
@@ -171,14 +138,6 @@ func IsRecipeInitialised(recipeId string) bool {
 		if err == nil {
 			isRecipeInitialised = true
 		}
-
-		if !isRecipeInitialised {
-			_, err := thirdpartyemailpassword.GetRecipeInstanceOrThrowError()
-
-			if err == nil {
-				isRecipeInitialised = true
-			}
-		}
 	} else if recipeId == passwordless.RECIPE_ID {
 		_, err := passwordless.GetRecipeInstanceOrThrowError()
 
@@ -200,14 +159,6 @@ func IsRecipeInitialised(recipeId string) bool {
 			isRecipeInitialised = true
 		}
 
-		if !isRecipeInitialised {
-			_, err := thirdpartyemailpassword.GetRecipeInstanceOrThrowError()
-
-			if err == nil {
-				isRecipeInitialised = true
-			}
-		}
-
 		if !isRecipeInitialised {
 			_, err := thirdpartypasswordless.GetRecipeInstanceOrThrowError()
 

diff --git a/recipe/dashboard/testingUtils.go b/recipe/dashboard/testingUtils.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/supertokens/supertokens-golang/recipe/multitenancy"
 	"github.com/supertokens/supertokens-golang/recipe/session"
-	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
 
 	"github.com/supertokens/supertokens-golang/supertokens"
 	"github.com/supertokens/supertokens-golang/test/unittesting"
@@ -30,7 +29,6 @@ func resetAll() {
 	supertokens.ResetForTest()
 	ResetForTest()
 	session.ResetForTest()
-	thirdpartyemailpassword.ResetForTest()
 	multitenancy.ResetForTest()
 }
 

diff --git a/recipe/dashboard/userGet_test.go b/recipe/dashboard/userGet_test.go
@@ -2,29 +2,28 @@ package dashboard
 
 import (
 	"encoding/json"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
 	"github.com/supertokens/supertokens-golang/recipe/dashboard/api"
 	"github.com/supertokens/supertokens-golang/recipe/dashboard/api/userdetails"
+	"github.com/supertokens/supertokens-golang/recipe/emailpassword"
 	"github.com/supertokens/supertokens-golang/recipe/passwordless/plessmodels"
 	"github.com/supertokens/supertokens-golang/recipe/session"
 	"github.com/supertokens/supertokens-golang/recipe/thirdparty/tpmodels"
 	"github.com/supertokens/supertokens-golang/recipe/thirdpartypasswordless"
 	"github.com/supertokens/supertokens-golang/recipe/thirdpartypasswordless/tplmodels"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/supertokens/supertokens-golang/recipe/dashboard/dashboardmodels"
-	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
 	"github.com/supertokens/supertokens-golang/supertokens"
 	"github.com/supertokens/supertokens-golang/test/unittesting"
 )
 
 /*
-- Initialise with thirdpartyemailpassword and provide no custom form fields
-- Create an emailpassword user using the thirdpartyemailpassword recipe
 - Get user from the user get API
 - Check that user has public tenant
 */
@@ -42,7 +41,7 @@ func TestThatUserGetReturnsTenantIDsCorrectly(t *testing.T) {
 			WebsiteDomain: "supertokens.io",
 		},
 		RecipeList: []supertokens.Recipe{
-			thirdpartyemailpassword.Init(nil),
+			emailpassword.Init(nil),
 			Init(&dashboardmodels.TypeInput{
 				ApiKey: "testapikey",
 			}),
@@ -61,7 +60,7 @@ func TestThatUserGetReturnsTenantIDsCorrectly(t *testing.T) {
 	testServer := httptest.NewServer(supertokens.Middleware(mux))
 	defer testServer.Close()
 
-	signupResponse, err := thirdpartyemailpassword.EmailPasswordSignUp("public", "[email protected]", "abcd1234")
+	signupResponse, err := emailpassword.SignUp("public", "[email protected]", "abcd1234")
 	if err != nil {
 		t.Error(err.Error())
 	}

diff --git a/recipe/dashboard/userPasswordPut_test.go b/recipe/dashboard/userPasswordPut_test.go
@@ -8,14 +8,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/supertokens/supertokens-golang/recipe/dashboard/dashboardmodels"
-	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
+	"github.com/supertokens/supertokens-golang/recipe/emailpassword"
 	"github.com/supertokens/supertokens-golang/supertokens"
 	"github.com/supertokens/supertokens-golang/test/unittesting"
 )
 
 /*
-- Initialise with thirdpartyemailpassword and provide no custom form fields
-- Create an emailpassword user using the thirdpartyemailpassword recipe
 - Try to change the password of the user
 - Should result in no errors
 - Sign in with new password
@@ -35,7 +33,7 @@ func TestThatUpdatingPasswordWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
 			WebsiteDomain: "supertokens.io",
 		},
 		RecipeList: []supertokens.Recipe{
-			thirdpartyemailpassword.Init(nil),
+			emailpassword.Init(nil),
 			Init(&dashboardmodels.TypeInput{
 				ApiKey: "testapikey",
 			}),
@@ -54,7 +52,7 @@ func TestThatUpdatingPasswordWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
 	testServer := httptest.NewServer(supertokens.Middleware(mux))
 	defer testServer.Close()
 
-	signupResponse, err := thirdpartyemailpassword.EmailPasswordSignUp("public", "[email protected]", "abcd1234")
+	signupResponse, err := emailpassword.SignUp("public", "[email protected]", "abcd1234")
 	if err != nil {
 		t.Error(err.Error())
 	}
@@ -78,7 +76,7 @@ func TestThatUpdatingPasswordWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, res.StatusCode)
 
-	signInResponse, err := thirdpartyemailpassword.EmailPasswordSignIn("public", "[email protected]", "newabcd1234")
+	signInResponse, err := emailpassword.SignIn("public", "[email protected]", "newabcd1234")
 	if err != nil {
 		t.Error(err.Error())
 	}

diff --git a/recipe/dashboard/userPut_test.go b/recipe/dashboard/userPut_test.go
@@ -8,14 +8,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/supertokens/supertokens-golang/recipe/dashboard/dashboardmodels"
-	"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
+	"github.com/supertokens/supertokens-golang/recipe/emailpassword"
 	"github.com/supertokens/supertokens-golang/supertokens"
 	"github.com/supertokens/supertokens-golang/test/unittesting"
 )
 
 /*
-- Initialise with thirdpartyemailpassword and provide no custom form fields
-- Create an emailpassword user using the thirdpartyemailpassword recipe
 - Try to change the password of the user
 - Should result in no errors
 - Sign in with new password
@@ -35,7 +33,7 @@ func TestThatUpdatingEmailWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
 			WebsiteDomain: "supertokens.io",
 		},
 		RecipeList: []supertokens.Recipe{
-			thirdpartyemailpassword.Init(nil),
+			emailpassword.Init(nil),
 			Init(&dashboardmodels.TypeInput{
 				ApiKey: "testapikey",
 			}),
@@ -54,7 +52,7 @@ func TestThatUpdatingEmailWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
 	testServer := httptest.NewServer(supertokens.Middleware(mux))
 	defer testServer.Close()
 
-	signupResponse, err := thirdpartyemailpassword.EmailPasswordSignUp("public", "[email protected]", "abcd1234")
+	signupResponse, err := emailpassword.SignUp("public", "[email protected]", "abcd1234")
 	if err != nil {
 		t.Error(err.Error())
 	}
@@ -78,7 +76,7 @@ func TestThatUpdatingEmailWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
 
 	assert.Equal(t, http.StatusOK, res.StatusCode)
 
-	signInResponse, err := thirdpartyemailpassword.EmailPasswordSignIn("public", "[email protected]", "abcd1234")
+	signInResponse, err := emailpassword.SignIn("public", "[email protected]", "abcd1234")
 
 	if err != nil {
 		t.Error(err.Error())