Skip to content

Commit

Permalink
MTDSA-26303 Remove scope from individuals-disclosures-api (#129)
Browse files Browse the repository at this point in the history
  • Loading branch information
iyadi authored Sep 11, 2024
1 parent 5c0cdf2 commit 9106223
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 59 deletions.
9 changes: 1 addition & 8 deletions app/definition/ApiDefinition.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package definition

import play.api.libs.json.{Format, Json, OFormat}
import routing.Version
import uk.gov.hmrc.auth.core.ConfidenceLevel
import utils.enums.Enums

case class Parameter(name: String, required: Boolean = false)
Expand Down Expand Up @@ -77,13 +76,7 @@ object APIDefinition {
implicit val formatAPIDefinition: OFormat[APIDefinition] = Json.format[APIDefinition]
}

case class Scope(key: String, name: String, description: String, confidenceLevel: ConfidenceLevel)

object Scope {
implicit val formatScope: OFormat[Scope] = Json.format[Scope]
}

case class Definition(scopes: Seq[Scope], api: APIDefinition)
case class Definition( api: APIDefinition)

object Definition {
implicit val formatDefinition: OFormat[Definition] = Json.format[Definition]
Expand Down
16 changes: 0 additions & 16 deletions app/definition/ApiDefinitionFactory.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ import javax.inject.{Inject, Singleton}
@Singleton
class ApiDefinitionFactory @Inject() (appConfig: AppConfig) {

private val readScope = "read:self-assessment"
private val writeScope = "write:self-assessment"
private val logger: Logger = Logger(this.getClass)

lazy val confidenceLevel: ConfidenceLevel = {
Expand All @@ -38,20 +36,6 @@ class ApiDefinitionFactory @Inject() (appConfig: AppConfig) {

lazy val definition: Definition =
Definition(
scopes = Seq(
Scope(
key = readScope,
name = "View your Self Assessment information",
description = "Allow read access to self assessment data",
confidenceLevel = confidenceLevel
),
Scope(
key = writeScope,
name = "Change your Self Assessment information",
description = "Allow write access to self assessment data",
confidenceLevel = confidenceLevel
)
),
api = APIDefinition(
name = "Individuals Disclosures (MTD)",
description = "An API for providing individual disclosures data",
Expand Down
17 changes: 0 additions & 17 deletions it/config/DocumentationControllerISpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,9 @@ import scala.util.Try

class DocumentationControllerISpec extends IntegrationBaseSpec {

private val config = app.injector.instanceOf[AppConfig]
private val confidenceLevel = config.confidenceLevelConfig.confidenceLevel

private val apiDefinitionJson = Json.parse(
s"""
|{
| "scopes":[
| {
| "key":"read:self-assessment",
| "name":"View your Self Assessment information",
| "description":"Allow read access to self assessment data",
| "confidenceLevel": $confidenceLevel
| },
| {
| "key":"write:self-assessment",
| "name":"Change your Self Assessment information",
| "description":"Allow write access to self assessment data",
| "confidenceLevel": $confidenceLevel
| }
| ],
| "api":{
| "name":"Individuals Disclosures (MTD)",
| "description":"An API for providing individual disclosures data",
Expand Down
18 changes: 0 additions & 18 deletions test/definition/ApiDefinitionFactorySpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,8 @@ class ApiDefinitionFactorySpec extends UnitSpec {
MockedAppConfig.endpointsEnabled(Version1) returns true
MockedAppConfig.confidenceLevelConfig.returns(confidenceLevelConfig).anyNumberOfTimes()

val readScope: String = "read:self-assessment"
val writeScope: String = "write:self-assessment"
val confidenceLevel: ConfidenceLevel = if (confidenceLevelConfig.authValidationEnabled) ConfidenceLevel.L200 else ConfidenceLevel.L50

apiDefinitionFactory.definition shouldBe
Definition(
scopes = Seq(
Scope(
key = readScope,
name = "View your Self Assessment information",
description = "Allow read access to self assessment data",
confidenceLevel
),
Scope(
key = writeScope,
name = "Change your Self Assessment information",
description = "Allow write access to self assessment data",
confidenceLevel
)
),
api = APIDefinition(
name = "Individuals Disclosures (MTD)",
description = "An API for providing individual disclosures data",
Expand Down

0 comments on commit 9106223

Please sign in to comment.