govuk_personalisation 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6aba4a93adaa9cf995e9933fb12276d84e8d0e3011c17ec4689a63a5cf8f4a0
-  data.tar.gz: 97b6c20b940afef6fb31671187b619b89f58222922b7b2b8c9ae6233d2dcec0e
+  metadata.gz: 72e80d8e2a45cc9b258a963263e91468d69372505d0452205393eb735cf569fa
+  data.tar.gz: 6cb230637923f915ef5117b812f6790ba244a07c45a29823ad52c51e6ae33f03
 SHA512:
-  metadata.gz: f431ca7c35aca6f808d968d82eca6420ce0fab31c00766ec39226284790c7a46f8a49bf2d1dda60784853c85a8f836972d628b21ee7a77d213b6d5d0090a1715
-  data.tar.gz: 43eb1db4b1c9cbd2c7a44d8610dc22f33e0ddd37e844038d5b0ca32140cc9c42f0d9519be395d5f247df9963ce17736b106dddd05de0a8f34e1d30366561c3ec
+  metadata.gz: f527d1acb925660f6b975ceab7bfc87b188578ddecef6e5af15dd340128daed02a84d2c5d042248c79a8b9c9e007a2238c7242fe41cf1dbd4070bea481230eca
+  data.tar.gz: 67b6f46b435a2e9480515cd41f98e6381286ede5d0f2c16d97e4f30f248dd52657d2bd95de056515c1c2a3ec5e24a9f51076cf71cdad285d41bdf5d3fb0e9d2a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.11.0
+
+- Remove references to the account manager from the URLs module ([#26](https://github.com/alphagov/govuk_personalisation/pull/26))
+
 # 0.10.1
 
 - Make session-change events uncacheable ([#24](https://github.com/alphagov/govuk_personalisation/pull/24))

data/lib/govuk_personalisation/urls.rb

@@ -26,21 +26,21 @@ module GovukPersonalisation::Urls
   #
   # @return [String] the URL
   def self.manage
-    find_external_url(var: "MANAGE", application: "account-manager", path: "/account/manage")
+    find_external_url(var: "MANAGE", url: "https://#{digital_identity_domain}?link=manage-account")
   end
 
   # Find the external URL for the "security" page
   #
   # @return [String] the URL
   def self.security
-    find_external_url(var: "SECURITY", application: "account-manager", path: "/account/security")
+    find_external_url(var: "SECURITY", url: "https://#{digital_identity_domain}?link=security-privacy")
   end
 
   # Find the external URL for the "feedback" page
   #
   # @return [String] the URL
   def self.feedback
-    find_external_url(var: "FEEDBACK", application: "account-manager", path: "/feedback")
+    find_external_url(var: "FEEDBACK", url: "https://signin.account.gov.uk/support")
   end
 
   # Finds a URL on www.gov.uk.  This method is used so we can have
@@ -76,12 +76,23 @@ module GovukPersonalisation::Urls
   #
   # Otherwise, an application URL generated by Plek will be returned.
   #
-  # @param var         [String] the name of the variable to look up
-  # @param application [String] the name of the frontend application, passed to Plek (if the env var is set, this is ignored)
-  # @param path        [String] the path to use (if the env var is set this is ignored)
+  # @param var [String] the name of the variable to look up
+  # @param url [String] the url to default to if there is no environment variable set
   #
   # @return [String] the URL
-  def self.find_external_url(var:, application:, path:)
-    ENV.fetch("GOVUK_PERSONALISATION_#{var}_URI", "#{Plek.find(application)}#{path}")
+  def self.find_external_url(var:, url:)
+    ENV.fetch("GOVUK_PERSONALISATION_#{var}_URI", url)
+  end
+
+  # Gets the Digital Identity domain for the current environment
+  #
+  # @return [String] the domain
+  def self.digital_identity_domain
+    environment = ENV["DIGITAL_IDENTITY_ENVIRONMENT"]
+    if environment
+      "#{environment}.account.gov.uk"
+    else
+      "account.gov.uk"
+    end
   end
 end

data/lib/govuk_personalisation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GovukPersonalisation
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_personalisation
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek