tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

squashed identity proof updates (#10375)

Browse Source
This commit is contained in:
Alex Gessner
2019-03-28 13:01:09 -04:00
committed by Eugen Rochko
parent 026dd75208
commit 69141dca26
20 changed files with 214 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/proof_provider/keybase/config_serializer.rb
View File

@ -14,7 +14,7 @@ class ProofProvider::Keybase::ConfigSerializer < ActiveModel::Serializer
end
def domain
Rails.configuration.x.local_domain
ProofProvider::Keybase::DOMAIN
end
def display_name
@ -66,6 +66,6 @@ class ProofProvider::Keybase::ConfigSerializer < ActiveModel::Serializer
end
def contact
[Setting.site_contact_email.presence].compact
[Setting.site_contact_email.presence || 'unknown'].compact
end
end

6
app/lib/proof_provider/keybase/verifier.rb
View File

@ -49,14 +49,10 @@ class ProofProvider::Keybase::Verifier
def query_params
{
domain: domain,
domain: ProofProvider::Keybase::DOMAIN,
kb_username: @provider_username,
username: @local_username,
sig_hash: @token,
}
end
def domain
Rails.configuration.x.local_domain
end
end