Add UI for admin to create org and config messengers #2020

mattwr18 · 2024-09-09T09:46:14Z

Closes #1948

TODOs

Telegram

Add set webhook job
restart the server

Signal

Option to use voice in register step
Add job to set username and update organization with signal_complete_onboarding_link
Translate page

Organizations

Add field to change project name
Redirect after success

Gemfile.lock

soey · 2024-09-11T08:02:31Z

app/dashboards/organization_dashboard.rb

+    whats_app_profile_about: Field::Text,
+    email_from_address: Field::Email,
+    telegram_bot_username: Field::String,
+    telegram_bot_api_key: Field::Password,


Suggested change

telegram_bot_api_key: Field::Password,

telegram_bot_api_key: Field::String,

soey · 2024-09-11T08:03:43Z

app/dashboards/organization_dashboard.rb

+    telegram_bot_username: Field::String,
+    telegram_bot_api_key: Field::Password,
+    threemarb_api_identity: Field::String,
+    threemarb_api_secret: Field::Password,


Suggested change

threemarb_api_secret: Field::Password,

threemarb_api_secret: Field::String,

soey · 2024-09-11T08:03:58Z

app/dashboards/organization_dashboard.rb

+    telegram_bot_api_key: Field::Password,
+    threemarb_api_identity: Field::String,
+    threemarb_api_secret: Field::Password,
+    threemarb_private: Field::Password,


Suggested change

threemarb_private: Field::Password,

threemarb_private: Field::String,

soey · 2024-09-11T08:04:37Z

app/dashboards/organization_dashboard.rb

+    whats_app_server_phone_number: Field::String,
+    twilio_account_sid: Field::String,
+    twilio_api_key_sid: Field::String,
+    twilio_api_key_secret: Field::Password


Suggested change

twilio_api_key_secret: Field::Password

twilio_api_key_secret: Field::String

at the organization level

- when a it is created with telegram config

- update the organization's signal_complete_onboarding_link with the username link in response

- there are only a few people who have access to adding this number and it causes flaky tests.

roschaefer · 2024-12-03T11:24:16Z

config/locales/de.yml

+        contact_person: Kontaktperson
+        email_from_address: E-Mail Adresse
+        telegram_bot_username: Telegram-Bot-Benutzername
+        threemarb_api_identity: Threema Id


Suggested change

threemarb_api_identity: Threema Id

threemarb_api_identity: Threema Id

threemarb_api_secret: Threema API secret

threemarb_private: Threema private key

roschaefer

roschaefer · 2024-12-03T12:23:24Z

app/controllers/organizations/signal_controller.rb

+      response = SignalAdapter::RegisterPhoneNumberService.new(organization_id: @organization.id, register_data: register_data).call
+      case response


Suggested change

response = SignalAdapter::RegisterPhoneNumberService.new(organization_id: @organization.id, register_data: register_data).call

case response

case SignalAdapter::RegisterPhoneNumberService.call(organization_id: @organization.id, register_data: register_data)

roschaefer · 2024-12-03T12:23:47Z

app/controllers/organizations/signal_controller.rb

+
+    def verify
+      token = params[:organization][:signal][:token]
+      response = SignalAdapter::VerifyPhoneNumberService.new(organization_id: @organization.id, token: token).call


same ☝️

roschaefer · 2024-12-03T12:30:56Z

app/jobs/signal_adapter/set_profile_info_job.rb

+      end
+      case response
+      when Net::HTTPSuccess
+        Rails.logger.debug 'Great!'


Suggested change

Rails.logger.debug 'Great!'

Rails.logger.debug 'Successfully set profile info job!'

# maybe more debug output like parts of the `response`?

roschaefer · 2024-12-03T12:32:37Z

app/jobs/signal_adapter/set_username_job.rb

+                                      Accept: 'application/json',
+                                      'Content-Type': 'application/json'
+                                    })
+      request.body = { username: organization.project_name.gsub(/[^\w\s]/, '').gsub(/\s+/, '').camelize }.to_json


Require a project name for every organization. The string must be validated according to signal's validations.

roschaefer · 2024-12-03T12:35:01Z

app/views/fields/setup_signal_link_field/_show.html.erb

@@ -0,0 +1,4 @@
+<p>Klicke hier, um dich zu registrieren, falls du noch nicht registriert bist.</p>


Suggested change

<p>Klicke hier, um dich zu registrieren, falls du noch nicht registriert bist.</p>

<p>Klicke hier, um dich zu registrieren, falls du noch nicht registriert bist.</p>

Localize this!

roschaefer · 2024-12-03T12:43:30Z

db/schema.rb

+  create_table "data_migrations", primary_key: "version", id: :string, force: :cascade do |t|
+  end
+


Suggested change

create_table "data_migrations", primary_key: "version", id: :string, force: :cascade do |t|

end

roschaefer · 2024-12-03T12:44:08Z

spec/adapters/signal_adapter/outbound/file_spec.rb

-  let(:request) { create(:request, organization: create(:organization, signal_server_phone_number: 'SIGNAL_SERVER_PHONE_NUMBER')) }
+  let(:organization) do
+    build(:organization, signal_server_phone_number: 'SIGNAL_SERVER_PHONE_NUMBER').tap do |org|
+      org.save(validate: false)


Looks like a dirty hack

roschaefer · 2024-12-03T12:47:49Z

spec/requests/admin/organization_spec.rb

+          required_params.deep_merge({ organization: signal_params })
+        end
+
+        it 'allows configuration of Twilio specific attrs' do


Suggested change

it 'allows configuration of Twilio specific attrs' do

it 'allows configuration of Twilio specific attributes' do

roschaefer · 2024-12-03T12:48:45Z

spec/requests/organizations/signal_spec.rb

+        end
+      end
+
+      context 'given the register is unsucessful' do


Suggested change

context 'given the register is unsucessful' do

context 'given the registration is unsuccessful' do

roschaefer · 2024-12-03T12:49:44Z

spec/requests/organizations/signal_spec.rb

+        expect { subject.call }.to have_enqueued_job(SignalAdapter::SetTrustModeJob).with(signal_server_phone_number: '+4912345678')
+      end
+
+      context 'given the verify is unsucessful' do


Suggested change

context 'given the verify is unsucessful' do

context 'given the verify is unsuccessful' do

mattwr18 commented Sep 9, 2024

View reviewed changes

Gemfile.lock Outdated Show resolved Hide resolved

soey approved these changes Sep 9, 2024

View reviewed changes

mattwr18 force-pushed the 1948_add_ui_for_admin_to_create_org_config_messengers branch from 5e9ec73 to 5c60304 Compare September 9, 2024 19:08

soey reviewed Sep 11, 2024

View reviewed changes

mattwr18 force-pushed the 1948_add_ui_for_admin_to_create_org_config_messengers branch 2 times, most recently from f60b7c8 to 0d787f8 Compare October 16, 2024 11:13

mattwr18 force-pushed the 1948_add_ui_for_admin_to_create_org_config_messengers branch from d6d658a to bd8f027 Compare October 24, 2024 10:43

mattwr18 added 20 commits December 3, 2024 10:33

Test drive creation of organizations by admin

78c7316

Test drive adding email from address

d710f09

Test drive configuring telegram when creating an org

b818bd4

Test drive configuring Threema at org creation

588beae

Lint, improve dashboard field types

4ff2168

Test drive Twilio WhatsApp configuration

9b7887b

Improve descriptions of specs

2c0604f

Add steps to add and register signal phone number

b551f68

at the organization level

Fix specs to work with both docker and local

9167777

Remove Twilio for new orgs, update field types

433c8b3

Allow org to be created without Telegram as a channel

e203ca0

Set telegram webhook url on org creation

ad2e0d0

- when a it is created with telegram config

Move adding signal phone number to admin portal

041cdd5

Update admin root to organizations#index

0b9817a

Add link to register signal

740e3a9

Refactor signal registration process

e450e8b

Schedule a job to set the username

9ea881b

- update the organization's signal_complete_onboarding_link with the username link in response

Lint

6a774a3

Fix failing tests

482dbaa

Fine tune signal setup

a9a9701

mattwr18 added 2 commits December 3, 2024 10:37

Add job to set profile info for Signal

508cd06

Remove undesired change

5e72aee

mattwr18 force-pushed the 1948_add_ui_for_admin_to_create_org_config_messengers branch from 844b28c to 5e72aee Compare December 3, 2024 09:42

Avoid validating signal_server_phone_number

b4b7089

- there are only a few people who have access to adding this number and it causes flaky tests.

roschaefer reviewed Dec 3, 2024

View reviewed changes

roschaefer approved these changes Dec 3, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add UI for admin to create org and config messengers #2020

Add UI for admin to create org and config messengers #2020

mattwr18 commented Sep 9, 2024 •

edited

Loading

soey Sep 11, 2024

soey Sep 11, 2024

soey Sep 11, 2024

soey Sep 11, 2024

roschaefer Dec 3, 2024

roschaefer left a comment

roschaefer Dec 3, 2024

roschaefer Dec 3, 2024

roschaefer Dec 3, 2024

roschaefer Dec 3, 2024

roschaefer Dec 3, 2024

roschaefer Dec 3, 2024

roschaefer Dec 3, 2024

roschaefer Dec 3, 2024

roschaefer Dec 3, 2024

roschaefer Dec 3, 2024

	telegram_bot_api_key: Field::Password,
	telegram_bot_api_key: Field::String,

	threemarb_api_secret: Field::Password,
	threemarb_api_secret: Field::String,

	threemarb_private: Field::Password,
	threemarb_private: Field::String,

	twilio_api_key_secret: Field::Password
	twilio_api_key_secret: Field::String

		response = SignalAdapter::RegisterPhoneNumberService.new(organization_id: @organization.id, register_data: register_data).call
		case response

	response = SignalAdapter::RegisterPhoneNumberService.new(organization_id: @organization.id, register_data: register_data).call
	case response
	case SignalAdapter::RegisterPhoneNumberService.call(organization_id: @organization.id, register_data: register_data)

	Rails.logger.debug 'Great!'
	Rails.logger.debug 'Successfully set profile info job!'
	# maybe more debug output like parts of the `response`?

		@@ -0,0 +1,4 @@
		<p>Klicke hier, um dich zu registrieren, falls du noch nicht registriert bist.</p>

		create_table "data_migrations", primary_key: "version", id: :string, force: :cascade do \|t\|
		end

	it 'allows configuration of Twilio specific attrs' do
	it 'allows configuration of Twilio specific attributes' do

	context 'given the register is unsucessful' do
	context 'given the registration is unsuccessful' do

	context 'given the verify is unsucessful' do
	context 'given the verify is unsuccessful' do

Add UI for admin to create org and config messengers #2020

Are you sure you want to change the base?

Add UI for admin to create org and config messengers #2020

Conversation

mattwr18 commented Sep 9, 2024 • edited Loading

Telegram

Signal

Organizations

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

roschaefer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mattwr18 commented Sep 9, 2024 •

edited

Loading