remove Canvas specific code from LinkedIn

fixes: CNVS-12505

test plan:
regression test linked in functionality

Change-Id: I7d4c327eefb8ac976c1d51e36aa6514c1742f739
Reviewed-on: https://gerrit.instructure.com/33458
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Jason Madsen <jmadsen@instructure.com>

Author: Raphael Weiner

app/controllers/users_controller.rb

@@ -148,7 +148,21 @@ def oauth
       redirect_to twitter_request_token_url(return_to_url)
     elsif params[:service] == "linked_in"
       linkedin_connection = LinkedIn.new
-      redirect_to linkedin_connection.linked_in_request_token_url(return_to_url, @current_user, session, request.host_with_port, oauth_success_url(:service => 'linked_in'))
+
+      request_token = linkedin_connection.request_token(oauth_success_url(:service => 'linked_in'))
+
+      session[:oauth_linked_in_request_token_token] = request_token.token
+      session[:oauth_linked_in_request_token_secret] = request_token.secret
+      OauthRequest.create(
+        :service => 'linked_in',
+        :token => request_token.token,
+        :secret => request_token.secret,
+        :return_url => return_to_url,
+        :user => @current_user,
+        :original_host_with_port => request.host_with_port
+      )
+
+      redirect_to request_token.authorize_url
     elsif params[:service] == "facebook"
       oauth_request = OauthRequest.create(
         :service => 'facebook',
@@ -194,7 +208,26 @@ def oauth_success
       elsif params[:service] == "linked_in"
         begin
           linkedin_connection = LinkedIn.new
-          linkedin_connection.linked_in_get_access_token(oauth_request, params[:oauth_verifier], session)
+          token = session.delete(:oauth_linked_in_request_token_token)
+          secret = session.delete(:oauth_linked_in_request_token_secret)
+          access_token = linkedin_connection.get_access_token(token, secret, params[:oauth_verifier])
+          service_user_id, service_user_name, service_user_url = linkedin_connection.get_service_user(access_token)
+
+          if oauth_request.user
+            UserService.register(
+              :service => "linked_in",
+              :access_token => access_token,
+              :user => oauth_request.user,
+              :service_domain => "linked_in.com",
+              :service_user_id => service_user_id,
+              :service_user_name => service_user_name,
+              :service_user_url => service_user_url
+            )
+          else
+            session[:oauth_linked_in_access_token_token] = access_token.token
+            session[:oauth_linked_in_access_token_secret] = access_token.secret
+          end
+
           flash[:notice] = t('linkedin_added', "LinkedIn account successfully added!")
         rescue => e
           ErrorReport.log_exception(:oauth, e)

lib/linked_in.rb

@@ -17,7 +17,7 @@
 #
 
 class LinkedIn
-  def linked_in_get_service_user(access_token)
+  def get_service_user(access_token)
     body = access_token.get('/v1/people/~:(id,first-name,last-name,public-profile-url,picture-url)').body
     data = Nokogiri::XML(body)
     service_user_id = data.css("id")[0].content
@@ -26,48 +26,18 @@ def linked_in_get_service_user(access_token)
     return service_user_id, service_user_name, service_user_url
   end
 
-  def linked_in_get_access_token(oauth_request, oauth_verifier, session)
-    consumer = linked_in_consumer
-    request_token = OAuth::RequestToken.new(consumer,
-                                            session.delete(:oauth_linked_in_request_token_token),
-                                            session.delete(:oauth_linked_in_request_token_secret))
-    access_token = request_token.get_access_token(:oauth_verifier => oauth_verifier)
-    service_user_id, service_user_name, service_user_url = linked_in_get_service_user(access_token)
-    session[:oauth_linked_in_access_token_token] = access_token.token
-    session[:oauth_linked_in_access_token_secret] = access_token.secret
-    if oauth_request.user
-      UserService.register(
-        :service => "linked_in", 
-        :access_token => access_token, 
-        :user => oauth_request.user,
-        :service_domain => "linked_in.com",
-        :service_user_id => service_user_id,
-        :service_user_name => service_user_name,
-        :service_user_url => service_user_url
-      )
-      session.delete(:oauth_linked_in_access_token_token)
-      session.delete(:oauth_linked_in_access_token_secret)
-    end
-    access_token
+  def get_access_token(token, secret, oauth_verifier)
+    consumer = self.class.consumer
+    request_token = OAuth::RequestToken.new(consumer, token, secret)
+    request_token.get_access_token(:oauth_verifier => oauth_verifier)
   end
 
-  def linked_in_request_token_url(return_to, user, session, host_with_port, oauth_callback)
-    consumer = linked_in_consumer
-    request_token = consumer.get_request_token(:oauth_callback => oauth_callback)
-    session[:oauth_linked_in_request_token_token] = request_token.token
-    session[:oauth_linked_in_request_token_secret] = request_token.secret
-    OauthRequest.create(
-      :service => 'linked_in',
-      :token => request_token.token,
-      :secret => request_token.secret,
-      :return_url => return_to,
-      :user => user,
-      :original_host_with_port => host_with_port
-    )
-    request_token.authorize_url
+  def request_token(oauth_callback)
+    consumer = self.class.consumer
+    consumer.get_request_token(:oauth_callback => oauth_callback)
   end
 
-  def linked_in_consumer(key=nil, secret=nil)
+  def self.consumer(key=nil, secret=nil)
     require 'oauth'
     require 'oauth/consumer'
     config = LinkedIn.config
@@ -83,7 +53,7 @@ def linked_in_consumer(key=nil, secret=nil)
   end
 
   def self.config_check(settings)
-    consumer = self.new.linked_in_consumer(settings[:api_key], settings[:secret_key])
+    consumer = self.consumer(settings[:api_key], settings[:secret_key])
     token = consumer.get_request_token rescue nil
     token ? nil : "Configuration check failed, please check your settings"
   end

spec/integration/oauth_token_spec.rb

@@ -91,7 +91,7 @@ def oauth_start(integration)
       if integration == "GoogleDocs"
         GoogleDocs.any_instance.expects(:get_service_user).with(instance_of(OAuth::AccessToken)).returns(["test_user_id", "test_user_name"])
       elsif integration == "LinkedIn"
-        LinkedIn.any_instance.expects(:linked_in_get_service_user).with(instance_of(OAuth::AccessToken)).returns(["test_user_id", "test_user_name"])
+        LinkedIn.any_instance.expects(:get_service_user).with(instance_of(OAuth::AccessToken)).returns(["test_user_id", "test_user_name"])
       else
         UsersController.any_instance.expects("#{integration.underscore}_get_service_user").with(instance_of(OAuth::AccessToken)).returns(["test_user_id", "test_user_name"])
       end
@@ -118,7 +118,7 @@ def oauth_start(integration)
       if integration == "GoogleDocs"
         GoogleDocs.any_instance.expects(:get_service_user).with(instance_of(OAuth::AccessToken)).raises(RuntimeError, "Third-party service totally like, failed")
       elsif integration == "LinkedIn"
-        LinkedIn.any_instance.expects(:linked_in_get_service_user).with(instance_of(OAuth::AccessToken)).raises(RuntimeError, "Third-party service totally like, failed")
+        LinkedIn.any_instance.expects(:get_service_user).with(instance_of(OAuth::AccessToken)).raises(RuntimeError, "Third-party service totally like, failed")
       else
         UsersController.any_instance.expects("#{integration.underscore}_get_service_user").with(instance_of(OAuth::AccessToken)).raises(RuntimeError, "Third-party service totally like, failed")
       end