govuk_personalisation 0.9.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c790c79fa0ba26b2b84efecd07532446c2497cbfd874586526b65f589ba715ca
-  data.tar.gz: 899f016d1a906e2fe2893b62da8999e33edc9b7c8ae6df9d6caee6ce9c14aa28
+  metadata.gz: 5ba20f9a3fd76c87998ab8d9739285c31273622fdf9f7692deef3d817aa351aa
+  data.tar.gz: a107bccb957e141838450837cb95c6677889c37c3418eaea5907408beb596afa
 SHA512:
-  metadata.gz: '0398288ee33c9a21186c833fec51049b38f49e62b7d6e649970599ffae8ae7a3a0096100fc17b325b1f63698030dc7c31c2a2350206b3af65c0bd3fb46e36bd8'
-  data.tar.gz: 2ca84334520a9521f79ca1e49a1a3f36af4e1fc0bccaa5c855f9f4b19628c6909a68af91c3388266039fec8afc2ce8c1883bd8be8aecba36567dd6d3a51c5fe0
+  metadata.gz: 8146a1c9c9e6db27a9066a79a55956888c814e2cad26c474bc76a33f66b8d8b395eb87eca8e29116526e928bbe672e89784b033c62e9d09858f4db8a231cdb0a
+  data.tar.gz: e93d8f2a38ff9c552691f123ad90525f1a737e792d9caa3692c0b2eb92a95712791868bae87b322bb463a27d7c6cf844a37a47fffa5a284a437b8d61df6f5634

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# 0.11.1
+
+- Change sign in path to `/account` ([#28](https://github.com/alphagov/govuk_personalisation/pull/28))
+
+# 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))
+
+# 0.10.0
+- Add `url_with_analytics` helper to allow apps to access the URL used for `redirect_with_analytics` ([#22](https://github.com/alphagov/govuk_personalisation/pull/22))
+
 # 0.9.0
 - Add `redirect_with_analytics` helper, attaches _ga and cookie_consent values from existing params to redirects. ([#19](https://github.com/alphagov/govuk_personalisation/pull/19))
 - Add `GovukPersonalisation::Redirect` and `.build_url` helper to construct valid URLs with additional parameters. ([#19](https://github.com/alphagov/govuk_personalisation/pull/19))

data/lib/govuk_personalisation/controller_concern.rb

@@ -83,6 +83,8 @@ module GovukPersonalisation
       session_with_flash = GovukPersonalisation::Flash.encode_session(@account_session_header, @new_account_flash.keys)
 
       response.headers[ACCOUNT_SESSION_HEADER_NAME] = session_with_flash
+      response.headers["Cache-Control"] = "no-store"
+
       if Rails.env.development?
         cookies[ACCOUNT_SESSION_DEV_COOKIE_NAME] = {
           value: session_with_flash,
@@ -95,7 +97,10 @@ module GovukPersonalisation
     # header.
     def logout!
       response.headers[ACCOUNT_END_SESSION_HEADER_NAME] = "1"
+      response.headers["Cache-Control"] = "no-store"
+
       @account_session_header = nil
+
       if Rails.env.development?
         cookies[ACCOUNT_SESSION_DEV_COOKIE_NAME] = {
           value: "",
@@ -131,7 +136,15 @@ module GovukPersonalisation
     #
     # @param url [String] The URL to redirect to
     def redirect_with_analytics(url)
-      redirect_to GovukPersonalisation::Redirect.build_url(url, params.permit(:_ga, :cookie_consent).to_h)
+      redirect_to url_with_analytics(url)
+    end
+
+    # Build a URL adding parameters necessary for cross-domain analytics
+    # and cookie consent
+    #
+    # @param url [String] The URL
+    def url_with_analytics(url)
+      GovukPersonalisation::Redirect.build_url(url, params.permit(:_ga, :cookie_consent).to_h)
     end
   end
 end

data/lib/govuk_personalisation/urls.rb

@@ -5,7 +5,7 @@ module GovukPersonalisation::Urls
   #
   # @return [String] the URL
   def self.sign_in
-    find_govuk_url(var: "SIGN_IN", application: "frontend", path: "/sign-in/redirect")
+    find_govuk_url(var: "SIGN_IN", application: "frontend", path: "/account")
   end
 
   # Find the GOV.UK URL for the "sign out" page
@@ -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.9.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_personalisation
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.11.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek