#3, test: Fixed outdated expected results

zalando-stups · Mar 7, 2016 · f70ace4 · f70ace4
1 parent ddb1928
commit f70ace4
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 229 deletions.
diff --git a/compiler/src/test/resources/expected_results/security/basic.auth.api.yaml.scala b/compiler/src/test/resources/expected_results/security/basic.auth.api.yaml.scala
@@ -2,31 +2,27 @@ package basic.auth.api.yaml
 
 import play.api.mvc._
 import Security.AuthenticatedBuilder
-import de.zalando.play.controllers.PlayBodyParsing
+import de.zalando.play.controllers.{PlayBodyParsing, SwaggerSecurityExtractors}
+import SwaggerSecurityExtractors._
 
 trait SecurityExtractors {
-    def basicAuth_Extractor[User >: Any](header: RequestHeader): Option[User] = ???
-
+    def basicAuth_Extractor[User >: Any](header: RequestHeader): Option[User] =
+        basicAuth(header) { (username: String, password: String) =>
+            ???
+        }
+    implicit val unauthorizedContentWriter = ???
+    def unauthorizedContent(req: RequestHeader) = Results.Unauthorized(???)
 }
 
 
 trait BasicAuthApiYamlSecurity extends SecurityExtractors {
-    val unauthorizedContent = ???
-    val mimeType: String = ???
-
 
     object getSecureAction extends AuthenticatedBuilder(
         req => {
             val secureChecks = Seq(basicAuth_Extractor _)
-            val individualChecks = secureChecks.map(_.apply(req))
+            val individualChecks: Seq[Option[_]] = secureChecks.map(_.apply(req))
             individualChecks.find(_.isEmpty).getOrElse(Option(individualChecks.flatten))
-        },
-        onUnauthorized(mimeType, unauthorizedContent)
-    )
+        }, unauthorizedContent)
 
-
-    private def onUnauthorized[C](mimeType: String, content: C): RequestHeader => Result =_ => {
-        implicit val writeable = PlayBodyParsing.anyToWritable[C](mimeType)
-        Results.Unauthorized(content)
-    }
 }
+
diff --git a/compiler/src/test/resources/expected_results/security/full.petstore.api.yaml.scala b/compiler/src/test/resources/expected_results/security/full.petstore.api.yaml.scala
@@ -2,88 +2,75 @@ package full.petstore.api.yaml
 
 import play.api.mvc._
 import Security.AuthenticatedBuilder
-import de.zalando.play.controllers.PlayBodyParsing
+import de.zalando.play.controllers.{PlayBodyParsing, SwaggerSecurityExtractors}
+import SwaggerSecurityExtractors._
 import de.zalando.play.controllers.ArrayWrapper
 import org.joda.time.DateTime
 
 trait SecurityExtractors {
-    def api_key_Extractor[User >: Any](header: RequestHeader): Option[User] = ???
-    def petstore_auth_Extractor[User >: Any](header: RequestHeader): Option[User] = ???
-
+    def api_key_Extractor[User >: Any](header: RequestHeader): Option[User] =
+        headerApiKey("api_key")(header) { (apiKey: String) =>
+            ???
+        }
+    def petstore_auth_Extractor[User >: Any](header: RequestHeader): Option[User] =
+        oAuth(header) { _ =>
+            ???
+        }
+    implicit val unauthorizedContentWriter = ???
+    def unauthorizedContent(req: RequestHeader) = Results.Unauthorized(???)
 }
 
 
 trait FullPetstoreApiYamlSecurity extends SecurityExtractors {
-    val unauthorizedContent = ???
-    val mimeType: String = ???
-
 
     object findPetsByTagsSecureAction extends AuthenticatedBuilder(
         req => {
             val secureChecks = Seq(petstore_auth_Extractor _)
-            val individualChecks = secureChecks.map(_.apply(req))
+            val individualChecks: Seq[Option[_]] = secureChecks.map(_.apply(req))
             individualChecks.find(_.isEmpty).getOrElse(Option(individualChecks.flatten))
-        },
-        onUnauthorized(mimeType, unauthorizedContent)
-    )
+        }, unauthorizedContent)
 
     object updatePetSecureAction extends AuthenticatedBuilder(
         req => {
             val secureChecks = Seq(petstore_auth_Extractor _)
-            val individualChecks = secureChecks.map(_.apply(req))
+            val individualChecks: Seq[Option[_]] = secureChecks.map(_.apply(req))
             individualChecks.find(_.isEmpty).getOrElse(Option(individualChecks.flatten))
-        },
-        onUnauthorized(mimeType, unauthorizedContent)
-    )
+        }, unauthorizedContent)
 
     object addPetSecureAction extends AuthenticatedBuilder(
         req => {
             val secureChecks = Seq(petstore_auth_Extractor _)
-            val individualChecks = secureChecks.map(_.apply(req))
+            val individualChecks: Seq[Option[_]] = secureChecks.map(_.apply(req))
             individualChecks.find(_.isEmpty).getOrElse(Option(individualChecks.flatten))
-        },
-        onUnauthorized(mimeType, unauthorizedContent)
-    )
+        }, unauthorizedContent)
 
     object getPetByIdSecureAction extends AuthenticatedBuilder(
         req => {
             val secureChecks = Seq(api_key_Extractor _, petstore_auth_Extractor _)
-            val individualChecks = secureChecks.map(_.apply(req))
+            val individualChecks: Seq[Option[_]] = secureChecks.map(_.apply(req))
             individualChecks.find(_.isEmpty).getOrElse(Option(individualChecks.flatten))
-        },
-        onUnauthorized(mimeType, unauthorizedContent)
-    )
+        }, unauthorizedContent)
 
     object updatePetWithFormSecureAction extends AuthenticatedBuilder(
         req => {
             val secureChecks = Seq(petstore_auth_Extractor _)
-            val individualChecks = secureChecks.map(_.apply(req))
+            val individualChecks: Seq[Option[_]] = secureChecks.map(_.apply(req))
             individualChecks.find(_.isEmpty).getOrElse(Option(individualChecks.flatten))
-        },
-        onUnauthorized(mimeType, unauthorizedContent)
-    )
+        }, unauthorizedContent)
 
     object deletePetSecureAction extends AuthenticatedBuilder(
         req => {
             val secureChecks = Seq(petstore_auth_Extractor _)
-            val individualChecks = secureChecks.map(_.apply(req))
+            val individualChecks: Seq[Option[_]] = secureChecks.map(_.apply(req))
             individualChecks.find(_.isEmpty).getOrElse(Option(individualChecks.flatten))
-        },
-        onUnauthorized(mimeType, unauthorizedContent)
-    )
+        }, unauthorizedContent)
 
     object findPetsByStatusSecureAction extends AuthenticatedBuilder(
         req => {
             val secureChecks = Seq(petstore_auth_Extractor _)
-            val individualChecks = secureChecks.map(_.apply(req))
+            val individualChecks: Seq[Option[_]] = secureChecks.map(_.apply(req))
             individualChecks.find(_.isEmpty).getOrElse(Option(individualChecks.flatten))
-        },
-        onUnauthorized(mimeType, unauthorizedContent)
-    )
+        }, unauthorizedContent)
 
-
-    private def onUnauthorized[C](mimeType: String, content: C): RequestHeader => Result =_ => {
-        implicit val writeable = PlayBodyParsing.anyToWritable[C](mimeType)
-        Results.Unauthorized(content)
-    }
 }
+