govuk_personalisation 0.13.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a5a2220ec7824bf32bffa97e4965169731f346303b2712908b4160587c85b1f
-  data.tar.gz: 9129d15308675709673f548c3df9d8be6c9d72a076395ef1817e563eb7482572
+  metadata.gz: ca12ab61e875bd39261e990560cd16d8957b15c2c4f16d9ffef0a2404cee91b7
+  data.tar.gz: e5826ce6cbd13aa29e6861ff15bd69d173313b73f73581e6df15ae8cc775157d
 SHA512:
-  metadata.gz: a1ad6932786c4569c68280bab4e0e02a74b0e0afae6e504028c94a6877273ae9c8df75c7de869fcba9eb3502067e2acf724fb72be17a00e04c5c7ac6a03d46a7
-  data.tar.gz: bd8db5c53d6f7526bb10f3ae8ca0240500932dfa6b91d361c3ae79ede0055dbcfc0c2faf7c87bd0f5fbe51b9dfecea307c176e7b004800f4db94c7ed5b50e214
+  metadata.gz: 0caf472a2188909e45cbe7720451dc224b9d809a9cf2983d8cb0f10111fd936fd164bbacafefb3c4480565f24d0ad36a87cd740ea5575076283a8ea688b9e307
+  data.tar.gz: 678e921c691e474ea7a87b7d1eb96061bceba614c6184c38731caf70e379e6877fb4cf58f5339a44316a616bf596e2634b7df595c93c968b4cd14271898a547f

data/.github/workflows/ci.yml

@@ -7,10 +7,10 @@ jobs:
       fail-fast: false
       matrix:
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
-        ruby: [2.7, '3.0', 3.1, 3.2]
+        ruby: ['3.0', 3.1, 3.2]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/.ruby-version

@@ -1 +1 @@
-2.7.6
+3.0.5

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.15.0
+
+- Update URLs and method names for One Login ([#56](https://github.com/alphagov/govuk_personalisation/pull/56))
+- Note that this release deprecates the your_account, manage, security, and feedback methods of GovukPersonalisation::Urls, but retains them as aliases to allow easier transition. They will be removed in a later release.
+
+# 0.14.0
+
+- Use GOVUK_ENVIRONMENT as a backstop for DIGITAL_IDENTITY_ENVIRONMENT ([#53](https://github.com/alphagov/govuk_personalisation/pull/53))
+- Drop Ruby 2.7 support ([#51](https://github.com/alphagov/govuk_personalisation/pull/51))
+
 # 0.13.0
 
 - Minimum Ruby version is now 2.7.6 ([#39](https://github.com/alphagov/govuk_personalisation/pull/39))

data/govuk_personalisation.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.description   = "A gem to hold shared code which other GOV.UK apps will use to implement accounts-related functionality."
   spec.homepage      = "https://github.com/alphagov/govuk_personalisation"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.6")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0")
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "rubocop-govuk", "4.9.0"
+  spec.add_development_dependency "rubocop-govuk", "4.12.0"
 end

data/lib/govuk_personalisation/flash.rb

@@ -3,7 +3,7 @@
 module GovukPersonalisation::Flash
   SESSION_SEPARATOR = "$$"
   MESSAGE_SEPARATOR = ","
-  MESSAGE_REGEX = /\A[a-zA-Z0-9._-]+\z/.freeze
+  MESSAGE_REGEX = /\A[a-zA-Z0-9._-]+\z/
 
   # Splits the session header into a session value (suitable for using
   # in account-api calls) and flash messages.

data/lib/govuk_personalisation/urls.rb

@@ -22,32 +22,41 @@ module GovukPersonalisation::Urls
     find_govuk_url(var: "SIGN_OUT", application: "email-alert-frontend", path: "/email/manage")
   end
 
-  # Find the external URL for the "your account" page
+  # Find the external URL for the "your services" page on One Login
   #
   # @return [String] the URL
+  def self.one_login_your_services
+    find_external_url(var: "ONE_LOGIN_YOUR_SERVICES", url: "https://#{digital_identity_domain('home')}")
+  end
+
   def self.your_account
-    find_external_url(var: "YOUR_ACCOUNT", url: "https://#{digital_identity_domain}")
+    one_login_your_services
   end
 
-  # Find the external URL for the "manage" page
+  # Find the external URL for the "security" page on One Login
   #
   # @return [String] the URL
+  def self.one_login_security
+    find_external_url(var: "ONE_LOGIN_SECURITY", url: "https://#{digital_identity_domain('home')}/security")
+  end
+
   def self.manage
-    find_external_url(var: "MANAGE", url: "https://#{digital_identity_domain}?link=manage-account")
+    one_login_security
   end
 
-  # Find the external URL for the "security" page
-  #
-  # @return [String] the URL
   def self.security
-    find_external_url(var: "SECURITY", url: "https://#{digital_identity_domain}?link=security-privacy")
+    one_login_security
   end
 
-  # Find the external URL for the "feedback" page
+  # Find the external URL for the "feedback" page on One Login
   #
   # @return [String] the URL
+  def self.one_login_feedback
+    find_external_url(var: "ONE_LOGIN_FEEDBACK", url: "https://#{digital_identity_domain('signin')}/support?supportType=PUBLIC")
+  end
+
   def self.feedback
-    find_external_url(var: "FEEDBACK", url: "https://signin.account.gov.uk/support")
+    one_login_feedback
   end
 
   # Finds a URL on www.gov.uk.  This method is used so we can have
@@ -91,15 +100,17 @@ module GovukPersonalisation::Urls
     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
-      "home.#{environment}.account.gov.uk"
+  def self.digital_identity_domain(host)
+    if digital_identity_environment
+      "#{host}.#{digital_identity_environment}.account.gov.uk"
     else
-      "home.account.gov.uk"
+      "#{host}.account.gov.uk"
     end
   end
+
+  def self.digital_identity_environment
+    return ENV["DIGITAL_IDENTITY_ENVIRONMENT"] if ENV["DIGITAL_IDENTITY_ENVIRONMENT"]
+
+    ENV["GOVUK_ENVIRONMENT"] == "production" ? nil : ENV["GOVUK_ENVIRONMENT"]
+  end
 end

data/lib/govuk_personalisation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_personalisation
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.15.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.9.0
+        version: 4.12.0
 description: A gem to hold shared code which other GOV.UK apps will use to implement
   accounts-related functionality.
 email:
@@ -170,14 +170,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.6
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: A gem to hold shared code which other GOV.UK apps will use to implement accounts-related