Merge pull request #74 from southbridgeio/update-tg-methods-and-client-auth

Update tg methods and client auth for new tdlib version

Author: nevrfl

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.5.3
+
+* Add step 3 to Telegram client authorization
+* Adapt tdlib commands for new version
+
+# 0.5.2
+
+* Merge old 'update' branch
+
 # 0.5.1
 
 * Fix problem with telegram_id exceeding int.

Gemfile

@@ -5,8 +5,8 @@ gem 'sidekiq-rate-limiter', '0.1.3', require: 'sidekiq-rate-limiter/server'
 gem 'telegram-bot-ruby', '>= 0.11', '< 1.0'
 gem 'slack-ruby-bot'
 gem 'celluloid-io'
-gem 'tdlib-ruby', '3.0.2'
-gem 'tdlib-schema', git: 'https://github.com/southbridgeio/tdlib-schema', branch: 'update'
+gem 'tdlib-ruby', git: 'https://github.com/southbridgeio/tdlib-ruby', tag: "v3.0.3"
+gem 'tdlib-schema', git: 'https://github.com/southbridgeio/tdlib-schema'
 gem 'jwt'
 gem 'filelock'
 gem 'patron'

app/controllers/redmine_telegram_setup_controller.rb

@@ -14,6 +14,16 @@ def step_2
     end
   end
 
+  def step_3
+    RedmineBots::Telegram::Tdlib.wrap do
+      promise = RedmineBots::Telegram::Tdlib::Authenticate.(params).rescue do |error|
+        redirect_to plugin_settings_path('redmine_bots'), alert: error.message
+      end
+
+      RedmineBots::Telegram::Tdlib.permit_concurrent_loads { promise.wait! }
+    end
+  end
+
   def authorize
     RedmineBots::Telegram::Tdlib.wrap do
       promise = RedmineBots::Telegram::Tdlib::Authenticate.(params).then do

app/views/redmine_telegram_setup/step_1.html.erb

@@ -1,6 +1,6 @@
 <h2><%= t 'redmine_bots.settings.telegram.authorize_client' %></h2>
 <hr>
-<p><strong>1. <%= t 'redmine_bots.settings.telegram.auth_step_1' %></strong> — 2. <%= t 'redmine_bots.settings.telegram.auth_step_2' %></p>
+<p><strong>1. <%= t 'redmine_bots.settings.telegram.auth_step_1' %></strong> — 2. <%= t 'redmine_bots.settings.telegram.auth_step_2' %> — 3. <%= t 'redmine_bots.settings.telegram.auth_step_3' %></p>
 <hr>
 
 <%= form_tag telegram_setup_2_path, method: :post do %>

app/views/redmine_telegram_setup/step_2.html.erb

@@ -1,9 +1,9 @@
 <h2><%= t 'redmine_bots.settings.telegram.authorize_client' %></h2>
 <hr>
-<p><%= link_to telegram_setup_1_path do %>1. <%= t 'redmine_bots.settings.telegram.auth_step_1' %><% end %> — <strong>2. <%= t 'redmine_bots.settings.telegram.auth_step_2' %></strong></p>
+<p><%= link_to telegram_setup_1_path do %>1. <%= t 'redmine_bots.settings.telegram.auth_step_1' %><% end %> — <strong>2. <%= t 'redmine_bots.settings.telegram.auth_step_2' %></strong> — 3. <%= t 'redmine_bots.settings.telegram.auth_step_3' %></p>
 <hr>
 
-<%= form_tag telegram_setup_authorize_path, method: :post do %>
+<%= form_tag telegram_setup_3_path, method: :post do %>
   <p>
     <label>
       <%= t 'redmine_bots.settings.telegram.phone_code' %>

app/views/redmine_telegram_setup/step_3.html.erb

@@ -0,0 +1,19 @@
+<h2><%= t 'redmine_bots.settings.telegram.authorize_client' %></h2>
+<hr>
+<p><%= link_to telegram_setup_1_path do %>1. <%= t 'redmine_bots.settings.telegram.auth_step_1' %><% end %> — 2. <%= t 'redmine_bots.settings.telegram.auth_step_2' %> — <strong>3. <%= t 'redmine_bots.settings.telegram.auth_step_3' %></strong></p>
+<hr>
+
+<%= form_tag telegram_setup_authorize_path, method: :post do %>
+  <p>
+    <label>
+      <%= t 'redmine_bots.settings.telegram.password' %>
+    </label>
+    <%= text_field_tag 'password' %>
+    <em class="info"><%= t 'redmine_bots.settings.telegram.password_hint' %></em>
+  </p>
+
+  <input type="hidden" name="phone_number" value="<%= params[:phone_number] %>">
+  <input type="hidden" name="phone_code_hash" value="<%= params[:phone_code_hash] %>">
+
+  <input type="submit" value="<%= t 'redmine_bots.settings.telegram.authorize_button' %>">
+<% end %>

config/locales/en.yml

@@ -14,13 +14,16 @@ en:
         phone_number: "Phone Number"
         phone_number_hint: "Format: 78005553535"
         phone_code: "Telegram code"
+        password: "Telegram password"
+        password_hint: "If you do not have two-factor authentication enabled in the Telegram application, click the «Authorize» button."
         authorize_button_code: "Receive code"
         authorize_button: "Authorize"
         authorize_client: "Authorize Telegram client"
         authorize_hint: "To authorize Telegram, press the button below. Current authorization will be drop."
         plugin_link: "Back to the plugin settings"
         auth_step_1: "Receiving Telegram code"
-        auth_step_2: "Authorization"
+        auth_step_2: "Code authorization"
+        auth_step_3: "Password authorization"
         reset: "Reset cache and authorization"
         bot_init: Initialize bot
         bot_deinit: Deinitialize bot

config/locales/ru.yml

@@ -15,13 +15,16 @@ ru:
         phone_number: "Номер телефона"
         phone_number_hint: "В формате: 78005553535"
         phone_code: "Код из Telegram"
+        password: "Пароль из Telegram"
+        password_hint: "Если у вас не включена двухфакторная аутентификация в приложении Telegram, нажмите кнопку «Авторизовать»."
         authorize_button_code: "Получить код авторизации"
         authorize_client: "Авторизовать клиент Telegram"
         authorize_hint: "Чтобы авторизировать Telegram, нажмите кнопку ниже. Текущая авторизация сбросится."
         authorize_button: "Авторизовать"
         plugin_link: "К настройкам плагина"
         auth_step_1: "Получение кода авторизации"
-        auth_step_2: "Авторизация"
+        auth_step_2: "Авторизация кода"
+        auth_step_3: "Авторизация пароля"
         reset: "Сбросить кеш и авторизацию"
         bot_init: Инициализировать бота
         bot_deinit: Деинициализировать бота

config/locales/zh-TW.yml

@@ -14,13 +14,16 @@ zh-TW:
         phone_number: "電話號碼"
         phone_number_hint: "以台灣手機 0912-345-678 為例，需輸入：886912345678"
         phone_code: "Telegram 代碼"
+        password: "Telegram 密碼"
+        password_hint: "如果您沒有在 Telegram 應用程式中啟用雙重認證，請按一下「授權」按鈕。"
         authorize_button_code: "接收代碼"
         authorize_button: "授權"
         authorize_client: "授權給 Telegram 用戶端"
         authorize_hint: "請按下面的按鈕授權給 Telegram。目前的授權則會被清除。"
         plugin_link: "回到外掛設定"
         auth_step_1: "接收 Telegram 代碼"
-        auth_step_2: "授權"
+        auth_step_2: "代碼授權"
+        auth_step_3: "密碼授權"
         reset: "重設快取及授權"
         bot_init: 初始化機器人
         bot_deinit: 停用機器人

config/routes.rb

@@ -9,6 +9,7 @@
   scope :setup do
     get 'step_1' => 'redmine_telegram_setup#step_1', as: :telegram_setup_1
     post 'step_2' => 'redmine_telegram_setup#step_2', as: :telegram_setup_2
+    post 'step_3' => 'redmine_telegram_setup#step_3', as: :telegram_setup_3
     post 'authorize' => 'redmine_telegram_setup#authorize', as: :telegram_setup_authorize
     delete 'reset' => 'redmine_telegram_setup#reset', as: :telegram_setup_reset
   end