Merge pull request #102 from hmrc/PLATUI-2108-remove-privacy-policy

PLATUI-2108 remove redundant PrivacyPage

README.md

@@ -2,7 +2,7 @@ help-frontend
 =============
 
 A frontend service which provides common help pages for services on tax.service.gov.uk,
-including cookie details, terms & conditions and privacy policy.
+including cookie details and terms & conditions.
 
 ## Adding details of new cookies
 To comply with GDPR and related regulations, we are required to document all cookies which

app/uk/gov/hmrc/helpfrontend/controllers/HelpController.scala

@@ -24,8 +24,7 @@ import uk.gov.hmrc.helpfrontend.views.html._
 import uk.gov.hmrc.play.bootstrap.frontend.controller.FrontendController
 
 import javax.inject.{Inject, Singleton}
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.Future
+import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Success, Try}
 
 @Singleton
@@ -34,9 +33,9 @@ class HelpController @Inject() (
   mcc: MessagesControllerComponents,
   termsAndConditionsPage: TermsAndConditionsPage,
   onlineServicesTermsPage: OnlineServicesTermsPage,
-  privacyPage: PrivacyPage,
   cookiesPage: CookiesPage
-) extends FrontendController(mcc)
+)(implicit val executionContext: ExecutionContext)
+    extends FrontendController(mcc)
     with I18nSupport {
 
   implicit val config: AppConfig = appConfig
@@ -52,10 +51,6 @@ class HelpController @Inject() (
     Ok(termsAndConditionsPage())
   }
 
-  val privacy: Action[AnyContent] = Action { implicit request =>
-    Ok(privacyPage())
-  }
-
   val cookies: Action[AnyContent] = Action { implicit request =>
     Redirect(
       appConfig.cookieSettingsUrl,

app/uk/gov/hmrc/helpfrontend/views/TermsAndConditionsPage.scala.html

@@ -21,7 +21,8 @@
 @this(layout: Layout, newTabLink: NewTabLink)
 
 @()(implicit request: Request[_], messages: Messages, appConfig: AppConfig)
-@privacyLink = { <a class="govuk-link" href="@routes.HelpController.privacy.url">@messages("help.links.privacy_policy.text.lower_case")</a> }
+@* Privacy policy is no longer part of this service, but is served via a redirect in MDTP frontend routes *@
+@privacyLink = { <a class="govuk-link" href="@{routes.HelpController.index.url}/privacy">@messages("help.links.privacy_policy.text.lower_case")</a> }
 @layout(pageTitle = Some(messages("help.terms_and_conditions.title"))) {
  <h1 class="govuk-heading-xl">@messages("help.terms_and_conditions.heading")</h1>
  <h2 class="govuk-heading-l" id="disclaimer">@messages("help.terms_and_conditions.disclaimer.heading")</h2>

conf/app.routes

@@ -4,7 +4,6 @@
 GET        /                                        uk.gov.hmrc.helpfrontend.controllers.HelpController.index
 GET        /cookies                                 uk.gov.hmrc.helpfrontend.controllers.HelpController.cookies
 GET        /cookie-details                          uk.gov.hmrc.helpfrontend.controllers.HelpController.cookieDetails
-GET        /privacy                                 uk.gov.hmrc.helpfrontend.controllers.HelpController.privacy
 GET        /terms-and-conditions/online-services    uk.gov.hmrc.helpfrontend.controllers.HelpController.onlineServicesTerms(lang: Option[String])
 GET        /terms-and-conditions                    uk.gov.hmrc.helpfrontend.controllers.HelpController.termsAndConditions
 

conf/messages

@@ -1,5 +1,3 @@
-help.links.hmrc_privacy_policy.text=HMRC’s Privacy Notice
-help.links.hmrc_privacy_policy.url=http://www.hmrc.gov.uk/about/privacy.htm
 help.links.online_security.text=Online security - making your online experience as secure as possible
 help.links.online_security.url=http://www.hmrc.gov.uk/security/index.htm
 help.links.copyright_notice.text=copyright notice
@@ -49,43 +47,6 @@ help.terms_and_conditions.governing_law.heading=Governing law
 help.terms_and_conditions.governing_law.paragraph.1=These terms and conditions shall be governed by and construed in accordance with the laws of England and Wales. Any dispute arising under these terms and conditions shall be subject to the exclusive jurisdiction of the courts of England and Wales.
 help.terms_and_conditions.updated.text=These Terms and Conditions were last updated April 2005.
 
-help.privacy_policy.title=Privacy policy – GOV.UK
-help.privacy_policy.heading=Privacy policy
-help.privacy_policy.personal_info.heading=Your personal information
-help.privacy_policy.personal_info.paragraph.1=This page explains what kind of personal information HM Revenue and Customs (HMRC) holds about you, how it’s protected and how you can find out about it.
-help.privacy_policy.personal_info.paragraph.2=You can also read
-help.privacy_policy.personal_info.hmrc_holds.heading=What personal information HMRC holds about you
-help.privacy_policy.personal_info.hmrc_holds.list_info=HMRC hold the following information about you:
-help.privacy_policy.personal_info.hmrc_holds.list_item.1=your personal details, eg name, email address and telephone number
-help.privacy_policy.personal_info.hmrc_holds.list_item.2=if you’ve signed up for Self Assessment email reminders
-help.privacy_policy.personal_info.hmrc_holds.list_item.3=your tax code and any company benefits you get
-help.privacy_policy.personal_info.hmrc_protection.heading=How HMRC protects your personal information
-help.privacy_policy.personal_info.hmrc_protection.text=HMRC complies with the Data Protection Act 1998.
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_info=HMRC will:
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_item.1=tell you why the information is needed, eg to report a change to a company benefit or capture your preference for paper or electronic Self Assessment notifications, reminders and associated letters
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_item.2=only ask for what’s needed
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_item.3=make sure nobody has access to it who shouldn’t
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_item.4=only keep the information for as long as it’s needed
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_item.5=not make it available for commercial use
-help.privacy_policy.personal_info.hmrc_protection.you.list_info=You must:
-help.privacy_policy.personal_info.hmrc_protection.you.list_item.1=give accurate information
-help.privacy_policy.personal_info.hmrc_protection.you.list_item.2=tell HMRC about any changes, eg to any company benefits from your employer, or the registered email address used for Self Assessment email reminders
-help.privacy_policy.personal_info.sharing.heading=Sharing your information
-help.privacy_policy.personal_info.sharing.paragraph.1=Your information can be shared with other organisations where this is needed to process your application.
-help.privacy_policy.personal_info.sharing.paragraph.2=There are some cases when your information can be shared for other reasons, eg to prevent crime.
-help.privacy_policy.personal_info.staff.heading=HMRC staff handling your information
-help.privacy_policy.personal_info.staff.paragraph.1=HMRC’s staff are trained in handling information and understand how important it is to protect personal and other sensitive information.
-help.privacy_policy.personal_info.asking_to_see.heading=Asking to see your information
-help.privacy_policy.personal_info.asking_to_see.paragraph.1=You can ask to see the personal information HMRC holds about you. To help locate the information you want and deal with your request more quickly, you should make your Data Protection Act request to the HMRC office that you’ve been dealing with. You should address your request to the ‘Data Protection Officer’.
-help.privacy_policy.personal_info.asking_to_see.paragraph.2=There is no charge.
-help.privacy_policy.personal_info.asking_to_see.paragraph.3=Sometimes HMRC can withhold information, eg to protect national security.
-help.privacy_policy.make_a_complaint.heading=How to make a complaint
-help.privacy_policy.make_a_complaint.paragraph.1=If you’re unhappy with the way HMRC handled your personal information, you can write to:
-help.privacy_policy.make_a_complaint.paragraph.2=The ‘Data Protection Officer’ at the HMRC office that you’ve been dealing with.
-help.privacy_policy.make_a_complaint.paragraph.3=You’ll get a confirmation that HMRC has received your complaint within 5 days and a full answer within 20 days. HMRC will tell you if there is going to be a delay.
-help.privacy_policy.make_a_complaint.paragraph.4=If you’re unhappy with the answer or need any advice,
-help.privacy_policy.make_a_complaint.paragraph.5=The ICO can investigate your complaint and take action against anyone who has misused personal data.
-
 help.cookies.title=Cookies – GOV.UK
 help.cookies.heading=Cookies
 help.cookies.info=Small files (known as ‘cookies’) are put onto your computer to collect information about how you browse the site.

conf/messages.cy

@@ -1,5 +1,3 @@
-help.links.hmrc_privacy_policy.text=Hysbysiad Preifatrwydd CThEM
-help.links.hmrc_privacy_policy.url=http://www.hmrc.gov.uk/about/privacy.htm
 help.links.online_security.text=Diogelwch ar-lein – gwneud eich profiad ar-lein mor ddiogel â phosibl
 help.links.online_security.url=http://www.hmrc.gov.uk/security/index.htm
 help.links.copyright_notice.text=hysbysiad hawlfraint
@@ -49,43 +47,6 @@ help.terms_and_conditions.governing_law.heading=Cyfraith sy’n rheoli
 help.terms_and_conditions.governing_law.paragraph.1=Bydd y telerau a’r amodau hyn yn cael eu rheoli gan gyfreithiau Cymru a Lloegr, a’u dehongli’n unol â nhw. Bydd unrhyw anghydfod sy’n codi o dan y telerau a’r amodau hyn yn dod o dan awdurdodaeth neilltuedig y llysoedd yng Nghymru a Lloegr.
 help.terms_and_conditions.updated.text=Cafodd y telerau a’r amodau hyn eu diweddaru ddiwethaf ym mis Ebrill 2005.
 
-help.privacy_policy.title=Polisi preifatrwydd – GOV.UK
-help.privacy_policy.heading=Polisi preifatrwydd
-help.privacy_policy.personal_info.heading=Eich gwybodaeth bersonol
-help.privacy_policy.personal_info.paragraph.1=Mae’r dudalen hon yn egluro pa fath o wybodaeth bersonol sydd ym meddiant CThEM amdanoch chi, sut y mae’n cael ei diogelu a sut y gallwch gael gwybod amdani.
-help.privacy_policy.personal_info.paragraph.2=Gallwch hefyd ddarllen
-help.privacy_policy.personal_info.hmrc_holds.heading=Pa wybodaeth bersonol sydd ym meddiant CThEM amdanoch chi
-help.privacy_policy.personal_info.hmrc_holds.list_info=Mae gan CThEM yr wybodaeth ganlynol amdanoch chi:
-help.privacy_policy.personal_info.hmrc_holds.list_item.1=eich manylion personol (er enghraifft, enw, cyfeiriad e-bost, rhif ffôn)
-help.privacy_policy.personal_info.hmrc_holds.list_item.2=a ydych wedi cofrestru i gael nodynnau atgoffa drwy e-bost am Hunanasesiad
-help.privacy_policy.personal_info.hmrc_holds.list_item.3=eich cod treth ac unrhyw fuddiannau cwmni yr ydych yn eu cael
-help.privacy_policy.personal_info.hmrc_protection.heading=Sut y mae CThEM yn diogelu eich gwybodaeth bersonol
-help.privacy_policy.personal_info.hmrc_protection.text=Mae CThEM yn cydymffurfio â Deddf Diogelu Data 1998.
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_info=Bydd CThEM yn:
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_item.1=rhoi gwybod i chi pam y mae angen yr wybodaeth (er enghraifft, i roi gwybod am newid i fuddiant cwmni neu i gofnodi eich dewisiadau ar gyfer cael negeseuon hysbysu ar bapur neu’n electronig am Hunanasesiad, nodynnau atgoffa a llythyrau cysylltiedig)
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_item.2=gofyn am yr hyn sydd ei angen yn unig
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_item.3=sicrhau mai dim ond y rheiny sydd â chaniatâd i’w defnyddio sy’n gwneud hynny
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_item.4=cadw’r wybodaeth am yr amser sydd ei hangen yn unig
-help.privacy_policy.personal_info.hmrc_protection.hmrc.list_item.5=sicrhau nad yw’r wybodaeth ar gael at ddefnydd masnachol
-help.privacy_policy.personal_info.hmrc_protection.you.list_info=Mae’n rhaid i chi:
-help.privacy_policy.personal_info.hmrc_protection.you.list_item.1=rhoi gwybodaeth gywir
-help.privacy_policy.personal_info.hmrc_protection.you.list_item.2=rhoi gwybod i CThEM am unrhyw newidiadau (er enghraifft, i unrhyw fuddiannau cwmni gan eich cyflogwr, neu i’r cyfeiriad e-bost cofrestredig a ddefnyddir i gael nodynnau atgoffa drwy e-bost am Hunanasesiad)
-help.privacy_policy.personal_info.sharing.heading=Rhannu eich gwybodaeth
-help.privacy_policy.personal_info.sharing.paragraph.1=Gellir rhannu eich gwybodaeth gyda sefydliadau eraill pan fo angen gwneud hyn i brosesu eich cais.
-help.privacy_policy.personal_info.sharing.paragraph.2=Mewn rhai achosion, gellir rhannu eich gwybodaeth at ddibenion eraill (er enghraifft, i atal trosedd).
-help.privacy_policy.personal_info.staff.heading=Staff CThEM yn trin eich gwybodaeth
-help.privacy_policy.personal_info.staff.paragraph.1=Mae staff CThEM wedi’u hyfforddi o ran trin gwybodaeth, ac maent yn deall pa mor bwysig yw diogelu gwybodaeth bersonol a gwybodaeth sensitif arall.
-help.privacy_policy.personal_info.asking_to_see.heading=Gofyn i weld eich gwybodaeth
-help.privacy_policy.personal_info.asking_to_see.paragraph.1=Gallwch ofyn i weld yr wybodaeth bersonol sydd ym meddiant CThEM amdanoch chi. Er mwyn helpu i ddod o hyd i’r wybodaeth yr ydych am ei gweld, ac i ddelio â’ch cais yn gyflymach, dylech anfon eich cais Deddf Diogelu Data i’r swyddfa CThEM yr ydych wedi bod yn delio â hi. Dylech gyfeirio eich cais at y ’Swyddog Diogelu Data’.
-help.privacy_policy.personal_info.asking_to_see.paragraph.2=Ni chodir tâl.
-help.privacy_policy.personal_info.asking_to_see.paragraph.3=Weithiau, gall CThEM gadw gwybodaeth yn ôl (er enghraifft, i warchod diogelwch gwladol).
-help.privacy_policy.make_a_complaint.heading=Sut i gwyno
-help.privacy_policy.make_a_complaint.paragraph.1=Os ydych yn anhapus gyda’r ffordd y mae CThEM wedi trin eich gwybodaeth bersonol, gallwch ysgrifennu at:
-help.privacy_policy.make_a_complaint.paragraph.2=Y ’Swyddog Diogelu Data’ yn y swyddfa CThEM yr ydych wedi bod yn delio â hi.
-help.privacy_policy.make_a_complaint.paragraph.3=Cewch gadarnhâd bod eich cwyn wedi dod i law CThEM cyn pen 5 diwrnod, ac ateb llawn cyn pen 20 diwrnod. Bydd CThEM yn rhoi gwybod i chi os bydd unrhyw oedi.
-help.privacy_policy.make_a_complaint.paragraph.4=Os ydych yn anhapus gyda’r ateb, neu os oes angen cyngor arnoch,
-help.privacy_policy.make_a_complaint.paragraph.5=Gall Swyddfa’r Comisiynydd Gwybodaeth ymchwilio i’ch cwyn a chymryd camau yn erbyn unrhyw un sydd wedi camddefnyddio data personol.
-
 help.cookies.title=Cwcis – GOV.UK
 help.cookies.heading=Cwcis
 help.cookies.info=Caiff ffeiliau bach (a elwir yn ‘cwcis’) eu gosod ar eich cyfrifiadur i gasglu gwybodaeth am sut yr ydych yn pori’r wefan.