Fix callback issue

This commit is contained in:
Ben Halpern 2018-06-12 22:19:44 -04:00
parent 7dac253de1
commit 66cb24dddf
10 changed files with 11 additions and 10 deletions

View file

@ -4,6 +4,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
# raise env["omniauth.auth"].to_yaml
class_eval %Q{
def #{provider}
raise
cta_variant = request.env["omniauth.params"]['state'].to_s
@user = AuthorizationService.new(request.env["omniauth.auth"], current_user, cta_variant).get_user
if @user.persisted?

View file

@ -14,7 +14,7 @@
<% end %>
</h2>
<div class="button-container">
<a href="/users/auth/twitter?callback_url=https://dev.to" class="cta cta-button" data-no-instant>
<a href="/users/auth/twitter?callback_url=https://dev.to/users/auth/twitter/callback" class="cta cta-button" data-no-instant>
TWITTER
</a>
<a href="/users/auth/github?state=in-feed-cta" class="cta cta-button" data-no-instant>

View file

@ -56,7 +56,7 @@
</header>
<div class="widget-body">
<center style="margin-bottom: 2px;">
<a href="/users/auth/twitter?callback_url=https://dev.to" class="cta cta-button login-cta-button" data-no-instant>
<a href="/users/auth/twitter?callback_url=https://dev.to/users/auth/twitter/callback" class="cta cta-button login-cta-button" data-no-instant>
SIGN IN VIA TWITTER
</a>
<a href="/users/auth/github?state=navbar_basic" class="cta cta-button login-cta-button" data-no-instant>

View file

@ -1,7 +1,7 @@
<div class="new-article-pitch">
<h1>Sign In or Create Your Account</h1>
<div class="links">
<a href="/users/auth/twitter?callback_url=https://dev.to" class="sign-up-link" data-no-instant>
<a href="/users/auth/twitter?callback_url=https://dev.to/users/auth/twitter/callback" class="sign-up-link" data-no-instant>
<%= icon("twitter") %> Auth with Twitter
</a>
<a href="/users/auth/github?state=join-club-page_basic" class="sign-up-link" data-no-instant>

View file

@ -9,7 +9,7 @@
<p>* * *</p>
<h2>Please sign in</h2>
<br/>
<a href="/users/auth/twitter?callback_url=https://dev.to" class="sign-up-link" data-no-instant><span class="sign-up-text"><img src="<%= asset_url("nerd-emoji.png") %>" alt="nerd emoji" /> Sign in with Twitter</span></a>
<a href="/users/auth/twitter?callback_url=https://dev.to/users/auth/twitter/callback" class="sign-up-link" data-no-instant><span class="sign-up-text"><img src="<%= asset_url("nerd-emoji.png") %>" alt="nerd emoji" /> Sign in with Twitter</span></a>
<p>or</p>
<a href="/users/auth/github" class="sign-up-link" data-no-instant><span class="sign-up-text github-text"><img src="<%= asset_url("nerd-emoji.png") %>" alt="nerd emoji" /> Sign in with Github</span></a>
</center>

View file

@ -38,7 +38,7 @@
Sign In/Up
</div>
</a>
<a href="/users/auth/twitter?callback_url=https://dev.to" data-no-instant>
<a href="/users/auth/twitter?callback_url=https://dev.to/users/auth/twitter/callback" data-no-instant>
<div class="option">
Via Twitter
</div>

View file

@ -17,7 +17,7 @@
<p>
Were a place where coders share, stay up-to-date and grow their careers.
</p>
<a href="/users/auth/twitter?callback_url=https://dev.to" class="sign-up-link cta" data-no-instant>
<a href="/users/auth/twitter?callback_url=https://dev.to/users/auth/twitter/callback" class="sign-up-link cta" data-no-instant>
<img src="<%= asset_path("twitter-logo.svg") %>" class="icon-img" alt="Twitter"/> Auth With Twitter
</a>
<a href="/users/auth/github?state=signup-modal" class="sign-up-link cta" data-no-instant>

View file

@ -5,7 +5,7 @@
<hr/>
Authenticate via
<center>
<a href="/users/auth/twitter?callback_url=https://dev.to" class="sign-up-link" data-no-instant><%= image_tag("twitter-logo.svg", class:"icon-img", alt: "twitter logo") %> Twitter</a>
<a href="/users/auth/twitter?callback_url=https://dev.to/users/auth/twitter/callback" class="sign-up-link" data-no-instant><%= image_tag("twitter-logo.svg", class:"icon-img", alt: "twitter logo") %> Twitter</a>
or
<a href="/users/auth/github?state=notifications-cue_<%= version %>" class="sign-up-link" data-no-instant><%= image_tag("github-logo.svg", class:"icon-img", alt: "github logo") %> GitHub</a>
</center>
@ -21,7 +21,7 @@
Create your account to customize your feed and start participating.
</p>
<center>
<a href="/users/auth/twitter?callback_url=https://dev.to" class="sign-up-link" data-no-instant><%= image_tag("twitter-logo.svg", class:"icon-img", alt: "twitter logo") %> Twitter</a>
<a href="/users/auth/twitter?callback_url=https://dev.to/users/auth/twitter/callback" class="sign-up-link" data-no-instant><%= image_tag("twitter-logo.svg", class:"icon-img", alt: "twitter logo") %> Twitter</a>
or
<a href="/users/auth/github?state=notifications-cue_<%= version %>" class="sign-up-link" data-no-instant><%= image_tag("github-logo.svg", class:"icon-img", alt: "github logo") %> GitHub</a>
</center>

View file

@ -19,7 +19,7 @@
<img style="width:30px; display:inline;" src="<%= asset_path("emoji/emoji-sparkling-heart.png") %>" />
<img style="width:30px; display:inline;" src="<%= asset_path("emoji/emoji-sparkling-heart.png") %>" />
<h2>Sign in to get your membership </h2>
<a href="/users/auth/twitter?callback_url=https://dev.to" class="cta cta-button" data-no-instant>
<a href="/users/auth/twitter?callback_url=https://dev.to/users/auth/twitter/callback" class="cta cta-button" data-no-instant>
TWITTER
</a>
<a href="/users/auth/github?state=membership-cta" class="cta cta-button" data-no-instant>

View file

@ -75,7 +75,7 @@
# end
# it "with Twitter" do
# # in_feed_link = find_link(href: "/users/auth/twitter?callback_url=https://dev.to")
# # in_feed_link = find_link(href: "/users/auth/twitter?callback_url=https://dev.to/users/auth/twitter/callback")
# # in_feed_link.click
# # expect(find(".global-modal-inner")).to have_content("WELCOME!")
# end