fix instance_double error in spec, and remove now-redundant top-level user hash from token data

Author: Alistair Davidson

app/controllers/concerns/token_authentication_concern.rb

@@ -41,9 +41,9 @@ def authenticate_user_by_jwt!
         data = jwt_info.first["data"]
         @current_user =
           User.find_by(
-            id: data["user"]["id"],
-            session_token: data["user"]["session_token"],
-            pwd_auth_session_token: data["user"]["pwd_auth_session_token"]
+            id: data.dig("user", "id"),
+            session_token: data.dig("user", "session_token"),
+            pwd_auth_session_token: data.dig("user", "pwd_auth_session_token")
           )
         if @current_user
           session["user"] = data["user"]
@@ -52,7 +52,7 @@ def authenticate_user_by_jwt!
         else
           session.clear
           token_error!(jwt)
-          Rails.logger.warn "Couldn't find user id #{data["user"]["id"]} with tokens"
+          Rails.logger.warn "Couldn't find user id #{data.dig("user", "id")} with tokens"
         end
       end
     rescue JWT::DecodeError, NoMethodError

app/controllers/one_time_tokens_controller.rb

@@ -11,7 +11,7 @@ def verify
     @token = OneTimeToken.find_by!(token: params[:token])
     @token.delete # <- Tokens are one-time use
     json_data =
-      @token.as_json.merge({ user: @token.user.as_json, jwt: jwt(@token) })
+      @token.as_json.merge({ jwt: jwt(@token) })
     render json: json_data
   rescue ActiveRecord::RecordNotFound
     render json: { errors: "Not found" }, status: :not_found

spec/controllers/concerns/authentication_concern_spec.rb

@@ -3,7 +3,7 @@
 # rubocop:disable RSpec/VerifiedDoubles
 describe AuthenticationConcern do
   let(:user) { @user = build(:user) }
-  let(:mock_request) { instance_double(request, headers: {}) }
+  let(:mock_request) { instance_double("request", headers: {}) }
   let(:sample_class) do
     Class
       .new do # rubocop:disable Style/BlockDelimiters