Fixed Linkedin integration

Author: rigoneri

README.md

@@ -349,17 +349,22 @@ If you want to turn off Flickr integration just set `FLICKR_INTEGRATION_ENABLED`
 
 ### Setting up LinkedIn integration
 
-LinkedIn has another level of security, therefore we need more information instead of just an api_key like Tumblr. To get started create a new application on LinkedIn for your website by going to <https://developer.linkedin.com/>. Once you are done creating your application you will be taken to your application page on LinkedIn, there you already have four pieces of the puzzle, the `Consumer key`, `Consumer secret`, `User Token` and `User Secret` make sure you save those.
+LinkedIn has the same level of security as Instagram and Foursquare and similar steps on getting the access token ourselves. To get started create a new application on LinkedIn for your website by going to <https://developer.linkedin.com/>. Once you are done creating your application you will be taken to your application page on LinkedIn, there you already have a few pieces of the puzzle, the `Api Key`, `Secret Key`, make sure you save those.
 
-Once you have those four items from LinkedIn you have to enter them in your **syte_settings.py** located in `syte > syte_settings.py`. Once you open that file enter the following:
+In that same page make sure to enter `http://127.0.0.1:8000/linkedin/auth/` under Oauth 2.0 Redirect URls.
 
-* `Consumer key` string you saved under `LINKEDIN_CONSUMER_KEY`
-* `Consumer secret` string you saved under  `LINKEDIN_CONSUMER_SECRET`
-* `User token` string you saved under `LINKEDIN_USER_TOKEN`
-* `User secret` string you saved under `LINKEDIN_USER_SECRET`
+Once you have those items from LinkedIn you have to enter them in your **syte_settings.py** located in `syte > syte_settings.py`. Once you open that file enter the following:
 
-If you want to turn off the LinkedIn integration just set `LINKEDIN_INTEGRATION_ENABLED` to False.
+* `Consumer key` string you saved under `LINKEDIN_API_KEY`
+* `Consumer secret` string you saved under  `LINKEDIN_API_SECRET`
+
+After you have entered those two items, follow the steps below for running your Syte locally on your machine. Once you have your Syte running navigate to `http://127.0.0.1:8000/linkedin/auth`, you will be taken to Linkedin's website and will be asked to sign in and authorize your application. After you authorized your application you will be taken back to your Syte and you will be given your ***Access Token***.
+
+Once you have the access token from Foursquare you have to enter them in your **syte_settings.py** located in `syte > syte_settings.py`. Once you open that file enter the following:
+
+* ***Access Token*** under `LINKEDIN_TOKEN`
 
+If you want to turn off the LinkedIn integration just set `LINKEDIN_INTEGRATION_ENABLED` to False.
 
 
 ## Running & Deployment Instructions

requirements.txt

@@ -1,8 +1,8 @@
 Django==1.5.2
-requests==1.2.3
+requests==2.3.0
 wsgiref==0.1.2
 gunicorn==0.16.1
 pybars==0.0.4
 python-twitter==1.0
-python-linkedin==4.0
+python-linkedin==4.1
 dj-static==0.0.5

syte/syte_settings.py

@@ -132,10 +132,9 @@
 
 #LinkedIn Integration
 LINKEDIN_INTEGRATION_ENABLED = True
-LINKEDIN_CONSUMER_KEY = '[ENTER YOUR LINKEDIN CONSUMER KEY HERE]'
-LINKEDIN_CONSUMER_SECRET = '[ENTER YOUR LINKEDIN CONSUMER SECRET KEY HERE]'
-LINKEDIN_USER_TOKEN = '[ENTER YOUR LINKED IN USER TOKEN HERE]'
-LINKEDIN_USER_SECRET = '[ENTER YOUR LINKED IN USER SECRET HERE]'
+LINKEDIN_API_KEY = '[ENTER YOUR LINKEDIN CONSUMER KEY HERE]'
+LINKEDIN_API_SECRET = '[ENTER YOUR LINKEDIN CONSUMER SECRET KEY HERE]'
+LINKEDIN_TOKEN = '[ENTER YOUR LINKED IN USER TOKEN HERE]'
 
 SITEMAP_ENABLED = False
 

syte/templates/linkedin_auth.html

@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+{% block pagetitle %}Linkedin Auth{% endblock %}
+{% block main_section %}
+<section class="main-section">
+  <article>
+      <h2>Linkedin Access Token</h2>
+      <p>Go to your syte_settings.py and enter the token under <code>LINKEDIN_TOKEN</code>.</p>
+      <dl>
+        <dt>Access Token</dt><dd>{{ token }}</dd>
+      </dl>
+  </article>
+</section>
+{% endblock %}
+
+

syte/urls.py

@@ -94,6 +94,7 @@
 #Linkedin Integration
 if settings.LINKEDIN_INTEGRATION_ENABLED:
     urlpatterns += patterns('',
+        url(r'^linkedin/auth/?$', 'syte.views.linkedin_view.linkedin_auth'),
         url(r'^linkedin/?$', 'syte.views.linkedin_view.linkedin_view'),
     )
 

syte/views/linkedin_view.py

@@ -4,20 +4,30 @@
 
 from django.http import HttpResponse
 from django.conf import settings
+from django.shortcuts import redirect, render
 
 LINKEDIN_NETWORK_UPDATE_TYPES = linkedin.NETWORK_UPDATES.enums.values()
 
-def linkedin_view(request):
-    authentication = linkedin.LinkedInDeveloperAuthentication(
-        consumer_key=settings.LINKEDIN_CONSUMER_KEY,
-        consumer_secret=settings.LINKEDIN_CONSUMER_SECRET,
-        user_token=settings.LINKEDIN_USER_TOKEN,
-        user_secret=settings.LINKEDIN_USER_SECRET,
-        redirect_uri=settings.SITE_ROOT_URI,
-        permissions=linkedin.PERMISSIONS.enums.values()
+def linkedin_auth(request):
+    code = request.GET.get('code', None)
+
+    authentication = linkedin.LinkedInAuthentication(
+        settings.LINKEDIN_API_KEY,
+        settings.LINKEDIN_API_SECRET,
+        '{0}linkedin/auth/'.format(settings.SITE_ROOT_URI),
+        linkedin.PERMISSIONS.enums.values()
     )
 
-    application = linkedin.LinkedInApplication(authentication)
+    if not code:
+        return redirect(authentication.authorization_url)
+
+    if code:
+        authentication.authorization_code = code
+        token = authentication.get_access_token()
+        return render(request, 'linkedin_auth.html', {'token': token[0]})
+
+def linkedin_view(request):
+    application = linkedin.LinkedInApplication(token=settings.LINKEDIN_TOKEN)
     profile_data = application.get_profile(selectors=['id', 'first-name', 'last-name', 'headline', 'location',
                                                       'num-connections', 'skills', 'educations', 'picture-url',
                                                       'site-standard-profile-request', 'summary', 'positions',