Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
commit
02da9bf634
1 changed files with 1 additions and 5 deletions
|
|
@ -330,17 +330,13 @@ class User
|
||||||
end
|
end
|
||||||
|
|
||||||
def setup_person
|
def setup_person
|
||||||
assign_key
|
self.person.serialized_key = generate_key.export
|
||||||
self.person.email = email
|
self.person.email = email
|
||||||
self.person.save!
|
self.person.save!
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
||||||
def assign_key
|
|
||||||
self.person.serialized_key ||= generate_key.export
|
|
||||||
end
|
|
||||||
|
|
||||||
def generate_key
|
def generate_key
|
||||||
OpenSSL::PKey::RSA::generate 1024
|
OpenSSL::PKey::RSA::generate 1024
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue