Merge pull request #14 from hmrc/APIS-1172

APIS-1172 Remove endpoints from definition.json, remove redundant XML…
hmrc · Jan 3, 2017 · 8da1122 · 8da1122
2 parents d9cba0a + dabe7bf
commit 8da1122
Show file tree

Hide file tree

Showing 45 changed files with 52 additions and 222 deletions.
diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/config/APIAccessConfig.scala b/app/uk/gov/hmrc/openidconnect/userinfo/config/APIAccessConfig.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,4 +37,4 @@ case class APIAccessConfig(value: Option[Configuration]) {
       case None => Some(Seq())
     }
   }
-}
+}
diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/config/AppContext.scala b/app/uk/gov/hmrc/openidconnect/userinfo/config/AppContext.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/config/microserviceGlobal.scala b/app/uk/gov/hmrc/openidconnect/userinfo/config/microserviceGlobal.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,4 +98,3 @@ object MicroserviceGlobal extends DefaultMicroserviceGlobal with RunMode with Se
 
   override def onHandlerNotFound(request: RequestHeader): Future[Result] = Future.successful(NotFound(Json.toJson(ErrorNotFound)))
 }
-
diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/config/microserviceWiring.scala b/app/uk/gov/hmrc/openidconnect/userinfo/config/microserviceWiring.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/connectors/AuthConnector.scala b/app/uk/gov/hmrc/openidconnect/userinfo/connectors/AuthConnector.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/connectors/DesConnector.scala b/app/uk/gov/hmrc/openidconnect/userinfo/connectors/DesConnector.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...uk/gov/hmrc/openidconnect/userinfo/connectors/ThirdPartyDelegatedAuthorityConnector.scala b/...uk/gov/hmrc/openidconnect/userinfo/connectors/ThirdPartyDelegatedAuthorityConnector.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/controllers/DocumentationController.scala b/app/uk/gov/hmrc/openidconnect/userinfo/controllers/DocumentationController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,13 +33,6 @@ class DocumentationController(errorHandler:HttpErrorHandler) extends uk.gov.hmrc
     Ok(txt.definition(buildAccess())).withHeaders("Content-Type" -> "application/json")
   }
 
-  override def documentation(version: String, endpointName: String): Action[AnyContent] = Action {
-    Documentation.findDocumentation(endpointName, version) match {
-      case Some(docs) => Ok(docs).withHeaders("Content-Type" -> "application/xml")
-      case None => NotFound
-    }
-  }
-
   def ramlDocs(version: String, filename: String): Action[AnyContent] = {
     Assets.at(s"/public/api/conf/$version", filename)
   }
@@ -51,24 +44,3 @@ class DocumentationController(errorHandler:HttpErrorHandler) extends uk.gov.hmrc
 }
 
 object DocumentationController extends DocumentationController(LazyHttpErrorHandler)
-
-object Documentation {
-  val version1_0 = "1.0"
-  val getUserInfo = "Get user info"
-
-  def findDocumentation(endpointName: String, version: String) = applyTemplate(endpointName, version)(userInfo)
-
-  def applyTemplate(apiName: String, version: String)(info: UserInfo): Option[Xml] = {
-    (apiName, version) match {
-      case (`getUserInfo`, `version1_0`) => Some(xml.getUserInfo(info))
-      case _ => None
-    }
-  }
-
-  def userInfo = {
-    UserInfoGenerator.userInfo.sample match {
-      case Some(userInfo) => userInfo
-      case None => throw new RuntimeException("Failed to generate dynamic UserInfo")
-    }
-  }
-}
diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/controllers/ErrorResponses.scala b/app/uk/gov/hmrc/openidconnect/userinfo/controllers/ErrorResponses.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/controllers/UserInfoController.scala b/app/uk/gov/hmrc/openidconnect/userinfo/controllers/UserInfoController.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/controllers/package.scala b/app/uk/gov/hmrc/openidconnect/userinfo/controllers/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/data/UserInfoGenerator.scala b/app/uk/gov/hmrc/openidconnect/userinfo/data/UserInfoGenerator.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/domain/APIDefinition.scala b/app/uk/gov/hmrc/openidconnect/userinfo/domain/APIDefinition.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 
 package uk.gov.hmrc.openidconnect.userinfo.domain
 
-case class APIAccess(`type`: String, whitelistedApplicationIds: Option[Seq[String]])
+case class APIAccess(`type`: String, whitelistedApplicationIds: Option[Seq[String]])
diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/domain/NinoNotFoundException.scala b/app/uk/gov/hmrc/openidconnect/userinfo/domain/NinoNotFoundException.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/domain/UserInfo.scala b/app/uk/gov/hmrc/openidconnect/userinfo/domain/UserInfo.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/domain/package.scala b/app/uk/gov/hmrc/openidconnect/userinfo/domain/package.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/filters/MicroserviceAuthFilter.scala b/app/uk/gov/hmrc/openidconnect/userinfo/filters/MicroserviceAuthFilter.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -59,4 +59,4 @@ trait MicroserviceAuthFilter extends Filter {
 object MicroserviceAuthFilter extends MicroserviceAuthFilter with MicroserviceFilterSupport {
   override lazy val authService = AuthService
   override lazy val authParamsConfig = AuthParamsControllerConfiguration
-}
+}
diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/services/AuthService.scala b/app/uk/gov/hmrc/openidconnect/userinfo/services/AuthService.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/services/CountryService.scala b/app/uk/gov/hmrc/openidconnect/userinfo/services/CountryService.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/services/UserInfoService.scala b/app/uk/gov/hmrc/openidconnect/userinfo/services/UserInfoService.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/services/UserInfoTransformer.scala b/app/uk/gov/hmrc/openidconnect/userinfo/services/UserInfoTransformer.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/views/definition.scala.txt b/app/uk/gov/hmrc/openidconnect/userinfo/views/definition.scala.txt
@@ -37,17 +37,7 @@
       {
         "version":"1.0",
         "status":"PUBLISHED",
-        "access" : @Json.toJson(access),
-        "endpoints":[
-          {
-            "uriPattern":"/",
-            "endpointName":"Get user info",
-            "method":"GET",
-            "authType":"USER",
-            "throttlingTier":"UNLIMITED",
-            "scope":"openid"
-          }
-        ]
+        "access" : @Json.toJson(access)
       }
     ]
   }

diff --git a/app/uk/gov/hmrc/openidconnect/userinfo/views/getUserInfo.scala.xml b/app/uk/gov/hmrc/openidconnect/userinfo/views/getUserInfo.scala.xml
diff --git a/conf/application.conf b/conf/application.conf
@@ -1,4 +1,4 @@
-# Copyright 2016 HM Revenue & Customs
+# Copyright 2017 HM Revenue & Customs
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -303,4 +303,4 @@ Prod {
             }
         }
     }
-}
+}
diff --git a/conf/definition.routes b/conf/definition.routes
@@ -1,4 +1,2 @@
 GET  /api/definition                             uk.gov.hmrc.openidconnect.userinfo.controllers.DocumentationController.definition()
-GET  /api/documentation/:version/:endpointName   uk.gov.hmrc.openidconnect.userinfo.controllers.DocumentationController.documentation(version, endpointName)
 GET  /api/conf/:version/*filename                uk.gov.hmrc.openidconnect.userinfo.controllers.DocumentationController.ramlDocs(version, filename)
-
diff --git a/test/it/BaseFeatureSpec.scala b/test/it/BaseFeatureSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 HM Revenue & Customs
+ * Copyright 2017 HM Revenue & Customs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.