Merge lp:~mandel/ubuntuone-windows-installer/add_account_information into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Re-activates the account tab and gets the account information from the rest service.

[lp:~mandel/ubuntuone-windows-installer/add_account_information]

180. By Manuel de la Peña on 2010-11-15

Added code to manage accounts

[John Lenton (chipaca)]

review: Approve

=== modified file 'src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml'
--- src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml	2010-11-15 02:17:01 +0000
+++ src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml	2010-11-15 02:17:02 +0000
@@ -45,8 +45,11 @@
             <Label Name="StatusLabel" Grid.Row="1">Disconnected</Label>
         </Grid>
         <TabControl Margin="3" Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+            <TabItem Header="{x:Static resx:Resources.PreferencesDialogAccountTabHeader}" >
+                <Views:AccountView x:Name="AccountsTab" Height="300" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+            </TabItem>
             <TabItem Header="{x:Static resx:Resources.PreferencesDialogDevicesTabHeader}" >
-                <Views:DevicesView x:Name="DevicesTab" Height="300" HorizontalAlignment="Stretch"/>
+                <Views:DevicesView x:Name="DevicesTab" Height="300" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
             </TabItem>
             <TabItem Header="{x:Static resx:Resources.PreferencesDialogWindowsTabHeader}">
                 <Views:WindowsSettingsView x:Name="WindowsTab" Height="300" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
@@ -55,9 +58,6 @@
                 <Views:BetaView x:Name="BetaTab" Height="300" IsEnabled="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
             </TabItem>
             <!--
-            <TabItem Header="{x:Static resx:Resources.PreferencesDialogAccountTabHeader}" >
-                <Views:AccountView x:Name="AccountsTab" Height="300" IsEnabled="False"/>
-            </TabItem>
             
             <TabItem Header="{x:Static resx:Resources.PreferencesDialogServicesTabHeader}" >
                 <Views:ServicesView x:Name="ServicesTab" Height="300" IsEnabled="False"/>

=== modified file 'src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs	2010-11-15 02:17:01 +0000
+++ src/Canonical.UbuntuOne.Client.Views/PreferencesDialog.xaml.cs	2010-11-15 02:17:02 +0000
@@ -59,20 +59,20 @@
             InitializeComponent();
         }
 
-        //public string UserName
-        //{
-        //    set { AccountsTab.UserName = value; }
-        //}
-
-        //public string Email
-        //{
-        //    set { AccountsTab.Email = value; }
-        //}
-
-        //public string CurrentPlan
-        //{
-        //    set { AccountsTab.CurrentPlan = value; }
-        //}
+        public string UserName
+        {
+            set { AccountsTab.UserName = value; }
+        }
+
+        public string Email
+        {
+            set { AccountsTab.Email = value; }
+        }
+
+        public string CurrentPlan
+        {
+            set { AccountsTab.CurrentPlan = value; }
+        }
 
         //public bool IsBookmarksSynced
         //{
@@ -129,21 +129,6 @@
             set { DevicesTab.Devices = value; }
         }
 
-        public string UserName
-        {
-            set {  }
-        }
-
-        public string Email
-        {
-            set {  }
-        }
-
-        public string CurrentPlan
-        {
-            set {  }
-        }
-
         public bool IsBookmarksSynced
         {
             get { return false; }

=== added file 'src/Canonical.UbuntuOne.Client/Account.cs'
--- src/Canonical.UbuntuOne.Client/Account.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/Account.cs	2010-11-15 02:17:02 +0000
@@ -0,0 +1,41 @@
+/* Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+namespace Canonical.UbuntuOne.Client
+{
+    /// <summary>
+    /// Represents the account information of the user in ubuntu one.
+    /// </summary>
+    public class Account : IAccount
+    {
+        /// <summary>
+        /// Gets and sets the name of the user.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets and sets the email of the user.
+        /// </summary>
+        public string EmailAddress { get; set; }
+
+        /// <summary>
+        /// Gets and sets a description of the user current plan.
+        /// </summary>
+        public string CurrentPlan { get; set; }
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Client/AccountException.cs'
--- src/Canonical.UbuntuOne.Client/AccountException.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/AccountException.cs	2010-11-15 02:17:02 +0000
@@ -0,0 +1,57 @@
+/* Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+
+namespace Canonical.UbuntuOne.Client
+{
+    /// <summary>
+    /// Exception thrown when there are issues retrieving the data of the users account.
+    /// </summary>
+    public class AccountException : Exception
+    {
+        /// <summary>
+        /// Creates a new instace of the object.
+        /// </summary>
+        public AccountException()
+        {
+            
+        }
+
+        /// <summary>
+        /// Creates a new instance that carries the given message.
+        /// </summary>
+        /// <param name="message">The message to be carried by the exception.</param>
+        public AccountException(string message)
+            : base(message)
+        {
+            
+        }
+
+        /// <summary>
+        /// Creates a new exception with the given message and inner exception.
+        /// </summary>
+        /// <param name="message">The message to be carried by the exception.</param>
+        /// <param name="inner">The inner exception that creatd the exception.</param>
+        public AccountException(string message, Exception inner)
+            : base(message, inner)
+        {
+            
+        }
+    }
+}

=== added file 'src/Canonical.UbuntuOne.Client/AccountFactory.cs'
--- src/Canonical.UbuntuOne.Client/AccountFactory.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/AccountFactory.cs	2010-11-15 02:17:02 +0000
@@ -0,0 +1,90 @@
+/* Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+using System;
+using System.IO;
+using Canonical.Ubuntu.SSO;
+using Canonical.UbuntuOne.Common.Net;
+using Newtonsoft.Json.Linq;
+
+namespace Canonical.UbuntuOne.Client
+{
+    /// <summary>
+    /// Factory that creates the account information of the user.
+    /// </summary>
+    internal class AccountFactory : IAccountFactory
+    {
+        #region Variables
+
+        internal const string AccountUri = "https://one.ubuntu.com/api/account/";
+        #endregion
+
+        #region Di properties
+
+        /// <summary>
+        /// Gets and sets the SSO provider that returns the credentials of the user.
+        /// </summary>
+        public ISSOCredentialsProvider SSOCredentialsProvider { get; set; }
+
+        /// <summary>
+        /// Gets and sets the oauth object that can be used to sign the http requests.
+        /// </summary>
+        public IOAuth OAuth { get; set; }
+
+        #endregion
+
+        /// <summary>
+        /// Creates the account information of the current user in ubuntu one.
+        /// </summary>
+        /// <returns>The account information of the user.</returns>
+        public IAccount Create()
+        {
+            string token;
+            string tokenSecret;
+            string consumerKey;
+            string consumerSecret;
+
+            // get the credentials
+            SSOCredentialsProvider.LoginToGetCredentials("UbuntuOne", out token, out tokenSecret, out consumerKey,
+                                                         out consumerSecret);
+            var request = OAuth.MakeRequest(AccountUri, "GET", consumerKey, consumerSecret, token, tokenSecret);
+            try
+            {
+                var response = request.GetResponse();
+                using(var stream = response.GetResponseStream())
+                {
+                    var data = new StreamReader(stream).ReadToEnd();
+                    var jobject = JObject.Parse(data);
+                    var subscriptionObject = (JObject)jobject["subscription"];
+                    var account = new Account
+                                      {
+                                          Name = (string) jobject["nickname"],
+                                          EmailAddress = (string) jobject["email"],
+                                          CurrentPlan = (string) subscriptionObject["description"]
+                                      };
+
+                    return account;
+                }
+            }
+            catch (Exception e)
+            {
+                throw new AccountException("The account information could not be retrieved.", e);
+            }
+        }
+    }
+}

=== modified file 'src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj'
--- src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-11-15 02:17:01 +0000
+++ src/Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client.csproj	2010-11-15 02:17:02 +0000
@@ -74,10 +74,15 @@
     <Compile Include="..\Version.cs">
       <Link>Properties\Version.cs</Link>
     </Compile>
+    <Compile Include="Account.cs" />
+    <Compile Include="AccountException.cs" />
+    <Compile Include="AccountFactory.cs" />
     <Compile Include="Device.cs" />
     <Compile Include="DeviceFactory.cs" />
     <Compile Include="DeviceManager.cs" />
     <Compile Include="DeviceManagerException.cs" />
+    <Compile Include="IAccount.cs" />
+    <Compile Include="IAccountFactory.cs" />
     <Compile Include="IDevice.cs" />
     <Compile Include="IDeviceFactory.cs" />
     <Compile Include="IDeviceManager.cs" />

=== modified file 'src/Canonical.UbuntuOne.Client/DeviceManager.cs'
--- src/Canonical.UbuntuOne.Client/DeviceManager.cs	2010-11-15 02:17:01 +0000
+++ src/Canonical.UbuntuOne.Client/DeviceManager.cs	2010-11-15 02:17:02 +0000
@@ -114,7 +114,7 @@
             var request = OAuth.MakeRequest(uri, "GET", consumerKey, consumerSecret, token, tokenSecret);
             try
             {
-                var response = request.GetResponse();
+                request.GetResponse();
             }
             catch (Exception e)
             {
@@ -139,14 +139,17 @@
             try
             {
                 var response = request.GetResponse();
-                var data = new StreamReader(response.GetResponseStream()).ReadToEnd();
-                // parse the json string
-                var devicesArray = JArray.Parse(data);
-                return devicesArray.Select(currentJDevice => 
-                    DeviceFactory.Create(
-                        (string) currentJDevice["description"], 
-                        (string) currentJDevice["token"], 
-                        (string) currentJDevice["kind"])).ToList();
+                using (var stream = response.GetResponseStream())
+                {
+                    var data = new StreamReader(stream).ReadToEnd();
+                    // parse the json string
+                    var devicesArray = JArray.Parse(data);
+                    return devicesArray.Select(currentJDevice =>
+                                               DeviceFactory.Create(
+                                                   (string) currentJDevice["description"],
+                                                   (string) currentJDevice["token"],
+                                                   (string) currentJDevice["kind"])).ToList();
+                }
             }
             catch (Exception e)
             {

=== added file 'src/Canonical.UbuntuOne.Client/IAccount.cs'
--- src/Canonical.UbuntuOne.Client/IAccount.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/IAccount.cs	2010-11-15 02:17:02 +0000
@@ -0,0 +1,41 @@
+/* Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+namespace Canonical.UbuntuOne.Client
+{
+    /// <summary>
+    /// Interface that represents the account information of a user.
+    /// </summary>
+    public interface IAccount
+    {
+        /// <summary>
+        /// Gets and sets the name of the user.
+        /// </summary>
+        string Name { get; set; }
+
+        /// <summary>
+        /// Gets and sets the email of the user.
+        /// </summary>
+        string EmailAddress { get; set; }
+
+        /// <summary>
+        /// Gets and sets a description of the user current plan.
+        /// </summary>
+        string CurrentPlan { get; set; }
+    }
+}
\ No newline at end of file

=== added file 'src/Canonical.UbuntuOne.Client/IAccountFactory.cs'
--- src/Canonical.UbuntuOne.Client/IAccountFactory.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client/IAccountFactory.cs	2010-11-15 02:17:02 +0000
@@ -0,0 +1,32 @@
+/* Copyright 2010 Canonical Ltd.
+ * 
+ * This file is part of UbuntuOne on Windows.
+ * 
+ * UbuntuOne on Windows is free software: you can redistribute it and/or modify		
+ * it under the terms of the GNU Lesser General Public License version 		
+ * as published by the Free Software Foundation.		
+ *		
+ * Ubuntu One on Windows is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	
+ * GNU Lesser General Public License for more details.	
+ *
+ * You should have received a copy of the GNU Lesser General Public License	
+ * along with UbuntuOne for Windows.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Authors: Manuel de la Peña <[e-mail]>
+ */
+namespace Canonical.UbuntuOne.Client
+{
+    /// <summary>
+    /// Interface to be implemented by an object that knows how to get the account information of the current user.
+    /// </summary>
+    public interface IAccountFactory
+    {
+        /// <summary>
+        /// Creates the account information of the current user in ubuntu one.
+        /// </summary>
+        /// <returns>The account information of the user.</returns>
+        IAccount Create();
+    }
+}
\ No newline at end of file

=== modified file 'src/Canonical.UbuntuOne.Client/Preferences/PreferencesDialogPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Preferences/PreferencesDialogPresenter.cs	2010-11-15 02:17:01 +0000
+++ src/Canonical.UbuntuOne.Client/Preferences/PreferencesDialogPresenter.cs	2010-11-15 02:17:02 +0000
@@ -114,6 +114,11 @@
         /// </summary>
         public IOAuth OAuth { get; set; }
 
+        /// <summary>
+        /// Gets and sets the account factory used to get the account information.
+        /// </summary>
+        public IAccountFactory AccountFactory { get; set; }
+
         #endregion
 
         #region Helpers
@@ -196,7 +201,12 @@
             PreferencesView.Consumption = consumption;
             PreferencesView.ConsumptionText = string.Format("{0}% used", consumption);
             PreferencesView.Devices = DeviceManager.GetSyncedDevices();
- 
+            // set account info
+            var accountInfo = AccountFactory.Create();
+            PreferencesView.UserName = accountInfo.Name;
+            PreferencesView.Email = accountInfo.EmailAddress;
+            PreferencesView.CurrentPlan = accountInfo.CurrentPlan;
+
             if (PreferencesManager.IsAutoSyncEnable)
                 PreferencesView.AutoSyncFrequency = PreferencesManager.AutoSyncFrequency;            
             PreferencesView.ShowDialog();

=== modified file 'src/Canonical.UbuntuOne.Client/objects.xml'
--- src/Canonical.UbuntuOne.Client/objects.xml	2010-11-15 02:17:01 +0000
+++ src/Canonical.UbuntuOne.Client/objects.xml	2010-11-15 02:17:02 +0000
@@ -21,4 +21,8 @@
   <object id="DeviceFactory"
             type="Canonical.UbuntuOne.Client.DeviceFactory, Canonical.UbuntuOne.Client"
             autowire="autodetect"/>
+
+  <object id="AccountFactory"
+            type="Canonical.UbuntuOne.Client.AccountFactory, Canonical.UbuntuOne.Client"
+            autowire="autodetect"/>
 </objects>
\ No newline at end of file