Allow to configure protocol together with host name

fsprojects · Aug 20, 2016 · 17886b6 · 17886b6
1 parent c7fea05
commit 17886b6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/SwaggerProvider.DesignTime/OperationCompiler.fs b/src/SwaggerProvider.DesignTime/OperationCompiler.fs
@@ -49,12 +49,8 @@ type OperationCompiler (schema:SwaggerObject, defCompiler:DefinitionCompiler) =
             let customizeHttpRequest = Expr.PropertyGet(this, thisTy.GetProperty("CustomizeHttpRequest"))
 
             let basePath =
-                let scheme =
-                    match schema.Schemes with
-                    | [||]  -> "http" // Should use the scheme used to access the Swagger definition itself.
-                    | array -> array.[0]
                 let basePath = schema.BasePath
-                <@  scheme + "://" + (%%host : string) + basePath @>
+                <@  (%%host : string) + basePath @>
 
             // Fit headers into quotation
             let headers =

diff --git a/src/SwaggerProvider.DesignTime/SwaggerProviderConfig.fs b/src/SwaggerProvider.DesignTime/SwaggerProviderConfig.fs
@@ -70,9 +70,14 @@ module private SwaggerProviderConfig =
                         ty.AddXmlDoc ("Swagger.io Provider for " + schema.Host)
                         ty.HideObjectMethods <- true
 
+                        let protocol =
+                            match schema.Schemes with
+                            | [||]  -> "http" // Should use the scheme used to access the Swagger definition itself.
+                            | array -> array.[0]
                         let ctor =
                             ProvidedConstructor(
-                                [ProvidedParameter("host", typeof<string>, optionalValue = schema.Host)],
+                                [ProvidedParameter("host", typeof<string>,
+                                    optionalValue = sprintf "%s://%s" protocol schema.Host)],
                                 InvokeCode = fun args ->
                                     match args with
                                     | [] -> failwith "Generated constructors should always pass the instance as the first argument!"

diff --git a/tests/SwaggerProvider.ProviderTests/Swagger.PetStore.Tests.fs b/tests/SwaggerProvider.ProviderTests/Swagger.PetStore.Tests.fs
@@ -12,11 +12,11 @@ let apiKey = "special-key"
 
 [<Test>]
 let ``Test provided Host property`` () =
-    store.Host |> shouldEqual "petstore.swagger.io"
-    store.Host <- "test"
-    store.Host |> shouldEqual "test"
-    store.Host <- "petstore.swagger.io"
-    store.Host |> shouldEqual "petstore.swagger.io"
+    store.Host |> shouldEqual "http://petstore.swagger.io"
+    store.Host <- "https://petstore.swagger.io"
+    store.Host |> shouldEqual "https://petstore.swagger.io"
+    store.Host <- "http://petstore.swagger.io"
+    store.Host |> shouldEqual "http://petstore.swagger.io"
 
 [<Test>]
 let ``instantiate provided objects`` () =