main: account login finished

FireWallet/FireWallet.csproj

@@ -12,4 +12,19 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>

FireWallet/MainForm.Designer.cs

@@ -32,6 +32,8 @@
             statusStripmain = new StatusStrip();
             toolStripStatusLabelNetwork = new ToolStripStatusLabel();
             toolStripStatusLabelstatus = new ToolStripStatusLabel();
+            toolStripStatusLabelaccount = new ToolStripStatusLabel();
+            toolStripSplitButtonlogout = new ToolStripSplitButton();
             timerNodeStatus = new System.Windows.Forms.Timer(components);
             panelaccount = new Panel();
             groupBoxaccount = new GroupBox();
@@ -50,7 +52,7 @@
             // statusStripmain
             // 
             statusStripmain.Dock = DockStyle.Top;
-            statusStripmain.Items.AddRange(new ToolStripItem[] { toolStripStatusLabelNetwork, toolStripStatusLabelstatus });
+            statusStripmain.Items.AddRange(new ToolStripItem[] { toolStripStatusLabelNetwork, toolStripStatusLabelstatus, toolStripStatusLabelaccount, toolStripSplitButtonlogout });
             statusStripmain.Location = new Point(0, 0);
             statusStripmain.Name = "statusStripmain";
             statusStripmain.Size = new Size(1074, 22);
@@ -72,6 +74,24 @@
             toolStripStatusLabelstatus.Size = new Size(126, 17);
             toolStripStatusLabelstatus.Text = "Status: Not Connected";
             // 
+            // toolStripStatusLabelaccount
+            // 
+            toolStripStatusLabelaccount.Margin = new Padding(0, 3, 50, 2);
+            toolStripStatusLabelaccount.Name = "toolStripStatusLabelaccount";
+            toolStripStatusLabelaccount.Size = new Size(55, 17);
+            toolStripStatusLabelaccount.Text = "Account:";
+            // 
+            // toolStripSplitButtonlogout
+            // 
+            toolStripSplitButtonlogout.DisplayStyle = ToolStripItemDisplayStyle.Text;
+            toolStripSplitButtonlogout.DropDownButtonWidth = 0;
+            toolStripSplitButtonlogout.ImageTransparentColor = Color.Magenta;
+            toolStripSplitButtonlogout.Name = "toolStripSplitButtonlogout";
+            toolStripSplitButtonlogout.Size = new Size(53, 20);
+            toolStripSplitButtonlogout.Text = "Log out";
+            toolStripSplitButtonlogout.Visible = false;
+            toolStripSplitButtonlogout.ButtonClick += toolStripSplitButtonlogout_ButtonClickAsync;
+            // 
             // timerNodeStatus
             // 
             timerNodeStatus.Enabled = true;
@@ -115,14 +135,16 @@
             label1.TabIndex = 7;
             label1.Text = "Please Login to your account";
             // 
-            // comboBoxusername
+            // comboBoxaccount
             // 
+            comboBoxaccount.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxaccount.FlatStyle = FlatStyle.Popup;
             comboBoxaccount.FormattingEnabled = true;
             comboBoxaccount.Location = new Point(97, 67);
-            comboBoxaccount.Name = "comboBoxusername";
+            comboBoxaccount.Name = "comboBoxaccount";
             comboBoxaccount.Size = new Size(190, 23);
             comboBoxaccount.TabIndex = 6;
+            comboBoxaccount.DropDownClosed += comboBoxaccount_DropDownClosed;
             // 
             // textBoxaccountpassword
             // 
@@ -131,6 +153,7 @@
             textBoxaccountpassword.Size = new Size(190, 23);
             textBoxaccountpassword.TabIndex = 5;
             textBoxaccountpassword.UseSystemPasswordChar = true;
+            textBoxaccountpassword.KeyDown += textBoxaccountpassword_KeyDown;
             // 
             // buttonaccountlogin
             // 
@@ -198,7 +221,7 @@
 
         private StatusStrip statusStripmain;
         private ToolStripStatusLabel toolStripStatusLabelNetwork;
-        private ToolStripStatusLabel toolStripStatusLabelstatus;
+        private ToolStripStatusLabel toolStripStatusLabelaccount;
         private System.Windows.Forms.Timer timerNodeStatus;
         private Panel panelaccount;
         private Button buttonaccountlogin;
@@ -209,5 +232,7 @@
         private Label label1;
         private ComboBox comboBoxaccount;
         private TextBox textBoxaccountpassword;
+        private ToolStripStatusLabel toolStripStatusLabelstatus;
+        private ToolStripSplitButton toolStripSplitButtonlogout;
     }
 }

FireWallet/MainForm.cs

@@ -336,13 +336,7 @@ namespace FireWallet
 
             string APIresponse = await APIPost(path, true, content);
 
-            if (APIresponse.Contains("true"))
+            if (!APIresponse.Contains("true"))
-            {
-                MessageBox.Show(APIresponse);
-                AddLog("Login success");
-                return true;
-            }
-            else
             {
                 AddLog("Login failed");
                 NotifyForm notifyForm = new NotifyForm("Login Failed\nMake sure your password is correct");
@@ -351,9 +345,21 @@ namespace FireWallet
                 return false;
             }
 
+            path = "";
+            content = "{\"method\": \"selectwallet\",\"params\":[ \"" + account + "\"]}";
 
+            APIresponse = await APIPost(path, true, content);
+            if (!APIresponse.Contains("\"error\":null"))
+            {
+                AddLog("Wallet selection failed");
+                NotifyForm notifyForm = new NotifyForm("Wallet selection failed\n" + APIresponse);
+                notifyForm.ShowDialog();
+                notifyForm.Dispose();
+                return false;
+            }
+            AddLog("Login successful");
 
-            return false;
+            return true;
         }
 
         #endregion
@@ -422,7 +428,8 @@ namespace FireWallet
             // Send request
             HttpResponseMessage resp = await httpClient.SendAsync(req);
 
-            try { 
+            try
+            {
                 resp.EnsureSuccessStatusCode();
             }
             catch
@@ -469,7 +476,48 @@ namespace FireWallet
         {
             account = comboBoxaccount.Text;
             password = textBoxaccountpassword.Text;
-            await Login();
+            bool loggedin = await Login();
+            if (loggedin)
+            {
+                toolStripStatusLabelaccount.Text = "Account: " + account;
+                textBoxaccountpassword.Text = "";
+                panelaccount.Visible = false;
+                toolStripSplitButtonlogout.Visible = true;
+            }
+        }
+
+        private void textBoxaccountpassword_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyValue == 13)
+            {
+                LoginClick(sender, e);
+            }
+        }
+
+        private void comboBoxaccount_DropDownClosed(object sender, EventArgs e)
+        {
+            textBoxaccountpassword.Focus();
+        }
+
+        private async void toolStripSplitButtonlogout_ButtonClickAsync(object sender, EventArgs e)
+        {
+            toolStripSplitButtonlogout.Visible = false;
+            string path = "wallet/" + account + "/lock";
+            string content = "";
+            string APIresponse = await APIPost(path, true, content);
+            if (!APIresponse.Contains("true"))
+            {
+                AddLog("Logout failed");
+                NotifyForm notifyForm = new NotifyForm("Logout Failed\n" + APIresponse);
+                notifyForm.ShowDialog();
+                notifyForm.Dispose();
+                panelaccount.Visible = true;
+                return;
+            }
+            AddLog("Logout successful");
+            panelaccount.Visible = true;
+            toolStripStatusLabelaccount.Text = "Account: Not Logged In";
+
         }
     }
 }

FireWallet/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace FireWallet.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FireWallet.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

FireWallet/Properties/Resources.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>