Skip to content

Commit 8e9ddb8

Browse files
sattvikcsattvikc
committed
fix: PR comments
1 parent f90f191 commit 8e9ddb8

File tree

11 files changed

+168
-117
lines changed

11 files changed

+168
-117
lines changed

‎recipe/emailpassword/ep_userIdMapping_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestCreateUserIdMappingGetUserById(t *testing.T) {
3232

3333
externalUserId := "externalId"
3434
externalUserIdInfo := "externalIdInfo"
35-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
35+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
3636
assert.NoError(t, err)
3737
assert.NotNil(t, createResp.OK)
3838

@@ -73,7 +73,7 @@ func TestCreateUserIdMappingGetUserByEmail(t *testing.T) {
7373

7474
externalUserId := "externalId"
7575
externalUserIdInfo := "externalIdInfo"
76-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
76+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
7777
assert.NoError(t, err)
7878
assert.NotNil(t, createResp.OK)
7979

@@ -106,7 +106,7 @@ func TestCreateUserIdMappingSignIn(t *testing.T) {
106106

107107
externalUserId := "externalId"
108108
externalUserIdInfo := "externalIdInfo"
109-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
109+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
110110
assert.NoError(t, err)
111111
assert.NotNil(t, createResp.OK)
112112

@@ -140,7 +140,7 @@ func TestCreateUserIdMappingPasswordReset(t *testing.T) {
140140

141141
externalUserId := "externalId"
142142
externalUserIdInfo := "externalIdInfo"
143-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
143+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
144144
assert.NoError(t, err)
145145
assert.NotNil(t, createResp.OK)
146146

@@ -182,7 +182,7 @@ func TestCreateUserIdMappingUpdateEmailPassword(t *testing.T) {
182182

183183
externalUserId := "externalId"
184184
externalUserIdInfo := "externalIdInfo"
185-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
185+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
186186
assert.NoError(t, err)
187187
assert.NotNil(t, createResp.OK)
188188

‎recipe/emailpassword/userIdMapping_create_test.go‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ func TestCreateUserIdMapping(t *testing.T) {
5454

5555
externalUserId := "externalId"
5656
externalUserIdInfo := "externalIdInfo"
57-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
57+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
5858
assert.NoError(t, err)
5959
assert.NotNil(t, createResp.OK)
6060

61-
supertokensType := "SUPERTOKENS"
61+
supertokensType := supertokens.UserIdTypeSupertokens
6262
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &supertokensType)
6363
assert.NoError(t, err)
6464
assert.NotNil(t, getResp.OK)
@@ -88,7 +88,7 @@ func TestCreateUserIdMappingWithUnknownSupertokensUserId(t *testing.T) {
8888
externalUserId := "externalId"
8989
externalUserIdInfo := "externalIdInfo"
9090

91-
createResp, err := supertokens.CreateUserIdMapping(supertokensUserId, externalUserId, &externalUserIdInfo, false)
91+
createResp, err := supertokens.CreateUserIdMapping(supertokensUserId, externalUserId, &externalUserIdInfo, nil)
9292
assert.NoError(t, err)
9393
assert.NotNil(t, createResp.UnknownSupertokensUserIdError)
9494
}
@@ -117,15 +117,15 @@ func TestCreateUserIdMappingWhenAlreadyExists(t *testing.T) {
117117
{
118118
externalUserId := "externalId"
119119
externalUserIdInfo := "externalIdInfo"
120-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
120+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
121121
assert.NoError(t, err)
122122
assert.NotNil(t, createResp.OK)
123123
}
124124

125125
{ // duplicate of both
126126
externalUserId := "externalId"
127127
externalUserIdInfo := "externalIdInfo"
128-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
128+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
129129
assert.NoError(t, err)
130130
assert.NotNil(t, createResp.UserIdMappingAlreadyExistsError)
131131
assert.True(t, createResp.UserIdMappingAlreadyExistsError.DoesExternalUserIdExist)
@@ -135,7 +135,7 @@ func TestCreateUserIdMappingWhenAlreadyExists(t *testing.T) {
135135
{ // duplicate of supertokensUserId
136136
externalUserId := "differentId"
137137
externalUserIdInfo := "externalIdInfo"
138-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
138+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
139139
assert.NoError(t, err)
140140
assert.NotNil(t, createResp.UserIdMappingAlreadyExistsError)
141141
assert.False(t, createResp.UserIdMappingAlreadyExistsError.DoesExternalUserIdExist)
@@ -150,7 +150,7 @@ func TestCreateUserIdMappingWhenAlreadyExists(t *testing.T) {
150150

151151
externalUserId := "externalId"
152152
externalUserIdInfo := "externalIdInfo"
153-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
153+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
154154
assert.NoError(t, err)
155155
assert.NotNil(t, createResp.UserIdMappingAlreadyExistsError)
156156
assert.True(t, createResp.UserIdMappingAlreadyExistsError.DoesExternalUserIdExist)
@@ -186,18 +186,29 @@ func TestCreateUserIdMappingWithMetadataAndWithAndWithoutForce(t *testing.T) {
186186
metadataResp, err := usermetadata.UpdateUserMetadata(signUpResponse.OK.User.ID, userMetadata)
187187
assert.NoError(t, err)
188188
assert.NotNil(t, metadataResp)
189-
{ // without force
189+
190+
{ // with force nil
190191
externalUserId := "externalId"
191192
externalUserIdInfo := "externalIdInfo"
192-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
193+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
193194
assert.Contains(t, err.Error(), "UserId is already in use in UserMetadata recipe")
194195
assert.Nil(t, createResp.OK)
195196
}
196197

197198
{ // without force
199+
False := false
200+
externalUserId := "externalId"
201+
externalUserIdInfo := "externalIdInfo"
202+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, &False)
203+
assert.Contains(t, err.Error(), "UserId is already in use in UserMetadata recipe")
204+
assert.Nil(t, createResp.OK)
205+
}
206+
207+
{ // with force
208+
True := true
198209
externalUserId := "externalId"
199210
externalUserIdInfo := "externalIdInfo"
200-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, true)
211+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, &True)
201212
assert.NoError(t, err)
202213
assert.NotNil(t, createResp.OK)
203214
}

‎recipe/emailpassword/userIdMapping_delete_test.go‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@ func TestDeleteUnknownUserIdMapping(t *testing.T) {
2727
}
2828

2929
{
30-
supertokensType := "SUPERTOKENS"
31-
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", &supertokensType, false)
30+
supertokensType := supertokens.UserIdTypeSupertokens
31+
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", &supertokensType, nil)
3232
assert.NoError(t, err)
3333
assert.NotNil(t, deleteResp.OK)
3434
assert.False(t, deleteResp.OK.DidMappingExist)
3535
}
3636

3737
{
38-
externalType := "EXTERNAL"
39-
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", &externalType, false)
38+
externalType := supertokens.UserIdTypeExternal
39+
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", &externalType, nil)
4040
assert.NoError(t, err)
4141
assert.NotNil(t, deleteResp.OK)
4242
assert.False(t, deleteResp.OK.DidMappingExist)
4343
}
4444

4545
{
46-
anyType := "ANY"
47-
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", &anyType, false)
46+
anyType := supertokens.UserIdTypeAny
47+
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", &anyType, nil)
4848
assert.NoError(t, err)
4949
assert.NotNil(t, deleteResp.OK)
5050
assert.False(t, deleteResp.OK.DidMappingExist)
@@ -75,12 +75,12 @@ func TestDeleteUserIdMappingOfSupertokensUserId(t *testing.T) {
7575

7676
externalUserId := "externalId"
7777
externalUserIdInfo := "externalIdInfo"
78-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
78+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
7979
assert.NoError(t, err)
8080
assert.NotNil(t, createResp.OK)
8181

82-
supertokensType := "SUPERTOKENS"
83-
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, &supertokensType, false)
82+
supertokensType := supertokens.UserIdTypeSupertokens
83+
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, &supertokensType, nil)
8484
assert.NoError(t, err)
8585
assert.NotNil(t, deleteResp.OK)
8686
assert.True(t, deleteResp.OK.DidMappingExist)
@@ -110,12 +110,12 @@ func TestDeleteUserIdMappingOfExternalUserId(t *testing.T) {
110110

111111
externalUserId := "externalId"
112112
externalUserIdInfo := "externalIdInfo"
113-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
113+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
114114
assert.NoError(t, err)
115115
assert.NotNil(t, createResp.OK)
116116

117-
externalType := "EXTERNAL"
118-
deleteResp, err := supertokens.DeleteUserIdMapping(externalUserId, &externalType, false)
117+
externalType := supertokens.UserIdTypeExternal
118+
deleteResp, err := supertokens.DeleteUserIdMapping(externalUserId, &externalType, nil)
119119
assert.NoError(t, err)
120120
assert.NotNil(t, deleteResp.OK)
121121
assert.True(t, deleteResp.OK.DidMappingExist)
@@ -142,16 +142,16 @@ func TestDeleteUserIdMappingOfAnyUsrId(t *testing.T) {
142142
assert.NoError(t, err)
143143
assert.NotNil(t, signUpResponse.OK)
144144

145-
anyType := "ANY"
145+
anyType := supertokens.UserIdTypeAny
146146

147147
{
148148
externalUserId := "externalId"
149149
externalUserIdInfo := "externalIdInfo"
150-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
150+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
151151
assert.NoError(t, err)
152152
assert.NotNil(t, createResp.OK)
153153

154-
deleteResp, err := supertokens.DeleteUserIdMapping(externalUserId, &anyType, false)
154+
deleteResp, err := supertokens.DeleteUserIdMapping(externalUserId, &anyType, nil)
155155
assert.NoError(t, err)
156156
assert.NotNil(t, deleteResp.OK)
157157
assert.True(t, deleteResp.OK.DidMappingExist)
@@ -164,11 +164,11 @@ func TestDeleteUserIdMappingOfAnyUsrId(t *testing.T) {
164164
{
165165
externalUserId := "externalId"
166166
externalUserIdInfo := "externalIdInfo"
167-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
167+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
168168
assert.NoError(t, err)
169169
assert.NotNil(t, createResp.OK)
170170

171-
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, &anyType, false)
171+
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, &anyType, nil)
172172
assert.NoError(t, err)
173173
assert.NotNil(t, deleteResp.OK)
174174
assert.True(t, deleteResp.OK.DidMappingExist)
@@ -202,7 +202,7 @@ func TestDeleteUserIdMappingWithMetadataAndWithAndWithoutForce(t *testing.T) {
202202

203203
externalUserId := "externalId"
204204
externalUserIdInfo := "externalIdInfo"
205-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
205+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
206206
assert.NoError(t, err)
207207
assert.NotNil(t, createResp.OK)
208208

@@ -212,14 +212,22 @@ func TestDeleteUserIdMappingWithMetadataAndWithAndWithoutForce(t *testing.T) {
212212
metadataResp, err := usermetadata.UpdateUserMetadata(externalUserId, userMetadata)
213213
assert.NoError(t, err)
214214
assert.NotNil(t, metadataResp)
215-
{ // without force
216-
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, nil, false)
215+
{ // with force nil
216+
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, nil, nil)
217217
assert.Contains(t, err.Error(), "UserId is already in use in UserMetadata recipe")
218218
assert.Nil(t, deleteResp.OK)
219219
}
220220

221221
{ // without force
222-
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, nil, true)
222+
False := false
223+
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, nil, &False)
224+
assert.Contains(t, err.Error(), "UserId is already in use in UserMetadata recipe")
225+
assert.Nil(t, deleteResp.OK)
226+
}
227+
228+
{ // with force
229+
True := true
230+
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, nil, &True)
223231
assert.NoError(t, err)
224232
assert.NotNil(t, deleteResp.OK)
225233
}

‎recipe/emailpassword/userIdMapping_get_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ func TestGetUserIdMapping(t *testing.T) {
3232

3333
externalUserId := "externalId"
3434
externalUserIdInfo := "externalIdInfo"
35-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
35+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, nil)
3636
assert.NoError(t, err)
3737
assert.NotNil(t, createResp.OK)
3838

3939
{
40-
supertokensType := "SUPERTOKENS"
40+
supertokensType := supertokens.UserIdTypeSupertokens
4141
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &supertokensType)
4242
assert.NoError(t, err)
4343
assert.NotNil(t, getResp.OK)
@@ -47,7 +47,7 @@ func TestGetUserIdMapping(t *testing.T) {
4747
}
4848

4949
{
50-
externalType := "EXTERNAL"
50+
externalType := supertokens.UserIdTypeExternal
5151
getResp, err := supertokens.GetUserIdMapping(externalUserId, &externalType)
5252
assert.NoError(t, err)
5353
assert.NotNil(t, getResp.OK)
@@ -57,7 +57,7 @@ func TestGetUserIdMapping(t *testing.T) {
5757
}
5858

5959
{
60-
anyType := "ANY"
60+
anyType := supertokens.UserIdTypeAny
6161
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &anyType)
6262
assert.NoError(t, err)
6363
assert.NotNil(t, getResp.OK)
@@ -67,7 +67,7 @@ func TestGetUserIdMapping(t *testing.T) {
6767
}
6868

6969
{
70-
anyType := "ANY"
70+
anyType := supertokens.UserIdTypeAny
7171
getResp, err := supertokens.GetUserIdMapping(externalUserId, &anyType)
7272
assert.NoError(t, err)
7373
assert.NotNil(t, getResp.OK)
@@ -95,21 +95,21 @@ func TestGetUserIdMappingThatDoesNotExist(t *testing.T) {
9595
}
9696

9797
{
98-
anyType := "ANY"
98+
anyType := supertokens.UserIdTypeAny
9999
getResp, err := supertokens.GetUserIdMapping("unknownId", &anyType)
100100
assert.NoError(t, err)
101101
assert.NotNil(t, getResp.UnknownMappingError)
102102
}
103103

104104
{
105-
supertokensType := "SUPERTOKENS"
105+
supertokensType := supertokens.UserIdTypeSupertokens
106106
getResp, err := supertokens.GetUserIdMapping("unknownId", &supertokensType)
107107
assert.NoError(t, err)
108108
assert.NotNil(t, getResp.UnknownMappingError)
109109
}
110110

111111
{
112-
externalType := "EXTERNAL"
112+
externalType := supertokens.UserIdTypeExternal
113113
getResp, err := supertokens.GetUserIdMapping("unknownId", &externalType)
114114
assert.NoError(t, err)
115115
assert.NotNil(t, getResp.UnknownMappingError)
@@ -139,12 +139,12 @@ func TestGetUserIdMappingWithNoExternalUserIdInfo(t *testing.T) {
139139
assert.NotNil(t, signUpResponse.OK)
140140

141141
externalUserId := "externalId"
142-
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, nil, false)
142+
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, nil, nil)
143143
assert.NoError(t, err)
144144
assert.NotNil(t, createResp.OK)
145145

146146
{
147-
supertokensType := "SUPERTOKENS"
147+
supertokensType := supertokens.UserIdTypeSupertokens
148148
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &supertokensType)
149149
assert.NoError(t, err)
150150
assert.NotNil(t, getResp.OK)
@@ -154,7 +154,7 @@ func TestGetUserIdMappingWithNoExternalUserIdInfo(t *testing.T) {
154154
}
155155

156156
{
157-
externalType := "EXTERNAL"
157+
externalType := supertokens.UserIdTypeExternal
158158
getResp, err := supertokens.GetUserIdMapping(externalUserId, &externalType)
159159
assert.NoError(t, err)
160160
assert.NotNil(t, getResp.OK)
@@ -164,7 +164,7 @@ func TestGetUserIdMappingWithNoExternalUserIdInfo(t *testing.T) {
164164
}
165165

166166
{
167-
anyType := "ANY"
167+
anyType := supertokens.UserIdTypeAny
168168
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &anyType)
169169
assert.NoError(t, err)
170170
assert.NotNil(t, getResp.OK)
@@ -174,7 +174,7 @@ func TestGetUserIdMappingWithNoExternalUserIdInfo(t *testing.T) {
174174
}
175175

176176
{
177-
anyType := "ANY"
177+
anyType := supertokens.UserIdTypeAny
178178
getResp, err := supertokens.GetUserIdMapping(externalUserId, &anyType)
179179
assert.NoError(t, err)
180180
assert.NotNil(t, getResp.OK)

0 commit comments

Comments
 (0)