Skip to content

Commit aa9c806

Browse files
author
David Revelo
committed
Apply code review suggestions
1 parent 319a18a commit aa9c806

7 files changed

Lines changed: 13 additions & 18 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
/*.sqlite3
1717
/spec/dummy/db/development.sqlite3
1818
/spec/dummy/db/test.sqlite3
19-
/graphql_devise-0.1.0.gem
19+
/*.gem

app/graphql/graphql_devise/mutations/sign_up.rb

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ module GraphqlDevise
22
module Mutations
33
class SignUp < Base
44
argument :email, String, required: true
5-
argument :name, String, required: false
65
argument :password, String, required: true
76
argument :password_confirmation, String, required: true
87
argument :confirm_success_url, String, required: false
98
argument :config_name, String, required: false
109

11-
def resolve(email:, **attrs)
12-
redirect_url = attrs.delete(:confirm_success_url)
13-
resource = resource_class.new(email: email, provider: :email, **attrs)
10+
def resolve(confirm_success_url: nil, config_name: nil, **attrs)
11+
resource = resource_class.new(provider: provider, **attrs)
1412

1513
if resource.present?
1614
resource.skip_confirmation_notification! if resource.respond_to?(:skip_confirmation_notification!)
@@ -21,8 +19,8 @@ def resolve(email:, **attrs)
2119
if confirmable_enabled?(resource) && !resource.confirmed?
2220
# user will require email authentication
2321
resource.send_confirmation_instructions(
24-
client_config: attrs[:config_name],
25-
redirect_url: redirect_url
22+
client_config: config_name,
23+
redirect_url: confirm_success_url
2624
)
2725
end
2826

@@ -55,9 +53,8 @@ def provider
5553
:email
5654
end
5755

58-
# NOTE: Devise controller method, find a way to re use it
5956
def clean_up_passwords(resource)
60-
resource.clean_up_passwords if object.respond_to?(:clean_up_passwords)
57+
controller.send(:clean_up_passwords, resource)
6158
end
6259
end
6360
end

app/helpers/graphql_devise/mailer_helper.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
module GraphqlDevise
22
module MailerHelper
3-
extend ActiveSupport::Concern
4-
5-
protected
6-
73
def confirmation_query(token:, config:, redirect_url:)
84
raw = <<-GRAPHQL
95
confirmAccount($token:ID!,$clientConfig:String,redirect:String!){

lib/graphql_devise.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require 'rails'
2+
require 'graphql'
23
require 'devise_token_auth'
34
require 'graphql_devise/engine'
4-
require 'graphql'
55
require 'graphql_devise/version'
66
require 'graphql_devise/error_codes'
77
require 'graphql_devise/user_error'

lib/graphql_devise/rails/routes.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def mount_graphql_devise_for(resource, opts = {})
1919
default_mutations = {
2020
login: GraphqlDevise::Mutations::Login,
2121
logout: GraphqlDevise::Mutations::Logout,
22-
signUp: GraphqlDevise::Mutations::SignUp,
22+
sign_up: GraphqlDevise::Mutations::SignUp,
2323
update_password: GraphqlDevise::Mutations::UpdatePassword
2424
}.freeze
2525

@@ -34,7 +34,7 @@ def mount_graphql_devise_for(resource, opts = {})
3434
new_mutation
3535
end
3636

37-
GraphqlDevise::Types::MutationType.field("#{mapping_name}_#{action.to_s.underscore}", mutation: used_mutation)
37+
GraphqlDevise::Types::MutationType.field("#{mapping_name}_#{action}", mutation: used_mutation)
3838
end
3939

4040
Devise.mailer.send(:add_template_helper, GraphqlDevise::MailerHelper)

spec/dummy/app/graphql/mutations/sign_up.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module Mutations
22
class SignUp < GraphqlDevise::Mutations::SignUp
3+
argument :name, String, required: false
4+
35
field :user, Types::UserType, null: true
46

57
def resolve(email:, **attrs)

spec/dummy/config/routes.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Rails.application.routes.draw do
22
mount_graphql_devise_for 'User', at: 'api/v1', mutations: {
3-
login: Mutations::Login,
4-
signUp: Mutations::SignUp
3+
login: Mutations::Login,
4+
sign_up: Mutations::SignUp
55
}
66
end

0 commit comments

Comments
 (0)