govuk_personalisation 0.14.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bcf8d368f8b0a1b1262d714d53eca96638270d12d9a064bb91439d384b42eb0
-  data.tar.gz: 277a7a1ca1a96370676bbce2548a85a033a73b8c49e1bcae6ca3f56671e45c6f
+  metadata.gz: 871e48e51f4a9c01f79d171f71e6fe5658cd2244383646a4067fb5f6c71a0dc5
+  data.tar.gz: 46945612a7a4c42d5c8e2b9cb92a6d080fd2c49456414045b8b9bd5e9bd98792
 SHA512:
-  metadata.gz: 1cd009d3a20051533961e3c581b178ffde8def6bf2e29fc4b2bde9745626abed38aa8153c8a99153401dac9b2d72d1cfcdfe97cad465f01f512bd8367d018167
-  data.tar.gz: 5c68fbff6fdbb178bb13e07e9002ba934a78e68a40e309de241495cd6eee265ab6ca5be0a8fe0f9bda39aa465e069baac407a433d72b0174d18feb6dfa30c65c
+  metadata.gz: 4fa1377a4de65067c052d465c85d98c62b4b2e97ad42957661608207977cd803ac6f9dcdc139874e847ce0c94d047479f30767303d7013361c245f4caf2a2b40
+  data.tar.gz: 7e08d033229d35b8a5009900aeff3f156ce3591285aed1b06d6b3e33609c9e5ca3d9babeb6142f797e78c80760d80e21b76bf4a2f29fd0371a9ec7435b68d1b3

data/.github/workflows/ci.yml

@@ -1,6 +1,27 @@
 on: [push, pull_request]
 
 jobs:
+  snyk-security:
+    name: SNYK security analysis
+    uses: alphagov/govuk-infrastructure/.github/workflows/snyk-security.yml@main
+    with:
+      skip_sca: true
+    secrets: inherit
+    permissions:
+      contents: read
+      security-events: write
+      actions: read
+  
+  codeql-sast:
+    name: CodeQL SAST scan
+    uses: alphagov/govuk-infrastructure/.github/workflows/codeql-analysis.yml@main
+    permissions:
+      security-events: write
+
+  dependency-review:
+    name: Dependency Review scan
+    uses: alphagov/govuk-infrastructure/.github/workflows/dependency-review.yml@main
+  
   # This matrix job runs the test suite against multiple Ruby versions
   test_matrix:
     strategy:
@@ -10,7 +31,7 @@ jobs:
         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/.govuk_dependabot_merger.yml

@@ -0,0 +1,6 @@
+api_version: 1
+auto_merge:
+  - dependency: rubocop-govuk
+    allowed_semver_bumps:
+      - patch
+      - minor

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.16.0
+
+- Update minimum required Ruby version ([#67](https://github.com/alphagov/govuk_personalisation/pull/67))
+- Map our environments correctly to DI/One Login's environments. ([#63](https://github.com/alphagov/govuk_personalisation/pull/63))
+
+# 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))

data/govuk_personalisation.gemspec

@@ -33,5 +33,6 @@ 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.11.0"
+  spec.add_development_dependency "rubocop-govuk", "4.14.0"
+  spec.add_development_dependency "simplecov"
 end

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,20 +100,25 @@ 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
-    if digital_identity_environment
-      "home.#{digital_identity_environment}.account.gov.uk"
+  def self.digital_identity_domain(host)
+    if ["production", nil].include?(digital_identity_environment)
+      "#{host}.account.gov.uk"
     else
-      "home.account.gov.uk"
+      "#{host}.#{digital_identity_environment}.account.gov.uk"
     end
   end
 
+  # DI/One Login's environments don't map exactly to ours - their staging points to
+  # our integration and vice versa. So translate here.
+  DIGITAL_IDENTITY_ENVIRONMENT_MAP = {
+    "production" => "production",
+    "staging" => "integration",
+    "integration" => "staging",
+  }.freeze
+
   def self.digital_identity_environment
     return ENV["DIGITAL_IDENTITY_ENVIRONMENT"] if ENV["DIGITAL_IDENTITY_ENVIRONMENT"]
 
-    ENV["GOVUK_ENVIRONMENT"] == "production" ? nil : ENV["GOVUK_ENVIRONMENT"]
+    DIGITAL_IDENTITY_ENVIRONMENT_MAP[ENV["GOVUK_ENVIRONMENT"]] || ENV["GOVUK_ENVIRONMENT"]
   end
 end

data/lib/govuk_personalisation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_personalisation
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-10 00:00:00.000000000 Z
+date: 2024-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plek
@@ -120,14 +120,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.11.0
+        version: 4.14.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem to hold shared code which other GOV.UK apps will use to implement
   accounts-related functionality.
 email:
@@ -139,6 +153,7 @@ files:
 - ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".govuk_dependabot_merger.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
@@ -177,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.15
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: A gem to hold shared code which other GOV.UK apps will use to implement accounts-related