graphql_devise 0.12.3 → 0.13.4

data/spec/dummy/config/initializers/inflections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

data/spec/dummy/config/initializers/mime_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/spec/dummy/config/puma.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Puma can serve each request in a thread from an internal thread pool.
 # The `threads` method setting takes two numbers: a minimum and maximum.
 # Any libraries that use thread pools should be configured to match

data/spec/dummy/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   mount_graphql_devise_for 'User', at: '/api/v1/graphql_auth', operations: {
     login:   Mutations::Login,
@@ -12,6 +14,9 @@ Rails.application.routes.draw do
     'Admin',
     authenticatable_type: Types::CustomAdminType,
     skip:                 [:sign_up, :check_password_token],
+    operations:           {
+      confirm_account: Resolvers::ConfirmAdminAccount
+    },
     at:                   '/api/v1/admin/graphql_auth'
   )
 

data/spec/dummy/config/spring.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 %w[
   .ruby-version
   .rbenv-vars

data/spec/dummy/db/migrate/20190815114303_create_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateUsers < ActiveRecord::Migration[5.2]
   def change
     create_table :users do |t|

data/spec/dummy/db/migrate/20190824215150_add_auth_available_to_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAuthAvailableToUsers < ActiveRecord::Migration[5.2]
   def change
     add_column :users, :auth_available, :boolean, null: false, default: true

data/spec/dummy/db/migrate/20190916012505_create_admins.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAdmins < ActiveRecord::Migration[5.2]
   def change
     create_table :admins do |t|

data/spec/dummy/db/migrate/20191013213045_create_guests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateGuests < ActiveRecord::Migration[6.0]
   def change
     create_table :guests do |t|

data/spec/dummy/db/migrate/20200321121807_create_users_customers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateUsersCustomers < ActiveRecord::Migration[6.0]
   def change
     create_table :users_customers do |t|

data/spec/dummy/db/migrate/20200621182414_remove_uncofirmed_email_from_admins.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveUncofirmedEmailFromAdmins < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :admins, :unconfirmed_email, :string
+  end
+end

data/spec/dummy/db/migrate/20200623003142_create_schema_users.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+class CreateSchemaUsers < ActiveRecord::Migration[6.0]
+  def change
+    create_table :schema_users do |t|
+      ## Required
+      t.string :provider, null: false, default: 'email'
+      t.string :uid, null: false, default: ''
+
+      ## Database authenticatable
+      t.string :encrypted_password, null: false, default: ''
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+      t.boolean  :allow_password_change, default: false
+
+      ## Confirmable
+      t.string   :confirmation_token
+      t.datetime :confirmed_at
+      t.datetime :confirmation_sent_at
+
+      # Trackable
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :last_sign_in_ip
+      t.string   :current_sign_in_ip
+      t.integer  :sign_in_count
+
+      ## User Info
+      t.string :name
+      t.string :email
+
+      ## Tokens
+      t.text :tokens
+
+      t.timestamps
+    end
+
+    add_index :schema_users, :email,                unique: true
+    add_index :schema_users, [:uid, :provider],     unique: true
+    add_index :schema_users, :reset_password_token, unique: true
+    add_index :schema_users, :confirmation_token,   unique: true
+    add_index :schema_users, :unlock_token,         unique: true
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_03_21_121807) do
+ActiveRecord::Schema.define(version: 2020_06_23_003142) do
 
   create_table "admins", force: :cascade do |t|
     t.string "provider", default: "email", null: false
@@ -22,7 +22,6 @@ ActiveRecord::Schema.define(version: 2020_03_21_121807) do
     t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string "unconfirmed_email"
     t.string "email"
     t.text "tokens"
     t.datetime "created_at", null: false
@@ -54,6 +53,33 @@ ActiveRecord::Schema.define(version: 2020_03_21_121807) do
     t.index ["uid", "provider"], name: "index_guests_on_uid_and_provider", unique: true
   end
 
+  create_table "schema_users", force: :cascade do |t|
+    t.string "provider", default: "email", null: false
+    t.string "uid", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.boolean "allow_password_change", default: false
+    t.string "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string "last_sign_in_ip"
+    t.string "current_sign_in_ip"
+    t.integer "sign_in_count"
+    t.string "name"
+    t.string "email"
+    t.text "tokens"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index "\"unlock_token\"", name: "index_schema_users_on_unlock_token", unique: true
+    t.index ["confirmation_token"], name: "index_schema_users_on_confirmation_token", unique: true
+    t.index ["email"], name: "index_schema_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_schema_users_on_reset_password_token", unique: true
+    t.index ["uid", "provider"], name: "index_schema_users_on_uid_and_provider", unique: true
+  end
+
   create_table "users", force: :cascade do |t|
     t.string "provider", default: "email", null: false
     t.string "uid", default: "", null: false

data/spec/dummy/db/seeds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
 #

data/spec/factories/admins.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :admin do
     email    { Faker::Internet.unique.email }

data/spec/factories/guests.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :guest do
     email    { Faker::Internet.unique.email }

data/spec/factories/schema_users.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :schema_user do
+    name      { Faker::FunnyName.two_word_name }
+    email     { Faker::Internet.unique.email }
+    password  { Faker::Internet.password }
+
+    trait :confirmed do
+      confirmed_at { Time.zone.now }
+    end
+  end
+end

data/spec/factories/users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :user do
     name      { Faker::FunnyName.two_word_name }

data/spec/factories/users_customers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :users_customer, class: 'Users::Customer' do
     name      { Faker::FunnyName.two_word_name }

data/spec/generators/graphql_devise/install_generator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Generators are not automatically loaded by Rails
 require 'rails_helper'
 require 'generators/graphql_devise/install_generator'
@@ -39,7 +41,7 @@ RSpec.describe GraphqlDevise::InstallGenerator, type: :generator do
     let(:args) { [] }
 
     it 'creates and updated required files' do
-      assert_file 'config/routes.rb', /^\s{2}mount_graphql_devise_for 'User', at: 'auth'/
+      assert_file 'config/routes.rb', /^\s{2}mount_graphql_devise_for 'User', at: 'graphql_auth'/
       expect(routes_content).not_to match(dta_route)
 
       assert_file 'config/initializers/devise.rb'

data/spec/graphql_devise/model/with_email_updater_spec.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe GraphqlDevise::Model::WithEmailUpdater do
+  describe '#call' do
+    subject(:updater) { described_class.new(resource, attributes).call }
+
+    context 'when the model does not have an unconfirmed_email column' do
+      let(:resource) { create(:admin, :confirmed) }
+
+      context 'when attributes contain email' do
+        let(:attributes) { { email: 'new@gmail.com', schema_url: 'http://localhost/test', confirmation_success_url: 'https://google.com' } }
+
+        it 'does not postpone email update' do
+          expect do
+            updater
+            resource.reload
+          end.to change(resource, :email).from(resource.email).to('new@gmail.com').and(
+            change(resource, :uid).from(resource.uid).to('new@gmail.com')
+          )
+        end
+      end
+    end
+
+    context 'when the model has an unconfirmed_email column' do
+      let(:resource) { create(:user, :confirmed) }
+
+      context 'when attributes do not contain email' do
+        let(:attributes) { { name: 'Updated Name', schema_url: 'http://localhost/test', confirmation_success_url: 'https://google.com' } }
+
+        it 'updates resource, ignores url params' do
+          expect do
+            updater
+            resource.reload
+          end.to change(resource, :name).from(resource.name).to('Updated Name')
+        end
+      end
+
+      context 'when attributes contain email' do
+        context 'when schema_url is missing' do
+          let(:attributes) { { email: 'new@gmail.com', name: 'Updated Name' } }
+
+          it 'raises an error' do
+            expect { updater }.to raise_error(
+              GraphqlDevise::Error,
+              'Method `update_with_email` requires attributes `confirmation_success_url` and `schema_url` for email reconfirmation to work'
+            )
+          end
+
+          context 'when email will not change' do
+            let(:attributes) { { email: resource.email, name: 'changed' } }
+
+            it 'updates name and does not raise an error' do
+              expect do
+                updater
+                resource.reload
+              end.to change(resource, :name).from(resource.name).to('changed').and(
+                not_change(resource, :email).from(resource.email)
+              ).and(
+                not_change(ActionMailer::Base.deliveries, :count).from(0)
+              )
+            end
+          end
+        end
+
+        context 'when only confirmation_success_url is missing' do
+          let(:attributes) { { email: 'new@gmail.com', name: 'Updated Name', schema_url: 'http://localhost/test' } }
+
+          it 'uses DTA default_confirm_success_url on the email' do
+            expect { updater }.to change(ActionMailer::Base.deliveries, :count).by(1)
+
+            email = ActionMailer::Base.deliveries.first
+            expect(email.body.decoded).to include(CGI.escape('https://google.com'))
+          end
+        end
+
+        context 'when both required urls are provided' do
+          let(:attributes) { { email: 'new@gmail.com', name: 'Updated Name', schema_url: 'http://localhost/test', confirmation_success_url: 'https://google.com' } }
+
+          it 'postpones email update' do
+            expect do
+              updater
+              resource.reload
+            end.to not_change(resource, :email).from(resource.email).and(
+              not_change(resource, :uid).from(resource.uid)
+            ).and(
+              change(resource, :unconfirmed_email).from(nil).to('new@gmail.com')
+            ).and(
+              change(resource, :name).from(resource.name).to('Updated Name')
+            )
+          end
+
+          it 'sends out a confirmation email to the unconfirmed_email' do
+            expect { updater }.to change(ActionMailer::Base.deliveries, :count).by(1)
+
+            email = ActionMailer::Base.deliveries.first
+            expect(email.to).to contain_exactly('new@gmail.com')
+          end
+
+          context 'when email value is the same on the DB' do
+            let(:attributes) { { email: resource.email, name: 'changed', schema_url: 'http://localhost/test', confirmation_success_url: 'https://google.com' } }
+
+            it 'updates attributes and does not send confirmation email' do
+              expect do
+                updater
+                resource.reload
+              end.to change(resource, :name).from(resource.name).to('changed').and(
+                not_change(resource, :email).from(resource.email)
+              ).and(
+                not_change(ActionMailer::Base.deliveries, :count).from(0)
+              )
+            end
+          end
+
+          context 'when provided params are invalid' do
+            let(:attributes) { { email: 'newgmail.com', name: '', schema_url: 'http://localhost/test', confirmation_success_url: 'https://google.com' } }
+
+            it 'returns false and adds errors to the model' do
+              expect(updater).to be_falsey
+              expect(resource.errors.full_messages).to contain_exactly(
+                'Email is not an email',
+                "Name can't be blank"
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/graphql_devise_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe GraphqlDevise do
   it 'has a version number' do
     expect(GraphqlDevise::VERSION).not_to be_nil

data/spec/models/user_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe User do

data/spec/rails_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 ENV['RAILS_ENV'] ||= 'test'
@@ -42,4 +44,5 @@ RSpec.configure do |config|
   config.before(:suite) do
     ActionController::Base.allow_forgery_protection = true
   end
+  config.before { ActionMailer::Base.deliveries.clear }
 end

data/spec/requests/graphql_controller_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe GraphqlDevise::GraphqlController do

data/spec/requests/mutations/additional_mutations_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe 'Additional Mutations' do

data/spec/requests/mutations/additional_queries_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe 'Additional Queries' do

data/spec/requests/mutations/login_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe 'Login Requests' do

data/spec/requests/mutations/logout_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe 'Logout Requests' do