Skip to content

Commit 96964cd

Browse files
sattvikcsattvikc
committed
fix: userIdType optional
1 parent ee775e6 commit 96964cd

File tree

4 files changed

+54
-24
lines changed

4 files changed

+54
-24
lines changed

‎recipe/emailpassword/userIdMapping_create_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ func TestCreateUserIdMapping(t *testing.T) {
5454
assert.NoError(t, err)
5555
assert.NotNil(t, createResp.OK)
5656

57-
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, "SUPERTOKENS")
57+
supertokensType := "SUPERTOKENS"
58+
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &supertokensType)
5859
assert.NoError(t, err)
5960
assert.NotNil(t, getResp.OK)
6061
assert.Equal(t, signUpResponse.OK.User.ID, getResp.OK.SupertokensUserId)

‎recipe/emailpassword/userIdMapping_delete_test.go‎

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

2828
{
29-
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", "SUPERTOKENS", false)
29+
supertokensType := "SUPERTOKENS"
30+
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", &supertokensType, false)
3031
assert.NoError(t, err)
3132
assert.NotNil(t, deleteResp.OK)
3233
assert.False(t, deleteResp.OK.DidMappingExist)
3334
}
3435

3536
{
36-
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", "EXTERNAL", false)
37+
externalType := "EXTERNAL"
38+
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", &externalType, false)
3739
assert.NoError(t, err)
3840
assert.NotNil(t, deleteResp.OK)
3941
assert.False(t, deleteResp.OK.DidMappingExist)
4042
}
4143

4244
{
43-
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", "ANY", false)
45+
anyType := "ANY"
46+
deleteResp, err := supertokens.DeleteUserIdMapping("unknownUserId", &anyType, false)
4447
assert.NoError(t, err)
4548
assert.NotNil(t, deleteResp.OK)
4649
assert.False(t, deleteResp.OK.DidMappingExist)
@@ -75,7 +78,8 @@ func TestDeleteUserIdMappingOfSupertokensUserId(t *testing.T) {
7578
assert.NoError(t, err)
7679
assert.NotNil(t, createResp.OK)
7780

78-
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, "SUPERTOKENS", false)
81+
supertokensType := "SUPERTOKENS"
82+
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, &supertokensType, false)
7983
assert.NoError(t, err)
8084
assert.NotNil(t, deleteResp.OK)
8185
assert.True(t, deleteResp.OK.DidMappingExist)
@@ -109,7 +113,8 @@ func TestDeleteUserIdMappingOfExternalUserId(t *testing.T) {
109113
assert.NoError(t, err)
110114
assert.NotNil(t, createResp.OK)
111115

112-
deleteResp, err := supertokens.DeleteUserIdMapping(externalUserId, "EXTERNAL", false)
116+
externalType := "EXTERNAL"
117+
deleteResp, err := supertokens.DeleteUserIdMapping(externalUserId, &externalType, false)
113118
assert.NoError(t, err)
114119
assert.NotNil(t, deleteResp.OK)
115120
assert.True(t, deleteResp.OK.DidMappingExist)
@@ -136,19 +141,21 @@ func TestDeleteUserIdMappingOfAnyUsrId(t *testing.T) {
136141
assert.NoError(t, err)
137142
assert.NotNil(t, signUpResponse.OK)
138143

144+
anyType := "ANY"
145+
139146
{
140147
externalUserId := "externalId"
141148
externalUserIdInfo := "externalIdInfo"
142149
createResp, err := supertokens.CreateUserIdMapping(signUpResponse.OK.User.ID, externalUserId, &externalUserIdInfo, false)
143150
assert.NoError(t, err)
144151
assert.NotNil(t, createResp.OK)
145152

146-
deleteResp, err := supertokens.DeleteUserIdMapping(externalUserId, "ANY", false)
153+
deleteResp, err := supertokens.DeleteUserIdMapping(externalUserId, &anyType, false)
147154
assert.NoError(t, err)
148155
assert.NotNil(t, deleteResp.OK)
149156
assert.True(t, deleteResp.OK.DidMappingExist)
150157

151-
getResp, err := supertokens.GetUserIdMapping(externalUserId, "ANY")
158+
getResp, err := supertokens.GetUserIdMapping(externalUserId, &anyType)
152159
assert.NoError(t, err)
153160
assert.NotNil(t, getResp.UnknownMappingError)
154161
}
@@ -160,12 +167,12 @@ func TestDeleteUserIdMappingOfAnyUsrId(t *testing.T) {
160167
assert.NoError(t, err)
161168
assert.NotNil(t, createResp.OK)
162169

163-
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, "ANY", false)
170+
deleteResp, err := supertokens.DeleteUserIdMapping(signUpResponse.OK.User.ID, &anyType, false)
164171
assert.NoError(t, err)
165172
assert.NotNil(t, deleteResp.OK)
166173
assert.True(t, deleteResp.OK.DidMappingExist)
167174

168-
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, "ANY")
175+
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &anyType)
169176
assert.NoError(t, err)
170177
assert.NotNil(t, getResp.UnknownMappingError)
171178
}

‎recipe/emailpassword/userIdMapping_get_test.go‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ func TestGetUserIdMapping(t *testing.T) {
3737
assert.NotNil(t, createResp.OK)
3838

3939
{
40-
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, "SUPERTOKENS")
40+
supertokensType := "SUPERTOKENS"
41+
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &supertokensType)
4142
assert.NoError(t, err)
4243
assert.NotNil(t, getResp.OK)
4344
assert.Equal(t, signUpResponse.OK.User.ID, getResp.OK.SupertokensUserId)
@@ -46,7 +47,8 @@ func TestGetUserIdMapping(t *testing.T) {
4647
}
4748

4849
{
49-
getResp, err := supertokens.GetUserIdMapping(externalUserId, "EXTERNAL")
50+
externalType := "EXTERNAL"
51+
getResp, err := supertokens.GetUserIdMapping(externalUserId, &externalType)
5052
assert.NoError(t, err)
5153
assert.NotNil(t, getResp.OK)
5254
assert.Equal(t, signUpResponse.OK.User.ID, getResp.OK.SupertokensUserId)
@@ -55,7 +57,8 @@ func TestGetUserIdMapping(t *testing.T) {
5557
}
5658

5759
{
58-
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, "ANY")
60+
anyType := "ANY"
61+
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &anyType)
5962
assert.NoError(t, err)
6063
assert.NotNil(t, getResp.OK)
6164
assert.Equal(t, signUpResponse.OK.User.ID, getResp.OK.SupertokensUserId)
@@ -64,7 +67,8 @@ func TestGetUserIdMapping(t *testing.T) {
6467
}
6568

6669
{
67-
getResp, err := supertokens.GetUserIdMapping(externalUserId, "ANY")
70+
anyType := "ANY"
71+
getResp, err := supertokens.GetUserIdMapping(externalUserId, &anyType)
6872
assert.NoError(t, err)
6973
assert.NotNil(t, getResp.OK)
7074
assert.Equal(t, signUpResponse.OK.User.ID, getResp.OK.SupertokensUserId)
@@ -91,19 +95,22 @@ func TestGetUserIdMappingThatDoesNotExist(t *testing.T) {
9195
}
9296

9397
{
94-
getResp, err := supertokens.GetUserIdMapping("unknownId", "ANY")
98+
anyType := "ANY"
99+
getResp, err := supertokens.GetUserIdMapping("unknownId", &anyType)
95100
assert.NoError(t, err)
96101
assert.NotNil(t, getResp.UnknownMappingError)
97102
}
98103

99104
{
100-
getResp, err := supertokens.GetUserIdMapping("unknownId", "SUPERTOKENS")
105+
supertokensType := "SUPERTOKENS"
106+
getResp, err := supertokens.GetUserIdMapping("unknownId", &supertokensType)
101107
assert.NoError(t, err)
102108
assert.NotNil(t, getResp.UnknownMappingError)
103109
}
104110

105111
{
106-
getResp, err := supertokens.GetUserIdMapping("unknownId", "EXTERNAL")
112+
externalType := "EXTERNAL"
113+
getResp, err := supertokens.GetUserIdMapping("unknownId", &externalType)
107114
assert.NoError(t, err)
108115
assert.NotNil(t, getResp.UnknownMappingError)
109116
}
@@ -137,7 +144,8 @@ func TestGetUserIdMappingWithNoExternalUserIdInfo(t *testing.T) {
137144
assert.NotNil(t, createResp.OK)
138145

139146
{
140-
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, "SUPERTOKENS")
147+
supertokensType := "SUPERTOKENS"
148+
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &supertokensType)
141149
assert.NoError(t, err)
142150
assert.NotNil(t, getResp.OK)
143151
assert.Equal(t, signUpResponse.OK.User.ID, getResp.OK.SupertokensUserId)
@@ -146,7 +154,8 @@ func TestGetUserIdMappingWithNoExternalUserIdInfo(t *testing.T) {
146154
}
147155

148156
{
149-
getResp, err := supertokens.GetUserIdMapping(externalUserId, "EXTERNAL")
157+
externalType := "EXTERNAL"
158+
getResp, err := supertokens.GetUserIdMapping(externalUserId, &externalType)
150159
assert.NoError(t, err)
151160
assert.NotNil(t, getResp.OK)
152161
assert.Equal(t, signUpResponse.OK.User.ID, getResp.OK.SupertokensUserId)
@@ -155,7 +164,8 @@ func TestGetUserIdMappingWithNoExternalUserIdInfo(t *testing.T) {
155164
}
156165

157166
{
158-
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, "ANY")
167+
anyType := "ANY"
168+
getResp, err := supertokens.GetUserIdMapping(signUpResponse.OK.User.ID, &anyType)
159169
assert.NoError(t, err)
160170
assert.NotNil(t, getResp.OK)
161171
assert.Equal(t, signUpResponse.OK.User.ID, getResp.OK.SupertokensUserId)
@@ -164,7 +174,8 @@ func TestGetUserIdMappingWithNoExternalUserIdInfo(t *testing.T) {
164174
}
165175

166176
{
167-
getResp, err := supertokens.GetUserIdMapping(externalUserId, "ANY")
177+
anyType := "ANY"
178+
getResp, err := supertokens.GetUserIdMapping(externalUserId, &anyType)
168179
assert.NoError(t, err)
169180
assert.NotNil(t, getResp.OK)
170181
assert.Equal(t, signUpResponse.OK.User.ID, getResp.OK.SupertokensUserId)

‎supertokens/userIdMapping.go‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import (
44
"errors"
55
)
66

7+
var userIdTypeDefault = "ANY"
8+
79
type CreateUserIdMappingResult struct {
810
OK *struct{}
911
UnknownSupertokensUserIdError *struct{}
@@ -68,7 +70,10 @@ type GetUserIdMappingResult struct {
6870
UnknownMappingError *struct{}
6971
}
7072

71-
func GetUserIdMapping(userId string, userIdType string) (GetUserIdMappingResult, error) {
73+
func GetUserIdMapping(userId string, userIdType *string) (GetUserIdMappingResult, error) {
74+
if userIdType == nil {
75+
userIdType = &userIdTypeDefault
76+
}
7277
querier, err := GetNewQuerierInstanceOrThrowError("")
7378
if err != nil {
7479
return GetUserIdMappingResult{}, err
@@ -83,7 +88,7 @@ func GetUserIdMapping(userId string, userIdType string) (GetUserIdMappingResult,
8388

8489
resp, err := querier.SendGetRequest("/recipe/userid/map", map[string]string{
8590
"userId": userId,
86-
"userIdType": userIdType,
91+
"userIdType": *userIdType,
8792
})
8893
if err != nil {
8994
return GetUserIdMappingResult{}, err
@@ -117,7 +122,10 @@ type DeleteUserIdMappingResult struct {
117122
}
118123
}
119124

120-
func DeleteUserIdMapping(userId string, userIdType string, force bool) (DeleteUserIdMappingResult, error) {
125+
func DeleteUserIdMapping(userId string, userIdType *string, force bool) (DeleteUserIdMappingResult, error) {
126+
if userIdType == nil {
127+
userIdType = &userIdTypeDefault
128+
}
121129
querier, err := GetNewQuerierInstanceOrThrowError("")
122130
if err != nil {
123131
return DeleteUserIdMappingResult{}, err
@@ -151,6 +159,9 @@ type UpdateOrDeleteUserIdMappingInfoResult struct {
151159
}
152160

153161
func UpdateOrDeleteUserIdMappingInfo(userId string, userIdType *string, externalUserIdInfo *string) (UpdateOrDeleteUserIdMappingInfoResult, error) {
162+
if userIdType == nil {
163+
userIdType = &userIdTypeDefault
164+
}
154165
querier, err := GetNewQuerierInstanceOrThrowError("")
155166
if err != nil {
156167
return UpdateOrDeleteUserIdMappingInfoResult{}, err

0 commit comments

Comments
 (0)