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

[Manuel de la Peña]

Correctly use the sso credential provider to tide up the code.

[John Lenton (chipaca)]

review: Approve

[Rick McBride (rmcbride)]

review: Approve

=== modified file 'src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj'
--- src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj	2010-10-05 17:20:59 +0000
+++ src/Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views.csproj	2010-10-05 17:21:00 +0000
@@ -95,6 +95,15 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Canonical.Ubuntu.SSO\Canonical.Ubuntu.SSO.csproj">
+      <Project>{9460A771-2589-45DA-9618-9FE8BB7D16E8}</Project>
+      <Name>Canonical.Ubuntu.SSO</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="objects.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

=== modified file 'src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml'
--- src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml	2010-10-05 17:20:59 +0000
+++ src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml	2010-10-05 17:21:00 +0000
@@ -64,8 +64,8 @@
                 <ColumnDefinition Width="85"/>
                 <ColumnDefinition Width="85"/>
             </Grid.ColumnDefinitions>
-            <Button Name="LoginButton" Grid.Column="1" Margin="3" Click="LoginButton_Click">Connect</Button>
-            <Button Name="CancelButton" Grid.Column="2" Margin="3" Click="CancelButton_Click">Cancel</Button>
+            <Button Name="LoginButton" Grid.Column="1" Margin="3" Click="ConnectButtonClick">Connect</Button>
+            <Button Name="CancelButton" Grid.Column="2" Margin="3" Click="CancelButtonClick">Cancel</Button>
         </Grid>
     </Grid>
 </Window>

=== modified file 'src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml.cs'
--- src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml.cs	2010-10-05 17:20:59 +0000
+++ src/Canonical.Ubuntu.SSO.Views/LoginDialog.xaml.cs	2010-10-05 17:21:00 +0000
@@ -15,6 +15,7 @@
 // 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.Windows;
 
 namespace Canonical.Ubuntu.SSO.Views
@@ -22,14 +23,43 @@
     /// <summary>
     /// Interaction logic for LoginDialog.xaml
     /// </summary>
-    public partial class LoginDialog : Window
+    public partial class LoginDialog : Window, ILoginView
     {
-        public bool WasCanceled { get; set; }
-
-        public string Email { get { return EmailTextBox.Text; } }
+        #region Variables
+
+        private MessageBoxResult _dialogResult;
+
+        #endregion
+
+        /// <summary>
+        /// Gets and sets the email address provided by the user.
+        /// </summary>
+        public string EmailAddress { get { return EmailTextBox.Text; } }
+
+        /// <summary>
+        /// Gets and sets the password set by the user.
+        /// </summary>
         public string Password { get { return PasswordTextBox.Password; } }
 
         /// <summary>
+        /// Gets if the view is visible.
+        /// </summary>
+        public bool IsShown
+        {
+            get { return IsVisible; }
+        }
+
+        /// <summary>
+        /// Shows the gui to the user in a dialog mode.
+        /// </summary>
+        /// <returns></returns>
+        public new MessageBoxResult ShowDialog()
+        {
+            base.ShowDialog();
+            return _dialogResult;
+        }
+
+        /// <summary>
         /// Initializes a new instance of the LoginDialog class.
         /// </summary>
         public LoginDialog()
@@ -37,15 +67,15 @@
             InitializeComponent();
         }
 
-        private void LoginButton_Click(object sender, RoutedEventArgs e)
+        private void ConnectButtonClick(object sender, RoutedEventArgs e)
         {
-            WasCanceled = false;
+            _dialogResult = MessageBoxResult.OK;
             Close();
         }
 
-        private void CancelButton_Click(object sender, RoutedEventArgs e)
+        private void CancelButtonClick(object sender, RoutedEventArgs e)
         {
-            WasCanceled = true;
+            _dialogResult = MessageBoxResult.Cancel;
             Close();
         }
     }

=== added file 'src/Canonical.Ubuntu.SSO.Views/objects.xml'
--- src/Canonical.Ubuntu.SSO.Views/objects.xml	1970-01-01 00:00:00 +0000
+++ src/Canonical.Ubuntu.SSO.Views/objects.xml	2010-10-05 17:21:00 +0000
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<objects xmlns="http://www.springframework.net">
+  <object id="LoginView"
+          type="Canonical.Ubuntu.SSO.Views.LoginDialog , Canonical.Ubuntu.SSO.Views"/>
+</objects>
\ No newline at end of file

=== modified file 'src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj'
--- src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj	2010-10-05 17:20:59 +0000
+++ src/Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO.csproj	2010-10-05 17:21:00 +0000
@@ -39,6 +39,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\JsonNet\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationFramework">
+      <RequiredTargetFramework>3.0</RequiredTargetFramework>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>

=== modified file 'src/Canonical.Ubuntu.SSO/ILoginView.cs'
--- src/Canonical.Ubuntu.SSO/ILoginView.cs	2010-09-09 09:11:07 +0000
+++ src/Canonical.Ubuntu.SSO/ILoginView.cs	2010-10-05 17:21:00 +0000
@@ -18,6 +18,7 @@
  * Authors: Manuel de la Peña <[e-mail]>
  */
 using System;
+using System.Windows;
 
 namespace Canonical.Ubuntu.SSO
 {
@@ -27,15 +28,19 @@
     /// </summary>
     public interface ILoginView
     {
-        #region Events
-
-        event EventHandler<LoginCredentialsEventArgs> OnLogin;
-
-        #endregion
-
         #region Properties
 
         /// <summary>
+        /// Gets and sets the email address used to login in Ubuntu One.
+        /// </summary>
+        string EmailAddress { get; }
+
+        /// <summary>
+        /// Gets and sets the password used to loign in ubuntu one.
+        /// </summary>
+        string Password { get; }
+
+        /// <summary>
         /// Gets if the view is visible.
         /// </summary>
         bool IsShown { get; }
@@ -46,5 +51,11 @@
         /// Shows the gui to the user.
         /// </summary>
         void Show();
+
+        /// <summary>
+        /// Shows the gui to the user in a dialog mode.
+        /// </summary>
+        /// <returns></returns>
+        MessageBoxResult ShowDialog();
     }
 }

=== modified file 'src/Canonical.Ubuntu.SSO/ISSOLoginProcessor.cs'
--- src/Canonical.Ubuntu.SSO/ISSOLoginProcessor.cs	2010-09-20 11:21:19 +0000
+++ src/Canonical.Ubuntu.SSO/ISSOLoginProcessor.cs	2010-10-05 17:21:00 +0000
@@ -26,6 +26,12 @@
     public interface ISSOLoginProcessor
     {
         /// <summary>
+        /// Gets and sets the credential encoder that will be used to encode the oauth credentials 
+        /// before they are saved in the keyring.
+        /// </summary>
+        ISSOCredentialsEncoder SSOCredentialsEncoder { get; set; }
+
+        /// <summary>
         /// Generates a new captha and stores it in the passed file path.
         /// </summary>
         /// <param name="filePath">The path in which the captcha should be stored.</param>

=== modified file 'src/Canonical.Ubuntu.SSO/JsonSSOCredentialsEncoder.cs'
--- src/Canonical.Ubuntu.SSO/JsonSSOCredentialsEncoder.cs	2010-10-05 17:20:59 +0000
+++ src/Canonical.Ubuntu.SSO/JsonSSOCredentialsEncoder.cs	2010-10-05 17:21:00 +0000
@@ -36,10 +36,10 @@
         public string Encode(string token, string tokenSecret, string consumerKey, string consumerSecret)
         {
             var jobject = new JObject();
-            jobject["consumer_key"] = "";
-            jobject["consumer_secret"] = "";
-            jobject["token"] = "";
-            jobject["token_secret"] = "";
+            jobject["consumer_key"] = consumerKey;
+            jobject["consumer_secret"] = consumerSecret;
+            jobject["token"] = token;
+            jobject["token_secret"] = tokenSecret;
             return jobject.ToString();
         }
 

=== modified file 'src/Canonical.Ubuntu.SSO/SSOCredentialsProvider.cs'
--- src/Canonical.Ubuntu.SSO/SSOCredentialsProvider.cs	2010-10-05 17:20:59 +0000
+++ src/Canonical.Ubuntu.SSO/SSOCredentialsProvider.cs	2010-10-05 17:21:00 +0000
@@ -18,6 +18,9 @@
  * Authors: Manuel de la Peña <[e-mail]>
  */
 using System;
+using System.Collections.Generic;
+using System.Windows;
+using Canonical.UbuntuOne.Common;
 using Canonical.UbuntuOne.Common.Aop;
 
 namespace Canonical.Ubuntu.SSO
@@ -28,10 +31,25 @@
     /// </summary>
     public class SSOCredentialsProvider : ISSOCredentialsProvider
     {
+        private const string ApplicationTokenName = "Ubuntu One @ {0} (Windows)";
+        internal const string KeyringName = "Default";
+        internal const string ApplicationName = "UbuntuOne";
+
         #region DI properties
 
+        /// <summary>
+        /// Gets and sets the view that is used to tell the user to provide his login details.
+        /// </summary>
         public ILoginView LoginView { get; set; }
 
+        /// <summary>
+        /// Gets and sets the processor that is used to login the user to the SSO service.
+        /// </summary>
+        public ISSOLoginProcessor SSOLoginProcessor { get; set; }
+
+        /// <summary>
+        /// Gets and sets the keyring that will be used to store the secrets.
+        /// </summary>
         public IKeyring Keyring { get; set; }
 
         #endregion
@@ -55,8 +73,68 @@
         [DebugLogged]
         public void LoginToGetCredentials()
         {
-            // try to get the credentials from the keyring
-            
+            try
+            {
+                // try to get the credentials from the keyring
+                var secret = Keyring.GetSecretByName(KeyringName, ApplicationName);
+                if (secret == null)
+                {
+                    // we need to use the processor to get the login info
+                    if (LoginView.IsShown)
+                        return;
+
+                    if(LoginView.ShowDialog() != MessageBoxResult.Cancel)
+                    {
+                        var tokenName = string.Format(ApplicationTokenName, Environment.MachineName);
+                        secret = SSOLoginProcessor.Login(LoginView.EmailAddress, LoginView.Password, tokenName);
+                        // save the credentials in the keyring
+                        Keyring.CreateSecret(KeyringName, ApplicationName, secret);
+                    }
+                    else
+                    {
+                        if (OnCredetialsDenied != null)
+                        {
+                            OnCredetialsDenied(this, new CredentialsDeniedEventArgs(ApplicationName));
+                        }
+                        return;
+                    }
+                    
+                }
+                // we execute the credentials found event
+                if(!string.IsNullOrEmpty(secret) && OnCredentialsFound != null)
+                {
+                    string token;
+                    string tokenSecret;
+                    string consumerKey;
+                    string consumerSecret;
+                    SSOLoginProcessor.SSOCredentialsEncoder.Decode(secret, out token, out tokenSecret, out consumerKey, out consumerSecret);
+                    var credentials = new Dictionary<string, string>
+                    {
+                        {"Token", token},
+                        {"TokenSecret", tokenSecret},
+                        {"ConsumerKey", consumerKey},
+                        {"ConsumerSecret", consumerSecret}
+                    };
+                    OnCredentialsFound(this, new CredentialsFoundEventArgs(ApplicationName, credentials));
+                }
+            }
+            catch (SSOLoginException e)
+            {
+                if (OnCredetialsDenied != null)
+                {
+                    OnCredetialsDenied(this, new CredentialsDeniedEventArgs(ApplicationName));
+                }
+            }
+            catch (Exception e)
+            {
+                // we have an error, therefore we will execute the OnCredentialsError
+                if (OnCredentialsError != null)
+                {
+                    OnCredentialsError(this, new CredentialsErrorEventArgs(ApplicationName, e.Message, e.StackTrace));
+                }
+            }
+
+
         }
 
         /// <summary>

=== modified file 'src/Canonical.Ubuntu.SSO/SSOLoginProcessor.cs'
--- src/Canonical.Ubuntu.SSO/SSOLoginProcessor.cs	2010-10-05 17:20:59 +0000
+++ src/Canonical.Ubuntu.SSO/SSOLoginProcessor.cs	2010-10-05 17:21:00 +0000
@@ -185,36 +185,32 @@
         /// <returns>A string with the sso credentials.</returns>
         public string Login(string email, string password, string tokenName)
         {
-            var secret = Keyring.GetSecretByName(KeyringName, ApplicationName);
-            if (secret == null)
+            
+            try
             {
-                try
-                {
-                    // credentials are not present in the keyring, therefore we will have to get them from the 
-                    // rest service
-                    string token;
-                    string tokenSecret;
-                    string consumerKey;
-                    string consumerSecret;
+                // credentials are not present in the keyring, therefore we will have to get them from the 
+                // rest service
+                string token;
+                string tokenSecret;
+                string consumerKey;
+                string consumerSecret;
 
-                    // the rest server returns json, we need to parse it.
-                    ParseCredentials(Authentications.Authenticate(email, password, tokenName),
-                        out consumerKey, out consumerSecret, out token, out tokenSecret);
-                    secret = SSOCredentialsEncoder.Encode(token, tokenSecret, consumerKey, consumerSecret);
-                    // ping the service to make it download the tokens
-                    PingUbuntuOneServer(email, consumerKey, consumerKey, token, tokenSecret);
-                    Keyring.CreateSecret(KeyringName, ApplicationName, secret);
-                }
-                catch (WebException e)
-                {
-                    throw new SSOLoginException("Unable to login", e);
-                }
-                catch (Exception e)
-                {
-                    throw new SSOLoginException("Unable to login", e);
-                }
-            }
-            return secret;
+                // the rest server returns json, we need to parse it.
+                ParseCredentials(Authentications.Authenticate(email, password, tokenName),
+                    out consumerKey, out consumerSecret, out token, out tokenSecret);
+                var secret = SSOCredentialsEncoder.Encode(token, tokenSecret, consumerKey, consumerSecret);
+                // ping the service to make it download the tokens
+                PingUbuntuOneServer(email, consumerKey, consumerSecret, token, tokenSecret);
+                return secret;
+            }
+            catch (WebException e)
+            {
+                throw new SSOLoginException("Unable to login", e);
+            }
+            catch (Exception e)
+            {
+                throw new SSOLoginException("Unable to login", e);
+            }
         }
 
         /// <summary>

=== modified file 'src/Canonical.Ubuntu.SSO/objects.xml'
--- src/Canonical.Ubuntu.SSO/objects.xml	2010-10-05 17:20:59 +0000
+++ src/Canonical.Ubuntu.SSO/objects.xml	2010-10-05 17:21:00 +0000
@@ -32,6 +32,8 @@
 
   <object id="SSOCredentialsProvider"
           type="Canonical.Ubuntu.SSO.SSOCredentialsProvider , Canonical.Ubuntu.SSO"
-          autowire="autodetect"/>
+          autowire="autodetect">
+    <property name="LoginView" ref="LoginView"/>
+  </object>
   
 </objects>
\ No newline at end of file

=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-08-28 19:55:55 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-10-05 17:21:00 +0000
@@ -68,7 +68,8 @@
                                   Header="{x:Static resx:Resources.MoreSpace}"/>
                         <MenuItem x:Uid="ExitMenuItem" 
                                   Name="ExitMenuItem" 
-                                  Header="{x:Static resx:Resources.Exit}" />
+                                  Header="{x:Static resx:Resources.Exit}" 
+                                  Click="OnExitMenuItemClick"/>
                     </ContextMenu>
                 </FrameworkElement.ContextMenu>
             </av:NotifyIcon>

=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-08-30 17:30:31 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-10-05 17:21:00 +0000
@@ -90,5 +90,10 @@
         {
             NotificationIconPresenter.ManualSync();
         }
+
+        private void OnExitMenuItemClick(object sender, System.Windows.RoutedEventArgs e)
+        {
+            NotificationIconPresenter.Exit();
+        }
     }
 }

=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-10-05 17:20:59 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-10-05 17:21:00 +0000
@@ -19,16 +19,12 @@
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Net;
-using System.Windows;
 using Canonical.Ubuntu.SSO;
-using Canonical.Ubuntu.SSO.Service;
-using Canonical.Ubuntu.SSO.Views;
 using Canonical.UbuntuOne.Client.Preferences;
+using Canonical.UbuntuOne.Common;
 using Canonical.UbuntuOne.Common.Aop;
 using Canonical.UbuntuOne.Common.Utils;
 using log4net;
-using Newtonsoft.Json.Linq;
 
 namespace Canonical.UbuntuOne.Client.Notification
 {
@@ -53,9 +49,11 @@
         private static readonly string SharesLocation = "";
         private static readonly string SyncsLocation = "";
         private ISyncDaemonClientNotifier _clientNotifier;
+        private ISSOCredentialsProvider _ssoProvider;
         private ILog _logger;
         private readonly object _loggerLock = new object();
 
+
         #endregion
 
         #region Di properties
@@ -92,6 +90,26 @@
         public IApplication Application { get; set; }
 
         /// <summary>
+        /// Gets and sets the message box used to send messages to the user.
+        /// </summary>
+        public IMessageBox MessageBox { get; set; }
+        /// <summary>
+        /// Gets and sets the provider that will return the credentials used in ubuntu one.
+        /// </summary>
+        public ISSOCredentialsProvider SSOCredentialsProvider
+        {
+            get { return _ssoProvider; }
+            set
+            {
+                if (value == null) return;
+                _ssoProvider = value;
+                _ssoProvider.OnCredentialsFound += OnCredentialsFound;
+                _ssoProvider.OnCredentialsError += OnCredentialsError;
+                _ssoProvider.OnCredetialsDenied += OnCredentialsDenied;
+            }
+        }
+
+        /// <summary>
         /// Gets and sets the notifier that will ensure that the presenter know about changes in the 
         /// sync daemon.
         /// </summary>
@@ -147,26 +165,6 @@
 
         #region Helper methods
 
-        public HttpWebRequest MakeRequest(string uri, string consumerKey, string consumerSecret, string token, string tokenSecret)
-        {
-            // Form the full REST request url
-            Uri url = new Uri(uri);
-
-            // Instantiate OAuthBase and declare variables
-            var oAuth = new OAuth();
-            
-            var normUrl = string.Empty;
-            var normParams = string.Empty;
-
-            var authHeader = oAuth.GenerateHeaderWithSignature(url, string.Empty, consumerKey, consumerSecret,
-                token, tokenSecret, "GET", oAuth.GenerateTimeStamp(), oAuth.GenerateNonce(), OAuth.SignatureTypes.HMACSHA1,
-                out normUrl, out normParams);
-            
-            var request = WebRequest.Create(normUrl) as HttpWebRequest;
-            request.Headers.Add(authHeader.Key, authHeader.Value);
-            return request;
-        }
-
         /// <summary>
         /// Helper method that will ensure that when the state of the sync daemon changes this change
         /// is correctly reflected in the View.
@@ -215,63 +213,30 @@
             NotificationIconView.Notification = e.Message;
         }
 
-        #endregion
-
-        #region Implementation of INotificationIconPresenter
-
         /// <summary>
-        /// When implemented this method should for the sync of the ubuntu one folder.
+        /// Helper method executed when the provider did return new credentials.
         /// </summary>
-        public void ManualSync()
+        /// <param name="sender"></param>
+        /// <param name="args"></param>
+        [DebugLogged]
+        private void OnCredentialsFound(object sender, CredentialsFoundEventArgs args)
         {
-            // TODO: use the oauth code from the provider not here!
-            var keyring = new Keyring();
-            keyring.DataProtector = new DPAPIDataProtector();
-            var secret = keyring.GetSecretByName("Default", "UbuntuOne");
-            if (secret == null)
-            {
-                var dialog = new LoginDialog();
-                dialog.ShowDialog();
-                if (dialog.WasCanceled)
-                {
-                    MessageBox.Show("You need to login to be able to sync your files.");
-                    return;
-                }
-                try
-                {
-                    var auth = new Authentications();
-                    var credentials = JObject.Parse(auth.Authenticate(dialog.Email, dialog.Password, "Ubuntu One @ Windows"));
-                    secret = string.Format("{0}:{1}:{2}:{3}", 
-                        (string)credentials["token"],
-                        (string)credentials["token_secret"],
-                        (string)credentials["consumer_key"],
-                        (string)credentials["consumer_secret"]);
-                    // TODO: Move this out of here!!! put it in the correct location, like the SSOProvider!!
-                    // ping the service to make it download the tokens
-                    var pingRequest = MakeRequest(Constants.PingUrl + dialog.Email, (string) credentials["consumer_key"],
-                                                  (string) credentials["consumer_secret"],
-                                                  (string) credentials["token"], (string) credentials["token_secret"]);
-                    var pingRepomse = pingRequest.GetResponse();
-                    keyring.CreateSecret("Default", "UbuntuOne", secret);
-                }
-                catch (Exception e)
-                {
-                    MessageBox.Show("You provided the wrong credentials.");
-                    return;
-                }
-            }
-
-            // TODO: Use the service rather than do it here.
-            // TODO: This has to be fixed, we should not call the command directly, user the
-            // process dispatcher to prepare for the syncdaemon!!!!
-            // TODO: Do not hardcode the folder, use an object to store that
-
+            // check if the credentials are for us
+            if (args.ApplicationName != "UbuntuOne") return;
+            Logger.Info("Got the UbuntuOne credentials!");
+            // get the string used to pass the credentials to the python code.
+            var tokens = string.Format("{0}:{1}:{2}:{3}",
+                                       args.Credentials["Token"],
+                                       args.Credentials["TokenSecret"],
+                                       args.Credentials["ConsumerKey"],
+                                       args.Credentials["ConsumerSecret"]);
             var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-                "UbuntuOne");
+                                      "UbuntuOne");
             // ensure that the path can be handled by the python code
             oneDir = oneDir.Replace("\\", "\\\\");
             if (!Directory.Exists(oneDir))
             {
+                Logger.InfoFormat("Creating dir '{0}'", oneDir);
                 Directory.CreateDirectory(oneDir);
             }
 
@@ -284,18 +249,22 @@
                     {
                         WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync",
                         FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe",
-                        Arguments = String.Format(" --init \"{0}\" --oauth {1}",
-                            oneDir, secret),
+                        Arguments = String.Format(" --init \"{0}\" --oauth {1}", oneDir, tokens),
                         UseShellExecute = false,
-                        RedirectStandardOutput = false,
-                        RedirectStandardError = false,
+                        RedirectStandardOutput = true,
+                        RedirectStandardError = true,
                         CreateNoWindow = true,
                         WindowStyle = ProcessWindowStyle.Hidden
+                        
                     }
                 };
+                Logger.InfoFormat("Executing u1sync with args: {0}", init.StartInfo.Arguments);
                 init.Start();
                 init.WaitForExit();
+                Logger.InfoFormat("StandarOutput from u1sync is: {0}", init.StandardOutput.ReadToEnd());
+                Logger.ErrorFormat("StandardError from u1sync is: {0}", init.StandardError.ReadToEnd());
                 init.Close();
+                
             }
 
             var proc = new Process
@@ -304,17 +273,41 @@
                 {
                     WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync",
                     FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe",
-                    Arguments = String.Format("\"{0}\" --oauth {1}",
-                        oneDir, secret),
+                    Arguments = String.Format("\"{0}\" --oauth {1}", oneDir, tokens),
                     UseShellExecute = false,
-                    RedirectStandardOutput = false,
-                    RedirectStandardError = false,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
                     CreateNoWindow = true,
                     WindowStyle = ProcessWindowStyle.Hidden
                 }
             };
             proc.Start();
-
+        }
+
+        [DebugLogged]
+        private void OnCredentialsDenied(object sender, CredentialsDeniedEventArgs args)
+        {
+
+            MessageBox.ShowWarning("You need to login to be able to sync your files.");
+        }
+
+        [DebugLogged]
+        private void OnCredentialsError(object sender, CredentialsErrorEventArgs args)
+        {
+            MessageBox.ShowError("An error courred when trying to retrieve your credentials.");
+        }
+
+        #endregion
+
+        #region Implementation of INotificationIconPresenter
+
+        /// <summary>
+        /// When implemented this method should for the sync of the ubuntu one folder.
+        /// </summary>
+        public void ManualSync()
+        {
+            // we get the credentials, because we have register an action to the credetials aquired, we do nothing besides this
+            SSOCredentialsProvider.LoginToGetCredentials();
         }
 
         /// <summary>
@@ -366,6 +359,7 @@
         /// <summary>
         /// Opens the location used to provide help to the user.
         /// </summary>
+        [DebugLogged]
         public void OpenHelp()
         {
             Webbrowser.LauncWebpage(HelpUrl);
@@ -374,6 +368,7 @@
         /// <summary>
         /// Opens the location used to upgrade the account of the user.
         /// </summary>
+        [DebugLogged]
         public void OpenUpgradeOption()
         {
             Webbrowser.LauncWebpage(UpgradeUrl);
@@ -382,6 +377,7 @@
         /// <summary>
         /// Close the client and the daemon.
         /// </summary>
+        [DebugLogged]
         public void Exit()
         {
             Application.Exit();

=== modified file 'src/Canonical.UbuntuOne.Client/objects.xml'
--- src/Canonical.UbuntuOne.Client/objects.xml	2010-08-30 17:31:04 +0000
+++ src/Canonical.UbuntuOne.Client/objects.xml	2010-10-05 17:21:00 +0000
@@ -2,5 +2,6 @@
 <objects xmlns="http://www.springframework.net">
   <!-- Define the different presenters to be used -->
   <object id="NotificationIconPresenter"
-            type="Canonical.UbuntuOne.Client.Notification.NotificationIconPresenter, Canonical.UbuntuOne.Client" />
+          type="Canonical.UbuntuOne.Client.Notification.NotificationIconPresenter, Canonical.UbuntuOne.Client" 
+          autowire="autodetect"/>
 </objects>
\ No newline at end of file

=== modified file 'src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj'
--- src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj	2010-08-02 14:31:39 +0000
+++ src/UbuntuOneClient.Tests/UbuntuOneClient.Tests.csproj	2010-10-05 17:21:00 +0000
@@ -76,6 +76,14 @@
     <Compile Include="SetupClass.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Canonical.Ubuntu.SSO.Views\Canonical.Ubuntu.SSO.Views.csproj">
+      <Project>{33187F40-201E-4429-B299-E582CF114E28}</Project>
+      <Name>Canonical.Ubuntu.SSO.Views</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Canonical.Ubuntu.SSO\Canonical.Ubuntu.SSO.csproj">
+      <Project>{9460A771-2589-45DA-9618-9FE8BB7D16E8}</Project>
+      <Name>Canonical.Ubuntu.SSO</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Canonical.UbuntuOne.Client.Views\Canonical.UbuntuOne.Client.Views.csproj">
       <Project>{1F0E3DAF-F22F-4B0C-8039-118B082DA237}</Project>
       <Name>Canonical.UbuntuOne.Client.Views</Name>

=== modified file 'src/UbuntuOneClient/App.config'
--- src/UbuntuOneClient/App.config	2010-10-05 17:20:59 +0000
+++ src/UbuntuOneClient/App.config	2010-10-05 17:21:00 +0000
@@ -34,6 +34,7 @@
     <context>
       <resource uri="assembly://UbuntuOneClient/UbuntuOneClient/objects.xml" />
       <resource uri="assembly://Canonical.Ubuntu.SSO/Canonical.Ubuntu.SSO/objects.xml" />
+      <resource uri="assembly://Canonical.Ubuntu.SSO.Views/Canonical.Ubuntu.SSO.Views/objects.xml" />
       <resource uri="assembly://Canonical.UbuntuOne.Client/Canonical.UbuntuOne.Client/objects.xml" />
       <resource uri="assembly://Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views/objects.xml" />
       <resource uri="assembly://Canonical.UbuntuOne.Common/Canonical.UbuntuOne.Common/objects.xml" />

=== modified file 'src/UbuntuOneClient/UbuntuOneClient.csproj'
--- src/UbuntuOneClient/UbuntuOneClient.csproj	2010-10-05 17:20:59 +0000
+++ src/UbuntuOneClient/UbuntuOneClient.csproj	2010-10-05 17:21:00 +0000
@@ -96,6 +96,10 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Canonical.Ubuntu.SSO.Views\Canonical.Ubuntu.SSO.Views.csproj">
+      <Project>{33187F40-201E-4429-B299-E582CF114E28}</Project>
+      <Name>Canonical.Ubuntu.SSO.Views</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Canonical.Ubuntu.SSO\Canonical.Ubuntu.SSO.csproj">
       <Project>{9460A771-2589-45DA-9618-9FE8BB7D16E8}</Project>
       <Name>Canonical.Ubuntu.SSO</Name>