Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions lib/graphql_devise/mutations/sign_up.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ class SignUp < Base
argument :password_confirmation, String, required: true
argument :confirm_success_url, String, required: false

field :credentials,
GraphqlDevise::Types::CredentialType,
null: true,
description: 'Authentication credentials. Null if after signUp resource is not active for authentication (e.g. Email confirmation required).'

def resolve(confirm_success_url: nil, **attrs)
resource = build_resource(attrs.merge(provider: provider))
raise_user_error(I18n.t('graphql_devise.resource_build_failed')) if resource.blank?
Expand All @@ -34,9 +39,11 @@ def resolve(confirm_success_url: nil, **attrs)
)
end

set_auth_headers(resource) if resource.active_for_authentication?
response_payload = { authenticatable: resource }

response_payload[:credentials] = set_auth_headers(resource) if resource.active_for_authentication?

{ authenticatable: resource }
response_payload
else
resource.try(:clean_up_passwords)
raise_user_error_list(
Expand Down
15 changes: 13 additions & 2 deletions spec/requests/mutations/sign_up_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
passwordConfirmation: "#{password}"
confirmSuccessUrl: "#{redirect}"
) {
credentials { accessToken }
user {
email
name
Expand All @@ -43,7 +44,8 @@
expect(user.confirmed_at).to be_nil
expect(user).to be_valid_password(password)
expect(json_response[:data][:userSignUp]).to include(
user: {
credentials: nil,
user: {
email: email,
name: name
}
Expand Down Expand Up @@ -126,6 +128,7 @@
passwordConfirmation: "#{password}"
confirmSuccessUrl: "#{redirect}"
) {
credentials { accessToken client uid }
authenticatable {
email
}
Expand All @@ -134,8 +137,16 @@
GRAPHQL
end

it 'works without the confirmable module' do
it 'returns credentials as no confirmation is required' do
expect { post_request }.to change(Guest, :count).from(0).to(1)

expect(json_response[:data][:guestSignUp]).to include(
authenticatable: { email: email },
credentials: hash_including(
uid: email,
client: Guest.last.tokens.keys.first
)
)
end
end
end