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

[Andrew Starr-Bochicchio]

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

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

[Alberto Mardegan (mardy)]

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.

[Andrew Starr-Bochicchio (andrewsomething)]

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

[Alberto Mardegan (mardy)]

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

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)

[Andrew Starr-Bochicchio (andrewsomething)]

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

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[lp:~andrewsomething/account-plugins/instagram]

102. By Andrew Starr-Bochicchio on 2013-04-29

Remerge on trunk to resolve conflict in debian/changelog.

[Alberto Mardegan (mardy)]

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

review: Needs Fixing

[Andrew Starr-Bochicchio (andrewsomething)]

Done. Thanks!

[Alberto Mardegan (mardy)]

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

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-04-02 13:00:57 +0000
+++ Makefile.am	2013-04-29 17:24:26 +0000
@@ -61,6 +61,7 @@
 	data/providers/google.provider.in.in \
 	data/providers/identica.provider.in.in \
 	data/providers/linkedin.provider.in.in \
+	data/providers/instagram.provider.in.in \
 	data/providers/sina.provider.in.in \
 	data/providers/sohu.provider.in.in \
 	data/providers/twitter.provider.in.in \
@@ -85,6 +86,7 @@
 	data/services/google-im.service.in \
 	data/services/identica-microblog.service.in \
 	data/services/linkedin-microblog.service.in \
+	data/services/instagram-microblog.service.in \
 	data/services/picasa.service.in \
 	data/services/sina-microblog.service.in \
 	data/services/sohu-microblog.service.in \
@@ -97,6 +99,7 @@
 webkitoptionsdir = $(sysconfdir)/signon-ui/webkit-options.d
 dist_webkitoptions_DATA = \
 	data/webkit-options/accounts.google.com.conf \
+	data/webkit-options/api.instagram.com.conf \
 	data/webkit-options/api.weibo.com.conf \
 	data/webkit-options/api.t.sohu.com.conf \
 	data/webkit-options/api.twitter.com.conf \

=== modified file 'configure.ac'
--- configure.ac	2013-04-12 14:11:16 +0000
+++ configure.ac	2013-04-29 17:24:26 +0000
@@ -100,6 +100,20 @@
 AC_SUBST(LINKEDIN_CONSUMER_KEY, ["$linkedin_consumer_key"])
 AC_SUBST(LINKEDIN_CONSUMER_SECRET, ["$linkedin_consumer_secret"])
 
+# Set Instagram client id/secret.
+AC_ARG_WITH(instagram-client-id,
+            [AS_HELP_STRING([--with-instagram-client-id],
+                            [instagram client id])],
+                            [instagram_client_id=$withval],
+                            [instagram_client_id="01c3df41a2274a14882adea8e8ebbd46"])
+AC_ARG_WITH(instagram-client-secret,
+            [AS_HELP_STRING([--with-instagram-client-secret],
+                            [instagram client secret])],
+                            [instagram_client_secret=$withval],
+                            [instagram_client_secret="4751ccdc39c648719ea83cfb1c866c26"])
+AC_SUBST(INSTAGRAM_CLIENT_ID, ["$instagram_client_id"])
+AC_SUBST(INSTAGRAM_CLIENT_SECRET, ["$instagram_client_secret"])
+
 # Set Facebook client id
 AC_ARG_WITH(facebook-client-id,
             [AS_HELP_STRING([--with-facebook-client-id],
@@ -201,6 +215,7 @@
 	data/providers/google.provider.in
 	data/providers/identica.provider.in
 	data/providers/linkedin.provider.in
+	data/providers/instagram.provider.in
 	data/providers/sina.provider.in
 	data/providers/sohu.provider.in
 	data/providers/twitter.provider.in

=== added file 'data/providers/instagram.provider.in.in'
--- data/providers/instagram.provider.in.in	1970-01-01 00:00:00 +0000
+++ data/providers/instagram.provider.in.in	2013-04-29 17:24:26 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<provider id="instagram">
+  <name>Instagram</name>
+  <icon>instagram</icon>
+  <domains>*instagram\.com</domains>
+  <translations>account-plugins</translations>
+  <plugin>generic-oauth</plugin>
+
+  <template>
+    <group name="auth">
+      <setting name="method">oauth2</setting>
+      <setting name="mechanism">web_server</setting>
+      <group name="oauth2">
+        <group name="web_server">
+          <setting name="Host">api.instagram.com</setting>
+          <setting name="AuthPath">oauth/authorize</setting>
+          <setting name="TokenPath">oauth/access_token</setting>
+          <setting name="ClientId">@INSTAGRAM_CLIENT_ID@</setting>
+          <setting name="ClientSecret">@INSTAGRAM_CLIENT_SECRET@</setting>
+          <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
+          <setting name="ResponseType">code</setting>
+          <setting type="as" name="Scope">['likes', 'comments']</setting>
+        </group>
+      </group>
+    </group>
+  </template>
+</provider>

=== added file 'data/services/instagram-microblog.service.in'
--- data/services/instagram-microblog.service.in	1970-01-01 00:00:00 +0000
+++ data/services/instagram-microblog.service.in	2013-04-29 17:24:26 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="linkedin-microblog">
+  <type>microblogging</type>
+  <name>Instagram</name>
+  <icon>instagram</icon>
+  <provider>instagram</provider>
+  <translations>account-plugins</translations>
+
+  <!-- default settings (account settings have precedence over these) -->
+  <template>
+    <group name="friends">
+      <setting name="send_enabled" type="bool">false</setting>
+      <setting name="color">#416F96</setting>
+    </group>
+    <group name="gwibber">
+      <setting name="send_enabled" type="bool">false</setting>
+      <setting name="color">#416F96</setting>
+    </group>
+  </template>
+
+</service>

=== added file 'data/webkit-options/api.instagram.com.conf'
--- data/webkit-options/api.instagram.com.conf	1970-01-01 00:00:00 +0000
+++ data/webkit-options/api.instagram.com.conf	2013-04-29 17:24:26 +0000
@@ -0,0 +1,2 @@
+UsernameField = input[id="username"]
+PasswordField = input[id="password"]

=== added file 'debian/account-plugin-instagram.install'
--- debian/account-plugin-instagram.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-instagram.install	2013-04-29 17:24:26 +0000
@@ -0,0 +1,3 @@
+etc/signon-ui/webkit-options.d/api.instagram.com.conf
+usr/share/accounts/services/instagram-microblog.service
+usr/share/accounts/providers/instagram.provider

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-26 18:18:50 +0000
+++ debian/changelog	2013-04-29 17:24:26 +0000
@@ -9,6 +9,9 @@
   [ Ken VanDine ]
   * Automatic snapshot from revision 98 (bootstrap)
 
+  [ Andrew Starr-Bochicchio ]
+  * Added account-plugin-instagram (LP: #1167449). 
+
  -- Ken VanDine <[e-mail]>  Fri, 26 Apr 2013 14:17:51 -0400
 
 account-plugins (0.10bzr13.03.19-0ubuntu1) raring; urgency=low

=== modified file 'debian/control'
--- debian/control	2013-03-20 15:40:18 +0000
+++ debian/control	2013-04-29 17:24:26 +0000
@@ -109,6 +109,14 @@
 Description: GNOME Control Center account plugin for single signon - LinkedIn
  GNOME Control Center account plugins for single signon
 
+Package: account-plugin-instagram
+Architecture: any
+Depends: ${misc:Depends},
+        account-plugin-generic-oauth,
+        unity-asset-pool (>> 0.8.24daily12.12.05-0ubuntu1)
+Description: GNOME Control Center account plugin for single signon - Instagram
+ GNOME Control Center account plugins for single signon
+
 Package: account-plugin-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},

=== modified file 'debian/rules'
--- debian/rules	2013-03-20 13:41:47 +0000
+++ debian/rules	2013-04-29 17:24:26 +0000
@@ -17,7 +17,9 @@
 		--with-flickr-consumer-key="d87224f0b467093b2a87fd788d950e27" \
 		--with-flickr-consumer-secret="4c7e48102c226509" \
 		--with-linkedin-consumer-key="34gnzrg96iq5" \
-		--with-linkedin-consumer-secret="BazRki2LE8eZtcqh"
+		--with-linkedin-consumer-secret="BazRki2LE8eZtcqh" \
+		--with-instagram-client-id="01c3df41a2274a14882adea8e8ebbd46" \
+		--with-instagram-client-secret="4751ccdc39c648719ea83cfb1c866c26" 
 
 override_dh_install:
 	rm -f debian/*/usr/lib/*/*/*.la

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2013-03-21 08:24:18 +0000
+++ po/POTFILES.skip	2013-04-29 17:24:26 +0000
@@ -1,5 +1,6 @@
 data/services/facebook-microblog.service.in
 data/services/identica-microblog.service.in
+data/services/instagram-microblog.service.in
 data/services/linkedin-microblog.service.in
 data/services/twitter-microblog.service.in