Online Accounts: Account plugins

Merge lp:~jpds/account-plugins/linkedin-plugin into lp:account-plugins

  1. linkedin-plugin
  2. Merge into trunk
Proposed by Jonathan Davies
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 113
Merged at revision: 96
Proposed branch: lp:~jpds/account-plugins/linkedin-plugin
Merge into: lp:account-plugins
Diff against target: 196 lines (+94/-2)
10 files modified
Makefile.am (+4/-1)
configure.ac (+15/-0)
data/providers/linkedin.provider.in.in (+27/-0)
data/services/linkedin-microblog.service.in (+21/-0)
data/webkit-options/www.linkedin.com.conf (+5/-0)
debian/account-plugin-linkedin.install (+3/-0)
debian/changelog (+7/-0)
debian/control (+8/-0)
debian/rules (+3/-1)
po/POTFILES.skip (+1/-0)
To merge this branch: bzr merge lp:~jpds/account-plugins/linkedin-plugin
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+154406@code.launchpad.net

Commit message

Created account-plugin-linkedin plugin for Online Accounts.

Description of the change

This branch adds a account-plugin-linkedin plugin to Online Accounts.

To post a comment you must log in.
Revision history for this message
David King (amigadave) wrote :

Copy/paste error with the Facebook consumer key in configure.ac?

lp:~jpds/account-plugins/linkedin-plugin updated
104. By Jonathan Davies

Corrected linkedin-microblog.service.in to say Linkedin.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:103
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jpds/account-plugins/linkedin-plugin/+merge/154406/+edit-commit-message

http://s-jenkins:8080/job/account-plugins-ci/33/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/33/console
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/33/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/33/rebuild

review: Needs Fixing (continuous-integration)
lp:~jpds/account-plugins/linkedin-plugin updated
105. By Jonathan Davies

Removed mispasted Facebook parts from configure.ac.

106. By Jonathan Davies

Fixed service ID for linkedin-microblog.

107. By Jonathan Davies

Removed extra line in control.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:107
http://s-jenkins:8080/job/account-plugins-ci/34/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/34
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/34

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/34/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

Looks good, thanks! I'll experiment some more with signon-ui, to see if we can fix the issue with the missing scrollbars.
Meanwhile, could you please keep the files in alphabetical order:

8 - data/providers/windows-live.provider.in.in
9 + data/providers/windows-live.provider.in.in \
10 + data/providers/linkedin.provider.in.in

(there are more places where this should be changed, please see the diff below).

review: Needs Fixing
lp:~jpds/account-plugins/linkedin-plugin updated
108. By Jonathan Davies

Place files in alphabetical order.

109. By Jonathan Davies

Alphabetical order on these files too.

Revision history for this message
Alberto Mardegan (mardy) wrote :

Hi Jonathan, please add this to the webkit-options file:

    VerticalScrollBar = alwaysOn

This doesn't work yet, but it will when the fix for bug 1158173 will be integrated (until then this line is anyway harmless, so please write it already now).

lp:~jpds/account-plugins/linkedin-plugin updated
110. By Jonathan Davies

Force the showing of scrollbar in webkit options.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:109
http://s-jenkins:8080/job/account-plugins-ci/35/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/35/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/35/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/35/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:110
http://s-jenkins:8080/job/account-plugins-ci/36/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/36/console
    FAILURE: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/36/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/36/rebuild

review: Needs Fixing (continuous-integration)
lp:~jpds/account-plugins/linkedin-plugin updated
111. By Jonathan Davies

Added missing \ to Makefile.am.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:111
http://s-jenkins:8080/job/account-plugins-ci/37/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=amd64/37
    SUCCESS: http://s-jenkins:8080/job/account-plugins-ci/./build=pbuilder,distribution=raring,flavor=i386/37

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/37/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alberto Mardegan (mardy) wrote :

I've been now testing it with the new signon-ui, and it works well.

Just a couple of changes:

126 +UsernameField = input[name="email"]
127 +PasswordField = input[name="pass"]

Remove the password field, and change the username one to:

    UsernameField = input[name="session_key"]

Then, in the .provider file:

70 + <name> LinkedIn® </name>

Remove the spaces inside the element: they cause the label not to be properly left-aligned in the UI.

review: Needs Fixing
lp:~jpds/account-plugins/linkedin-plugin updated
112. By Jonathan Davies

webkit-options/www.linkedin.com.conf: Removed password and set UsernameField to
session_key.

113. By Jonathan Davies

Removed spaces in provider name.

Revision history for this message
Alberto Mardegan (mardy) wrote :

Excellent, thanks!!!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile.am'
--- Makefile.am 2013-03-19 14:47:46 +0000
+++ Makefile.am 2013-03-21 15:43:05 +0000
@@ -60,6 +60,7 @@
60 data/providers/foursquare.provider.in.in \60 data/providers/foursquare.provider.in.in \
61 data/providers/google.provider.in.in \61 data/providers/google.provider.in.in \
62 data/providers/identica.provider.in.in \62 data/providers/identica.provider.in.in \
63 data/providers/linkedin.provider.in.in \
63 data/providers/sina.provider.in.in \64 data/providers/sina.provider.in.in \
64 data/providers/sohu.provider.in.in \65 data/providers/sohu.provider.in.in \
65 data/providers/twitter.provider.in.in \66 data/providers/twitter.provider.in.in \
@@ -83,6 +84,7 @@
83 data/services/google-docs.service.in \84 data/services/google-docs.service.in \
84 data/services/google-im.service.in \85 data/services/google-im.service.in \
85 data/services/identica-microblog.service.in \86 data/services/identica-microblog.service.in \
87 data/services/linkedin-microblog.service.in \
86 data/services/picasa.service.in \88 data/services/picasa.service.in \
87 data/services/sina-microblog.service.in \89 data/services/sina-microblog.service.in \
88 data/services/sohu-microblog.service.in \90 data/services/sohu-microblog.service.in \
@@ -103,7 +105,8 @@
103 data/webkit-options/login.live.com.conf \105 data/webkit-options/login.live.com.conf \
104 data/webkit-options/login.yahoo.com.conf \106 data/webkit-options/login.yahoo.com.conf \
105 data/webkit-options/secure.flickr.com.conf \107 data/webkit-options/secure.flickr.com.conf \
106 data/webkit-options/www.facebook.com.conf108 data/webkit-options/www.facebook.com.conf \
109 data/webkit-options/www.linkedin.com.conf
107110
108dist_bin_SCRIPTS = \111dist_bin_SCRIPTS = \
109 tools/account-console112 tools/account-console
110113
=== modified file 'configure.ac'
--- configure.ac 2013-02-22 15:17:49 +0000
+++ configure.ac 2013-03-21 15:43:05 +0000
@@ -86,6 +86,20 @@
86AC_SUBST(TWITTER_CONSUMER_KEY, ["$twitter_consumer_key"])86AC_SUBST(TWITTER_CONSUMER_KEY, ["$twitter_consumer_key"])
87AC_SUBST(TWITTER_CONSUMER_SECRET, ["$twitter_consumer_secret"])87AC_SUBST(TWITTER_CONSUMER_SECRET, ["$twitter_consumer_secret"])
8888
89# Set LinkedIn consumer key/secret.
90AC_ARG_WITH(linkedin-consumer-key,
91 [AS_HELP_STRING([--with-linkedin-consumer-key],
92 [LinkedIn consumer key])],
93 [linkedin_consumer_key=$withval],
94 [linkedin_consumer_key="34gnzrg96iq5"])
95AC_ARG_WITH(linkedin-consumer-secret,
96 [AS_HELP_STRING([--with-linkedin-consumer-secret],
97 [LinkedIn consumer secret])],
98 [linkedin_consumer_secret=$withval],
99 [linkedin_consumer_secret="BazRki2LE8eZtcqh"])
100AC_SUBST(LINKEDIN_CONSUMER_KEY, ["$linkedin_consumer_key"])
101AC_SUBST(LINKEDIN_CONSUMER_SECRET, ["$linkedin_consumer_secret"])
102
89# Set Facebook client id103# Set Facebook client id
90AC_ARG_WITH(facebook-client-id,104AC_ARG_WITH(facebook-client-id,
91 [AS_HELP_STRING([--with-facebook-client-id],105 [AS_HELP_STRING([--with-facebook-client-id],
@@ -186,6 +200,7 @@
186 data/providers/foursquare.provider.in200 data/providers/foursquare.provider.in
187 data/providers/google.provider.in201 data/providers/google.provider.in
188 data/providers/identica.provider.in202 data/providers/identica.provider.in
203 data/providers/linkedin.provider.in
189 data/providers/sina.provider.in204 data/providers/sina.provider.in
190 data/providers/sohu.provider.in205 data/providers/sohu.provider.in
191 data/providers/twitter.provider.in206 data/providers/twitter.provider.in
192207
=== added file 'data/providers/linkedin.provider.in.in'
--- data/providers/linkedin.provider.in.in 1970-01-01 00:00:00 +0000
+++ data/providers/linkedin.provider.in.in 2013-03-21 15:43:05 +0000
@@ -0,0 +1,27 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<provider id="linkedin">
3 <name>LinkedIn®</name>
4 <icon>linkedin</icon>
5 <domains>*linkedin\.com</domains>
6 <translations>account-plugins</translations>
7 <plugin>generic-oauth</plugin>
8
9 <template>
10 <group name="auth">
11 <setting name="method">oauth2</setting>
12 <setting name="mechanism">web_server</setting>
13 <group name="oauth2">
14 <group name="web_server">
15 <setting name="Host">www.linkedin.com</setting>
16 <setting name="AuthPath">uas/oauth2/authorization</setting>
17 <setting name="TokenPath">uas/oauth2/accessToken</setting>
18 <setting name="ClientId">@LINKEDIN_CONSUMER_KEY@</setting>
19 <setting name="ClientSecret">@LINKEDIN_CONSUMER_SECRET@</setting>
20 <setting name="RedirectUri">https://www.linkedin.com/</setting>
21 <setting name="ResponseType">code&amp;state=sajfhaskncask</setting>
22 <setting type="as" name="Scope">['r_fullprofile','r_emailaddress']</setting>
23 </group>
24 </group>
25 </group>
26 </template>
27</provider>
028
=== added file 'data/services/linkedin-microblog.service.in'
--- data/services/linkedin-microblog.service.in 1970-01-01 00:00:00 +0000
+++ data/services/linkedin-microblog.service.in 2013-03-21 15:43:05 +0000
@@ -0,0 +1,21 @@
1<?xml version="1.0" encoding="UTF-8" ?>
2<service id="linkedin-microblog">
3 <type>microblogging</type>
4 <name>LinkedIn®</name>
5 <icon>linkedin</icon>
6 <provider>linkedin</provider>
7 <translations>account-plugins</translations>
8
9 <!-- default settings (account settings have precedence over these) -->
10 <template>
11 <group name="friends">
12 <setting name="send_enabled" type="bool">true</setting>
13 <setting name="color">#1169E1</setting>
14 </group>
15 <group name="gwibber">
16 <setting name="send_enabled" type="bool">true</setting>
17 <setting name="color">#1169E1</setting>
18 </group>
19 </template>
20
21</service>
022
=== added file 'data/webkit-options/www.linkedin.com.conf'
--- data/webkit-options/www.linkedin.com.conf 1970-01-01 00:00:00 +0000
+++ data/webkit-options/www.linkedin.com.conf 2013-03-21 15:43:05 +0000
@@ -0,0 +1,5 @@
1UsernameField = input[name="session_key"]
2VerticalScrollBar = alwaysOn
3# Force mobile version, so that layout does not scroll horizonally
4# https://bugs.launchpad.net/1051596
5UserAgent = Mozilla/5.0 (iPhone; CPU iPhone OS 5_1_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B206 Safari/7534.48.3
06
=== added file 'debian/account-plugin-linkedin.install'
--- debian/account-plugin-linkedin.install 1970-01-01 00:00:00 +0000
+++ debian/account-plugin-linkedin.install 2013-03-21 15:43:05 +0000
@@ -0,0 +1,3 @@
1etc/signon-ui/webkit-options.d/www.linkedin.com.conf
2usr/share/accounts/services/linkedin-microblog.service
3usr/share/accounts/providers/linkedin.provider
04
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-19 17:12:22 +0000
+++ debian/changelog 2013-03-21 15:43:05 +0000
@@ -1,3 +1,10 @@
1account-plugins (0.10bzr13.03.19-0ubuntu2) UNRELEASED; urgency=low
2
3 [ Jonathan Davies ]
4 * Added account-plugin-linkedin.
5
6 -- Jonathan Davies <jpds@ubuntu.com> Wed, 20 Mar 2013 10:17:55 +0000
7
1account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low8account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low
29
3 * Add transitional dummy package for unity-asset-pool10 * Add transitional dummy package for unity-asset-pool
411
=== modified file 'debian/control'
--- debian/control 2013-03-19 18:41:45 +0000
+++ debian/control 2013-03-21 15:43:05 +0000
@@ -101,6 +101,14 @@
101Description: GNOME Control Center account plugin for single signon - sina101Description: GNOME Control Center account plugin for single signon - sina
102 GNOME Control Center account plugins for single signon102 GNOME Control Center account plugins for single signon
103103
104Package: account-plugin-linkedin
105Architecture: any
106Depends: ${misc:Depends},
107 account-plugin-generic-oauth,
108 unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
109Description: GNOME Control Center account plugin for single signon - LinkedIn
110 GNOME Control Center account plugins for single signon
111
104Package: account-plugin-tools112Package: account-plugin-tools
105Architecture: any113Architecture: any
106Depends: ${shlibs:Depends}, ${misc:Depends},114Depends: ${shlibs:Depends}, ${misc:Depends},
107115
=== modified file 'debian/rules'
--- debian/rules 2012-12-07 16:45:47 +0000
+++ debian/rules 2013-03-21 15:43:05 +0000
@@ -15,7 +15,9 @@
15 --with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \15 --with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \
16 --with-google-client-secret="juFngKUcuhB7IRQqHtSLavqJ" \16 --with-google-client-secret="juFngKUcuhB7IRQqHtSLavqJ" \
17 --with-flickr-consumer-key="d87224f0b467093b2a87fd788d950e27" \17 --with-flickr-consumer-key="d87224f0b467093b2a87fd788d950e27" \
18 --with-flickr-consumer-secret="4c7e48102c226509"18 --with-flickr-consumer-secret="4c7e48102c226509" \
19 --with-linkedin-consumer-key="34gnzrg96iq5" \
20 --with-linkedin-consumer-secret="BazRki2LE8eZtcqh"
1921
20override_dh_install:22override_dh_install:
21 rm -f debian/*/usr/lib/*/*/*.la23 rm -f debian/*/usr/lib/*/*/*.la
2224
=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip 2012-10-05 07:39:20 +0000
+++ po/POTFILES.skip 2013-03-21 15:43:05 +0000
@@ -1,4 +1,5 @@
1data/services/facebook-microblog.service.in1data/services/facebook-microblog.service.in
2data/services/identica-microblog.service.in2data/services/identica-microblog.service.in
3data/services/linkedin-microblog.service.in
3data/services/twitter-microblog.service.in4data/services/twitter-microblog.service.in
45

Subscribers

People subscribed via source and target branches