invitations_controller.rb in devise_invitable-1.3.0

- old
+ new

@@ -12,11 +12,11 @@
     render :new
   end
 
   # POST /resource/invitation
   def create
-    self.resource = resource_class.invite!(invite_params, current_inviter)
+    self.resource = invite_resource
 
     if resource.errors.empty?
       set_flash_message :notice, :send_instructions, :email => self.resource.email if self.resource.invitation_sent_at
       respond_with resource, :location => after_invite_path_for(resource)
     else
@@ -24,10 +24,11 @@
     end
   end
 
   # GET /resource/invitation/accept?invitation_token=abcdef
   def edit
+    resource.invitation_token = params[:invitation_token]
     render :edit
   end
 
   # PUT /resource/invitation
   def update
@@ -49,10 +50,15 @@
     set_flash_message :notice, :invitation_removed
     redirect_to after_sign_out_path_for(resource_name)
   end
 
   protected
+
+  def invite_resource
+    resource_class.invite!(invite_params, current_inviter)
+  end
+
   def current_inviter
     @current_inviter ||= authenticate_inviter!
   end
 
   def has_invitations_left?
@@ -62,21 +68,21 @@
       respond_with_navigational(resource) { render :new }
     end
   end
   
   def resource_from_invitation_token
-    unless params[:invitation_token] && self.resource = resource_class.to_adapter.find_first(params.slice(:invitation_token))
+    unless params[:invitation_token] && self.resource = resource_class.find_by_invitation_token(params[:invitation_token], true)
       set_flash_message(:alert, :invitation_token_invalid)
       redirect_to after_sign_out_path_for(resource_name)
     end
   end
 
   def invite_params
-    devise_parameter_sanitizer.for(:invite)
+    devise_parameter_sanitizer.sanitize(:invite)
   end
 
   def update_resource_params
-    devise_parameter_sanitizer.for(:accept_invitation)
+    devise_parameter_sanitizer.sanitize(:accept_invitation)
   end
   
 end
 