summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-11-10 13:07:15 +0100
committerClaire <claire.github-309c@sitedethib.com>2023-11-13 13:49:03 +0100
commit8dc250a35726d7a867f7301aeef5b1edcbf82167 (patch)
tree11da0838336c13dcaf578199fe4e46d43842d4bd
parentc01f13d04a1c8cab1a4173629fa2acfcd867c786 (diff)
Change `GET /invite/:invite_code` to return a JSON document when JSON is requestedfeatures/registration-invite-api
-rw-r--r--app/controllers/api/v1/invites_controller.rb30
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/routes.rb2
-rw-r--r--spec/requests/invite_spec.rb27
4 files changed, 60 insertions, 0 deletions
diff --git a/app/controllers/api/v1/invites_controller.rb b/app/controllers/api/v1/invites_controller.rb
new file mode 100644
index 00000000000..ea17ba74038
--- /dev/null
+++ b/app/controllers/api/v1/invites_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class Api::V1::InvitesController < Api::BaseController
+ include RegistrationHelper
+
+ skip_before_action :require_authenticated_user!
+ skip_around_action :set_locale
+
+ before_action :set_invite
+ before_action :check_enabled_registrations!
+
+ # Override `current_user` to avoid reading session cookies
+ def current_user; end
+
+ def show
+ render json: { invite_code: params[:invite_code], instance_api_url: api_v2_instance_url }, status: 200
+ end
+
+ private
+
+ def set_invite
+ @invite = Invite.find_by!(code: params[:invite_code])
+ end
+
+ def check_enabled_registrations!
+ return render json: { error: I18n.t('invites.invalid') }, status: 401 unless @invite.valid_for_use?
+
+ raise Mastodon::NotPermittedError unless allowed_registration?(request.remote_ip, @invite)
+ end
+end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c298c47d351..7319de53dba 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1368,6 +1368,7 @@ en:
'86400': 1 day
expires_in_prompt: Never
generate: Generate invite link
+ invalid: This invite is not valid
invited_by: 'You were invited by:'
max_uses:
one: 1 use
diff --git a/config/routes.rb b/config/routes.rb
index 3adda3b8224..82431f6ec3f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -81,6 +81,8 @@ Rails.application.routes.draw do
resource :outbox, only: [:show], module: :activitypub
end
+ get '/invite/:invite_code', constraints: ->(req) { req.format == :json }, to: 'api/v1/invites#show'
+
devise_scope :user do
get '/invite/:invite_code', to: 'auth/registrations#new', as: :public_invite
diff --git a/spec/requests/invite_spec.rb b/spec/requests/invite_spec.rb
new file mode 100644
index 00000000000..c44ef2419c0
--- /dev/null
+++ b/spec/requests/invite_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe 'invites' do
+ let(:invite) { Fabricate(:invite) }
+
+ context 'when requesting a JSON document' do
+ it 'returns a JSON document with expected attributes' do
+ get "/invite/#{invite.code}", headers: { 'Accept' => 'application/activity+json' }
+
+ expect(response).to have_http_status(200)
+ expect(response.media_type).to eq 'application/json'
+
+ expect(body_as_json[:invite_code]).to eq invite.code
+ end
+ end
+
+ context 'when not requesting a JSON document' do
+ it 'returns an HTML page' do
+ get "/invite/#{invite.code}"
+
+ expect(response).to have_http_status(200)
+ expect(response.media_type).to eq 'text/html'
+ end
+ end
+end