forked from glitch-soc/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Remove Keybase integration (mastodon#17045)"
This reverts commit 7de0ee7.
- Loading branch information
Showing
43 changed files
with
1,214 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# frozen_string_literal: true | ||
|
||
class Api::ProofsController < Api::BaseController | ||
include AccountOwnedConcern | ||
|
||
skip_before_action :require_authenticated_user! | ||
|
||
before_action :set_provider | ||
|
||
def index | ||
render json: @account, serializer: @provider.serializer_class | ||
end | ||
|
||
private | ||
|
||
def set_provider | ||
@provider = ProofProvider.find(params[:provider]) || raise(ActiveRecord::RecordNotFound) | ||
end | ||
|
||
def username_param | ||
params[:username] | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
# frozen_string_literal: true | ||
|
||
class Settings::IdentityProofsController < Settings::BaseController | ||
before_action :check_required_params, only: :new | ||
|
||
def index | ||
@proofs = AccountIdentityProof.where(account: current_account).order(provider: :asc, provider_username: :asc) | ||
@proofs.each(&:refresh!) | ||
end | ||
|
||
def new | ||
@proof = current_account.identity_proofs.new( | ||
token: params[:token], | ||
provider: params[:provider], | ||
provider_username: params[:provider_username] | ||
) | ||
|
||
if current_account.username.casecmp(params[:username]).zero? | ||
render layout: 'auth' | ||
else | ||
redirect_to settings_identity_proofs_path, alert: I18n.t('identity_proofs.errors.wrong_user', proving: params[:username], current: current_account.username) | ||
end | ||
end | ||
|
||
def create | ||
@proof = current_account.identity_proofs.where(provider: resource_params[:provider], provider_username: resource_params[:provider_username]).first_or_initialize(resource_params) | ||
@proof.token = resource_params[:token] | ||
|
||
if @proof.save | ||
PostStatusService.new.call(current_user.account, text: post_params[:status_text]) if publish_proof? | ||
redirect_to @proof.on_success_path(params[:user_agent]) | ||
else | ||
redirect_to settings_identity_proofs_path, alert: I18n.t('identity_proofs.errors.failed', provider: @proof.provider.capitalize) | ||
end | ||
end | ||
|
||
def destroy | ||
@proof = current_account.identity_proofs.find(params[:id]) | ||
@proof.destroy! | ||
redirect_to settings_identity_proofs_path, success: I18n.t('identity_proofs.removed') | ||
end | ||
|
||
private | ||
|
||
def check_required_params | ||
redirect_to settings_identity_proofs_path unless [:provider, :provider_username, :username, :token].all? { |k| params[k].present? } | ||
end | ||
|
||
def resource_params | ||
params.require(:account_identity_proof).permit(:provider, :provider_username, :token) | ||
end | ||
|
||
def publish_proof? | ||
ActiveModel::Type::Boolean.new.cast(post_params[:post_status]) | ||
end | ||
|
||
def post_params | ||
params.require(:account_identity_proof).permit(:post_status, :status_text) | ||
end | ||
end |
9 changes: 9 additions & 0 deletions
9
app/controllers/well_known/keybase_proof_config_controller.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# frozen_string_literal: true | ||
|
||
module WellKnown | ||
class KeybaseProofConfigController < ActionController::Base | ||
def show | ||
render json: {}, serializer: ProofProvider::Keybase::ConfigSerializer, root: 'keybase_config' | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import api from '../api'; | ||
|
||
export const IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST = 'IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST'; | ||
export const IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS = 'IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS'; | ||
export const IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL = 'IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL'; | ||
|
||
export const fetchAccountIdentityProofs = accountId => (dispatch, getState) => { | ||
dispatch(fetchAccountIdentityProofsRequest(accountId)); | ||
|
||
api(getState).get(`/api/v1/accounts/${accountId}/identity_proofs`) | ||
.then(({ data }) => dispatch(fetchAccountIdentityProofsSuccess(accountId, data))) | ||
.catch(err => dispatch(fetchAccountIdentityProofsFail(accountId, err))); | ||
}; | ||
|
||
export const fetchAccountIdentityProofsRequest = id => ({ | ||
type: IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST, | ||
id, | ||
}); | ||
|
||
export const fetchAccountIdentityProofsSuccess = (accountId, identity_proofs) => ({ | ||
type: IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS, | ||
accountId, | ||
identity_proofs, | ||
}); | ||
|
||
export const fetchAccountIdentityProofsFail = (accountId, err) => ({ | ||
type: IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL, | ||
accountId, | ||
err, | ||
skipNotFound: true, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import { Map as ImmutableMap, fromJS } from 'immutable'; | ||
import { | ||
IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST, | ||
IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS, | ||
IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL, | ||
} from '../actions/identity_proofs'; | ||
|
||
const initialState = ImmutableMap(); | ||
|
||
export default function identityProofsReducer(state = initialState, action) { | ||
switch(action.type) { | ||
case IDENTITY_PROOFS_ACCOUNT_FETCH_REQUEST: | ||
return state.set('isLoading', true); | ||
case IDENTITY_PROOFS_ACCOUNT_FETCH_FAIL: | ||
return state.set('isLoading', false); | ||
case IDENTITY_PROOFS_ACCOUNT_FETCH_SUCCESS: | ||
return state.update(identity_proofs => identity_proofs.withMutations(map => { | ||
map.set('isLoading', false); | ||
map.set('loaded', true); | ||
map.set(action.accountId, fromJS(action.identity_proofs)); | ||
})); | ||
default: | ||
return state; | ||
} | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# frozen_string_literal: true | ||
|
||
module ProofProvider | ||
SUPPORTED_PROVIDERS = %w(keybase).freeze | ||
|
||
def self.find(identifier, proof = nil) | ||
case identifier | ||
when 'keybase' | ||
ProofProvider::Keybase.new(proof) | ||
end | ||
end | ||
end |
Oops, something went wrong.