AccountCreator fixes GitHub signup #10517

pull/10552/head
Juan Ignacio Sánchez Lara 8 years ago
parent 0b84e91177
commit 5debf8259d

@ -0,0 +1,11 @@
module AccountCreator
def trigger_account_creation(account_creator)
creation_data = account_creator.enqueue_creation(self)
flash.now[:success] = 'User creation in progress'
# Template variables
@user_creation_id = creation_data[:id]
@user_name = creation_data[:id]
@redirect_url = CartoDB.url(self, 'dashboard')
end
end

@ -2,9 +2,12 @@
require_dependency 'oauth/github/api'
require_dependency 'oauth/github/config'
require_dependency 'account_creator'
module Carto
class GithubController < ApplicationController
include AccountCreator
ssl_required :github
before_filter :initialize_github_config

@ -1,9 +1,11 @@
require_dependency 'google_plus_config'
require_dependency 'account_creator'
require_relative '../../lib/user_account_creator'
class SignupController < ApplicationController
include LoginHelper
include AccountCreator
layout 'frontend'
@ -116,16 +118,6 @@ class SignupController < ApplicationController
private
def trigger_account_creation(account_creator)
creation_data = account_creator.enqueue_creation(self)
flash.now[:success] = 'User creation in progress'
# Template variables
@user_creation_id = creation_data[:id]
@user_name = creation_data[:id]
@redirect_url = CartoDB.url(self, 'dashboard')
end
def existing_user(user)
!Carto::User.find_by_username_and_email(user.username, user.email).nil?
end

Loading…
Cancel
Save