Merge pull request #57 from centosadmin/develop

Release 1.5.0
southbridgeio · Mar 19, 2018 · 1827d04 · 1827d04
2 parents a711ed2 + ccbdba7
commit 1827d04
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.5.0
+
+* Use Telegram login
+* Fix "Code sent" message
+* Fix RQRCode::QRCodeRunTimeError
+
 # 1.4.0
 
 * Update telegram-bot-ruby

diff --git a/app/views/account/init_2fa.html.erb b/app/views/account/init_2fa.html.erb
@@ -10,14 +10,17 @@
       <div id="init2FAFormAuthSources">
         <% Redmine2FA.active_protocols.each do |protocol| %>
           <div class="authSource">
-            <%= radio_button_tag 'protocol', protocol, false, data: { protocol: protocol } %>
+            <%= radio_button_tag 'protocol', protocol, (protocol == 'telegram' ? true : false), data: { protocol: protocol } %>
             <%= label_tag "protocol_#{protocol}", t("redmine_2fa.protocols.#{protocol}") %>
           </div>
         <% end %>
       </div>
     <% end %>
     <table>
-      <% Redmine2FA.active_protocols.each do |protocol| %>
+      <% if Redmine2FA.active_protocols.include?('telegram') %>
+        <%= render "account/init_2fa/telegram" %>
+      <% end %>
+      <% (Redmine2FA.active_protocols - ['telegram']).each do |protocol| %>
         <%= render "account/init_2fa/#{protocol}", style: 'display: none' %>
       <% end %>
     </table>

diff --git a/app/views/account/init_2fa/_telegram.html.erb b/app/views/account/init_2fa/_telegram.html.erb
@@ -1,5 +1,3 @@
-<tr class="instruction2FA telegramInstruction" style="<%= style %>">
-  <td colspan="3">
-    <%= t 'redmine_2fa.second_authentications.telegram.instruction_html', bot_name: Setting.plugin_redmine_telegram_common['bot_name'] %>
-  </td>
-</tr>
+<div align="center" class="instruction2FA telegramInstruction">
+  <%= render partial: 'telegram_login/widget' %>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -72,7 +72,7 @@ en:
     auth_code: 'Authorization code'
     resend:
       link: 'Resend code'
-      instruction_html: 'Code sent by <a href="https://telegram.me/%{bot_name}" target="_blank">%{bot_name}</a> (need to be in your contacts list).<br><br>Code resending is possible after 5 seconds <span id="otpCodeResendTimer">%{timeout}</span> секунд.'
+      instruction_html: 'Code sent. Code resending is possible after <span id="otpCodeResendTimer">%{timeout}</span> seconds.'
     notice:
       auth_code:
         invalid: 'Wrong authorization code'

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
@@ -74,7 +74,7 @@ ru:
     auth_code: 'Код подтверждения'
     resend:
       link: 'Отправить повторно'
-      instruction_html: 'Код отправлен ботом <a href="https://telegram.me/%{bot_name}" target="_blank">%{bot_name}</a> (необходимо добавить в контакты).<br><br>Повторная отправка кода возможна через <span id="otpCodeResendTimer">%{timeout}</span> секунд.'
+      instruction_html: 'Код отправлен. Повторная отправка кода возможна через <span id="otpCodeResendTimer">%{timeout}</span> секунд.'
     notice:
       auth_code:
         invalid: 'Неверный код подтверждения'

diff --git a/init.rb b/init.rb
@@ -21,7 +21,7 @@
 
 Redmine::Plugin.register :redmine_2fa do
   name 'Redmine 2FA'
-  version '1.4.0'
+  version '1.5.0'
   url 'https://github.com/centosadmin/redmine_2fa'
   description 'Two-factor authorization for Redmine'
   author 'Southbridge'

diff --git a/lib/redmine_2fa/code_sender.rb b/lib/redmine_2fa/code_sender.rb
@@ -17,8 +17,6 @@ def send_code
 
     def define_sender
       case user&.two_fa&.auth_method_name
-      when 'Telegram'
-        CodeSender::TelegramSender.new(user)
       when 'SMS'
         CodeSender::SMSSender.new(user)
       else

diff --git a/lib/redmine_2fa/patches/account_controller_patch/second_authentication_init.rb b/lib/redmine_2fa/patches/account_controller_patch/second_authentication_init.rb
@@ -8,8 +8,14 @@ def password_authentication
           if Redmine2FA.switched_off? || @user.ignore_2fa? || @user.two_factor_authenticable?
             super
           else
-            @qr = RQRCode::QRCode.new(@user.provisioning_uri("#{@user.login}", issuer: "#{Setting.host_name}"), size: 10, level: :h)
-            render 'account/init_2fa'
+            begin
+              qr_size ||= 10
+              @qr = RQRCode::QRCode.new(@user.provisioning_uri("#{@user.login}", issuer: "#{Setting.host_name}"), size: qr_size, level: :h)
+              render 'account/init_2fa'
+            rescue RQRCode::QRCodeRunTimeError => e
+              retry unless (qr_size += 1) > 20
+              raise e
+            end
           end
         end
       end

diff --git a/lib/redmine_2fa/patches/account_controller_patch/second_authentication_step.rb b/lib/redmine_2fa/patches/account_controller_patch/second_authentication_step.rb
@@ -8,7 +8,7 @@ def password_authentication
           if Redmine2FA.switched_on? && !@user.ignore_2fa? && @user.two_factor_authenticable?
             send_code
             flash[:error] = sender.errors.join(', ') if sender.errors.present?
-            render 'account/otp'
+            render(@user.two_fa&.name == 'Telegram' ? 'telegram_login/index' : 'account/otp')
           else
             super
           end

diff --git a/test/unit/redmine_2fa/code_sender_test.rb b/test/unit/redmine_2fa/code_sender_test.rb
@@ -17,7 +17,7 @@ class Redmine2FA::CodeSenderTest < ActiveSupport::TestCase
       should 'be TelegramSender' do
         @user.two_fa = auth_sources(:telegram)
         @sender = Redmine2FA::CodeSender.new(@user)
-        assert @sender.sender.is_a?(Redmine2FA::CodeSender::TelegramSender)
+        assert @sender.sender.is_a?(Redmine2FA::CodeSender::NullSender)
       end
 
       should 'be SMSSender' do