From ad864261dd6d29959dfe86974154b0e111d7c84f Mon Sep 17 00:00:00 2001
From: geetikagupta16 <2011geetikagupta@gmail.com>
Date: Mon, 8 Jul 2019 13:25:20 +0530
Subject: [PATCH] 1. Added implementation for basic auth security definitions
 2. Added basic security definition for CatController test cases 3. Refactored
 test cases

---
 .../app/play/modules/swagger/PlayReader.java    |  6 ++++++
 .../test/PlayApiListingCacheSpec.scala          |  2 +-
 .../test/testdata/CatController.scala           | 17 ++++++++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/play-2.6/swagger-play2/app/play/modules/swagger/PlayReader.java b/play-2.6/swagger-play2/app/play/modules/swagger/PlayReader.java
index 3989468..3da59af 100644
--- a/play-2.6/swagger-play2/app/play/modules/swagger/PlayReader.java
+++ b/play-2.6/swagger-play2/app/play/modules/swagger/PlayReader.java
@@ -323,7 +323,13 @@ protected void readSwaggerConfig(Class<?> cls, SwaggerDefinition config) {
             swagger.addSecurityDefinition(apiKeyAuthConfig.key(), apiKeyAuthDefinition);
         }
 
+        for (BasicAuthDefinition basicAuthConfig:config.securityDefinition().basicAuthDefinitions()) {
 
+            io.swagger.models.auth.BasicAuthDefinition basicAuthDefinition = new io.swagger.models.auth.BasicAuthDefinition();
+            basicAuthDefinition.setDescription(basicAuthConfig.description());
+
+            swagger.addSecurityDefinition(basicAuthConfig.key(), basicAuthDefinition);
+        }
 
         for (SwaggerDefinition.Scheme scheme : config.schemes()) {
             if (scheme != SwaggerDefinition.Scheme.DEFAULT) {
diff --git a/play-2.6/swagger-play2/test/PlayApiListingCacheSpec.scala b/play-2.6/swagger-play2/test/PlayApiListingCacheSpec.scala
index 34bbd2f..0798296 100644
--- a/play-2.6/swagger-play2/test/PlayApiListingCacheSpec.scala
+++ b/play-2.6/swagger-play2/test/PlayApiListingCacheSpec.scala
@@ -87,7 +87,7 @@ PUT /api/dog/api/:id testdata.DogController.add0(id:String)
       swagger.get.getInfo.getTitle must beEqualTo(swaggerConfig.getTitle)
       swagger.get.getInfo.getTermsOfService must beEqualTo(swaggerConfig.getTermsOfServiceUrl)
       swagger.get.getInfo.getLicense.getName must beEqualTo(swaggerConfig.getLicense)
-      swagger.get.getSecurityDefinitions.size() must beEqualTo(2)
+      swagger.get.getSecurityDefinitions.size() must beEqualTo(3)
 
       val pathDoc = swagger.get.getPaths.get("/document/{settlementId}/files/{fileId}/accept")
       pathDoc.getOperations.size must beEqualTo(1)
diff --git a/play-2.6/swagger-play2/test/testdata/CatController.scala b/play-2.6/swagger-play2/test/testdata/CatController.scala
index 93190e8..c8e1de4 100644
--- a/play-2.6/swagger-play2/test/testdata/CatController.scala
+++ b/play-2.6/swagger-play2/test/testdata/CatController.scala
@@ -17,10 +17,21 @@ import play.api.mvc.{Action, Controller}
         authorizationUrl = "/authorize",
         scopes = Array(new Scope(name = "write_pets", description = "modify pets"))
       )
-    )
+    ),
+    basicAuthDefinitions = Array(new BasicAuthDefinition(key = "basic_auth"))
   )
 )
-@Api(value = "/apitest/cats", description = "play with cats")
+@Api(value = "/apitest/cats", description = "play with cats", authorizations = Array (
+  new Authorization(
+    value = "oauth2"
+  ),
+  new Authorization(
+    value = "api_key"
+  ),
+  new Authorization(
+    value = "basic_auth"
+  )
+))
 class CatController extends Controller {
 
   @ApiOperation(value = "addCat1",
@@ -76,7 +87,7 @@ class CatController extends Controller {
   @ApiOperation(value = "test issue #43",
     nickname = "test issue #43_nick",
     notes = "test issue #43_notes",
-    response = classOf[testdata.Cat],
+    response = classOf[Cat],
     responseContainer = "List",
     httpMethod = "GET")
   @ApiImplicitParams(Array(