graphql_devise 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 623b4df681f9e3ae95598c67885cbc261d4e73c5d6bd2cb070ea9c39b4305dbb
-  data.tar.gz: 4efd72cc4b7b61d44b03cdf062db5a47c3bbce831c9101801b1a0a6d6af91701
+  metadata.gz: bf545450ef87f507744e5bf493ebc30d94c20da544307ec11657f58d2e685b37
+  data.tar.gz: 7c62c31ef018325ed51516e08a3f5774d5ebe8325340ce57edbee2df9a9e29bf
 SHA512:
-  metadata.gz: 0510a69ab752c9f5047f1d4dd3a7f6721c974b5d3af979b73cacd9a5456cd0cdc695766fce66e6b2ed70879a9faa24104fb71140ec12e900c51e4925bf4fc850
-  data.tar.gz: afb8d1f441dde3094e11f9ff12e9555d7d0ada530d086a3836f371855ce1f784e48be0e93d3c0c20bef5e0bae5328cd7a4e17168e747edb57a43b03fbfec5ee4
+  metadata.gz: 53dfe2bfde5d1e22f7d5d91f03c6336559abe2967208c2a237218d06fc65d4df2c5c3d0bf5d84f097c77fa2d39299defe6318999adddb68b05263c403a418654
+  data.tar.gz: dc0e2a550b3657fc13505db35042febdc32df9770cdfb00524fabb1fdaf09b1d43a0fc6a13ce71160e37aada85e3cef8ff611aaebb4d027efb81ec8013267eba

data/.travis.yml

@@ -25,6 +25,7 @@ gemfile:
   - gemfiles/rails5.2_graphql1.9.gemfile
   - gemfiles/rails5.2_graphql1.10.gemfile
   - gemfiles/rails5.2_graphql1.11.gemfile
+  - gemfiles/rails5.2_graphql1.12.gemfile
 
 jobs:
   include:
@@ -52,6 +53,12 @@ jobs:
       rvm: 2.6.6
     - gemfile: gemfiles/rails6.0_graphql1.11.gemfile
       rvm: 2.7.1
+    - gemfile: gemfiles/rails6.0_graphql1.12.gemfile
+      rvm: 2.5.8
+    - gemfile: gemfiles/rails6.0_graphql1.12.gemfile
+      rvm: 2.6.6
+    - gemfile: gemfiles/rails6.0_graphql1.12.gemfile
+      rvm: 2.7.1
     - gemfile: gemfiles/rails6.0_graphql_edge.gemfile
       rvm: 2.6.6
       env:

data/Appraisals

@@ -68,6 +68,13 @@ appraise 'rails5.2-graphql1.11' do
   gem 'rspec-rails', '< 4.0'
 end
 
+appraise 'rails5.2-graphql1.12' do
+  gem 'sqlite3', '~> 1.3.6'
+  gem 'rails', github: 'rails/rails', branch: '5-2-stable'
+  gem 'graphql', '~> 1.12.0'
+  gem 'rspec-rails', '< 4.0'
+end
+
 appraise 'rails6.0-graphql1.8' do
   gem 'sqlite3', '~> 1.4'
   gem 'devise', '>= 4.7'
@@ -96,6 +103,13 @@ appraise 'rails6.0-graphql1.11' do
   gem 'graphql', '~> 1.11.0'
 end
 
+appraise 'rails6.0-graphql1.12' do
+  gem 'sqlite3', '~> 1.4'
+  gem 'devise', '>= 4.7'
+  gem 'rails', github: 'rails/rails', branch: '6-0-stable'
+  gem 'graphql', '~> 1.12.0'
+end
+
 appraise 'rails6.0-graphql_edge' do
   gem 'sqlite3', '~> 1.4'
   gem 'devise_token_auth', github: 'lynndylanhurley/devise_token_auth', branch: 'master'

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v0.14.1](https://github.com/graphql-devise/graphql_devise/tree/v0.14.1) (2021-02-11)
+
+[Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v0.14.0...v0.14.1)
+
+**Implemented enhancements:**
+
+- Testing Authenticated Elements [\#138](https://github.com/graphql-devise/graphql_devise/issues/138)
+- Add support for GraphQL 1.12 [\#150](https://github.com/graphql-devise/graphql_devise/pull/150) ([mengqing](https://github.com/mengqing))
+- Allow setting current resource in tests [\#149](https://github.com/graphql-devise/graphql_devise/pull/149) ([00dav00](https://github.com/00dav00))
+
+**Merged pull requests:**
+
+- Document password reset flows [\#147](https://github.com/graphql-devise/graphql_devise/pull/147) ([mcelicalderon](https://github.com/mcelicalderon))
+
 ## [v0.14.0](https://github.com/graphql-devise/graphql_devise/tree/v0.14.0) (2021-01-19)
 
 [Full Changelog](https://github.com/graphql-devise/graphql_devise/compare/v0.13.6...v0.14.0)

data/README.md

@@ -33,6 +33,7 @@ GraphQL interface on top of the [Devise Token Auth](https://github.com/lynndylan
          * [Making Requests](#making-requests)
             * [Mutations](#mutations)
             * [Queries](#queries)
+         * [Reset Password Flow](#reset-password-flow)
          * [More Configuration Options](#more-configuration-options)
             * [Devise Token Auth Initializer](#devise-token-auth-initializer)
             * [Devise Initializer](#devise-initializer)
@@ -42,7 +43,7 @@ GraphQL interface on top of the [Devise Token Auth](https://github.com/lynndylan
       * [Contributing](#contributing)
       * [License](#license)
 
-<!-- Added by: david, at: mar jul 14 08:08:02 -05 2020 -->
+<!-- Added by: mcelicalderon, at: Mon Jan 25 22:48:17 -05 2021 -->
 
 <!--te-->
 
@@ -288,10 +289,12 @@ The following is a list of the symbols you can provide to the `operations`, `ski
 :login
 :logout
 :sign_up
-:update_password
-:send_password_reset
 :confirm_account
+:send_password_reset
 :check_password_token
+:update_password
+:send_password_reset_with_token
+:update_password_with_token
 ```
 
 ### Configuring Model
@@ -458,9 +461,11 @@ Operation | Description | Example
 login | This mutation has a second field by default. `credentials` can be fetched directly on the mutation return type.<br>Credentials are still returned in the headers of the response. | userLogin(email: String!, password: String!): UserLoginPayload
 logout | | userLogout: UserLogoutPayload
 signUp | The parameter `confirmSuccessUrl` is optional unless you are using the `confirmable` plugin from Devise in your `resource`'s model. If you have `confirmable` set up, you will have to provide it unless you have `config.default_confirm_success_url` set in `config/initializers/devise_token_auth.rb`. | userSignUp(email: String!, password: String!, passwordConfirmation: String!, confirmSuccessUrl: String): UserSignUpPayload
-sendResetPassword | | userSendResetPassword(email: String!, redirectUrl: String!): UserSendReserPasswordPayload
-updatePassword | The parameter `currentPassword` is optional if you have `config.check_current_password_before_update` set to false (disabled by default) on your generated `config/initializers/devise_token_aut.rb` or if the `resource` model supports the `recoverable` Devise plugin and the `resource`'s `allow_password_change` attribute is set to true (this is done in the `userCheckPasswordToken` query when you click on the sent email's link). | userUpdatePassword(password: String!, passwordConfirmation: String!, currentPassword: String): UserUpdatePasswordPayload
+sendPasswordResetWithToken | Sends an email to the provided address with a link to reset the password of the resource. First step of the most recently implemented password reset flow. | userSendPasswordResetWithToken(email: String!, redirectUrl: String!): UserSendPasswordResetWithTokenPayload
+updatePasswordWithToken | Uses a `resetPasswordToken` to update the password of a resource. Second and last step of the most recently implemented password reset flow. | userSendPasswordResetWithToken(resetPasswordToken: String!, password: String!, passwordConfirmation: String!): UserUpdatePasswordWithTokenPayload
 resendConfirmation | The `UserResendConfirmationPayload` will return the `authenticatable` resource that was sent the confirmation instructions but also has a `message: String!` that can be used to notify a user what to do after the instructions were sent to them | userResendConfirmation(email: String!, redirectUrl: String!): UserResendConfirmationPayload
+sendResetPassword | Sends an email to the provided address with a link to reset the password of the resource. **This mutation is part of the first and soon to be deprecated password reset flow.** | userSendResetPassword(email: String!, redirectUrl: String!): UserSendReserPasswordPayload
+updatePassword | The parameter `currentPassword` is optional if you have `config.check_current_password_before_update` set to false (disabled by default) on your generated `config/initializers/devise_token_aut.rb` or if the `resource` model supports the `recoverable` Devise plugin and the `resource`'s `allow_password_change` attribute is set to true (this is done in the `userCheckPasswordToken` query when you click on the sent email's link). **This mutation is part of the first and soon to be deprecated password reset flow.** | userUpdatePassword(password: String!, passwordConfirmation: String!, currentPassword: String): UserUpdatePasswordPayload
 
 #### Queries
 Operation | Description | Example
@@ -478,6 +483,11 @@ you can use [our specs](spec/requests) to better understand how to use the gem.
 Also, the [dummy app](spec/dummy) used in our specs will give you
 a clear idea on how to configure the gem on your Rails application.
 
+### Reset Password Flow
+This gem supports two password recovery flows. The most recently implemented is preferred and
+requires less steps. More detail on how it works can be found
+[here](docs/usage/reset_password_flow.md).
+
 ### More Configuration Options
 As mentioned in the introduction there are many configurations that will change how this gem behaves. You can change
 this values on the initializer files generated by the installer.

data/docs/usage/reset_password_flow.md

@@ -0,0 +1,90 @@
+# Reset Password Flow
+This gem supports two different ways to reset a password on a resource. Each password reset flow has it's own set of
+operations and this document will explain in more detail how to use each.
+The first and most recently implemented flow is preferred as it requires less steps and doesn't require a mutation
+to return a redirect on the response. Flow 2 might be deprecated in the future.
+
+## Flow #1 (Preferred)
+This flow only has two steps. Each step name refers to the operation name you can use in the mount options to skip or override.
+
+### 1. send_password_reset_with_token
+This mutation will send an email to the specified address if it's found on the system. Returns an error if the email is not found. Here's an example assuming the resource used
+for authentication is `User`:
+```graphql
+mutation {
+  userSendPasswordResetWithToken(
+    email:       "vvega@wallaceinc.com",
+    redirectUrl: "https://google.com"
+  ) {
+    message
+  }
+}
+```
+The email will contain a link to the `redirectUrl` (https://google.com in the example) and append a `reset_password_token` query param. This is the token you will
+need to use in the next step in order to reset the password.
+
+### 2. update_password_with_token
+This mutation uses the token sent on the email to find the resource you are trying to recover.
+All you have to do is send a valid token together with the new password and password confirmation.
+Here's an example assuming the resource used for authentication is `User`:
+
+```graphql
+mutation {
+  userUpdatePasswordWithToken(
+    resetPasswordToken: "token_here",
+    password: "password123",
+    passwordConfirmation: "password123"
+  ) {
+    authenticatable { email }
+    credentials { accessToken }
+  }
+}
+```
+The mutation has two fields:
+1. `authenticatable`: Just like other mutations, returns the actual resource you just recover the password for.
+1. `credentials`: This is a nullable field. It will only return credentials as if you had just logged
+in into the app if you explicitly say so by overriding the mutation. The docs have more detail
+on how to extend the default behavior of mutations, but
+[here](https://github.com/graphql-devise/graphql_devise/blob/8c7c8a5ff1b35fb026e4c9499c70dc5f90b9187a/spec/dummy/app/graphql/mutations/reset_admin_password_with_token.rb)
+you can find an example mutation on what needs to be done in order for the mutation to return
+credentials after updating the password.
+
+## Flow 2 (Deprecated)
+This was the first flow to be implemented, requires an additional step and also to encode a GQL query in a url, so this is not the preferred method.
+Each step name refers to the operation name you can use in the mount options to skip or override.
+
+### 1. send_password_reset
+This mutation will send an email to the specified address if it's found on the system. Returns an error if the email is not found. Here's an example assuming the resource used
+for authentication is `User`:
+```graphql
+mutation {
+  userSendPasswordReset(
+    email:       "vvega@wallaceinc.com",
+    redirectUrl: "https://google.com"
+  ) {
+    message
+  }
+}
+```
+The email will contain an encoded GraphQL query that holds the reset token and redirectUrl.
+The query is described in the next step.
+
+### 2. check_password_token
+This query checks the reset password token and if successful changes a column in the DB (`allow_password_change`) to true.
+This change will allow for the next step to update the password without providing the current password.
+Then, this query will redirect to the provided `redirectUrl` with credentials.
+
+### 3. update_password
+This step requires the request to include authentication headers and will allow the user to
+update the password if step 2 was successful.
+Here's an example assuming the resource used for authentication is `User`:
+```graphql
+mutation {
+  userUpdatePassword(
+    password: "password123",
+    passwordConfirmation: "password123"
+  ) {
+    authenticatable { email }
+  }
+}
+```

data/graphql_devise.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.2.0'
 
   spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
-  spec.add_dependency 'graphql', '>= 1.8', '< 1.12.0'
+  spec.add_dependency 'graphql', '>= 1.8', '< 1.13.0'
   spec.add_dependency 'rails', '>= 4.2', '< 6.2'
 
   spec.add_development_dependency 'appraisal'

data/lib/graphql_devise/schema_plugin.rb

@@ -24,13 +24,12 @@ module GraphqlDevise
       # Authenticate only root level queries
       return yield unless event == 'execute_field' && path(trace_data).count == 1
 
-      field = traced_field(trace_data)
-      provided_value = authenticate_option(field, trace_data)
-      context = set_current_resource(context_from_data(trace_data))
+      field         = traced_field(trace_data)
+      auth_required = authenticate_option(field, trace_data)
+      context       = context_from_data(trace_data)
 
-      if !provided_value.nil?
-        raise_on_missing_resource(context, field) if provided_value
-      elsif @authenticate_default
+      if auth_required
+        context = set_current_resource(context)
         raise_on_missing_resource(context, field)
       end
 
@@ -40,9 +39,10 @@ module GraphqlDevise
     private
 
     def set_current_resource(context)
-      controller                 = context[:controller]
-      resource_names             = Array(context[:resource_name])
-      context[:current_resource] = resource_names.find do |resource_name|
+      controller     = context[:controller]
+      resource_names = Array(context[:resource_name])
+
+      context[:current_resource] ||= resource_names.find do |resource_name|
         unless Devise.mappings.key?(resource_name)
           raise(
             GraphqlDevise::Error,
@@ -88,11 +88,13 @@ module GraphqlDevise
     end
 
     def authenticate_option(field, trace_data)
-      if trace_data[:context]
+      auth_required = if trace_data[:context]
         field.metadata[:authenticate]
       else
         field.graphql_definition.metadata[:authenticate]
       end
+
+      auth_required.nil? ? @authenticate_default : auth_required
     end
 
     def reconfigure_warden!

data/lib/graphql_devise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlDevise
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.14.1'.freeze
 end

data/spec/graphql/user_queries_spec.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Users controller specs' do
+  include_context 'with graphql schema test'
+
+  let(:schema)          { DummySchema }
+  let(:user)            { create(:user, :confirmed) }
+  let(:field)           { 'privateField' }
+  let(:public_message)  { 'Field does not require authentication' }
+  let(:private_message) { 'Field will always require authentication' }
+  let(:private_error) do
+    {
+      message:    "#{field} field requires authentication",
+      extensions: { code: 'AUTHENTICATION_ERROR' }
+    }
+  end
+
+  describe 'publicField' do
+    let(:query) do
+      <<-GRAPHQL
+        query {
+          publicField
+        }
+      GRAPHQL
+    end
+
+    context 'when using a regular schema' do
+      it 'does not require authentication' do
+        expect(response[:data][:publicField]).to eq(public_message)
+      end
+    end
+  end
+
+  describe 'privateField' do
+    let(:query) do
+      <<-GRAPHQL
+        query {
+          privateField
+        }
+      GRAPHQL
+    end
+
+    context 'when using a regular schema' do
+      context 'when user is authenticated' do
+        let(:resource) { user }
+
+        it 'allows to perform the query' do
+          expect(response[:data][:privateField]).to eq(private_message)
+        end
+
+        context 'when using a SchemaUser' do
+          let(:resource) { create(:schema_user, :confirmed) }
+
+          it 'allows to perform the query' do
+            expect(response[:data][:privateField]).to eq(private_message)
+          end
+        end
+      end
+    end
+
+    context 'when using an interpreter schema' do
+      let(:schema) { InterpreterSchema }
+
+      context 'when user is authenticated' do
+        let(:resource) { user }
+
+        it 'allows to perform the query' do
+          expect(response[:data][:privateField]).to eq(private_message)
+        end
+      end
+    end
+  end
+
+  describe 'user' do
+    let(:user_data) { { email: user.email, id: user.id } }
+    let(:query) do
+      <<-GRAPHQL
+        query {
+          user(id: #{user.id}) {
+            id
+            email
+          }
+        }
+      GRAPHQL
+    end
+
+    context 'when using a regular schema' do
+      context 'when user is authenticated' do
+        let(:resource) { user }
+
+        it 'allows to perform the query' do
+          expect(response[:data][:user]).to match(**user_data)
+        end
+      end
+    end
+
+    context 'when using an interpreter schema' do
+      let(:schema) { InterpreterSchema }
+
+      context 'when user is authenticated' do
+        let(:resource) { user }
+
+        it 'allows to perform the query' do
+          expect(response[:data][:user]).to match(**user_data)
+        end
+      end
+
+      context 'when user is not authenticated' do
+        # Interpreter schema fields are public unless specified otherwise (plugin setting)
+        it 'allows to perform the query' do
+          expect(response[:data][:user]).to match(**user_data)
+        end
+      end
+    end
+  end
+end

data/spec/requests/user_controller_spec.rb

@@ -31,15 +31,6 @@ RSpec.describe "Integrations with the user's controller" do
         expect(json_response[:data][:publicField]).to eq('Field does not require authentication')
       end
     end
-
-    context 'when using the failing route' do
-      it 'raises an invalid resource_name error' do
-        expect { post_request('/api/v1/failing') }.to raise_error(
-          GraphqlDevise::Error,
-          'Invalid resource_name `fail` provided to `graphql_context`. Possible values are: [:user, :admin, :guest, :users_customer, :schema_user].'
-        )
-      end
-    end
   end
 
   describe 'privateField' do
@@ -77,6 +68,15 @@ RSpec.describe "Integrations with the user's controller" do
           )
         end
       end
+
+      context 'when using the failing route' do
+        it 'raises an invalid resource_name error' do
+          expect { post_request('/api/v1/failing') }.to raise_error(
+            GraphqlDevise::Error,
+            'Invalid resource_name `fail` provided to `graphql_context`. Possible values are: [:user, :admin, :guest, :users_customer, :schema_user].'
+          )
+        end
+      end
     end
 
     context 'when using an interpreter schema' do

data/spec/support/contexts/schema_test.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+RSpec.shared_context 'with graphql schema test' do
+  let(:variables)      { {} }
+  let(:resource_names) { [:user] }
+  let(:resource)       { nil }
+  let(:controller)     { instance_double(GraphqlDevise::GraphqlController) }
+  let(:context) do
+    { current_resource: resource, controller: controller, resource_name: resource_names }
+  end
+  let(:response) do
+    schema.execute(query, context: context, variables: variables).deep_symbolize_keys
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_devise
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Mario Celi
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise_token_auth
@@ -40,7 +40,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '1.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -302,6 +302,7 @@ files:
 - bin/setup
 - config/locales/en.yml
 - config/routes.rb
+- docs/usage/reset_password_flow.md
 - graphql_devise.gemspec
 - lib/generators/graphql_devise/install_generator.rb
 - lib/graphql_devise.rb
@@ -431,6 +432,7 @@ files:
 - spec/factories/users.rb
 - spec/factories/users_customers.rb
 - spec/generators/graphql_devise/install_generator_spec.rb
+- spec/graphql/user_queries_spec.rb
 - spec/graphql_devise/model/with_email_updater_spec.rb
 - spec/graphql_devise_spec.rb
 - spec/models/user_spec.rb
@@ -470,6 +472,7 @@ files:
 - spec/services/schema_plugin_spec.rb
 - spec/spec_helper.rb
 - spec/support/contexts/graphql_request.rb
+- spec/support/contexts/schema_test.rb
 - spec/support/factory_bot.rb
 - spec/support/matchers/auth_headers_matcher.rb
 - spec/support/matchers/not_change_matcher.rb
@@ -577,6 +580,7 @@ test_files:
 - spec/factories/users.rb
 - spec/factories/users_customers.rb
 - spec/generators/graphql_devise/install_generator_spec.rb
+- spec/graphql/user_queries_spec.rb
 - spec/graphql_devise/model/with_email_updater_spec.rb
 - spec/graphql_devise_spec.rb
 - spec/models/user_spec.rb
@@ -616,6 +620,7 @@ test_files:
 - spec/services/schema_plugin_spec.rb
 - spec/spec_helper.rb
 - spec/support/contexts/graphql_request.rb
+- spec/support/contexts/schema_test.rb
 - spec/support/factory_bot.rb
 - spec/support/matchers/auth_headers_matcher.rb
 - spec/support/matchers/not_change_matcher.rb