Online Accounts: Account plugins

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

Proposed by Jonathan Davies on 2013-03-20
Status: Merged
Approved by: Alberto Mardegan on 2013-03-21
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
To merge this branch: bzr merge lp:~jpds/account-plugins/linkedin-plugin
Reviewer Review Type Date Requested Status
Alberto Mardegan 2013-03-20 Approve on 2013-03-21
PS Jenkins bot continuous-integration Approve on 2013-03-21
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.
David King (amigadave) wrote :

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

104. By Jonathan Davies on 2013-03-20

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

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)
105. By Jonathan Davies on 2013-03-20

Removed mispasted Facebook parts from configure.ac.

106. By Jonathan Davies on 2013-03-20

Fixed service ID for linkedin-microblog.

107. By Jonathan Davies on 2013-03-20

Removed extra line in control.

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
108. By Jonathan Davies on 2013-03-21

Place files in alphabetical order.

109. By Jonathan Davies on 2013-03-21

Alphabetical order on these files too.

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).

110. By Jonathan Davies on 2013-03-21

Force the showing of scrollbar in webkit options.

111. By Jonathan Davies on 2013-03-21

Added missing \ to Makefile.am.

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
112. By Jonathan Davies on 2013-03-21

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

113. By Jonathan Davies on 2013-03-21

Removed spaces in provider name.

Alberto Mardegan (mardy) wrote :

Excellent, thanks!!!

review: Approve

Preview Diff

1=== modified file 'Makefile.am'
2--- Makefile.am 2013-03-19 14:47:46 +0000
3+++ Makefile.am 2013-03-21 15:43:05 +0000
4@@ -60,6 +60,7 @@
5 data/providers/foursquare.provider.in.in \
6 data/providers/google.provider.in.in \
7 data/providers/identica.provider.in.in \
8+ data/providers/linkedin.provider.in.in \
9 data/providers/sina.provider.in.in \
10 data/providers/sohu.provider.in.in \
11 data/providers/twitter.provider.in.in \
12@@ -83,6 +84,7 @@
13 data/services/google-docs.service.in \
14 data/services/google-im.service.in \
15 data/services/identica-microblog.service.in \
16+ data/services/linkedin-microblog.service.in \
17 data/services/picasa.service.in \
18 data/services/sina-microblog.service.in \
19 data/services/sohu-microblog.service.in \
20@@ -103,7 +105,8 @@
21 data/webkit-options/login.live.com.conf \
22 data/webkit-options/login.yahoo.com.conf \
23 data/webkit-options/secure.flickr.com.conf \
24- data/webkit-options/www.facebook.com.conf
25+ data/webkit-options/www.facebook.com.conf \
26+ data/webkit-options/www.linkedin.com.conf
27
28 dist_bin_SCRIPTS = \
29 tools/account-console
30
31=== modified file 'configure.ac'
32--- configure.ac 2013-02-22 15:17:49 +0000
33+++ configure.ac 2013-03-21 15:43:05 +0000
34@@ -86,6 +86,20 @@
35 AC_SUBST(TWITTER_CONSUMER_KEY, ["$twitter_consumer_key"])
36 AC_SUBST(TWITTER_CONSUMER_SECRET, ["$twitter_consumer_secret"])
37
38+# Set LinkedIn consumer key/secret.
39+AC_ARG_WITH(linkedin-consumer-key,
40+ [AS_HELP_STRING([--with-linkedin-consumer-key],
41+ [LinkedIn consumer key])],
42+ [linkedin_consumer_key=$withval],
43+ [linkedin_consumer_key="34gnzrg96iq5"])
44+AC_ARG_WITH(linkedin-consumer-secret,
45+ [AS_HELP_STRING([--with-linkedin-consumer-secret],
46+ [LinkedIn consumer secret])],
47+ [linkedin_consumer_secret=$withval],
48+ [linkedin_consumer_secret="BazRki2LE8eZtcqh"])
49+AC_SUBST(LINKEDIN_CONSUMER_KEY, ["$linkedin_consumer_key"])
50+AC_SUBST(LINKEDIN_CONSUMER_SECRET, ["$linkedin_consumer_secret"])
51+
52 # Set Facebook client id
53 AC_ARG_WITH(facebook-client-id,
54 [AS_HELP_STRING([--with-facebook-client-id],
55@@ -186,6 +200,7 @@
56 data/providers/foursquare.provider.in
57 data/providers/google.provider.in
58 data/providers/identica.provider.in
59+ data/providers/linkedin.provider.in
60 data/providers/sina.provider.in
61 data/providers/sohu.provider.in
62 data/providers/twitter.provider.in
63
64=== added file 'data/providers/linkedin.provider.in.in'
65--- data/providers/linkedin.provider.in.in 1970-01-01 00:00:00 +0000
66+++ data/providers/linkedin.provider.in.in 2013-03-21 15:43:05 +0000
67@@ -0,0 +1,27 @@
68+<?xml version="1.0" encoding="UTF-8" ?>
69+<provider id="linkedin">
70+ <name>LinkedIn®</name>
71+ <icon>linkedin</icon>
72+ <domains>*linkedin\.com</domains>
73+ <translations>account-plugins</translations>
74+ <plugin>generic-oauth</plugin>
75+
76+ <template>
77+ <group name="auth">
78+ <setting name="method">oauth2</setting>
79+ <setting name="mechanism">web_server</setting>
80+ <group name="oauth2">
81+ <group name="web_server">
82+ <setting name="Host">www.linkedin.com</setting>
83+ <setting name="AuthPath">uas/oauth2/authorization</setting>
84+ <setting name="TokenPath">uas/oauth2/accessToken</setting>
85+ <setting name="ClientId">@LINKEDIN_CONSUMER_KEY@</setting>
86+ <setting name="ClientSecret">@LINKEDIN_CONSUMER_SECRET@</setting>
87+ <setting name="RedirectUri">https://www.linkedin.com/</setting>
88+ <setting name="ResponseType">code&amp;state=sajfhaskncask</setting>
89+ <setting type="as" name="Scope">['r_fullprofile','r_emailaddress']</setting>
90+ </group>
91+ </group>
92+ </group>
93+ </template>
94+</provider>
95
96=== added file 'data/services/linkedin-microblog.service.in'
97--- data/services/linkedin-microblog.service.in 1970-01-01 00:00:00 +0000
98+++ data/services/linkedin-microblog.service.in 2013-03-21 15:43:05 +0000
99@@ -0,0 +1,21 @@
100+<?xml version="1.0" encoding="UTF-8" ?>
101+<service id="linkedin-microblog">
102+ <type>microblogging</type>
103+ <name>LinkedIn®</name>
104+ <icon>linkedin</icon>
105+ <provider>linkedin</provider>
106+ <translations>account-plugins</translations>
107+
108+ <!-- default settings (account settings have precedence over these) -->
109+ <template>
110+ <group name="friends">
111+ <setting name="send_enabled" type="bool">true</setting>
112+ <setting name="color">#1169E1</setting>
113+ </group>
114+ <group name="gwibber">
115+ <setting name="send_enabled" type="bool">true</setting>
116+ <setting name="color">#1169E1</setting>
117+ </group>
118+ </template>
119+
120+</service>
121
122=== added file 'data/webkit-options/www.linkedin.com.conf'
123--- data/webkit-options/www.linkedin.com.conf 1970-01-01 00:00:00 +0000
124+++ data/webkit-options/www.linkedin.com.conf 2013-03-21 15:43:05 +0000
125@@ -0,0 +1,5 @@
126+UsernameField = input[name="session_key"]
127+VerticalScrollBar = alwaysOn
128+# Force mobile version, so that layout does not scroll horizonally
129+# https://bugs.launchpad.net/1051596
130+UserAgent = 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
131
132=== added file 'debian/account-plugin-linkedin.install'
133--- debian/account-plugin-linkedin.install 1970-01-01 00:00:00 +0000
134+++ debian/account-plugin-linkedin.install 2013-03-21 15:43:05 +0000
135@@ -0,0 +1,3 @@
136+etc/signon-ui/webkit-options.d/www.linkedin.com.conf
137+usr/share/accounts/services/linkedin-microblog.service
138+usr/share/accounts/providers/linkedin.provider
139
140=== modified file 'debian/changelog'
141--- debian/changelog 2013-03-19 17:12:22 +0000
142+++ debian/changelog 2013-03-21 15:43:05 +0000
143@@ -1,3 +1,10 @@
144+account-plugins (0.10bzr13.03.19-0ubuntu2) UNRELEASED; urgency=low
145+
146+ [ Jonathan Davies ]
147+ * Added account-plugin-linkedin.
148+
149+ -- Jonathan Davies <jpds@ubuntu.com> Wed, 20 Mar 2013 10:17:55 +0000
150+
151 account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low
152
153 * Add transitional dummy package for unity-asset-pool
154
155=== modified file 'debian/control'
156--- debian/control 2013-03-19 18:41:45 +0000
157+++ debian/control 2013-03-21 15:43:05 +0000
158@@ -101,6 +101,14 @@
159 Description: GNOME Control Center account plugin for single signon - sina
160 GNOME Control Center account plugins for single signon
161
162+Package: account-plugin-linkedin
163+Architecture: any
164+Depends: ${misc:Depends},
165+ account-plugin-generic-oauth,
166+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
167+Description: GNOME Control Center account plugin for single signon - LinkedIn
168+ GNOME Control Center account plugins for single signon
169+
170 Package: account-plugin-tools
171 Architecture: any
172 Depends: ${shlibs:Depends}, ${misc:Depends},
173
174=== modified file 'debian/rules'
175--- debian/rules 2012-12-07 16:45:47 +0000
176+++ debian/rules 2013-03-21 15:43:05 +0000
177@@ -15,7 +15,9 @@
178 --with-google-client-id="759250720802-4sii0me9963n9fdqdmi7cepn6ub8luoh.apps.googleusercontent.com" \
179 --with-google-client-secret="juFngKUcuhB7IRQqHtSLavqJ" \
180 --with-flickr-consumer-key="d87224f0b467093b2a87fd788d950e27" \
181- --with-flickr-consumer-secret="4c7e48102c226509"
182+ --with-flickr-consumer-secret="4c7e48102c226509" \
183+ --with-linkedin-consumer-key="34gnzrg96iq5" \
184+ --with-linkedin-consumer-secret="BazRki2LE8eZtcqh"
185
186 override_dh_install:
187 rm -f debian/*/usr/lib/*/*/*.la
188
189=== modified file 'po/POTFILES.skip'
190--- po/POTFILES.skip 2012-10-05 07:39:20 +0000
191+++ po/POTFILES.skip 2013-03-21 15:43:05 +0000
192@@ -1,4 +1,5 @@
193 data/services/facebook-microblog.service.in
194 data/services/identica-microblog.service.in
195+data/services/linkedin-microblog.service.in
196 data/services/twitter-microblog.service.in
197

Subscribers

People subscribed via source and target branches