Merge pull request #52 from kaishuu0123/master

Release
kaishuu0123 · Dec 13, 2019 · c1e6b71 · c1e6b71
2 parents 2cf84f1 + ae38f3b
commit c1e6b71
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/app/controllers/omniauth_finished_controller.rb b/app/controllers/omniauth_finished_controller.rb
@@ -8,6 +8,8 @@ def finish_signup
     @provider = params[:provider]
 
     if (request.post? || request.patch?) && @user.update(user_params)
+      # OAuth の場合には希望アカウントが入力された後にグループを作る
+      @user.create_default_group
       # @user.send_confirmation_instructions unless @user.confirmed?
       sign_in(@user, bypass: true)
       redirect_to root_url, notice: t('devise.omniauth_callbacks.success', kind: @provider.capitalize)

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -15,7 +15,8 @@
 
 class User < ApplicationRecord
   rolify
-  after_commit :create_default_group, on: [:create]
+  attr_accessor :skip_create_default_group
+  after_commit :create_default_group, on: [:create], if: Proc.new { skip_create_default_group == false }
   after_create :assign_default_role
 
   attr_writer :login

diff --git a/app/services/o_auth_service.rb b/app/services/o_auth_service.rb
@@ -39,6 +39,7 @@ def find_or_create_new_user(auth)
             email:    email ? email : temp_email,
             password: Devise.friendly_token[0, 20]
           )
+          user.skip_create_default_group = true
           # email確認メール送信を延期するために一時的にemail確認済みの状態にする。
           # user.skip_confirmation!
           # email仮をデータベースに保存するため、validationを一時的に無効化。