Merge lp:~mardy/reminders-app/account-plugin into lp:reminders-app

[Alberto Mardegan]

Merge account plugin, get username

Add the account-plugin-evernote code into reminders-app. This allows us to
retrieve the account username from within the account plugin by using the
Evernote QML API.
Packaging wise, split the debian packaging so that the new account plugin and
the Evernote QML module get shipped in their own binary packages.

Merge account plugin, get username

Add the account-plugin-evernote code into reminders-app. This allows us to
retrieve the account username from within the account plugin by using the
Evernote QML API.
Packaging wise, split the debian packaging so that the new account plugin and
the Evernote QML module get shipped in their own binary packages.

[David Planella (dpm)]

From my limited knowledge of online account plugins, looks good to me. However, a question:

35 + qtdeclarative5-evernote0.1,

If I understand it correctly, this will mean that until we are able to ship authentication plugins in click packages, both the account-plugin-evernote and qtdeclarative5-evernote0.1 packages will need to be installed by default in the image, right? That is, we're moving the Evernote SDK out of the Reminders click package and into the distro.

I don't see it as much of an issue, I just wanted to make sure I understand it, as we'll then need to land qtdeclarative5-evernote0.1 too.

review: Needs Information

[Alberto Mardegan (mardy)]

Your understanding is correct, David. Though I don't think that this package needs to be seeded into the image, because it should automatically get pulled in by the fact that account-plugin-evernote is depending on it.

Note however that we are not moving the evernote SDK out of the click package (at least, this Mp doesn't do this). Once Online Accounts will support shipping account plugins in click packages, what will happen is that the evernote SDK will be present (duplicated, unfortunately) both in the click package for the account plugin and the click package for the reminders app.

[David Planella (dpm)]

On Thu, Jan 30, 2014 at 4:01 PM, Alberto Mardegan <
<email address hidden>> wrote:

> Your understanding is correct, David. Though I don't think that this
> package needs to be seeded into the image, because it should automatically
> get pulled in by the fact that account-plugin-evernote is depending on it.
>
>
Ah, that's right. Thanks for the clarification.

> Note however that we are not moving the evernote SDK out of the click
> package (at least, this Mp doesn't do this). Once Online Accounts will
> support shipping account plugins in click packages, what will happen is
> that the evernote SDK will be present (duplicated, unfortunately) both in
> the click package for the account plugin and the click package for the
> reminders app.

But to avoid this duplication once shipping in clicks is supported, would
it not make sense to have one single click package that installs both the
app and the authentication plugin?

[Michael Zanetti (mzanetti)]

hmmm yeah. To be closer to what it is when we have click packages I would probably vote for installing the qml plugin from within the accounts-plugin, probably to /usr/share/accounts-plugin-evernote/lib/ .

But no biggie. It shouldn't break anything if keep it like this temporarily. What is the ETA on being able to ship account plugins with clicks btw?

[Michael Zanetti (mzanetti)]

My previous comment was in reply to the first 2 comments. Sorry. I wrote it a while ago and only hit the send button now.

>
> But to avoid this duplication once shipping in clicks is supported, would
> it not make sense to have one single click package that installs both the
> app and the authentication plugin?

Yes, I agree.

[Alberto Mardegan (mardy)]

On 01/30/2014 05:21 PM, Michael Zanetti wrote:
> But no biggie. It shouldn't break anything if keep it like this temporarily. What is the ETA on being able to ship account plugins with clicks btw?

Soon (couble of weeks?) we should get the ability to support account
plugins shipped by click packages, but they will run in the
online-accounts-ui process (so, unconfined) and won't be able to have
dependencies (such as the Evernote QML plugin).

Moving account plugins into their own separate process, and running them
with the proper apparmor confinement (and access to libs they ship in
their click package) is under heavy development :-), and will come later
(one month?).

[Michael Zanetti (mzanetti)]

looks good to me... Wondering why jenkins doesn't pick it up though...

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2014-01-27 13:04:39 +0000
+++ .bzrignore	2014-01-30 14:52:43 +0000
@@ -1,2 +1,13 @@
+*.log
+*.substvars
 CMakeLists.txt.user
 builddir
+debian/account-plugin-evernote/
+debian/files
+debian/qtdeclarative5-evernote0.1/
+debian/reminders-app/
+debian/reminders-app-autopilot/
+debian/tmp/
+obj-*/
+reminders-app.qmlproject.user
+reminders-app.pro.user

=== added file 'debian/account-plugin-evernote.install'
--- debian/account-plugin-evernote.install	1970-01-01 00:00:00 +0000
+++ debian/account-plugin-evernote.install	2014-01-30 14:52:43 +0000
@@ -0,0 +1,4 @@
+usr/share/accounts/providers/*
+usr/share/accounts/qml-plugins/*
+usr/share/accounts/services/*
+usr/share/icons/hicolor/32x32/apps/evernote.png

=== modified file 'debian/control'
--- debian/control	2013-12-18 23:10:42 +0000
+++ debian/control	2014-01-30 14:52:43 +0000
@@ -20,6 +20,7 @@
 Depends: ${misc:Depends},
          account-plugin-evernote,
          qmlscene,
+         qtdeclarative5-evernote0.1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-localstorage-plugin,
          qtdeclarative5-qtquick2-plugin,
@@ -27,6 +28,23 @@
 Description: Reminders application
  Note taking application powered by Evernote
 
+Package: qtdeclarative5-evernote0.1
+Architecture: all
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Expose the Evernote API to QML applications
+ This module provides access to the Evernote API from QML applications.
+
+Package: account-plugin-evernote
+Architecture: all
+Depends: libaccount-plugin-generic-oauth,
+         qtdeclarative5-evernote0.1,
+         qtdeclarative5-online-accounts-client0.1,
+         ${misc:Depends},
+Description: Allow Ubuntu to access the Evernote developer sandbox
+ This plugin enables developers to authenticate to their Evernote developer
+ sandbox account, which allows syncing of Evernote notes across Ubuntu devices.
+
 Package: reminders-app-autopilot
 Architecture: all
 Depends: ${misc:Depends},

=== added file 'debian/qtdeclarative5-evernote0.1.install'
--- debian/qtdeclarative5-evernote0.1.install	1970-01-01 00:00:00 +0000
+++ debian/qtdeclarative5-evernote0.1.install	2014-01-30 14:52:43 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/qt5/qml/Evernote

=== modified file 'debian/reminders-app.install'
--- debian/reminders-app.install	2014-01-19 13:59:12 +0000
+++ debian/reminders-app.install	2014-01-30 14:52:43 +0000
@@ -1,3 +1,4 @@
 usr/bin/*
-usr/lib/*/qt5/*
-usr/share/*
+usr/share/applications/*
+usr/share/locale
+usr/share/reminders/*

=== modified file 'debian/rules'
--- debian/rules	2014-01-19 13:59:12 +0000
+++ debian/rules	2014-01-30 14:52:43 +0000
@@ -7,5 +7,9 @@
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DEVERNOTE_CONSUMER_KEY="ubuntu" \
+		-DEVERNOTE_CONSUMER_SECRET="44f8ee81a8359500"
+
 override_dh_install:	
 	dh_install --fail-missing

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-12-18 00:30:17 +0000
+++ src/CMakeLists.txt	2014-01-30 14:52:43 +0000
@@ -1,2 +1,5 @@
+if(NOT CLICK_MODE)
+add_subdirectory(account-plugin)
+endif(NOT CLICK_MODE)
 add_subdirectory(plugin)
 add_subdirectory(app)

=== added directory 'src/account-plugin'
=== added file 'src/account-plugin/CMakeLists.txt'
--- src/account-plugin/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/account-plugin/CMakeLists.txt	2014-01-30 14:52:43 +0000
@@ -0,0 +1,21 @@
+set(ICON data/icons/evernote.png)
+set(PROVIDER_FILE data/providers/evernote.provider)
+set(SERVICE_FILE data/services/evernote.service)
+set(QML_PLUGIN_DIR ${CMAKE_INSTALL_DATADIR}/accounts/qml-plugins)
+
+set(ICON_DIR ${CMAKE_INSTALL_DATADIR}/icons/hicolor/32x32/apps)
+set(PROVIDER_DIR ${CMAKE_INSTALL_DATADIR}/accounts/providers)
+set(SERVICE_DIR ${CMAKE_INSTALL_DATADIR}/accounts/services)
+
+install(FILES ${ICON} DESTINATION ${ICON_DIR})
+
+configure_file(${PROVIDER_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER_FILE})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROVIDER_FILE}
+        DESTINATION ${PROVIDER_DIR})
+
+install(FILES ${SERVICE_FILE} DESTINATION ${SERVICE_DIR})
+
+file(GLOB_RECURSE QML_FILES
+     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+     qml/**.qml)
+install(FILES ${QML_FILES} DESTINATION ${QML_PLUGIN_DIR}/evernote)

=== added directory 'src/account-plugin/data'
=== added directory 'src/account-plugin/data/icons'
=== added file 'src/account-plugin/data/icons/evernote.png'
Binary files src/account-plugin/data/icons/evernote.png	1970-01-01 00:00:00 +0000 and src/account-plugin/data/icons/evernote.png	2014-01-30 14:52:43 +0000 differ
=== added directory 'src/account-plugin/data/providers'
=== added file 'src/account-plugin/data/providers/evernote.provider.in'
--- src/account-plugin/data/providers/evernote.provider.in	1970-01-01 00:00:00 +0000
+++ src/account-plugin/data/providers/evernote.provider.in	2014-01-30 14:52:43 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider id="evernote">
+  <name>Evernote Developer Sandbox</name>
+  <icon>evernote</icon>
+  <translations>account-plugins</translations>
+  <plugin>generic-oauth</plugin>
+  <domains>.*evernote\.com</domains>
+
+  <template>
+    <group name="auth">
+      <setting name="method">oauth2</setting>
+      <setting name="mechanism">HMAC-SHA1</setting>
+      <group name="oauth2">
+        <group name="HMAC-SHA1">
+          <setting name="RequestEndpoint">https://sandbox.evernote.com/oauth</setting>
+          <setting name="TokenEndpoint">https://sandbox.evernote.com/oauth</setting>
+          <setting name="AuthorizationEndpoint">https://sandbox.evernote.com/OAuth.action</setting>
+          <setting name="Callback">https://wiki.ubuntu.com/</setting>
+          <setting name="ConsumerKey">@EVERNOTE_CONSUMER_KEY@</setting>
+          <setting name="ConsumerSecret">@EVERNOTE_CONSUMER_SECRET@</setting>
+        </group>
+      </group>
+    </group>
+  </template>
+</provider>

=== added directory 'src/account-plugin/data/services'
=== added file 'src/account-plugin/data/services/evernote.service'
--- src/account-plugin/data/services/evernote.service	1970-01-01 00:00:00 +0000
+++ src/account-plugin/data/services/evernote.service	2014-01-30 14:52:43 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="evernote">
+  <type>sharing</type>
+  <name>Evernote Developer Sandbox</name>
+  <icon>evernote</icon>
+  <provider>evernote</provider>
+  <translations>account-plugins</translations>
+</service>

=== added directory 'src/account-plugin/qml'
=== added directory 'src/account-plugin/qml/evernote'
=== added file 'src/account-plugin/qml/evernote/Main.qml'
--- src/account-plugin/qml/evernote/Main.qml	1970-01-01 00:00:00 +0000
+++ src/account-plugin/qml/evernote/Main.qml	2014-01-30 14:52:43 +0000
@@ -0,0 +1,25 @@
+import Evernote 0.1
+import QtQuick 2.0
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+OAuthMain {
+    creationComponent: OAuth {
+        Connections {
+            target: UserStore
+            onUsernameChanged: saveUsername()
+        }
+
+        function completeCreation(reply) {
+            EvernoteConnection.token = reply.AccessToken
+            /* At this point the username is getting retrieved. Once that's
+             * done, UserStore will notify that its "username" property has
+             * been changed, and we'll continue from saveUsername(). */
+        }
+
+        function saveUsername() {
+            account.updateDisplayName(UserStore.username)
+            account.synced.connect(finished)
+            account.sync()
+        }
+    }
+}