Skip to content

Commit edcc793

Browse files
rishabhpoddarrishabhpoddar
committed
moves tests around and removes tpep folder
1 parent 8f65e8e commit edcc793

34 files changed

+610
-4000
lines changed

‎frontendDriverInterfaceSupported.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"_comment": "contains a list of frontend-driver interfaces branch names that this core supports",
33
"versions": [
4-
"1.17"
4+
"1.17",
5+
"2.0"
56
]
67
}

‎recipe/dashboard/api/userdetails/userPasswordPut.go

+3-56
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/supertokens/supertokens-golang/recipe/dashboard/dashboardmodels"
2323
"github.com/supertokens/supertokens-golang/recipe/emailpassword"
2424
"github.com/supertokens/supertokens-golang/recipe/emailpassword/epmodels"
25-
"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
2625
"github.com/supertokens/supertokens-golang/supertokens"
2726
)
2827

@@ -69,66 +68,14 @@ func UserPasswordPut(apiInterface dashboardmodels.APIInterface, tenantId string,
6968
recipeToUse = "emailpassword"
7069
}
7170

72-
if recipeToUse == "none" {
73-
tpepInstance := thirdpartyemailpassword.GetRecipeInstance()
74-
75-
if tpepInstance != nil {
76-
recipeToUse = "thirdpartyemailpassword"
77-
}
78-
}
79-
8071
if recipeToUse == "none" {
8172
// This means that neither emailpassword or thirdpartyemailpassword is initialised
8273
return userPasswordPutResponse{}, errors.New("Should never come here")
8374
}
8475

85-
if recipeToUse == "emailpassword" {
86-
var passwordField epmodels.NormalisedFormField
87-
88-
for _, value := range emailPasswordInstance.Config.SignUpFeature.FormFields {
89-
if value.ID == "password" {
90-
passwordField = value
91-
}
92-
}
93-
94-
validationError := passwordField.Validate(*readBody.NewPassword, tenantId)
95-
96-
if validationError != nil {
97-
return userPasswordPutResponse{
98-
Status: "INVALID_PASSWORD_ERROR",
99-
Error: *validationError,
100-
}, nil
101-
}
102-
103-
passwordResetToken, resetTokenErr := emailpassword.CreateResetPasswordToken(tenantId, *readBody.UserId, userContext)
104-
105-
if resetTokenErr != nil {
106-
return userPasswordPutResponse{}, resetTokenErr
107-
}
108-
109-
if passwordResetToken.UnknownUserIdError != nil {
110-
// Techincally it can but its an edge case so we assume that it wont
111-
return userPasswordPutResponse{}, errors.New("Should never come here")
112-
}
113-
114-
passwordResetResponse, passwordResetErr := emailpassword.ResetPasswordUsingToken(tenantId, passwordResetToken.OK.Token, *readBody.NewPassword, userContext)
115-
116-
if passwordResetErr != nil {
117-
return userPasswordPutResponse{}, passwordResetErr
118-
}
119-
120-
if passwordResetResponse.ResetPasswordInvalidTokenError != nil {
121-
return userPasswordPutResponse{}, errors.New("Should never come here")
122-
}
123-
124-
return userPasswordPutResponse{
125-
Status: "OK",
126-
}, nil
127-
}
128-
12976
var passwordField epmodels.NormalisedFormField
13077

131-
for _, value := range thirdpartyemailpassword.GetRecipeInstance().GetEmailPasswordRecipe().Config.SignUpFeature.FormFields {
78+
for _, value := range emailPasswordInstance.Config.SignUpFeature.FormFields {
13279
if value.ID == "password" {
13380
passwordField = value
13481
}
@@ -143,7 +90,7 @@ func UserPasswordPut(apiInterface dashboardmodels.APIInterface, tenantId string,
14390
}, nil
14491
}
14592

146-
passwordResetToken, resetTokenErr := thirdpartyemailpassword.CreateResetPasswordToken(tenantId, *readBody.UserId, userContext)
93+
passwordResetToken, resetTokenErr := emailpassword.CreateResetPasswordToken(tenantId, *readBody.UserId, userContext)
14794

14895
if resetTokenErr != nil {
14996
return userPasswordPutResponse{}, resetTokenErr
@@ -154,7 +101,7 @@ func UserPasswordPut(apiInterface dashboardmodels.APIInterface, tenantId string,
154101
return userPasswordPutResponse{}, errors.New("Should never come here")
155102
}
156103

157-
passwordResetResponse, passwordResetErr := thirdpartyemailpassword.ResetPasswordUsingToken(tenantId, passwordResetToken.OK.Token, *readBody.NewPassword, userContext)
104+
passwordResetResponse, passwordResetErr := emailpassword.ResetPasswordUsingToken(tenantId, passwordResetToken.OK.Token, *readBody.NewPassword, userContext)
158105

159106
if passwordResetErr != nil {
160107
return userPasswordPutResponse{}, passwordResetErr

‎recipe/dashboard/api/userdetails/userPut.go

-41
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"github.com/supertokens/supertokens-golang/recipe/emailpassword"
2626
"github.com/supertokens/supertokens-golang/recipe/emailpassword/epmodels"
2727
"github.com/supertokens/supertokens-golang/recipe/passwordless"
28-
"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
2928
"github.com/supertokens/supertokens-golang/recipe/thirdpartypasswordless"
3029
"github.com/supertokens/supertokens-golang/recipe/usermetadata"
3130
"github.com/supertokens/supertokens-golang/supertokens"
@@ -95,46 +94,6 @@ func updateEmailForRecipeId(recipeId string, userId string, email string, tenant
9594
}, nil
9695
}
9796

98-
if recipeId == "thirdpartyemailpassword" {
99-
var emailField epmodels.NormalisedFormField
100-
101-
for _, value := range thirdpartyemailpassword.GetRecipeInstance().GetEmailPasswordRecipe().Config.SignUpFeature.FormFields {
102-
if value.ID == "email" {
103-
emailField = value
104-
}
105-
}
106-
107-
validationError := emailField.Validate(email, tenantId)
108-
109-
if validationError != nil {
110-
return updateEmailResponse{
111-
Status: "INVALID_EMAIL_ERROR",
112-
Error: *validationError,
113-
}, nil
114-
}
115-
116-
tenantId := "public"
117-
updateResponse, err := thirdpartyemailpassword.UpdateEmailOrPassword(userId, &email, nil, nil, &tenantId, userContext)
118-
119-
if err != nil {
120-
return updateEmailResponse{}, err
121-
}
122-
123-
if updateResponse.EmailAlreadyExistsError != nil {
124-
return updateEmailResponse{
125-
Status: "EMAIL_ALREADY_EXISTS_ERROR",
126-
}, nil
127-
}
128-
129-
if updateResponse.UnknownUserIdError != nil {
130-
return updateEmailResponse{}, errors.New("Should never come here")
131-
}
132-
133-
return updateEmailResponse{
134-
Status: "OK",
135-
}, nil
136-
}
137-
13897
if recipeId == "passwordless" {
13998
isValidEmail := true
14099
validationError := ""

‎recipe/dashboard/api/utils.go

-49
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"github.com/supertokens/supertokens-golang/recipe/emailpassword"
88
"github.com/supertokens/supertokens-golang/recipe/passwordless"
99
"github.com/supertokens/supertokens-golang/recipe/thirdparty"
10-
"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
1110
"github.com/supertokens/supertokens-golang/recipe/thirdpartypasswordless"
1211
"github.com/supertokens/supertokens-golang/supertokens"
1312
)
@@ -45,21 +44,6 @@ func GetUserForRecipeId(userId string, recipeId string, userContext supertokens.
4544

4645
recipeToReturn = emailpassword.RECIPE_ID
4746
}
48-
49-
if reflect.DeepEqual(userToReturn, dashboardmodels.UserType{}) {
50-
tpepResponse, tpepError := thirdpartyemailpassword.GetUserById(userId, userContext)
51-
52-
if tpepError == nil && tpepResponse != nil {
53-
userToReturn.Id = tpepResponse.ID
54-
userToReturn.TimeJoined = tpepResponse.TimeJoined
55-
userToReturn.FirstName = ""
56-
userToReturn.LastName = ""
57-
userToReturn.Email = tpepResponse.Email
58-
userToReturn.TenantIds = tpepResponse.TenantIds
59-
60-
recipeToReturn = thirdpartyemailpassword.RECIPE_ID
61-
}
62-
}
6347
} else if recipeId == thirdparty.RECIPE_ID {
6448
response, error := thirdparty.GetUserByID(userId, userContext)
6549

@@ -76,23 +60,6 @@ func GetUserForRecipeId(userId string, recipeId string, userContext supertokens.
7660
userToReturn.TenantIds = response.TenantIds
7761
}
7862

79-
if reflect.DeepEqual(userToReturn, dashboardmodels.UserType{}) {
80-
tpepResponse, tpepError := thirdpartyemailpassword.GetUserById(userId, userContext)
81-
82-
if tpepError == nil && tpepResponse != nil {
83-
userToReturn.Id = tpepResponse.ID
84-
userToReturn.TimeJoined = tpepResponse.TimeJoined
85-
userToReturn.FirstName = ""
86-
userToReturn.LastName = ""
87-
userToReturn.Email = tpepResponse.Email
88-
userToReturn.ThirdParty = &dashboardmodels.ThirdParty{
89-
Id: tpepResponse.ThirdParty.ID,
90-
UserId: tpepResponse.ThirdParty.UserID,
91-
}
92-
userToReturn.TenantIds = tpepResponse.TenantIds
93-
}
94-
}
95-
9663
if reflect.DeepEqual(userToReturn, dashboardmodels.UserType{}) {
9764
tpplessResponse, tpplessError := thirdpartypasswordless.GetUserById(userId, userContext)
9865

@@ -171,14 +138,6 @@ func IsRecipeInitialised(recipeId string) bool {
171138
if err == nil {
172139
isRecipeInitialised = true
173140
}
174-
175-
if !isRecipeInitialised {
176-
_, err := thirdpartyemailpassword.GetRecipeInstanceOrThrowError()
177-
178-
if err == nil {
179-
isRecipeInitialised = true
180-
}
181-
}
182141
} else if recipeId == passwordless.RECIPE_ID {
183142
_, err := passwordless.GetRecipeInstanceOrThrowError()
184143

@@ -200,14 +159,6 @@ func IsRecipeInitialised(recipeId string) bool {
200159
isRecipeInitialised = true
201160
}
202161

203-
if !isRecipeInitialised {
204-
_, err := thirdpartyemailpassword.GetRecipeInstanceOrThrowError()
205-
206-
if err == nil {
207-
isRecipeInitialised = true
208-
}
209-
}
210-
211162
if !isRecipeInitialised {
212163
_, err := thirdpartypasswordless.GetRecipeInstanceOrThrowError()
213164

‎recipe/dashboard/testingUtils.go

-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020

2121
"github.com/supertokens/supertokens-golang/recipe/multitenancy"
2222
"github.com/supertokens/supertokens-golang/recipe/session"
23-
"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
2423

2524
"github.com/supertokens/supertokens-golang/supertokens"
2625
"github.com/supertokens/supertokens-golang/test/unittesting"
@@ -30,7 +29,6 @@ func resetAll() {
3029
supertokens.ResetForTest()
3130
ResetForTest()
3231
session.ResetForTest()
33-
thirdpartyemailpassword.ResetForTest()
3432
multitenancy.ResetForTest()
3533
}
3634

‎recipe/dashboard/userGet_test.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,28 @@ package dashboard
22

33
import (
44
"encoding/json"
5+
"io"
6+
"net/http"
7+
"net/http/httptest"
8+
"strings"
9+
"testing"
10+
511
"github.com/supertokens/supertokens-golang/recipe/dashboard/api"
612
"github.com/supertokens/supertokens-golang/recipe/dashboard/api/userdetails"
13+
"github.com/supertokens/supertokens-golang/recipe/emailpassword"
714
"github.com/supertokens/supertokens-golang/recipe/passwordless/plessmodels"
815
"github.com/supertokens/supertokens-golang/recipe/session"
916
"github.com/supertokens/supertokens-golang/recipe/thirdparty/tpmodels"
1017
"github.com/supertokens/supertokens-golang/recipe/thirdpartypasswordless"
1118
"github.com/supertokens/supertokens-golang/recipe/thirdpartypasswordless/tplmodels"
12-
"io"
13-
"net/http"
14-
"net/http/httptest"
15-
"strings"
16-
"testing"
1719

1820
"github.com/stretchr/testify/assert"
1921
"github.com/supertokens/supertokens-golang/recipe/dashboard/dashboardmodels"
20-
"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
2122
"github.com/supertokens/supertokens-golang/supertokens"
2223
"github.com/supertokens/supertokens-golang/test/unittesting"
2324
)
2425

2526
/*
26-
- Initialise with thirdpartyemailpassword and provide no custom form fields
27-
- Create an emailpassword user using the thirdpartyemailpassword recipe
2827
- Get user from the user get API
2928
- Check that user has public tenant
3029
*/
@@ -42,7 +41,7 @@ func TestThatUserGetReturnsTenantIDsCorrectly(t *testing.T) {
4241
WebsiteDomain: "supertokens.io",
4342
},
4443
RecipeList: []supertokens.Recipe{
45-
thirdpartyemailpassword.Init(nil),
44+
emailpassword.Init(nil),
4645
Init(&dashboardmodels.TypeInput{
4746
ApiKey: "testapikey",
4847
}),
@@ -61,7 +60,7 @@ func TestThatUserGetReturnsTenantIDsCorrectly(t *testing.T) {
6160
testServer := httptest.NewServer(supertokens.Middleware(mux))
6261
defer testServer.Close()
6362

64-
signupResponse, err := thirdpartyemailpassword.EmailPasswordSignUp("public", "[email protected]", "abcd1234")
63+
signupResponse, err := emailpassword.SignUp("public", "[email protected]", "abcd1234")
6564
if err != nil {
6665
t.Error(err.Error())
6766
}

‎recipe/dashboard/userPasswordPut_test.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ import (
88

99
"github.com/stretchr/testify/assert"
1010
"github.com/supertokens/supertokens-golang/recipe/dashboard/dashboardmodels"
11-
"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
11+
"github.com/supertokens/supertokens-golang/recipe/emailpassword"
1212
"github.com/supertokens/supertokens-golang/supertokens"
1313
"github.com/supertokens/supertokens-golang/test/unittesting"
1414
)
1515

1616
/*
17-
- Initialise with thirdpartyemailpassword and provide no custom form fields
18-
- Create an emailpassword user using the thirdpartyemailpassword recipe
1917
- Try to change the password of the user
2018
- Should result in no errors
2119
- Sign in with new password
@@ -35,7 +33,7 @@ func TestThatUpdatingPasswordWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
3533
WebsiteDomain: "supertokens.io",
3634
},
3735
RecipeList: []supertokens.Recipe{
38-
thirdpartyemailpassword.Init(nil),
36+
emailpassword.Init(nil),
3937
Init(&dashboardmodels.TypeInput{
4038
ApiKey: "testapikey",
4139
}),
@@ -54,7 +52,7 @@ func TestThatUpdatingPasswordWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
5452
testServer := httptest.NewServer(supertokens.Middleware(mux))
5553
defer testServer.Close()
5654

57-
signupResponse, err := thirdpartyemailpassword.EmailPasswordSignUp("public", "[email protected]", "abcd1234")
55+
signupResponse, err := emailpassword.SignUp("public", "[email protected]", "abcd1234")
5856
if err != nil {
5957
t.Error(err.Error())
6058
}
@@ -78,7 +76,7 @@ func TestThatUpdatingPasswordWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
7876

7977
assert.Equal(t, http.StatusOK, res.StatusCode)
8078

81-
signInResponse, err := thirdpartyemailpassword.EmailPasswordSignIn("public", "[email protected]", "newabcd1234")
79+
signInResponse, err := emailpassword.SignIn("public", "[email protected]", "newabcd1234")
8280
if err != nil {
8381
t.Error(err.Error())
8482
}

‎recipe/dashboard/userPut_test.go

+4-6
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ import (
88

99
"github.com/stretchr/testify/assert"
1010
"github.com/supertokens/supertokens-golang/recipe/dashboard/dashboardmodels"
11-
"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword"
11+
"github.com/supertokens/supertokens-golang/recipe/emailpassword"
1212
"github.com/supertokens/supertokens-golang/supertokens"
1313
"github.com/supertokens/supertokens-golang/test/unittesting"
1414
)
1515

1616
/*
17-
- Initialise with thirdpartyemailpassword and provide no custom form fields
18-
- Create an emailpassword user using the thirdpartyemailpassword recipe
1917
- Try to change the password of the user
2018
- Should result in no errors
2119
- Sign in with new password
@@ -35,7 +33,7 @@ func TestThatUpdatingEmailWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
3533
WebsiteDomain: "supertokens.io",
3634
},
3735
RecipeList: []supertokens.Recipe{
38-
thirdpartyemailpassword.Init(nil),
36+
emailpassword.Init(nil),
3937
Init(&dashboardmodels.TypeInput{
4038
ApiKey: "testapikey",
4139
}),
@@ -54,7 +52,7 @@ func TestThatUpdatingEmailWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
5452
testServer := httptest.NewServer(supertokens.Middleware(mux))
5553
defer testServer.Close()
5654

57-
signupResponse, err := thirdpartyemailpassword.EmailPasswordSignUp("public", "[email protected]", "abcd1234")
55+
signupResponse, err := emailpassword.SignUp("public", "[email protected]", "abcd1234")
5856
if err != nil {
5957
t.Error(err.Error())
6058
}
@@ -78,7 +76,7 @@ func TestThatUpdatingEmailWithNoSignUpFeatureInTPEPWorks(t *testing.T) {
7876

7977
assert.Equal(t, http.StatusOK, res.StatusCode)
8078

81-
signInResponse, err := thirdpartyemailpassword.EmailPasswordSignIn("public", "[email protected]", "abcd1234")
79+
signInResponse, err := emailpassword.SignIn("public", "[email protected]", "abcd1234")
8280

8381
if err != nil {
8482
t.Error(err.Error())

0 commit comments

Comments
 (0)