gds-api-adapters 71.3.0 → 71.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea739e39026f239c010c4810ba88c6c0f8f77a0fb2375e24c9026cd2a388465e
-  data.tar.gz: c18db19adc96aab183ab99edfc30db4691d7ab5d055def3fbcfc406f6b16c1a8
+  metadata.gz: 7748e3505408224466ce191efa83ee616ae6bd602f3cec8760fedb09aaaed859
+  data.tar.gz: c4e7b3e9f9af207d97e5a62e776f6de9dfbea8791e20636e64740e362a8a0457
 SHA512:
-  metadata.gz: 1b03304634769b69d8549664720619081836366bacb76948e19275751b0f4d2482f0adf14977b82569e4e265b081e590c338f9a2167e78170bab9af0f8c27a68
-  data.tar.gz: b5dfc1690a1e783e67bf350d2d5fb8d66c9aa0eaaa758bdbb7be381cd34a76780de465c9bfc78b539c9712ba3e6b586788f7139edab07aa8fab7ea2d6ae974f9
+  metadata.gz: ebd5592b71e1ccea18a2578e52307227689036b8bbd35daf20c7cd0bf7eb67bd85af32fbe8a016e010bdecd1b28e37a4bdeebc3513b9d4f17a0178078828c1db
+  data.tar.gz: dd41b35ed23b58a7049c5b3327225781a85fa4396f278d3ef064909e453be3b898272504d82beff32c0a06c71e620956d9fa9d0984b04e1be31bd5ed40c00bb5

data/lib/gds_api/account_api.rb

@@ -54,6 +54,24 @@ class GdsApi::AccountApi < GdsApi::Base
     get_json("#{endpoint}/api/user", auth_headers(govuk_account_session))
   end
 
+  # Update the user record with privileged information from the auth service.  Only the auth service will call this.
+  #
+  # @param [String] subject_identifier The identifier of the user, shared between the auth service and GOV.UK.
+  # @param [String, nil] email The user's current
+  # @param [Boolean, nil] email_verified Whether the user's current email address is verified
+  # @param [Boolean, nil] has_unconfirmed_email Whether the user has a new, pending, email address
+  #
+  # @return [Hash] The user's subject identifier and email attributes
+  def update_user_by_subject_identifier(subject_identifier:, email: nil, email_verified: nil, has_unconfirmed_email: nil)
+    params = {
+      email: email,
+      email_verified: email_verified,
+      has_unconfirmed_email: has_unconfirmed_email,
+    }.compact
+
+    patch_json("#{endpoint}/api/oidc-users/#{subject_identifier}", params)
+  end
+
   # Check if a user has an email subscription for the Transition Checker
   #
   # @param [String] govuk_account_session Value of the session header
@@ -105,13 +123,42 @@ class GdsApi::AccountApi < GdsApi::Base
     get_json("#{endpoint}/api/attributes/names?#{querystring}", auth_headers(govuk_account_session))
   end
 
+  # Get the details of an account-linked email subscription.
+  #
+  # @param [String] name Name of the subscription
+  # @param [String] govuk_account_session Value of the session header
+  #
+  # @return [Hash] Details of the subscription, if it exists.
+  def get_email_subscription(name:, govuk_account_session:)
+    get_json("#{endpoint}/api/email-subscriptions/#{CGI.escape(name)}", auth_headers(govuk_account_session))
+  end
+
+  # Create or update an account-linked email subscription.
+  #
+  # @param [String] name Name of the subscription
+  # @param [String] topic_slug The email-alert-api topic slug to subscribe to
+  # @param [String] govuk_account_session Value of the session header
+  #
+  # @return [Hash] Details of the newly created subscription.
+  def put_email_subscription(name:, topic_slug:, govuk_account_session:)
+    put_json("#{endpoint}/api/email-subscriptions/#{CGI.escape(name)}", { topic_slug: topic_slug }, auth_headers(govuk_account_session))
+  end
+
+  # Unsubscribe and delete an account-linked email subscription.
+  #
+  # @param [String] name Name of the subscription
+  # @param [String] govuk_account_session Value of the session header
+  def delete_email_subscription(name:, govuk_account_session:)
+    delete_json("#{endpoint}/api/email-subscriptions/#{CGI.escape(name)}", {}, auth_headers(govuk_account_session))
+  end
+
   # Look up all pages saved by a user in their Account
   #
   # @param [String] govuk_account_session Value of the session header
   #
-  # @return [Hash] containing :saved_pages, an array of single saved page hashes  def get_saved_pages(govuk_account_session:)
+  # @return [Hash] containing :saved_pages, an array of single saved page hashes
   def get_saved_pages(govuk_account_session:)
-    get_json("#{endpoint}/api/saved_pages", auth_headers(govuk_account_session))
+    get_json("#{endpoint}/api/saved-pages", auth_headers(govuk_account_session))
   end
 
   # Return a single page by unique URL
@@ -121,7 +168,7 @@ class GdsApi::AccountApi < GdsApi::Base
   #
   # @return [Hash] containing :saved_page, a hash of a single saved page value
   def get_saved_page(page_path:, govuk_account_session:)
-    get_json("#{endpoint}/api/saved_pages/#{CGI.escape(page_path)}", auth_headers(govuk_account_session))
+    get_json("#{endpoint}/api/saved-pages/#{CGI.escape(page_path)}", auth_headers(govuk_account_session))
   end
 
   # Upsert a single saved page entry in a users account
@@ -131,7 +178,7 @@ class GdsApi::AccountApi < GdsApi::Base
   #
   # @return [Hash] A single saved page value (if sucessful)
   def save_page(page_path:, govuk_account_session:)
-    put_json("#{endpoint}/api/saved_pages/#{CGI.escape(page_path)}", {}, auth_headers(govuk_account_session))
+    put_json("#{endpoint}/api/saved-pages/#{CGI.escape(page_path)}", {}, auth_headers(govuk_account_session))
   end
 
   # Delete a single saved page entry from a users account
@@ -142,7 +189,7 @@ class GdsApi::AccountApi < GdsApi::Base
   # @return [GdsApi::Response] A status code of 204 indicates the saved page has been successfully deleted.
   #                            A status code of 404 indicates there is no saved page with this path.
   def delete_saved_page(page_path:, govuk_account_session:)
-    delete_json("#{endpoint}/api/saved_pages/#{CGI.escape(page_path)}", {}, auth_headers(govuk_account_session))
+    delete_json("#{endpoint}/api/saved-pages/#{CGI.escape(page_path)}", {}, auth_headers(govuk_account_session))
   end
 
 private

data/lib/gds_api/email_alert_api.rb

@@ -156,10 +156,10 @@ class GdsApi::EmailAlertApi < GdsApi::Base
   # @param [string] Subscriber new_address
   #
   # @return [Hash] subscriber
-  def change_subscriber(id:, new_address:)
+  def change_subscriber(id:, new_address:, on_conflict: nil)
     patch_json(
       "#{endpoint}/subscribers/#{uri_encode(id)}",
-      new_address: new_address,
+      { new_address: new_address, on_conflict: on_conflict }.compact,
     )
   end
 
@@ -176,6 +176,44 @@ class GdsApi::EmailAlertApi < GdsApi::Base
     )
   end
 
+  # Verify a GOV.UK Account-holder has a corresponding subscriber
+  #
+  # @param [string] govuk_account_session The request's session identifier
+  #
+  # @return [Hash] subscriber
+  def authenticate_subscriber_by_govuk_account(govuk_account_session:)
+    post_json(
+      "#{endpoint}/subscribers/govuk-account",
+      govuk_account_session: govuk_account_session,
+    )
+  end
+
+  # Mark a subscriber as "linked" to its corresponding GOV.UK Account.
+  # In practice "linking" will mean that email-alert-frontend and
+  # account-api will treat the subscriber specially (eg, only allowing
+  # address changes via the account).
+  #
+  # @param [string] govuk_account_session The request's session identifier
+  #
+  # @return [Hash] subscriber
+  def link_subscriber_to_govuk_account(govuk_account_session:)
+    post_json(
+      "#{endpoint}/subscribers/govuk-account/link",
+      govuk_account_session: govuk_account_session,
+    )
+  end
+
+  # Find a subscriber which has been "linked" to a GOV.UK Account.
+  #
+  # @param [String] govuk_account_id An ID for the account.
+  #
+  # @return [Hash] subscriber
+  def find_subscriber_by_govuk_account(govuk_account_id:)
+    get_json(
+      "#{endpoint}/subscribers/govuk-account/#{govuk_account_id}",
+    )
+  end
+
   # Verify a subscriber has control of a provided email
   #
   # @param [string]       address       Address to send verification email to

data/lib/gds_api/test_helpers/account_api.rb

@@ -5,6 +5,20 @@ module GdsApi
     module AccountApi
       ACCOUNT_API_ENDPOINT = Plek.find("account-api")
 
+      def stub_account_api_request(method, path, with: {}, response_status: 200, response_body: {}, govuk_account_session: nil, new_govuk_account_session: nil)
+        with.merge!(headers: { GdsApi::AccountApi::AUTH_HEADER_NAME => govuk_account_session }) if govuk_account_session
+        new_govuk_account_session = nil if response_status >= 400
+        to_return = { status: response_status, body: response_body.merge(govuk_account_session: new_govuk_account_session).compact.to_json }
+        if with.empty?
+          stub_request(method, "#{ACCOUNT_API_ENDPOINT}#{path}").to_return(**to_return)
+        else
+          stub_request(method, "#{ACCOUNT_API_ENDPOINT}#{path}").with(**with).to_return(**to_return)
+        end
+      end
+
+      #########################
+      # GET /api/oauth2/sign-in
+      #########################
       def stub_account_api_get_sign_in_url(redirect_path: nil, state_id: nil, level_of_authentication: nil, auth_uri: "http://auth/provider", state: "state")
         querystring = Rack::Utils.build_nested_query({ redirect_path: redirect_path, state_id: state_id, level_of_authentication: level_of_authentication }.compact)
         stub_request(:get, "#{ACCOUNT_API_ENDPOINT}/api/oauth2/sign-in?#{querystring}")
@@ -14,6 +28,9 @@ module GdsApi
           )
       end
 
+      ###########################
+      # POST /api/oauth2/callback
+      ###########################
       def stub_account_api_validates_auth_response(code: nil, state: nil, govuk_account_session: "govuk-account-session", redirect_path: "/", ga_client_id: "ga-client-id")
         stub_request(:post, "#{ACCOUNT_API_ENDPOINT}/api/oauth2/callback")
           .with(body: hash_including({ code: code, state: state }.compact))
@@ -29,6 +46,9 @@ module GdsApi
           .to_return(status: 401)
       end
 
+      ########################
+      # POST /api/oauth2/state
+      ########################
       def stub_account_api_create_registration_state(attributes: nil, state_id: "state-id")
         stub_request(:post, "#{ACCOUNT_API_ENDPOINT}/api/oauth2/state")
           .with(body: hash_including({ attributes: attributes }.compact))
@@ -38,14 +58,19 @@ module GdsApi
           )
       end
 
-      def stub_account_api_user_info(level_of_authentication: "level0", email: "email@example.com", email_verified: true, services: {}, **options)
+      ###############
+      # GET /api/user
+      ###############
+      def stub_account_api_user_info(id: "user-id", level_of_authentication: "level0", email: "email@example.com", email_verified: true, has_unconfirmed_email: false, services: {}, **options)
         stub_account_api_request(
           :get,
           "/api/user",
           response_body: {
+            id: id,
             level_of_authentication: level_of_authentication,
             email: email,
             email_verified: email_verified,
+            has_unconfirmed_email: has_unconfirmed_email,
             services: services,
           },
           **options,
@@ -69,6 +94,120 @@ module GdsApi
         )
       end
 
+      ###########################################
+      # PATCH /api/oidc-users/:subject_identifier
+      ###########################################
+      def stub_update_user_by_subject_identifier(subject_identifier:, email: nil, email_verified: nil, has_unconfirmed_email: nil, old_email: nil, old_email_verified: nil, old_has_unconfirmed_email: nil)
+        stub_account_api_request(
+          :patch,
+          "/api/oidc-users/#{subject_identifier}",
+          with: { body: hash_including({ email: email, email_verified: email_verified, has_unconfirmed_email: has_unconfirmed_email }.compact) },
+          response_body: {
+            sub: subject_identifier,
+            email: email || old_email,
+            email_verified: email_verified || old_email_verified,
+            has_unconfirmed_email: has_unconfirmed_email || old_has_unconfirmed_email,
+          },
+        )
+      end
+
+      ####################################
+      # GET /api/email-subscriptions/:name
+      ####################################
+      def stub_account_api_get_email_subscription(name:, topic_slug: "slug", email_alert_api_subscription_id: "12345", **options)
+        stub_account_api_request(
+          :get,
+          "/api/email-subscriptions/#{name}",
+          response_body: {
+            email_subscription: {
+              name: name,
+              topic_slug: topic_slug,
+              email_alert_api_subscription_id: email_alert_api_subscription_id,
+            },
+          },
+          **options,
+        )
+      end
+
+      def stub_account_api_get_email_subscription_does_not_exist(name:, **options)
+        stub_account_api_request(
+          :get,
+          "/api/email-subscriptions/#{name}",
+          response_status: 404,
+          **options,
+        )
+      end
+
+      def stub_account_api_get_email_subscription_unauthorized(name:, **options)
+        stub_account_api_request(
+          :get,
+          "/api/email-subscriptions/#{name}",
+          response_status: 401,
+          **options,
+        )
+      end
+
+      ####################################
+      # PUT /api/email-subscriptions/:name
+      ####################################
+      def stub_account_api_put_email_subscription(name:, topic_slug: nil, **options)
+        stub_account_api_request(
+          :put,
+          "/api/email-subscriptions/#{name}",
+          with: { body: hash_including({ topic_slug: topic_slug }.compact) },
+          response_body: {
+            email_subscription: {
+              name: name,
+              topic_slug: topic_slug || "slug",
+            },
+          },
+          **options,
+        )
+      end
+
+      def stub_account_api_unauthorized_put_email_subscription(name:, topic_slug: nil, **options)
+        stub_account_api_request(
+          :put,
+          "/api/email-subscriptions/#{name}",
+          with: { body: hash_including({ topic_slug: topic_slug }.compact) },
+          response_status: 401,
+          **options,
+        )
+      end
+
+      #######################################
+      # DELETE /api/email-subscriptions/:name
+      #######################################
+      def stub_account_api_delete_email_subscription(name:, **options)
+        stub_account_api_request(
+          :delete,
+          "/api/email-subscriptions/#{name}",
+          response_status: 204,
+          **options,
+        )
+      end
+
+      def stub_account_api_delete_email_subscription_does_not_exist(name:, **options)
+        stub_account_api_request(
+          :delete,
+          "/api/email-subscriptions/#{name}",
+          response_status: 404,
+          **options,
+        )
+      end
+
+      def stub_account_api_unauthorized_delete_email_subscription(name:, **options)
+        stub_account_api_request(
+          :delete,
+          "/api/email-subscriptions/#{name}",
+          response_status: 401,
+          **options,
+        )
+      end
+
+      ################################################
+      # GET /api/transition-checker-email-subscription
+      ################################################
       def stub_account_api_has_email_subscription(**options)
         stub_account_api_request(
           :get,
@@ -106,6 +245,9 @@ module GdsApi
         )
       end
 
+      #################################################
+      # POST /api/transition-checker-email-subscription
+      #################################################
       def stub_account_api_set_email_subscription(slug: nil, **options)
         stub_account_api_request(
           :post,
@@ -136,6 +278,9 @@ module GdsApi
         )
       end
 
+      #####################
+      # GET /api/attributes
+      #####################
       def stub_account_api_has_attributes(attributes: [], values: {}, **options)
         querystring = Rack::Utils.build_nested_query({ attributes: attributes }.compact)
         stub_account_api_request(
@@ -167,6 +312,9 @@ module GdsApi
         )
       end
 
+      #######################
+      # PATCH /api/attributes
+      #######################
       def stub_account_api_set_attributes(attributes: nil, **options)
         stub_account_api_request(
           :patch,
@@ -197,6 +345,9 @@ module GdsApi
         )
       end
 
+      ###########################
+      # GET /api/attributes/names
+      ###########################
       def stub_account_api_get_attributes_names(attributes: [], **options)
         querystring = Rack::Utils.build_nested_query({ attributes: attributes }.compact)
         stub_account_api_request(
@@ -228,24 +379,13 @@ module GdsApi
         )
       end
 
-      def stub_account_api_request(method, path, with: {}, response_status: 200, response_body: {}, govuk_account_session: nil, new_govuk_account_session: nil)
-        with.merge!(headers: { GdsApi::AccountApi::AUTH_HEADER_NAME => govuk_account_session }) if govuk_account_session
-        new_govuk_account_session = nil if response_status >= 400
-        to_return = { status: response_status, body: response_body.merge(govuk_account_session: new_govuk_account_session).compact.to_json }
-        if with.empty?
-          stub_request(method, "#{ACCOUNT_API_ENDPOINT}#{path}").to_return(**to_return)
-        else
-          stub_request(method, "#{ACCOUNT_API_ENDPOINT}#{path}").with(**with).to_return(**to_return)
-        end
-      end
-
       ######################
-      # GET /api/saved_pages
+      # GET /api/saved-pages
       ######################
       def stub_account_api_returning_saved_pages(saved_pages: [], **options)
         stub_account_api_request(
           :get,
-          "/api/saved_pages",
+          "/api/saved-pages",
           response_body: { saved_pages: saved_pages },
           **options,
         )
@@ -254,7 +394,7 @@ module GdsApi
       def stub_account_api_unauthorized_get_saved_pages(**options)
         stub_account_api_request(
           :get,
-          "/api/saved_pages",
+          "/api/saved-pages",
           response_status: 401,
           **options,
         )
@@ -266,7 +406,7 @@ module GdsApi
       def stub_account_api_get_saved_page(page_path:, content_id: "46163ed2-1777-4ee6-bdd4-6a2007e49d8f", title: "Ministry of Magic", **options)
         stub_account_api_request(
           :get,
-          "/api/saved_pages/#{CGI.escape(page_path)}",
+          "/api/saved-pages/#{CGI.escape(page_path)}",
           response_body: {
             saved_page: {
               page_path: page_path,
@@ -281,7 +421,7 @@ module GdsApi
       def stub_account_api_does_not_have_saved_page(page_path:, **options)
         stub_account_api_request(
           :get,
-          "/api/saved_pages/#{CGI.escape(page_path)}",
+          "/api/saved-pages/#{CGI.escape(page_path)}",
           response_status: 404,
           **options,
         )
@@ -290,19 +430,19 @@ module GdsApi
       def stub_account_api_unauthorized_get_saved_page(page_path:, **options)
         stub_account_api_request(
           :get,
-          "/api/saved_pages/#{CGI.escape(page_path)}",
+          "/api/saved-pages/#{CGI.escape(page_path)}",
           response_status: 401,
           **options,
         )
       end
 
       #################################
-      # PUT /api/saved_pages/:page_path
+      # PUT /api/saved-pages/:page_path
       #################################
       def stub_account_api_save_page(page_path:, content_id: "c840bfa2-011a-42cc-ac7a-a6da990aff0b", title: "Ministry of Magic", **options)
         stub_account_api_request(
           :put,
-          "/api/saved_pages/#{CGI.escape(page_path)}",
+          "/api/saved-pages/#{CGI.escape(page_path)}",
           response_body: {
             saved_page: {
               page_path: page_path,
@@ -321,7 +461,7 @@ module GdsApi
       def stub_account_api_save_page_cannot_save_page(page_path:, **options)
         stub_account_api_request(
           :put,
-          "/api/saved_pages/#{CGI.escape(page_path)}",
+          "/api/saved-pages/#{CGI.escape(page_path)}",
           response_status: 422,
           response_body: cannot_save_page_problem_detail({ page_path: page_path }),
           **options,
@@ -331,7 +471,7 @@ module GdsApi
       def stub_account_api_unauthorized_save_page(page_path:, **options)
         stub_account_api_request(
           :put,
-          "/api/saved_pages/#{CGI.escape(page_path)}",
+          "/api/saved-pages/#{CGI.escape(page_path)}",
           response_status: 401,
           **options,
         )
@@ -352,7 +492,7 @@ module GdsApi
       def stub_account_api_delete_saved_page(page_path:, **options)
         stub_account_api_request(
           :delete,
-          "/api/saved_pages/#{CGI.escape(page_path)}",
+          "/api/saved-pages/#{CGI.escape(page_path)}",
           response_status: 204,
           **options,
         )
@@ -361,7 +501,7 @@ module GdsApi
       def stub_account_api_delete_saved_page_does_not_exist(page_path:, **options)
         stub_account_api_request(
           :delete,
-          "/api/saved_pages/#{CGI.escape(page_path)}",
+          "/api/saved-pages/#{CGI.escape(page_path)}",
           response_status: 404,
           **options,
         )
@@ -370,7 +510,7 @@ module GdsApi
       def stub_account_api_delete_saved_page_unauthorised(page_path:, **options)
         stub_account_api_request(
           :delete,
-          "/api/saved_pages/#{CGI.escape(page_path)}",
+          "/api/saved-pages/#{CGI.escape(page_path)}",
           response_status: 401,
           **options,
         )

data/lib/gds_api/test_helpers/email_alert_api.rb

@@ -6,11 +6,11 @@ module GdsApi
     module EmailAlertApi
       EMAIL_ALERT_API_ENDPOINT = Plek.find("email-alert-api")
 
-      def stub_email_alert_api_has_updated_subscriber(id, new_address)
+      def stub_email_alert_api_has_updated_subscriber(id, new_address, govuk_account_id: nil)
         stub_request(:patch, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/#{id}")
           .to_return(
             status: 200,
-            body: get_subscriber_response(id, new_address).to_json,
+            body: get_subscriber_response(id, new_address, govuk_account_id).to_json,
           )
       end
 
@@ -265,11 +265,11 @@ module GdsApi
           ).to_return(status: 422)
       end
 
-      def stub_email_alert_api_sends_subscriber_verification_email(subscriber_id, address)
+      def stub_email_alert_api_sends_subscriber_verification_email(subscriber_id, address, govuk_account_id: nil)
         stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/auth-token")
           .to_return(
             status: 201,
-            body: get_subscriber_response(subscriber_id, address).to_json,
+            body: get_subscriber_response(subscriber_id, address, govuk_account_id).to_json,
           )
       end
 
@@ -283,6 +283,102 @@ module GdsApi
           .to_return(status: 404)
       end
 
+      def stub_email_alert_api_subscriber_verification_email_linked_to_govuk_account
+        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/auth-token")
+          .to_return(status: 403)
+      end
+
+      def stub_email_alert_api_authenticate_subscriber_by_govuk_account(govuk_account_session, subscriber_id, address, govuk_account_id: "user-id", new_govuk_account_session: nil)
+        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/govuk-account")
+          .with(
+            body: { govuk_account_session: govuk_account_session }.to_json,
+          ).to_return(
+            status: 200,
+            body: {
+              govuk_account_session: new_govuk_account_session,
+            }.compact.merge(get_subscriber_response(subscriber_id, address, govuk_account_id)).to_json,
+          )
+      end
+
+      def stub_email_alert_api_authenticate_subscriber_by_govuk_account_session_invalid(govuk_account_session)
+        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/govuk-account")
+          .with(
+            body: { govuk_account_session: govuk_account_session }.to_json,
+          ).to_return(
+            status: 401,
+          )
+      end
+
+      def stub_email_alert_api_authenticate_subscriber_by_govuk_account_email_unverified(govuk_account_session, new_govuk_account_session: nil)
+        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/govuk-account")
+          .with(
+            body: { govuk_account_session: govuk_account_session }.to_json,
+          ).to_return(
+            status: 403,
+            body: {
+              govuk_account_session: new_govuk_account_session,
+            }.compact.to_json,
+          )
+      end
+
+      def stub_email_alert_api_authenticate_subscriber_by_govuk_account_no_subscriber(govuk_account_session, new_govuk_account_session: nil)
+        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/govuk-account")
+          .with(
+            body: { govuk_account_session: govuk_account_session }.to_json,
+          ).to_return(
+            status: 404,
+            body: {
+              govuk_account_session: new_govuk_account_session,
+            }.compact.to_json,
+          )
+      end
+
+      def stub_email_alert_api_link_subscriber_to_govuk_account(govuk_account_session, subscriber_id, address, govuk_account_id: "user-id", new_govuk_account_session: nil)
+        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/govuk-account/link")
+          .with(
+            body: { govuk_account_session: govuk_account_session }.to_json,
+          ).to_return(
+            status: 200,
+            body: {
+              govuk_account_session: new_govuk_account_session,
+            }.compact.merge(get_subscriber_response(subscriber_id, address, govuk_account_id)).to_json,
+          )
+      end
+
+      def stub_email_alert_api_link_subscriber_to_govuk_account_session_invalid(govuk_account_session)
+        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/govuk-account/link")
+          .with(
+            body: { govuk_account_session: govuk_account_session }.to_json,
+          ).to_return(
+            status: 401,
+          )
+      end
+
+      def stub_email_alert_api_link_subscriber_to_govuk_account_email_unverified(govuk_account_session, new_govuk_account_session: nil)
+        stub_request(:post, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/govuk-account/link")
+          .with(
+            body: { govuk_account_session: govuk_account_session }.to_json,
+          ).to_return(
+            status: 403,
+            body: {
+              govuk_account_session: new_govuk_account_session,
+            }.compact.to_json,
+          )
+      end
+
+      def stub_email_alert_api_find_subscriber_by_govuk_account(govuk_account_id, subscriber_id, address)
+        stub_request(:get, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/govuk-account/#{govuk_account_id}")
+          .to_return(
+            status: 200,
+            body: get_subscriber_response(subscriber_id, address, govuk_account_id).to_json,
+          )
+      end
+
+      def stub_email_alert_api_find_subscriber_by_govuk_account_no_subscriber(govuk_account_id)
+        stub_request(:get, "#{EMAIL_ALERT_API_ENDPOINT}/subscribers/govuk-account/#{govuk_account_id}")
+          .to_return(status: 404)
+      end
+
       def assert_unsubscribed(uuid)
         assert_requested(:post, "#{EMAIL_ALERT_API_ENDPOINT}/unsubscribe/#{uuid}", times: 1)
       end
@@ -314,11 +410,12 @@ module GdsApi
 
     private
 
-      def get_subscriber_response(id, address)
+      def get_subscriber_response(id, address, govuk_account_id)
         {
           "subscriber" => {
             "id" => id,
             "address" => address,
+            "govuk_account_id" => govuk_account_id,
           },
         }
       end

data/lib/gds_api/version.rb

@@ -1,3 +1,3 @@
 module GdsApi
-  VERSION = "71.3.0".freeze
+  VERSION = "71.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds-api-adapters
 version: !ruby/object:Gem::Version
-  version: 71.3.0
+  version: 71.8.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable