diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rb index caff1cb0b9c8c6b73f8e0fb3b1a8738a4ac7db6c..03567166e6eabf550afc6f8fa256734f07791650 100644 --- a/app/controllers/invitations_controller.rb +++ b/app/controllers/invitations_controller.rb @@ -37,7 +37,6 @@ class InvitationsController < Devise::InvitationsController raise "Invalid Invite Token" end user = User.find_by_invitation_token(params[:user][:invitation_token]) - puts user.inspect user.seed_aspects user.accept_invitation!(params[:user]) rescue Exception => e diff --git a/app/models/user.rb b/app/models/user.rb index 51d8f2b265e5181039a75641c4dc573bcb140c2e..8d7969805cb6af572d76c026b5f08cd5c52706eb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -381,7 +381,7 @@ class User log_string << "inviter=#{invitations_to_me.first.from.diaspora_handle}" if invitations_to_me.first Rails.logger.info log_string self.setup(opts) - + puts "foobar" self.invitation_token = nil self.password = opts[:password] self.password_confirmation = opts[:password_confirmation] @@ -419,6 +419,8 @@ class User self.serialized_private_key ||= User.generate_key self.person.serialized_public_key = OpenSSL::PKey::RSA.new(self.serialized_private_key).public_key + + puts self.serialized_public_key self end diff --git a/app/views/invitations/edit.html.haml b/app/views/invitations/edit.html.haml index 30c04e0d048e54e00b3fc6f7d17c6472020985db..365f8af3919d1058219aa1d5ba3527bb69240fe5 100644 --- a/app/views/invitations/edit.html.haml +++ b/app/views/invitations/edit.html.haml @@ -19,6 +19,7 @@ %p = f.label :password_confirmation , t('password_confirmation') = f.password_field :password_confirmation, :title => t('registrations.new.enter_password_again') + = f.hidden_field :invitation_token = f.submit t('registrations.new.sign_up') %br