Commit bd6ebbab by tady

set default nickname

parent 36905501
...@@ -41,10 +41,12 @@ class User < ActiveRecord::Base ...@@ -41,10 +41,12 @@ class User < ActiveRecord::Base
user = User.where(email: info['email']).first user = User.where(email: info['email']).first
unless user unless user
new_nickname = (("a".."z").to_a + ("A".."Z").to_a + (0..9).to_a).shuffle[0..4].join
user = User.create(name: info['name'], user = User.create(name: info['name'],
image_url: info['image'], image_url: info['image'],
email: info['email'], email: info['email'],
password: Devise.friendly_token[0, 20] password: Devise.friendly_token[0, 20],
nickname: new_nickname
) )
end end
......
...@@ -25,7 +25,7 @@ Rendezvous::Application.routes.draw do ...@@ -25,7 +25,7 @@ Rendezvous::Application.routes.draw do
# devise_for :users , controllers: { omniauth_callbacks: 'users/omniauth_callbacks' } # devise_for :users , controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }
# devise_for :users , only: [:sign_in, :sign_out, :session] # devise_for :users , only: [:sign_in, :sign_out, :session]
devise_for :users, controllers: { omniauth_callbacks: "users/omniauth_callbacks" }, skip: [:sessions] devise_for :users, controllers: { omniauth_callbacks: 'users/omniauth_callbacks' }, skip: [:sessions]
devise_scope :user do devise_scope :user do
# get 'sign_in', to: 'users/sessions#new', as: :new_user_session # get 'sign_in', to: 'users/sessions#new', as: :new_user_session
delete 'sign_out', to: 'devise/sessions#destroy', as: :sign_out delete 'sign_out', to: 'devise/sessions#destroy', as: :sign_out
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment