Merge lp:~andrewsomething/account-plugins/instagram into lp:account-plugins

Proposed by Andrew Starr-Bochicchio on 2013-04-11
Status: Merged
Approved by: VĂ­ctor R. Ruiz on 2013-04-29
Approved revision: 102
Merged at revision: 101
Proposed branch: lp:~andrewsomething/account-plugins/instagram
Merge into: lp:account-plugins
Diff against target: 191 lines (+86/-1)
10 files modified
Makefile.am (+3/-0)
configure.ac (+15/-0)
data/providers/instagram.provider.in.in (+27/-0)
data/services/instagram-microblog.service.in (+21/-0)
data/webkit-options/api.instagram.com.conf (+2/-0)
debian/account-plugin-instagram.install (+3/-0)
debian/changelog (+3/-0)
debian/control (+8/-0)
debian/rules (+3/-1)
po/POTFILES.skip (+1/-0)
To merge this branch: bzr merge lp:~andrewsomething/account-plugins/instagram
Reviewer Review Type Date Requested Status
Ken VanDine 2013-04-29 Approve on 2013-04-30
PS Jenkins bot (community) continuous-integration Approve on 2013-04-30
Alberto Mardegan (community) 2013-04-11 Approve on 2013-04-29
Andrew Starr-Bochicchio (community) Approve on 2013-04-29
Review via email: mp+158442@code.launchpad.net

Commit message

Added account-plugin-instagram (LP: #1167449).

Description of the change

Add support for instagram as first step to adding instagram to friends-app.

To post a comment you must log in.
Alberto Mardegan (mardy) wrote :

Hi Andrew, , thank you very much for your contribution. We'd love to see it incorporate in to Ubuntu, but first I need to ask you to sign the contributor agreement. It's a straight forward process, and you can find full details here:

http://www.canonical.com/contributors

Please let me know once you've completed the form.

On the code front, I'd like to suggest you a change:
87 + <setting type="as" name="Scope">['likes+comments']</setting>

Instead of "likes+comments", try to write this as:
  <setting type="as" name="Scope">['likes', 'comments']</setting>

Our oauth plugin should concatenate the two strings as appropriate, but just to be on the safe side please test it once more, after having made the change.

Done and done. A MP against friends should be up soon as well.

Alberto Mardegan (mardy) wrote :

Hi Andrew! Sorry for taking so long for replying! It looks good to me know, thanks a lot! :-)

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~andrewsomething/account-plugins/instagram/+merge/158442/+edit-commit-message

review: Needs Fixing (continuous-integration)

Adding a merge commit message to try to make the auto-lander happy.

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/account-plugins-autolanding/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-plugins-raring-amd64-autolanding/3/console

review: Needs Fixing (continuous-integration)
102. By Andrew Starr-Bochicchio on 2013-04-29

Remerge on trunk to resolve conflict in debian/changelog.

Alberto Mardegan (mardy) wrote :

Ops! Andrew, can you please fix the conflict in debian/changelog?

review: Needs Fixing

Done. Thanks!

Alberto Mardegan (mardy) wrote :

Looks good to me. I'm adding Ken to the reviewers just to make sure that the change in debian/changelog is OK.

review: Approve
review: Approve (continuous-integration)
Ken VanDine (ken-vandine) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2013-04-02 13:00:57 +0000
3+++ Makefile.am 2013-04-29 17:24:26 +0000
4@@ -61,6 +61,7 @@
5 data/providers/google.provider.in.in \
6 data/providers/identica.provider.in.in \
7 data/providers/linkedin.provider.in.in \
8+ data/providers/instagram.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@@ -85,6 +86,7 @@
13 data/services/google-im.service.in \
14 data/services/identica-microblog.service.in \
15 data/services/linkedin-microblog.service.in \
16+ data/services/instagram-microblog.service.in \
17 data/services/picasa.service.in \
18 data/services/sina-microblog.service.in \
19 data/services/sohu-microblog.service.in \
20@@ -97,6 +99,7 @@
21 webkitoptionsdir = $(sysconfdir)/signon-ui/webkit-options.d
22 dist_webkitoptions_DATA = \
23 data/webkit-options/accounts.google.com.conf \
24+ data/webkit-options/api.instagram.com.conf \
25 data/webkit-options/api.weibo.com.conf \
26 data/webkit-options/api.t.sohu.com.conf \
27 data/webkit-options/api.twitter.com.conf \
28
29=== modified file 'configure.ac'
30--- configure.ac 2013-04-12 14:11:16 +0000
31+++ configure.ac 2013-04-29 17:24:26 +0000
32@@ -100,6 +100,20 @@
33 AC_SUBST(LINKEDIN_CONSUMER_KEY, ["$linkedin_consumer_key"])
34 AC_SUBST(LINKEDIN_CONSUMER_SECRET, ["$linkedin_consumer_secret"])
35
36+# Set Instagram client id/secret.
37+AC_ARG_WITH(instagram-client-id,
38+ [AS_HELP_STRING([--with-instagram-client-id],
39+ [instagram client id])],
40+ [instagram_client_id=$withval],
41+ [instagram_client_id="01c3df41a2274a14882adea8e8ebbd46"])
42+AC_ARG_WITH(instagram-client-secret,
43+ [AS_HELP_STRING([--with-instagram-client-secret],
44+ [instagram client secret])],
45+ [instagram_client_secret=$withval],
46+ [instagram_client_secret="4751ccdc39c648719ea83cfb1c866c26"])
47+AC_SUBST(INSTAGRAM_CLIENT_ID, ["$instagram_client_id"])
48+AC_SUBST(INSTAGRAM_CLIENT_SECRET, ["$instagram_client_secret"])
49+
50 # Set Facebook client id
51 AC_ARG_WITH(facebook-client-id,
52 [AS_HELP_STRING([--with-facebook-client-id],
53@@ -201,6 +215,7 @@
54 data/providers/google.provider.in
55 data/providers/identica.provider.in
56 data/providers/linkedin.provider.in
57+ data/providers/instagram.provider.in
58 data/providers/sina.provider.in
59 data/providers/sohu.provider.in
60 data/providers/twitter.provider.in
61
62=== added file 'data/providers/instagram.provider.in.in'
63--- data/providers/instagram.provider.in.in 1970-01-01 00:00:00 +0000
64+++ data/providers/instagram.provider.in.in 2013-04-29 17:24:26 +0000
65@@ -0,0 +1,27 @@
66+<?xml version="1.0" encoding="UTF-8" ?>
67+<provider id="instagram">
68+ <name>Instagram</name>
69+ <icon>instagram</icon>
70+ <domains>*instagram\.com</domains>
71+ <translations>account-plugins</translations>
72+ <plugin>generic-oauth</plugin>
73+
74+ <template>
75+ <group name="auth">
76+ <setting name="method">oauth2</setting>
77+ <setting name="mechanism">web_server</setting>
78+ <group name="oauth2">
79+ <group name="web_server">
80+ <setting name="Host">api.instagram.com</setting>
81+ <setting name="AuthPath">oauth/authorize</setting>
82+ <setting name="TokenPath">oauth/access_token</setting>
83+ <setting name="ClientId">@INSTAGRAM_CLIENT_ID@</setting>
84+ <setting name="ClientSecret">@INSTAGRAM_CLIENT_SECRET@</setting>
85+ <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
86+ <setting name="ResponseType">code</setting>
87+ <setting type="as" name="Scope">['likes', 'comments']</setting>
88+ </group>
89+ </group>
90+ </group>
91+ </template>
92+</provider>
93
94=== added file 'data/services/instagram-microblog.service.in'
95--- data/services/instagram-microblog.service.in 1970-01-01 00:00:00 +0000
96+++ data/services/instagram-microblog.service.in 2013-04-29 17:24:26 +0000
97@@ -0,0 +1,21 @@
98+<?xml version="1.0" encoding="UTF-8" ?>
99+<service id="linkedin-microblog">
100+ <type>microblogging</type>
101+ <name>Instagram</name>
102+ <icon>instagram</icon>
103+ <provider>instagram</provider>
104+ <translations>account-plugins</translations>
105+
106+ <!-- default settings (account settings have precedence over these) -->
107+ <template>
108+ <group name="friends">
109+ <setting name="send_enabled" type="bool">false</setting>
110+ <setting name="color">#416F96</setting>
111+ </group>
112+ <group name="gwibber">
113+ <setting name="send_enabled" type="bool">false</setting>
114+ <setting name="color">#416F96</setting>
115+ </group>
116+ </template>
117+
118+</service>
119
120=== added file 'data/webkit-options/api.instagram.com.conf'
121--- data/webkit-options/api.instagram.com.conf 1970-01-01 00:00:00 +0000
122+++ data/webkit-options/api.instagram.com.conf 2013-04-29 17:24:26 +0000
123@@ -0,0 +1,2 @@
124+UsernameField = input[id="username"]
125+PasswordField = input[id="password"]
126
127=== added file 'debian/account-plugin-instagram.install'
128--- debian/account-plugin-instagram.install 1970-01-01 00:00:00 +0000
129+++ debian/account-plugin-instagram.install 2013-04-29 17:24:26 +0000
130@@ -0,0 +1,3 @@
131+etc/signon-ui/webkit-options.d/api.instagram.com.conf
132+usr/share/accounts/services/instagram-microblog.service
133+usr/share/accounts/providers/instagram.provider
134
135=== modified file 'debian/changelog'
136--- debian/changelog 2013-04-26 18:18:50 +0000
137+++ debian/changelog 2013-04-29 17:24:26 +0000
138@@ -9,6 +9,9 @@
139 [ Ken VanDine ]
140 * Automatic snapshot from revision 98 (bootstrap)
141
142+ [ Andrew Starr-Bochicchio ]
143+ * Added account-plugin-instagram (LP: #1167449).
144+
145 -- Ken VanDine <ken.vandine@canonical.com> Fri, 26 Apr 2013 14:17:51 -0400
146
147 account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low
148
149=== modified file 'debian/control'
150--- debian/control 2013-03-20 15:40:18 +0000
151+++ debian/control 2013-04-29 17:24:26 +0000
152@@ -109,6 +109,14 @@
153 Description: GNOME Control Center account plugin for single signon - LinkedIn
154 GNOME Control Center account plugins for single signon
155
156+Package: account-plugin-instagram
157+Architecture: any
158+Depends: ${misc:Depends},
159+ account-plugin-generic-oauth,
160+ unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
161+Description: GNOME Control Center account plugin for single signon - Instagram
162+ GNOME Control Center account plugins for single signon
163+
164 Package: account-plugin-tools
165 Architecture: any
166 Depends: ${shlibs:Depends}, ${misc:Depends},
167
168=== modified file 'debian/rules'
169--- debian/rules 2013-03-20 13:41:47 +0000
170+++ debian/rules 2013-04-29 17:24:26 +0000
171@@ -17,7 +17,9 @@
172 --with-flickr-consumer-key="d87224f0b467093b2a87fd788d950e27" \
173 --with-flickr-consumer-secret="4c7e48102c226509" \
174 --with-linkedin-consumer-key="34gnzrg96iq5" \
175- --with-linkedin-consumer-secret="BazRki2LE8eZtcqh"
176+ --with-linkedin-consumer-secret="BazRki2LE8eZtcqh" \
177+ --with-instagram-client-id="01c3df41a2274a14882adea8e8ebbd46" \
178+ --with-instagram-client-secret="4751ccdc39c648719ea83cfb1c866c26"
179
180 override_dh_install:
181 rm -f debian/*/usr/lib/*/*/*.la
182
183=== modified file 'po/POTFILES.skip'
184--- po/POTFILES.skip 2013-03-21 08:24:18 +0000
185+++ po/POTFILES.skip 2013-04-29 17:24:26 +0000
186@@ -1,5 +1,6 @@
187 data/services/facebook-microblog.service.in
188 data/services/identica-microblog.service.in
189+data/services/instagram-microblog.service.in
190 data/services/linkedin-microblog.service.in
191 data/services/twitter-microblog.service.in
192

Subscribers

People subscribed via source and target branches