Skip to content

Commit 4ce7e36

Browse files
committed
Remove deprecated mutations and queries before v1.0.0
1 parent e9c9a8f commit 4ce7e36

27 files changed

Lines changed: 21 additions & 1294 deletions

app/helpers/graphql_devise/mailer_helper.rb

Lines changed: 0 additions & 37 deletions
This file was deleted.

app/views/graphql_devise/mailer/confirmation_instructions.html.erb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,5 @@
33
<p><%= t('.confirm_link_msg') %></p>
44

55
<p>
6-
<% if message['schema_url'].present? %>
7-
<%= link_to t('.confirm_account_link'), "#{message['schema_url']}?#{confirmation_query(resource_name: @resource.class.to_s, redirect_url: message['redirect-url'], token: @token).to_query}" %>
8-
<% else %>
9-
<%= link_to t('.confirm_account_link'), "#{CGI.escape(message['redirect-url'].to_s)}?#{{ confirmationToken: @token }.to_query}" %>
10-
<% end %>
6+
<%= link_to t('.confirm_account_link'), "#{message['redirect-url'].to_s}?#{{ confirmationToken: @token }.to_query}" %>
117
</p>

config/routes.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,5 @@
1414
GraphqlDevise::Schema.query(GraphqlDevise::Types::QueryType)
1515

1616
GraphqlDevise.load_schema
17-
18-
Devise.mailer.helper(GraphqlDevise::MailerHelper)
1917
end
2018
end

lib/graphql_devise/default_operations/mutations.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@
33
require 'graphql_devise/mutations/base'
44
require 'graphql_devise/mutations/login'
55
require 'graphql_devise/mutations/logout'
6-
require 'graphql_devise/mutations/resend_confirmation'
76
require 'graphql_devise/mutations/resend_confirmation_with_token'
8-
require 'graphql_devise/mutations/send_password_reset'
97
require 'graphql_devise/mutations/send_password_reset_with_token'
10-
require 'graphql_devise/mutations/sign_up'
118
require 'graphql_devise/mutations/register'
12-
require 'graphql_devise/mutations/update_password'
139
require 'graphql_devise/mutations/update_password_with_token'
1410
require 'graphql_devise/mutations/confirm_registration_with_token'
1511

@@ -18,13 +14,9 @@ module DefaultOperations
1814
MUTATIONS = {
1915
login: { klass: GraphqlDevise::Mutations::Login, authenticatable: true },
2016
logout: { klass: GraphqlDevise::Mutations::Logout, authenticatable: true },
21-
sign_up: { klass: GraphqlDevise::Mutations::SignUp, authenticatable: true, deprecation_reason: 'use register instead' },
2217
register: { klass: GraphqlDevise::Mutations::Register, authenticatable: true },
23-
update_password: { klass: GraphqlDevise::Mutations::UpdatePassword, authenticatable: true, deprecation_reason: 'use update_password_with_token instead' },
2418
update_password_with_token: { klass: GraphqlDevise::Mutations::UpdatePasswordWithToken, authenticatable: true },
25-
send_password_reset: { klass: GraphqlDevise::Mutations::SendPasswordReset, authenticatable: false, deprecation_reason: 'use send_password_reset_with_token instead' },
2619
send_password_reset_with_token: { klass: GraphqlDevise::Mutations::SendPasswordResetWithToken, authenticatable: false },
27-
resend_confirmation: { klass: GraphqlDevise::Mutations::ResendConfirmation, authenticatable: false, deprecation_reason: 'use resend_confirmation_with_token instead' },
2820
resend_confirmation_with_token: { klass: GraphqlDevise::Mutations::ResendConfirmationWithToken, authenticatable: false },
2921
confirm_registration_with_token: { klass: GraphqlDevise::Mutations::ConfirmRegistrationWithToken, authenticatable: true }
3022
}.freeze
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
# frozen_string_literal: true
22

33
require 'graphql_devise/resolvers/base'
4-
require 'graphql_devise/resolvers/check_password_token'
5-
require 'graphql_devise/resolvers/confirm_account'
64

75
module GraphqlDevise
86
module DefaultOperations
9-
QUERIES = {
10-
confirm_account: { klass: GraphqlDevise::Resolvers::ConfirmAccount, deprecation_reason: 'use the new confirmation flow as it does not require this query anymore' },
11-
check_password_token: { klass: GraphqlDevise::Resolvers::CheckPasswordToken, deprecation_reason: 'use the new password reset flow as it does not require this query anymore' }
12-
}.freeze
7+
QUERIES = {}.freeze
138
end
149
end

lib/graphql_devise/model/with_email_updater.rb

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ def initialize(resource, attributes)
99
end
1010

1111
def call
12-
check_deprecated_attributes
13-
14-
resource_attributes = @attributes.except(:schema_url, :confirmation_success_url, :confirmation_url)
12+
resource_attributes = @attributes.except(:confirmation_url)
1513
return @resource.update(resource_attributes) unless requires_reconfirmation?(resource_attributes)
1614

1715
@resource.assign_attributes(resource_attributes)
@@ -36,24 +34,8 @@ def call
3634

3735
private
3836

39-
def check_deprecated_attributes
40-
if [@attributes[:schema_url], @attributes[:confirmation_success_url]].any?(&:present?)
41-
ActiveSupport::Deprecation.warn(<<-DEPRECATION.strip_heredoc, caller)
42-
Providing `schema_url` and `confirmation_success_url` to `update_with_email` is deprecated and will be
43-
removed in a future version of this gem.
44-
45-
Now you must only provide `confirmation_url` and the email will contain the new format of the confirmation
46-
url that needs to be used with the new `confirmRegistrationWithToken` on the client application.
47-
DEPRECATION
48-
end
49-
end
50-
5137
def required_reconfirm_attributes?
52-
if @attributes[:schema_url].present?
53-
[@attributes[:confirmation_success_url], DeviseTokenAuth.default_confirm_success_url].any?(&:present?)
54-
else
55-
[@attributes[:confirmation_url], DeviseTokenAuth.default_confirm_success_url].any?(&:present?)
56-
end
38+
[@attributes[:confirmation_url], DeviseTokenAuth.default_confirm_success_url].any?(&:present?)
5739
end
5840

5941
def requires_reconfirmation?(resource_attributes)
@@ -78,14 +60,7 @@ def email_in_database
7860
end
7961

8062
def confirmation_method_params
81-
if @attributes[:schema_url].present?
82-
{
83-
redirect_url: @attributes[:confirmation_success_url] || DeviseTokenAuth.default_confirm_success_url,
84-
schema_url: @attributes[:schema_url]
85-
}
86-
else
87-
{ redirect_url: @attributes[:confirmation_url] || DeviseTokenAuth.default_confirm_success_url }
88-
end
63+
{ redirect_url: @attributes[:confirmation_url] || DeviseTokenAuth.default_confirm_success_url }
8964
end
9065

9166
def send_confirmation_instructions(saved)

lib/graphql_devise/mutations/resend_confirmation.rb

Lines changed: 0 additions & 45 deletions
This file was deleted.

lib/graphql_devise/mutations/send_password_reset.rb

Lines changed: 0 additions & 38 deletions
This file was deleted.

lib/graphql_devise/mutations/sign_up.rb

Lines changed: 0 additions & 61 deletions
This file was deleted.

lib/graphql_devise/mutations/update_password.rb

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)