Merge branch 'develop' of github.com:tryzealot/zealot into develop

Dockerfile

@@ -61,7 +61,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG TAG
 
-ARG ZEALOT_VERSION="4.3.0"
+ARG ZEALOT_VERSION="4.3.1"
 ARG REPLACE_CHINA_MIRROR="true"
 ARG ORIGINAL_REPO_URL="dl-cdn.alpinelinux.org"
 ARG MIRROR_REPO_URL="mirrors.ustc.edu.cn"

app/controllers/users/omniauth_callbacks_controller.rb

@@ -8,6 +8,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 
   def passthru
+    # User had been logged in, redirect to root page
     redirect_to root_path(signin: 'true')
   end
 

app/models/concerns/user_omniauth.rb

@@ -26,13 +26,13 @@ def from_omniauth(auth)
   end
 
   def oauth_providers
-    omniauth_providers.each_with_object([]) do |name, obj|
+    @oauth_providers ||= Devise.omniauth_providers.each_with_object([]) do |name, obj|
       obj << name if enabled?(name)
     end
   end
 
   def enabled?(name)
-    send("enabled_#{name}?")
+    send("enabled_#{name}?".to_sym)
   end
 
   def enabled_google_oauth2?

app/views/devise/shared/_links.html.slim

@@ -6,7 +6,7 @@
           title = omniauth_display_name(provider)
           key = title.downcase
 
-        a.btn.btn-default.btn-block.text-left href="#{public_send("user_#{provider}_omniauth_authorize_path")}" class="btn-auth-#{key}"
+        a.btn.btn-default.btn-block.text-left href="#{public_send("user_#{provider}_omniauth_authorize_path")}" class="btn-auth-#{key}" data-method="post"
           = t('devise.shared.links.sign_in_with_provider', provider: t("devise.shared.links.provider.#{key}", default: title))
           i.icon.fab.float-right class="fa-#{key}"
 

package.json

@@ -15,5 +15,5 @@
   "devDependencies": {
     "webpack-dev-server": "^3.11.3"
   },
-  "version": "4.3.0"
+  "version": "4.3.1"
 }