govuk_personalisation 0.10.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d966869deca66c3fbea1730d7b2478ca77bc019d499b824269a9456eeffa82d9
-  data.tar.gz: fc4735bde8c3077c1e8e2795e4deb496b2c7816bfe6006057b0c8e59ceb27196
+  metadata.gz: 3027b7bc4c484759eed32262b7988b2a6f8953b57634d35174002881dedbd806
+  data.tar.gz: f504185b2dee2d3c4cd0c9627a54872c4cb10744ea19bb96a9ceea22bed1cd75
 SHA512:
-  metadata.gz: 826c826f13b08be03d467655bab27bab323ec6b8823bdddc25b52f0d20906344ee4ece5c95a31bf7726e2aabdea0511b46934b5a37137d7e8788d496b570395f
-  data.tar.gz: a74b510d5f549e3d0cc9df6b533763d5ac9a3c9211e424f49372b705acb9bb64229f35794f0aadaeee5492d8108040a5780acdc9a8e4d5c7bb4cf54a88b4b979
+  metadata.gz: 83785705cddaee76e6804d2d4f64cfb2cedc1ac5dbeab91e5f07e982e4fd1a1ffbcbc0d8f56e26afb9551298be122aed9cc36a42b58690b405440ed86f4c0dd2
+  data.tar.gz: 39f5a7677091f18583ebc374541af421a61f70968cedd4954ba7ac69444d1758a394430c80308ab38976a9633de2e71406b9221e446e3950853b896b267ec88f

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 0.11.2
+
+- Add support for Rails 7 ([#33](https://github.com/alphagov/govuk_personalisation/pull/33))
+
+# 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))
 

data/govuk_personalisation.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
 
   spec.add_dependency "plek", ">= 1.9.0"
-  spec.add_dependency "rails", "~> 6"
+  spec.add_dependency "rails", ">= 6", "< 8"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "climate_control"

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: "",
@@ -130,8 +135,8 @@ module GovukPersonalisation
     # and cookie consent
     #
     # @param url [String] The URL to redirect to
-    def redirect_with_analytics(url)
-      redirect_to url_with_analytics(url)
+    def redirect_with_analytics(url, allow_other_host: true)
+      redirect_to(url_with_analytics(url), allow_other_host: allow_other_host)
     end
 
     # Build a URL adding parameters necessary for cross-domain analytics

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.10.0"
+  VERSION = "0.11.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_personalisation
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.2
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -28,16 +28,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement