Change Twitter callback_url

2018-06-12 21:40:55 -04:00 · 2018-06-12 21:40:55 -04:00 · cb4340819e
commit cb4340819e
parent 5bcc8f45d8
10 changed files with 13 additions and 13 deletions
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@ -4,7 +4,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
    # raise env["omniauth.auth"].to_yaml
    class_eval %Q{
      def #{provider}
-        cta_variant = request.env["omniauth.params"]['state']
+        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?
          remember_me(@user)
--- a/app/views/articles/_main_stories_feed.html.erb
+++ b/app/views/articles/_main_stories_feed.html.erb
@ -14,7 +14,7 @@
            <% end %>
          </h2>
          <div class="button-container">
-            <a href="/users/auth/twitter?state=in-feed-cta" class="cta cta-button" data-no-instant>
+            <a href="/users/auth/twitter?callback_url=https://dev.to" 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>
--- a/app/views/articles/_sidebar_additional.html.erb
+++ b/app/views/articles/_sidebar_additional.html.erb
@ -56,7 +56,7 @@
          </header>
          <div class="widget-body">
            <center style="margin-bottom: 2px;">
-              <a href="/users/auth/twitter?state=navbar_basic" class="cta cta-button login-cta-button" data-no-instant>
+              <a href="/users/auth/twitter?callback_url=https://dev.to" 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>
--- a/app/views/devise/registrations/_registration_form.html.erb
+++ b/app/views/devise/registrations/_registration_form.html.erb
@ -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?state=join-club-page_basic" class="sign-up-link" data-no-instant>
+    <a href="/users/auth/twitter?callback_url=https://dev.to" 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>
--- a/app/views/giveaways/edit.html.erb
+++ b/app/views/giveaways/edit.html.erb
@ -9,7 +9,7 @@
      <p>* * *</p>
      <h2>Please sign in</h2>
      <br/>
-      <a href="/users/auth/twitter?state=sticker-giveaway_sign-in-with-twitter" 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" 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>
--- a/app/views/layouts/_nav_menu.html.erb
+++ b/app/views/layouts/_nav_menu.html.erb
@ -38,7 +38,7 @@
        Sign In/Up
      </div>
    </a>
-    <a href="/users/auth/twitter?state=navbar_basic" data-no-instant>
+    <a href="/users/auth/twitter?callback_url=https://dev.to" data-no-instant>
      <div class="option">
        Via Twitter
      </div>
--- a/app/views/layouts/_signup_modal.html.erb
+++ b/app/views/layouts/_signup_modal.html.erb
@ -17,7 +17,7 @@
      <p>
        We’re a place where coders share, stay up-to-date and grow their careers.
      </p>
-      <a href="/users/auth/twitter?state=signup-modal" class="sign-up-link cta" data-no-instant>
+      <a href="/users/auth/twitter?callback_url=https://dev.to" 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>
--- a/app/views/notifications/_signup_cta_test.html.erb
+++ b/app/views/notifications/_signup_cta_test.html.erb
@ -5,9 +5,9 @@
    <hr/>
    Authenticate via
    <center>
-    <a onclick='<%=track_split_version("/users/auth/twitter?state=notifications-cue_#{version}",version) %>' href="/users/auth/twitter?state=notifications-cue_<%= version %>" 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" class="sign-up-link" data-no-instant><%= image_tag("twitter-logo.svg", class:"icon-img", alt: "twitter logo") %> Twitter</a>
    or
-    <a onclick='<%=track_split_version("/users/auth/github?state=notifications-cue_#{version}", version) %>' 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>
+    <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>
  </div>
 <% else %>
@ -21,9 +21,9 @@
      Create your account to customize your feed and start participating.
    </p>
    <center>
-      <a onclick='<%=track_split_version("/users/auth/twitter?state=signup-modal_#{version}",version) %>' href="/users/auth/twitter?state=notifications-cue_<%= version %>" 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" class="sign-up-link" data-no-instant><%= image_tag("twitter-logo.svg", class:"icon-img", alt: "twitter logo") %> Twitter</a>
      or
-      <a onclick='<%=track_split_version("/users/auth/github?state=signup-modal_#{version}", version) %>' 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>
+      <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>
      <%=image_tag(cl_image_path(asset_path("/assets/sloan.png"),
       :type=>"fetch",
--- a/app/views/pages/membership_form.html.erb
+++ b/app/views/pages/membership_form.html.erb
@ -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?state=membership-cta" class="cta cta-button" data-no-instant>
+    <a href="/users/auth/twitter?callback_url=https://dev.to" class="cta cta-button" data-no-instant>
      TWITTER
    </a>
    <a href="/users/auth/github?state=membership-cta" class="cta cta-button" data-no-instant>
--- a/spec/features/user_views_and_closes_onboarding_spec.rb
+++ b/spec/features/user_views_and_closes_onboarding_spec.rb
@ -75,7 +75,7 @@ describe "User views and closes onboarding", type: :feature, js: true do
    end

    it "with Twitter" do
-      in_feed_link = find_link(href: "/users/auth/twitter?state=in-feed-cta")
+      in_feed_link = find_link(href: "/users/auth/twitter?callback_url=https://dev.to")
      in_feed_link.click
      expect(find(".global-modal-inner")).to have_content("WELCOME!")
    end