From 6888443d35f9871cab322d2030ca5bf019232435 Mon Sep 17 00:00:00 2001 From: Mario Celi Date: Sun, 18 Aug 2019 21:34:24 -0500 Subject: [PATCH 1/4] Add base engine structure --- Gemfile | 2 +- .../graphql_devise/application_controller.rb | 4 ++++ app/helpers/graphql_devise/application_helper.rb | 4 ++++ app/jobs/graphql_devise/application_job.rb | 4 ++++ app/mailers/graphql_devise/application_mailer.rb | 6 ++++++ app/models/graphql_devise/application_record.rb | 5 +++++ app/views/.keep | 0 bin/rails | 14 ++++++++++++++ graphql_devise.gemspec | 3 ++- lib/graphql_devise.rb | 3 ++- lib/graphql_devise/concerns/models/testable.rb | 12 ------------ lib/graphql_devise/engine.rb | 7 +++++++ lib/graphql_devise/rails/routes.rb | 9 +++++++++ spec/dummy/app/models/user.rb | 1 - spec/dummy/config/application.rb | 16 ++++++++-------- spec/graphql_devise_spec.rb | 6 +++--- spec/models/user_spec.rb | 4 ++-- spec/rails_helper.rb | 8 +++----- spec/spec_helper.rb | 6 +++--- 19 files changed, 77 insertions(+), 37 deletions(-) create mode 100644 app/controllers/graphql_devise/application_controller.rb create mode 100644 app/helpers/graphql_devise/application_helper.rb create mode 100644 app/jobs/graphql_devise/application_job.rb create mode 100644 app/mailers/graphql_devise/application_mailer.rb create mode 100644 app/models/graphql_devise/application_record.rb create mode 100644 app/views/.keep create mode 100755 bin/rails delete mode 100644 lib/graphql_devise/concerns/models/testable.rb create mode 100644 lib/graphql_devise/engine.rb create mode 100644 lib/graphql_devise/rails/routes.rb diff --git a/Gemfile b/Gemfile index 53519927..9383f269 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source "https://rubygems.org" +source 'https://rubygems.org' gemspec diff --git a/app/controllers/graphql_devise/application_controller.rb b/app/controllers/graphql_devise/application_controller.rb new file mode 100644 index 00000000..f2d18a15 --- /dev/null +++ b/app/controllers/graphql_devise/application_controller.rb @@ -0,0 +1,4 @@ +module GraphqlDevise + class ApplicationController < ActionController::API + end +end diff --git a/app/helpers/graphql_devise/application_helper.rb b/app/helpers/graphql_devise/application_helper.rb new file mode 100644 index 00000000..6147a090 --- /dev/null +++ b/app/helpers/graphql_devise/application_helper.rb @@ -0,0 +1,4 @@ +module GraphqlDevise + module ApplicationHelper + end +end diff --git a/app/jobs/graphql_devise/application_job.rb b/app/jobs/graphql_devise/application_job.rb new file mode 100644 index 00000000..3770f77f --- /dev/null +++ b/app/jobs/graphql_devise/application_job.rb @@ -0,0 +1,4 @@ +module GraphqlDevise + class ApplicationJob < ActiveJob::Base + end +end diff --git a/app/mailers/graphql_devise/application_mailer.rb b/app/mailers/graphql_devise/application_mailer.rb new file mode 100644 index 00000000..6cf6c0e2 --- /dev/null +++ b/app/mailers/graphql_devise/application_mailer.rb @@ -0,0 +1,6 @@ +module GraphqlDevise + class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' + end +end diff --git a/app/models/graphql_devise/application_record.rb b/app/models/graphql_devise/application_record.rb new file mode 100644 index 00000000..9565172b --- /dev/null +++ b/app/models/graphql_devise/application_record.rb @@ -0,0 +1,5 @@ +module GraphqlDevise + class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true + end +end diff --git a/app/views/.keep b/app/views/.keep new file mode 100644 index 00000000..e69de29b diff --git a/bin/rails b/bin/rails new file mode 100755 index 00000000..d41e74d8 --- /dev/null +++ b/bin/rails @@ -0,0 +1,14 @@ +#!/usr/bin/env ruby +# This command will automatically be run when you run "rails" with Rails gems +# installed from the root of your application. + +ENGINE_ROOT = File.expand_path('..', __dir__) +ENGINE_PATH = File.expand_path('../lib/graphql_devise/engine', __dir__) +APP_PATH = File.expand_path('../test/dummy/config/application', __dir__) + +# Set up gems listed in the Gemfile. +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) +require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) + +require 'rails/all' +require 'rails/engine/commands' diff --git a/graphql_devise.gemspec b/graphql_devise.gemspec index 9ae65d52..cc089b75 100644 --- a/graphql_devise.gemspec +++ b/graphql_devise.gemspec @@ -21,9 +21,10 @@ Gem::Specification.new do |spec| spec.bindir = 'exe' spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.test_files = Dir["spec/**/*"] + spec.test_files = Dir['spec/**/*'] spec.add_dependency 'devise_token_auth' + spec.add_dependency 'rails', '~> 5.0' spec.add_development_dependency 'bundler', '~> 2.0' spec.add_development_dependency 'rake', '~> 10.0' diff --git a/lib/graphql_devise.rb b/lib/graphql_devise.rb index e1369fb2..fb1e1d54 100644 --- a/lib/graphql_devise.rb +++ b/lib/graphql_devise.rb @@ -1,6 +1,7 @@ +require 'rails' +require 'graphql_devise/engine' require 'devise_token_auth' require 'graphql_devise/version' -require 'graphql_devise/concerns/models/testable' module GraphqlDevise class Error < StandardError; end diff --git a/lib/graphql_devise/concerns/models/testable.rb b/lib/graphql_devise/concerns/models/testable.rb deleted file mode 100644 index 0a7cf606..00000000 --- a/lib/graphql_devise/concerns/models/testable.rb +++ /dev/null @@ -1,12 +0,0 @@ -module GraphqlDevise - module Concerns - module Models - module Testable - def test - 'This is a test' - end - end - end - end -end - diff --git a/lib/graphql_devise/engine.rb b/lib/graphql_devise/engine.rb new file mode 100644 index 00000000..36458e3b --- /dev/null +++ b/lib/graphql_devise/engine.rb @@ -0,0 +1,7 @@ +require 'graphql_devise/rails/routes' + +module GraphqlDevise + class Engine < ::Rails::Engine + isolate_namespace GraphqlDevise + end +end diff --git a/lib/graphql_devise/rails/routes.rb b/lib/graphql_devise/rails/routes.rb new file mode 100644 index 00000000..0d88d8b3 --- /dev/null +++ b/lib/graphql_devise/rails/routes.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +module ActionDispatch::Routing + class Mapper + def mount_graphql_devise_for(resource, opts = {}) + # Code to mount routes and controllers for specified model + end + end +end diff --git a/spec/dummy/app/models/user.rb b/spec/dummy/app/models/user.rb index 1842d4f0..379658a5 100644 --- a/spec/dummy/app/models/user.rb +++ b/spec/dummy/app/models/user.rb @@ -1,3 +1,2 @@ class User < ApplicationRecord - include GraphqlDevise::Concerns::Models::Testable end diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb index d3cc73c2..caef4e3c 100644 --- a/spec/dummy/config/application.rb +++ b/spec/dummy/config/application.rb @@ -1,14 +1,14 @@ require_relative 'boot' -require "rails" +require 'rails' # Pick the frameworks you want: -require "active_model/railtie" -require "active_job/railtie" -require "active_record/railtie" +require 'active_model/railtie' +require 'active_job/railtie' +require 'active_record/railtie' # require "active_storage/engine" -require "action_controller/railtie" -require "action_mailer/railtie" -require "action_view/railtie" +require 'action_controller/railtie' +require 'action_mailer/railtie' +require 'action_view/railtie' # require "action_cable/engine" # require "sprockets/railtie" # require "rails/test_unit/railtie" @@ -16,7 +16,7 @@ # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) -require "graphql_devise" +require 'graphql_devise' module Dummy class Application < Rails::Application diff --git a/spec/graphql_devise_spec.rb b/spec/graphql_devise_spec.rb index a6df42c1..1dd184fe 100644 --- a/spec/graphql_devise_spec.rb +++ b/spec/graphql_devise_spec.rb @@ -1,9 +1,9 @@ RSpec.describe GraphqlDevise do - it "has a version number" do + it 'has a version number' do expect(GraphqlDevise::VERSION).not_to be nil end - it "does something useful" do - expect(false).to eq(true) + it 'does something useful' do + expect(true).to eq(true) end end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index c49aff0f..4a3618f1 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -2,8 +2,8 @@ RSpec.describe User do it 'responds to included concern method' do - user = User.new + user = described_class.new - expect(user.test).to eq('This is a test') + expect(user).not_to be_persisted end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 9e5c68d7..17d1e098 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,10 +1,10 @@ ENV['RAILS_ENV'] ||= 'test' ENGINE_ROOT = File.join(File.dirname(__FILE__), '../') -require File.expand_path('../dummy/config/environment.rb', __FILE__) +require File.expand_path('dummy/config/environment.rb', __dir__) # Prevent database truncation if the environment is production -abort("The Rails environment is running in production mode!") if Rails.env.production? +abort('The Rails environment is running in production mode!') if Rails.env.production? require 'spec_helper' require 'rspec/rails' @@ -16,9 +16,7 @@ # Load migrations from the dummy app. -RSpec.configure do |config| - config.infer_spec_type_from_file_location! -end +RSpec.configure(&:infer_spec_type_from_file_location!) # Checks for pending migrations and applies them before tests are run. # If you are not using ActiveRecord, you can remove these lines. begin diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 765a646d..88534b6f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,9 +1,9 @@ -require "bundler/setup" -require "graphql_devise" +require 'bundler/setup' +require 'graphql_devise' RSpec.configure do |config| # Enable flags like --only-failures and --next-failure - config.example_status_persistence_file_path = ".rspec_status" + config.example_status_persistence_file_path = '.rspec_status' # Disable RSpec exposing methods globally on `Module` and `main` config.disable_monkey_patching! From 9bcf881828c3a03da1a71c0803f4f4b33d59a922 Mon Sep 17 00:00:00 2001 From: Mario Celi Date: Sun, 18 Aug 2019 23:11:45 -0500 Subject: [PATCH 2/4] Add controller and mount method for routes --- .../graphql_devise/application_controller.rb | 2 +- .../graphql_devise/graphql_controller.rb | 8 + lib/graphql_devise/rails/routes.rb | 22 +- spec/dummy/app/models/user.rb | 9 + spec/dummy/config/initializers/devise.rb | 290 ++++++++++++++++++ .../config/initializers/devise_token_auth.rb | 55 ++++ spec/dummy/config/routes.rb | 3 +- 7 files changed, 385 insertions(+), 4 deletions(-) create mode 100644 app/controllers/graphql_devise/graphql_controller.rb create mode 100644 spec/dummy/config/initializers/devise.rb create mode 100644 spec/dummy/config/initializers/devise_token_auth.rb diff --git a/app/controllers/graphql_devise/application_controller.rb b/app/controllers/graphql_devise/application_controller.rb index f2d18a15..c76cace5 100644 --- a/app/controllers/graphql_devise/application_controller.rb +++ b/app/controllers/graphql_devise/application_controller.rb @@ -1,4 +1,4 @@ module GraphqlDevise - class ApplicationController < ActionController::API + class ApplicationController < DeviseTokenAuth::ApplicationController end end diff --git a/app/controllers/graphql_devise/graphql_controller.rb b/app/controllers/graphql_devise/graphql_controller.rb new file mode 100644 index 00000000..a8edfd23 --- /dev/null +++ b/app/controllers/graphql_devise/graphql_controller.rb @@ -0,0 +1,8 @@ +require_dependency 'graphql_devise/application_controller' + +module GraphqlDevise + class GraphqlController < ApplicationController + def auth + end + end +end diff --git a/lib/graphql_devise/rails/routes.rb b/lib/graphql_devise/rails/routes.rb index 0d88d8b3..bec9c013 100644 --- a/lib/graphql_devise/rails/routes.rb +++ b/lib/graphql_devise/rails/routes.rb @@ -3,7 +3,27 @@ module ActionDispatch::Routing class Mapper def mount_graphql_devise_for(resource, opts = {}) - # Code to mount routes and controllers for specified model + mount_devise_token_auth_for( + resource, + { + skip: [ + :sessions, + :registrations, + :passwords, + :confirmations, + :token_validations, + :omniauth_callbacks, + :unlocks + ] + }.merge(opts) + ) + + path = opts.fetch(:at, '/') + mapping_name = resource.underscore.gsub('/', '_') + + devise_scope mapping_name.to_sym do + post "#{path}/graphql_auth", to: 'graphql_devise/graphql#auth' + end end end end diff --git a/spec/dummy/app/models/user.rb b/spec/dummy/app/models/user.rb index 379658a5..7ad44780 100644 --- a/spec/dummy/app/models/user.rb +++ b/spec/dummy/app/models/user.rb @@ -1,2 +1,11 @@ class User < ApplicationRecord + devise :database_authenticatable, + :registerable, + :recoverable, + :rememberable, + :trackable, + :validatable, + :confirmable + + include DeviseTokenAuth::Concerns::User end diff --git a/spec/dummy/config/initializers/devise.rb b/spec/dummy/config/initializers/devise.rb new file mode 100644 index 00000000..cf12bdbd --- /dev/null +++ b/spec/dummy/config/initializers/devise.rb @@ -0,0 +1,290 @@ +# frozen_string_literal: true + +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # Devise will use the `secret_key_base` as its `secret_key` + # by default. You can change it below and use your own secret key. + # config.secret_key = '981f041712ce247008f46fec55e5d3e7fea904bd1601412a5810c74af3f1d9c33399bc34405b85a78dac04c9fb017270e691305b3ddb073f93578df124538e89' + + # ==> Controller configuration + # Configure the parent class to the devise controllers. + # config.parent_controller = 'DeviseController' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # Configure the parent class responsible to send e-mails. + # config.parent_mailer = 'ActionMailer::Base' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + config.authentication_keys = [:email, :nickname] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [:email] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [:email] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If 401 status code should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # When false, Devise will not attempt to reload routes on eager load. + # This can reduce the time taken to boot the app but if your application + # requires the Devise mappings to be loaded during boot time the application + # won't boot properly. + # config.reload_routes = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 11. If + # using other algorithms, it sets how many times you want the password to be hashed. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # algorithm), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 11 + + # Set up a pepper to generate the hashed password. + # config.pepper = 'ced2d580bc6502ee4c7c70eb54499e72c04430932a791b1ec4694f7ebecafec05f487517c2f7337a4757e67bcc74fa957d23d89b1ea61cfb48a8ebe31c8dade1' + + # Send a notification to the original email when the user's email is changed. + # config.send_email_changed_notification = false + + # Send a notification email when the user's password is changed. + # config.send_password_change_notification = false + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [:email] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # Invalidates all the remember me tokens when the user signs out. + config.expire_all_remember_me_on_sign_out = true + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 6..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [:email] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = true + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [:email] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # When set to false, does not sign a user in automatically after their password is + # reset. Defaults to true, so a user is signed in automatically after a reset. + # config.sign_in_after_reset_password = true + + # ==> Configuration for :encryptable + # Allow you to use another hashing or encryption algorithm besides bcrypt (default). + # You can use :sha1, :sha512 or algorithms from others authentication tools as + # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20 + # for default behavior) and :restful_authentication_sha1 (then you should set + # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using OmniAuth, Devise cannot automatically set OmniAuth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' + + # ==> Turbolinks configuration + # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly: + # + # ActiveSupport.on_load(:devise_failure_app) do + # include Turbolinks::Controller + # end +end diff --git a/spec/dummy/config/initializers/devise_token_auth.rb b/spec/dummy/config/initializers/devise_token_auth.rb new file mode 100644 index 00000000..6e22e25a --- /dev/null +++ b/spec/dummy/config/initializers/devise_token_auth.rb @@ -0,0 +1,55 @@ +# frozen_string_literal: true + +DeviseTokenAuth.setup do |config| + # By default the authorization headers will change after each request. The + # client is responsible for keeping track of the changing tokens. Change + # this to false to prevent the Authorization header from changing after + # each request. + # config.change_headers_on_each_request = true + + # By default, users will need to re-authenticate after 2 weeks. This setting + # determines how long tokens will remain valid after they are issued. + # config.token_lifespan = 2.weeks + + # Limiting the token_cost to just 4 in testing will increase the performance of + # your test suite dramatically. The possible cost value is within range from 4 + # to 31. It is recommended to not use a value more than 10 in other environments. + config.token_cost = Rails.env.test? ? 4 : 10 + + # Sets the max number of concurrent devices per user, which is 10 by default. + # After this limit is reached, the oldest tokens will be removed. + # config.max_number_of_devices = 10 + + # Sometimes it's necessary to make several requests to the API at the same + # time. In this case, each request in the batch will need to share the same + # auth token. This setting determines how far apart the requests can be while + # still using the same auth token. + # config.batch_request_buffer_throttle = 5.seconds + + # This route will be the prefix for all oauth2 redirect callbacks. For + # example, using the default '/omniauth', the github oauth2 provider will + # redirect successful authentications to '/omniauth/github/callback' + # config.omniauth_prefix = "/omniauth" + + # By default sending current password is not needed for the password update. + # Uncomment to enforce current_password param to be checked before all + # attribute updates. Set it to :password if you want it to be checked only if + # password is updated. + # config.check_current_password_before_update = :attributes + + # By default we will use callbacks for single omniauth. + # It depends on fields like email, provider and uid. + # config.default_callbacks = true + + # Makes it possible to change the headers names + # config.headers_names = {:'access-token' => 'access-token', + # :'client' => 'client', + # :'expiry' => 'expiry', + # :'uid' => 'uid', + # :'token-type' => 'token-type' } + + # By default, only Bearer Token authentication is implemented out of the box. + # If, however, you wish to integrate with legacy Devise authentication, you can + # do so by enabling this flag. NOTE: This feature is highly experimental! + # config.enable_standard_devise_support = false +end diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb index a744ed45..e108daa4 100644 --- a/spec/dummy/config/routes.rb +++ b/spec/dummy/config/routes.rb @@ -1,4 +1,3 @@ Rails.application.routes.draw do - resources :users - # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + mount_graphql_devise_for 'User', at: 'api/v1' end From 6c9ebb481c3b797487617797bfc180cc72dc66a5 Mon Sep 17 00:00:00 2001 From: Mario Celi Date: Mon, 19 Aug 2019 00:08:52 -0500 Subject: [PATCH 3/4] Add first POC login mutation --- .../graphql_devise/graphql_controller.rb | 43 +++++++++++++++++++ app/graphql/graphql_devise/mutations/login.rb | 34 +++++++++++++++ app/graphql/graphql_devise/schema.rb | 6 +++ .../types/authenticable_type.rb | 7 +++ .../graphql_devise/types/mutation_type.rb | 7 +++ .../graphql_devise/types/query_type.rb | 6 +++ graphql_devise.gemspec | 1 + lib/graphql_devise.rb | 1 + 8 files changed, 105 insertions(+) create mode 100644 app/graphql/graphql_devise/mutations/login.rb create mode 100644 app/graphql/graphql_devise/schema.rb create mode 100644 app/graphql/graphql_devise/types/authenticable_type.rb create mode 100644 app/graphql/graphql_devise/types/mutation_type.rb create mode 100644 app/graphql/graphql_devise/types/query_type.rb diff --git a/app/controllers/graphql_devise/graphql_controller.rb b/app/controllers/graphql_devise/graphql_controller.rb index a8edfd23..3160f6ba 100644 --- a/app/controllers/graphql_devise/graphql_controller.rb +++ b/app/controllers/graphql_devise/graphql_controller.rb @@ -3,6 +3,49 @@ module GraphqlDevise class GraphqlController < ApplicationController def auth + result = if params[:_json] + GraphqlDevise::Schema.multiplex( + params[:_json].map do |param| + { query: param[:query] }.merge(execute_params(param)) + end + ) + else + GraphqlDevise::Schema.execute(params[:query], execute_params(params)) + end + + render json: result + end + + private + + def execute_params(item, user = current_user) + { + operation_name: item[:operationName], + variables: ensure_hash(item[:variables]), + context: { + current_user: user, + request: request, + response: response, + resource_class: resource_class + } + } + end + + def ensure_hash(ambiguous_param) + case ambiguous_param + when String + if ambiguous_param.present? + ensure_hash(JSON.parse(ambiguous_param)) + else + {} + end + when Hash, ActionController::Parameters + ambiguous_param + when nil + {} + else + raise ArgumentError, "Unexpected parameter: #{ambiguous_param}" + end end end end diff --git a/app/graphql/graphql_devise/mutations/login.rb b/app/graphql/graphql_devise/mutations/login.rb new file mode 100644 index 00000000..848c9234 --- /dev/null +++ b/app/graphql/graphql_devise/mutations/login.rb @@ -0,0 +1,34 @@ +module GraphqlDevise + module Mutations + class Login < GraphQL::Schema::Mutation + argument :email, String, required: true + argument :password, String, required: true + + field :authenticable, GraphqlDevise::Types::AuthenticableType, null: true + + def resolve(email:, password:) + resource = context[:resource_class].find_by(email: email) + + if resource && (!resource.respond_to?(:active_for_authentication?) || resource.active_for_authentication?) + valid_password = resource.valid_password?(password) + if (resource.respond_to?(:valid_for_authentication?) && !resource.valid_for_authentication? { valid_password }) || !valid_password + return {} + end + + auth_headers = resource.create_new_auth_token + context[:response].headers.merge!(auth_headers) + + { authenticable: resource } + elsif resource && !(!resource.respond_to?(:active_for_authentication?) || resource.active_for_authentication?) + if resource.respond_to?(:locked_at) && resource.locked_at + return {} + else + return {} + end + else + return {} + end + end + end + end +end diff --git a/app/graphql/graphql_devise/schema.rb b/app/graphql/graphql_devise/schema.rb new file mode 100644 index 00000000..d1dcc53d --- /dev/null +++ b/app/graphql/graphql_devise/schema.rb @@ -0,0 +1,6 @@ +module GraphqlDevise + class Schema < GraphQL::Schema + mutation(GraphqlDevise::Types::MutationType) + query(GraphqlDevise::Types::QueryType) + end +end diff --git a/app/graphql/graphql_devise/types/authenticable_type.rb b/app/graphql/graphql_devise/types/authenticable_type.rb new file mode 100644 index 00000000..a69193cb --- /dev/null +++ b/app/graphql/graphql_devise/types/authenticable_type.rb @@ -0,0 +1,7 @@ +module GraphqlDevise + module Types + class AuthenticableType < GraphQL::Schema::Object + field :email, String, null: false + end + end +end diff --git a/app/graphql/graphql_devise/types/mutation_type.rb b/app/graphql/graphql_devise/types/mutation_type.rb new file mode 100644 index 00000000..a713d8ba --- /dev/null +++ b/app/graphql/graphql_devise/types/mutation_type.rb @@ -0,0 +1,7 @@ +module GraphqlDevise + module Types + class MutationType < GraphQL::Schema::Object + field :login, mutation: GraphqlDevise::Mutations::Login + end + end +end diff --git a/app/graphql/graphql_devise/types/query_type.rb b/app/graphql/graphql_devise/types/query_type.rb new file mode 100644 index 00000000..7ccf2400 --- /dev/null +++ b/app/graphql/graphql_devise/types/query_type.rb @@ -0,0 +1,6 @@ +module GraphqlDevise + module Types + class QueryType < GraphQL::Schema::Object + end + end +end diff --git a/graphql_devise.gemspec b/graphql_devise.gemspec index cc089b75..0581ffe5 100644 --- a/graphql_devise.gemspec +++ b/graphql_devise.gemspec @@ -24,6 +24,7 @@ Gem::Specification.new do |spec| spec.test_files = Dir['spec/**/*'] spec.add_dependency 'devise_token_auth' + spec.add_dependency 'graphql' spec.add_dependency 'rails', '~> 5.0' spec.add_development_dependency 'bundler', '~> 2.0' diff --git a/lib/graphql_devise.rb b/lib/graphql_devise.rb index fb1e1d54..6e2ccf2f 100644 --- a/lib/graphql_devise.rb +++ b/lib/graphql_devise.rb @@ -1,6 +1,7 @@ require 'rails' require 'graphql_devise/engine' require 'devise_token_auth' +require 'graphql' require 'graphql_devise/version' module GraphqlDevise From cfe7cd80a25dbf0844cc736808654c21ac30ccb0 Mon Sep 17 00:00:00 2001 From: Mario Celi Date: Mon, 19 Aug 2019 10:44:15 -0500 Subject: [PATCH 4/4] Remove unnecessary spec and model --- app/models/graphql_devise/application_record.rb | 5 ----- spec/graphql_devise_spec.rb | 4 ---- 2 files changed, 9 deletions(-) delete mode 100644 app/models/graphql_devise/application_record.rb diff --git a/app/models/graphql_devise/application_record.rb b/app/models/graphql_devise/application_record.rb deleted file mode 100644 index 9565172b..00000000 --- a/app/models/graphql_devise/application_record.rb +++ /dev/null @@ -1,5 +0,0 @@ -module GraphqlDevise - class ApplicationRecord < ActiveRecord::Base - self.abstract_class = true - end -end diff --git a/spec/graphql_devise_spec.rb b/spec/graphql_devise_spec.rb index 1dd184fe..32a8d652 100644 --- a/spec/graphql_devise_spec.rb +++ b/spec/graphql_devise_spec.rb @@ -2,8 +2,4 @@ it 'has a version number' do expect(GraphqlDevise::VERSION).not_to be nil end - - it 'does something useful' do - expect(true).to eq(true) - end end