Skip to content

Commit 3351470

Browse files
committed
Refactor based on PR comments
1 parent 39f8601 commit 3351470

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

recipe/dashboard/api/signInPost.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ func SignInPost(apiInterface dashboardmodels.APIInterface, options dashboardmode
5757
return apiErr
5858
}
5959

60-
status, ok := apiResponse["status"]
60+
status := apiResponse["status"]
6161

62-
if ok && status == "OK" {
62+
if status == "OK" {
6363
return supertokens.Send200Response(options.Res, map[string]interface{}{
6464
"status": "OK",
6565
"sessionId": apiResponse["sessionId"].(string),

recipe/dashboard/api/signOutPost.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ type signOutPostResponse struct {
1111
}
1212

1313
func SignOutPost(apiInterface dashboardmodels.APIInterface, options dashboardmodels.APIOptions) (signOutPostResponse, error) {
14-
if options.Config.ApiKey != "" {
14+
if options.Config.AuthMode == dashboardmodels.AuthModeAPIKey {
1515
return signOutPostResponse{
1616
Status: "OK",
1717
}, nil

recipe/dashboard/utils.go

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,22 @@ import (
2626
func validateAndNormaliseUserInput(appInfo supertokens.NormalisedAppinfo, config *dashboardmodels.TypeInput) dashboardmodels.TypeNormalisedInput {
2727
typeNormalisedInput := makeTypeNormalisedInput(appInfo)
2828

29-
if config.ApiKey != "" {
30-
typeNormalisedInput.ApiKey = config.ApiKey
29+
_config := dashboardmodels.TypeInput{}
30+
if config != nil {
31+
_config = *config
32+
}
33+
34+
if _config.ApiKey != "" {
35+
typeNormalisedInput.ApiKey = _config.ApiKey
3136
typeNormalisedInput.AuthMode = dashboardmodels.AuthModeAPIKey
3237
}
3338

34-
if config.Override != nil {
35-
if config.Override.Functions != nil {
36-
typeNormalisedInput.Override.Functions = config.Override.Functions
39+
if _config.Override != nil {
40+
if _config.Override.Functions != nil {
41+
typeNormalisedInput.Override.Functions = _config.Override.Functions
3742
}
38-
if config.Override.APIs != nil {
39-
typeNormalisedInput.Override.APIs = config.Override.APIs
43+
if _config.Override.APIs != nil {
44+
typeNormalisedInput.Override.APIs = _config.Override.APIs
4045
}
4146
}
4247

0 commit comments

Comments
 (0)