Skip to content

Commit f5d5882

Browse files
author
David Revelo
committed
Move mutation assign
1 parent 9cca60e commit f5d5882

4 files changed

Lines changed: 16 additions & 29 deletions

File tree

lib/graphql_devise/engine.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,13 @@
33
module GraphqlDevise
44
class Engine < ::Rails::Engine
55
isolate_namespace GraphqlDevise
6+
7+
config.before_initialize do
8+
GraphqlDevise::Schema.mutation(GraphqlDevise::Types::MutationType)
9+
10+
if GraphqlDevise::Types::QueryType.fields.blank?
11+
GraphqlDevise::Types::QueryType.field(:dummy, resolver: GraphqlDevise::Resolvers::Dummy)
12+
end
13+
end
614
end
715
end

lib/graphql_devise/rails/routes.rb

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,12 @@ def mount_graphql_devise_for(resource, opts = {})
5151
authenticatable_type: authenticatable_type
5252
)
5353

54-
add_gql_devise_mutations!(prepared_mutations, additional_mutations)
55-
add_gql_devise_queries!(prepared_queries, additional_queries)
54+
prepared_mutations.merge(additional_mutations).each do |action, mutation|
55+
GraphqlDevise::Types::MutationType.field(action, mutation: mutation)
56+
end
57+
prepared_queries.merge(additional_queries).each do |action, resolver|
58+
GraphqlDevise::Types::QueryType.field(action, resolver: resolver)
59+
end
5660

5761
Devise.mailer.helper(GraphqlDevise::MailerHelper)
5862

@@ -71,27 +75,5 @@ def validate_gql_devise_operations!(param_operations)
7175
**param_operations
7276
)
7377
end
74-
75-
def add_gql_devise_mutations!(prepared, additional)
76-
all_mutations = prepared.merge(additional)
77-
78-
all_mutations.each do |action, mutation|
79-
GraphqlDevise::Types::MutationType.field(action, mutation: mutation)
80-
end
81-
82-
if all_mutations.present? && GraphqlDevise::Schema.try(:mutation).nil?
83-
GraphqlDevise::Schema.mutation(GraphqlDevise::Types::MutationType)
84-
end
85-
end
86-
87-
def add_gql_devise_queries!(prepared, additional)
88-
prepared.merge(additional).each do |action, resolver|
89-
GraphqlDevise::Types::QueryType.field(action, resolver: resolver)
90-
end
91-
92-
if (prepared.blank? || additional.present?) && GraphqlDevise::Types::QueryType.fields.blank?
93-
GraphqlDevise::Types::QueryType.field(:dummy, resolver: GraphqlDevise::Resolvers::Dummy)
94-
end
95-
end
9678
end
9779
end

spec/requests/mutations/login_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
GRAPHQL
139139
end
140140

141-
before { post_request }
141+
before { post_request('/api/v1/guest/graphql_auth') }
142142

143143
it 'works alongside the user mount point' do
144144
expect(json_response[:data][:guestLogin]).to include(

spec/requests/mutations/sign_up_spec.rb

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,7 @@
123123
end
124124

125125
it 'works without the confirmable module' do
126-
expect {
127-
post_request('/api/v1/guest/graphql_auth')
128-
pp json_response
129-
}.to change(Guest, :count).by(1)
126+
expect { post_request('/api/v1/guest/graphql_auth') }.to change(Guest, :count).by(1)
130127
end
131128
end
132129
end

0 commit comments

Comments
 (0)