Skip to content

Remove unneeded todoWithDefault #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfadex merged 1 commit into from
May 9, 2026
Merged

Remove unneeded todoWithDefault #297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 84 additions & 91 deletions src/OpenApi/Generate.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,7 +1520,7 @@ operationToAuthorizationInfo : OpenApi.Operation.Operation -> CliMonad Authoriza
operationToAuthorizationInfo operation =
let
step :
Maybe (Dict String (OpenApi.Reference.ReferenceOr OpenApi.SecurityScheme.SecurityScheme))
Dict String (OpenApi.Reference.ReferenceOr OpenApi.SecurityScheme.SecurityScheme)
-> ( String, List String )
->
{ headers : Dict String (Elm.Expression -> Elm.Expression)
Expand Down Expand Up @@ -1575,107 +1575,74 @@ operationToAuthorizationInfo operation =
}

( name, _ ) ->
case securitySchemes of
Just securitySchemas ->
case Maybe.andThen OpenApi.Reference.toConcrete <| Dict.get name securitySchemas of
Nothing ->
CliMonad.todoWithDefault
acc
("Unknown security requirement: " ++ name)
case Maybe.andThen OpenApi.Reference.toConcrete <| Dict.get name securitySchemes of
Nothing ->
CliMonad.fail ("Unknown security requirement: " ++ name)

Just securitySchema ->
case OpenApi.SecurityScheme.type_ securitySchema of
OpenApi.SecurityScheme.ApiKey apiKey ->
let
unsafeName : Common.UnsafeName
unsafeName =
Common.UnsafeName (String.toLower apiKey.name)
Just securitySchema ->
case OpenApi.SecurityScheme.type_ securitySchema of
OpenApi.SecurityScheme.ApiKey apiKey ->
let
unsafeName : Common.UnsafeName
unsafeName =
Common.UnsafeName (String.toLower apiKey.name)

cleanName : String
cleanName =
Common.toValueName unsafeName
in
case apiKey.in_ of
OpenApi.SecurityScheme.Header ->
if Dict.member apiKey.name acc.headers then
CliMonad.fail (apiKey.name ++ " header already set")

else
CliMonad.succeed
{ acc
| headers =
Dict.insert apiKey.name
(\authorization ->
authorization |> Elm.get cleanName
)
acc.headers
, paramsAuthorization = Dict.insert cleanName Elm.Annotation.string acc.paramsAuthorization
}
cleanName : String
cleanName =
Common.toValueName unsafeName
in
case apiKey.in_ of
OpenApi.SecurityScheme.Header ->
if Dict.member apiKey.name acc.headers then
CliMonad.fail (apiKey.name ++ " header already set")

OpenApi.SecurityScheme.Query ->
else
CliMonad.succeed
{ acc
| query =
Dict.insert cleanName
(\config ->
config
|> Elm.get "authorization"
|> Elm.get cleanName
| headers =
Dict.insert apiKey.name
(\authorization ->
authorization |> Elm.get cleanName
)
acc.query
acc.headers
, paramsAuthorization = Dict.insert cleanName Elm.Annotation.string acc.paramsAuthorization
}
|> CliMonad.succeed

OpenApi.SecurityScheme.Cookie ->
if Dict.member "Cookie" acc.headers then
CliMonad.fail "Cookie header already set"

else
CliMonad.succeed
{ acc
| headers =
Dict.insert "Cookie"
(\authorization ->
Elm.Op.append
(Elm.string (apiKey.name ++ "="))
(authorization |> Elm.get cleanName)
)
acc.headers
, paramsAuthorization = Dict.insert cleanName Elm.Annotation.string acc.paramsAuthorization
}
OpenApi.SecurityScheme.Query ->
{ acc
| query =
Dict.insert cleanName
(\config ->
config
|> Elm.get "authorization"
|> Elm.get cleanName
)
acc.query
, paramsAuthorization = Dict.insert cleanName Elm.Annotation.string acc.paramsAuthorization
}
|> CliMonad.succeed

OpenApi.SecurityScheme.Http details ->
case details.scheme of
"bearer" ->
let
unsafeName : Common.UnsafeName
unsafeName =
Common.UnsafeName (String.toLower name)

cleanName : String
cleanName =
Common.toValueName unsafeName
in
OpenApi.SecurityScheme.Cookie ->
if Dict.member "Cookie" acc.headers then
CliMonad.fail "Cookie header already set"

else
CliMonad.succeed
{ acc
| headers =
Dict.insert "authorization"
Dict.insert "Cookie"
(\authorization ->
Elm.Op.append
(Elm.string "Bearer ")
(Elm.string (apiKey.name ++ "="))
(authorization |> Elm.get cleanName)
)
acc.headers
, paramsAuthorization = Dict.insert cleanName Elm.Annotation.string acc.paramsAuthorization
}
|> CliMonad.succeed

unsupportedScheme ->
CliMonad.todoWithDefault acc ("Unsupported security schema 'Http' with scheme of '" ++ unsupportedScheme ++ "'")

OpenApi.SecurityScheme.MutualTls ->
CliMonad.todoWithDefault acc "Unsupported security schema: MutualTls"

OpenApi.SecurityScheme.Oauth2 _ ->
OpenApi.SecurityScheme.Http details ->
case details.scheme of
"bearer" ->
let
unsafeName : Common.UnsafeName
unsafeName =
Expand All @@ -1698,13 +1665,37 @@ operationToAuthorizationInfo operation =
}
|> CliMonad.succeed

OpenApi.SecurityScheme.OpenIdConnect _ ->
CliMonad.todoWithDefault acc "Unsupported security schema: OpenIdConnect"
unsupportedScheme ->
CliMonad.todoWithDefault acc ("Unsupported security schema 'Http' with scheme of '" ++ unsupportedScheme ++ "'")

Nothing ->
CliMonad.todoWithDefault
acc
("Unknown security requirement: " ++ name)
OpenApi.SecurityScheme.MutualTls ->
CliMonad.todoWithDefault acc "Unsupported security schema: MutualTls"

OpenApi.SecurityScheme.Oauth2 _ ->
let
unsafeName : Common.UnsafeName
unsafeName =
Common.UnsafeName (String.toLower name)

cleanName : String
cleanName =
Common.toValueName unsafeName
in
{ acc
| headers =
Dict.insert "authorization"
(\authorization ->
Elm.Op.append
(Elm.string "Bearer ")
(authorization |> Elm.get cleanName)
)
acc.headers
, paramsAuthorization = Dict.insert cleanName Elm.Annotation.string acc.paramsAuthorization
}
|> CliMonad.succeed

OpenApi.SecurityScheme.OpenIdConnect _ ->
CliMonad.todoWithDefault acc "Unsupported security schema: OpenIdConnect"
in
CliMonad.getApiSpec
|> CliMonad.andThen
Expand All @@ -1714,9 +1705,11 @@ operationToAuthorizationInfo operation =
components =
OpenApi.components spec

securitySchemes : Maybe (Dict String (OpenApi.Reference.ReferenceOr OpenApi.SecurityScheme.SecurityScheme))
securitySchemes : Dict String (OpenApi.Reference.ReferenceOr OpenApi.SecurityScheme.SecurityScheme)
securitySchemes =
Maybe.map OpenApi.Components.securitySchemes components
components
|> Maybe.map OpenApi.Components.securitySchemes
|> Maybe.withDefault Dict.empty
in
-- If present, the operation's security overrides globalSecurity.
OpenApi.Operation.security operation
Expand Down
Loading