Skip to content

Commit fbe5726

Browse files
sattvikcsattvikc
committed
fix: fixes for tests
1 parent 0eda3cd commit fbe5726

File tree

5 files changed

+49
-17
lines changed

5 files changed

+49
-17
lines changed

‎recipe/emailpassword/emailpassword_email_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"github.com/supertokens/supertokens-golang/ingredients/emaildelivery"
2525
"github.com/supertokens/supertokens-golang/recipe/emailpassword/epmodels"
2626
"github.com/supertokens/supertokens-golang/recipe/emailverification"
27+
"github.com/supertokens/supertokens-golang/recipe/emailverification/emaildelivery/smtpService"
2728
"github.com/supertokens/supertokens-golang/recipe/emailverification/evmodels"
2829
"github.com/supertokens/supertokens-golang/recipe/session"
2930
"github.com/supertokens/supertokens-golang/supertokens"
@@ -469,7 +470,7 @@ func TestSMTPOverrideEmailVerifyForEmailPasswordUser(t *testing.T) {
469470
email := ""
470471
emailVerifyLink := ""
471472

472-
smtpService := MakeSMTPService(emaildelivery.SMTPServiceConfig{
473+
smtpService := smtpService.MakeSMTPService(emaildelivery.SMTPServiceConfig{
473474
Settings: emaildelivery.SMTPSettings{
474475
Host: "",
475476
From: emaildelivery.SMTPFrom{

‎recipe/emailverification/recipe.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func MakeRecipe(recipeId string, appInfo supertokens.NormalisedAppinfo, config e
8787
if err != nil {
8888
return emailRes, err
8989
}
90-
if emailRes.UnknownUserIDError != nil {
90+
if emailRes.EmailDoesNotExistError != nil {
9191
return emailRes, nil
9292
}
9393
if emailRes.OK != nil {

‎recipe/thirdparty/signinupFeature_test.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
"github.com/stretchr/testify/assert"
2828
"github.com/supertokens/supertokens-golang/recipe/emailverification"
29+
"github.com/supertokens/supertokens-golang/recipe/emailverification/evmodels"
2930
"github.com/supertokens/supertokens-golang/recipe/session"
3031
"github.com/supertokens/supertokens-golang/recipe/session/sessmodels"
3132
"github.com/supertokens/supertokens-golang/recipe/thirdparty/tpmodels"
@@ -361,6 +362,9 @@ func TestMinimumConfigForThirdPartyModuleWithEmailUnverified(t *testing.T) {
361362
WebsiteDomain: "supertokens.io",
362363
},
363364
RecipeList: []supertokens.Recipe{
365+
emailverification.Init(evmodels.TypeInput{
366+
Mode: evmodels.ModeOptional,
367+
}),
364368
session.Init(&sessmodels.TypeInput{
365369
AntiCsrf: &customAntiCsrfValue,
366370
}),

‎recipe/thirdpartyemailpassword/emailVerify_test.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
"github.com/stretchr/testify/assert"
2626
"github.com/supertokens/supertokens-golang/recipe/emailverification"
27+
"github.com/supertokens/supertokens-golang/recipe/emailverification/evmodels"
2728
"github.com/supertokens/supertokens-golang/recipe/session"
2829
"github.com/supertokens/supertokens-golang/recipe/session/sessmodels"
2930
"github.com/supertokens/supertokens-golang/supertokens"
@@ -42,6 +43,9 @@ func TestTheGenerateTokenAPIwithValidInputEmailNotVerified(t *testing.T) {
4243
WebsiteDomain: "supertokens.io",
4344
},
4445
RecipeList: []supertokens.Recipe{
46+
emailverification.Init(evmodels.TypeInput{
47+
Mode: evmodels.ModeOptional,
48+
}),
4549
Init(nil),
4650
session.Init(&sessmodels.TypeInput{
4751
AntiCsrf: &customCSRFval,
@@ -93,6 +97,9 @@ func TestGenerateTokenAPIwithValidInputEmailVerifiedAndTestError(t *testing.T) {
9397
WebsiteDomain: "supertokens.io",
9498
},
9599
RecipeList: []supertokens.Recipe{
100+
emailverification.Init(evmodels.TypeInput{
101+
Mode: evmodels.ModeOptional,
102+
}),
96103
Init(nil),
97104
session.Init(&sessmodels.TypeInput{
98105
AntiCsrf: &customCSRFval,
@@ -150,6 +157,9 @@ func TestGenerateTokenAPIWithValidInputNoSessionAndCheckOutput(t *testing.T) {
150157
WebsiteDomain: "supertokens.io",
151158
},
152159
RecipeList: []supertokens.Recipe{
160+
emailverification.Init(evmodels.TypeInput{
161+
Mode: evmodels.ModeOptional,
162+
}),
153163
Init(nil),
154164
session.Init(&sessmodels.TypeInput{
155165
AntiCsrf: &customCSRFval,
@@ -189,6 +199,9 @@ func TestEmailVerifyAPIwithInvalidTokenCheckError(t *testing.T) {
189199
WebsiteDomain: "supertokens.io",
190200
},
191201
RecipeList: []supertokens.Recipe{
202+
emailverification.Init(evmodels.TypeInput{
203+
Mode: evmodels.ModeOptional,
204+
}),
192205
Init(nil),
193206
session.Init(&sessmodels.TypeInput{
194207
AntiCsrf: &customCSRFval,

‎recipe/thirdpartyemailpassword/tpep_email_test.go‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ import (
2727
"github.com/supertokens/supertokens-golang/recipe/emailpassword"
2828
"github.com/supertokens/supertokens-golang/recipe/emailpassword/epmodels"
2929
"github.com/supertokens/supertokens-golang/recipe/emailverification"
30+
"github.com/supertokens/supertokens-golang/recipe/emailverification/emaildelivery/smtpService"
31+
"github.com/supertokens/supertokens-golang/recipe/emailverification/evmodels"
3032
"github.com/supertokens/supertokens-golang/recipe/session"
3133
"github.com/supertokens/supertokens-golang/recipe/thirdparty/tpmodels"
3234
"github.com/supertokens/supertokens-golang/recipe/thirdpartyemailpassword/tpepmodels"
@@ -514,7 +516,7 @@ func TestDefaultBackwardCompatibilityEmailVerifyForEmailPasswordUser(t *testing.
514516
unittesting.StartUpST("localhost", "8080")
515517
defer AfterEach()
516518

517-
testServer := supertokensInitForTest(t, session.Init(nil), Init(nil))
519+
testServer := supertokensInitForTest(t, emailverification.Init(evmodels.TypeInput{Mode: evmodels.ModeOptional}), session.Init(nil), Init(nil))
518520
defer testServer.Close()
519521

520522
resp, err := unittesting.SignupRequest("[email protected]", "1234abcd", testServer.URL)
@@ -540,7 +542,7 @@ func TestDefaultBackwardCompatibilityEmailVerifyForThirdpartyUser(t *testing.T)
540542
customProviderForEmailVerification,
541543
},
542544
}
543-
testServer := supertokensInitForTest(t, session.Init(nil), Init(tpepConfig))
545+
testServer := supertokensInitForTest(t, emailverification.Init(evmodels.TypeInput{Mode: evmodels.ModeOptional}), session.Init(nil), Init(tpepConfig))
544546
defer testServer.Close()
545547

546548
signinupPostData := PostDataForCustomProvider{
@@ -671,6 +673,12 @@ func TestCustomOverrideEmailVerifyForEmailPasswordUser(t *testing.T) {
671673
emailVerifyLink := ""
672674

673675
tpepConfig := &tpepmodels.TypeInput{
676+
Providers: []tpmodels.TypeProvider{
677+
customProviderForEmailVerification,
678+
},
679+
}
680+
testServer := supertokensInitForTest(t, emailverification.Init(evmodels.TypeInput{
681+
Mode: evmodels.ModeOptional,
674682
EmailDelivery: &emaildelivery.TypeInput{
675683
Override: func(originalImplementation emaildelivery.EmailDeliveryInterface) emaildelivery.EmailDeliveryInterface {
676684
*originalImplementation.SendEmail = func(input emaildelivery.EmailType, userContext supertokens.UserContext) error {
@@ -684,8 +692,7 @@ func TestCustomOverrideEmailVerifyForEmailPasswordUser(t *testing.T) {
684692
return originalImplementation
685693
},
686694
},
687-
}
688-
testServer := supertokensInitForTest(t, session.Init(nil), Init(tpepConfig))
695+
}), session.Init(nil), Init(tpepConfig))
689696
defer testServer.Close()
690697

691698
resp, err := unittesting.SignupRequest("[email protected]", "1234abcd", testServer.URL)
@@ -716,6 +723,12 @@ func TestCustomOverrideEmailVerifyForThirdpartyUser(t *testing.T) {
716723
emailVerifyLink := ""
717724

718725
tpepConfig := &tpepmodels.TypeInput{
726+
Providers: []tpmodels.TypeProvider{
727+
customProviderForEmailVerification,
728+
},
729+
}
730+
testServer := supertokensInitForTest(t, emailverification.Init(evmodels.TypeInput{
731+
Mode: evmodels.ModeOptional,
719732
EmailDelivery: &emaildelivery.TypeInput{
720733
Override: func(originalImplementation emaildelivery.EmailDeliveryInterface) emaildelivery.EmailDeliveryInterface {
721734
*originalImplementation.SendEmail = func(input emaildelivery.EmailType, userContext supertokens.UserContext) error {
@@ -729,9 +742,7 @@ func TestCustomOverrideEmailVerifyForThirdpartyUser(t *testing.T) {
729742
return originalImplementation
730743
},
731744
},
732-
Providers: []tpmodels.TypeProvider{customProviderForEmailVerification},
733-
}
734-
testServer := supertokensInitForTest(t, session.Init(nil), Init(tpepConfig))
745+
}), session.Init(nil), Init(tpepConfig))
735746
defer testServer.Close()
736747

737748
signinupPostData := PostDataForCustomProvider{
@@ -772,7 +783,7 @@ func TestSMTPOverrideEmailVerifyForEmailPasswordUser(t *testing.T) {
772783
email := ""
773784
emailVerifyLink := ""
774785

775-
smtpService := MakeSMTPService(emaildelivery.SMTPServiceConfig{
786+
smtpService := smtpService.MakeSMTPService(emaildelivery.SMTPServiceConfig{
776787
Settings: emaildelivery.SMTPSettings{
777788
Host: "",
778789
From: emaildelivery.SMTPFrom{
@@ -800,12 +811,13 @@ func TestSMTPOverrideEmailVerifyForEmailPasswordUser(t *testing.T) {
800811
return originalImplementation
801812
},
802813
})
803-
tpepConfig := &tpepmodels.TypeInput{
814+
tpepConfig := &tpepmodels.TypeInput{}
815+
testServer := supertokensInitForTest(t, emailverification.Init(evmodels.TypeInput{
816+
Mode: evmodels.ModeOptional,
804817
EmailDelivery: &emaildelivery.TypeInput{
805818
Service: smtpService,
806819
},
807-
}
808-
testServer := supertokensInitForTest(t, session.Init(nil), Init(tpepConfig))
820+
}), session.Init(nil), Init(tpepConfig))
809821
defer testServer.Close()
810822

811823
resp, err := unittesting.SignupRequest("[email protected]", "1234abcd", testServer.URL)
@@ -837,7 +849,7 @@ func TestSMTPOverrideEmailVerifyForThirdpartyUser(t *testing.T) {
837849
email := ""
838850
emailVerifyLink := ""
839851

840-
smtpService := MakeSMTPService(emaildelivery.SMTPServiceConfig{
852+
smtpService := smtpService.MakeSMTPService(emaildelivery.SMTPServiceConfig{
841853
Settings: emaildelivery.SMTPSettings{
842854
Host: "",
843855
From: emaildelivery.SMTPFrom{
@@ -866,12 +878,14 @@ func TestSMTPOverrideEmailVerifyForThirdpartyUser(t *testing.T) {
866878
},
867879
})
868880
tpepConfig := &tpepmodels.TypeInput{
881+
Providers: []tpmodels.TypeProvider{customProviderForEmailVerification},
882+
}
883+
testServer := supertokensInitForTest(t, emailverification.Init(evmodels.TypeInput{
884+
Mode: evmodels.ModeOptional,
869885
EmailDelivery: &emaildelivery.TypeInput{
870886
Service: smtpService,
871887
},
872-
Providers: []tpmodels.TypeProvider{customProviderForEmailVerification},
873-
}
874-
testServer := supertokensInitForTest(t, session.Init(nil), Init(tpepConfig))
888+
}), session.Init(nil), Init(tpepConfig))
875889
defer testServer.Close()
876890

877891
signinupPostData := PostDataForCustomProvider{

0 commit comments

Comments
 (0)