adamantite 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12c65083b751c2460cbc017507793dd3202f27c701b58a1c6b7d7d0612a683ab
-  data.tar.gz: 8c7d30ff3442a5d137058e00ccf0f1d3ee619c55214ba98feea29ed2a9caa66e
+  metadata.gz: fb2fee60dd29d1cf4e5d3ca9fe052322b5e824769c4fb673068c75ec75bdd700
+  data.tar.gz: 77b65b3e70c79ea50d945566f9f7b4af841d49449fab4ba69ecde594a0093a0a
 SHA512:
-  metadata.gz: 88eefbbf38673ff319d324bf51d101a2a6d0ba87a3f614bcdf8bbf1804bbcfd969ac70c7420bb82d0f17917d181f792bfca6a9d5ec6a0cc325c9da00d24972f6
-  data.tar.gz: d2ae10748dc73c4f9d83984ca6e38d279b9a182893f311cb41f675b0c35e6ac290451292a3b15817f254a0ebb373d3f5b7f86cdc9073afb061b7ec899d993b6a
+  metadata.gz: 8d512ad63718365e1076946093bbf180a2e48d98a74f1ca94ebcf7f3db0f8812a8d2a021b43c653762fecd29741e602ea5c6c92e5021658f550bb1d7bf0c6ede
+  data.tar.gz: 2e68d7b07925cc5910fa6129371696191f0ca721c7676db9d61aad9daac4694682f3cebda5b7d3c237df3178b08064a6645e87225dbf6352d815e3c694f988d0

data/lib/adamantite.rb

@@ -8,6 +8,7 @@ require "io/console"
 require "file_utils/file_utils"
 require "pw_utils/pw_utils"
 require "base/adamantite"
+require "base/password_object"
 require "gui/screen/login_screen"
 require "gui/screen/copy_screen"
 require "gui/screen/show_screen"
@@ -17,6 +18,7 @@ require "gui/request/login_request"
 require "gui/request/add_password_request"
 require "gui/request/update_master_password_request"
 require "gui/request/set_master_password_request"
+require "gui/form/password_object_form_window"
 
 include Adamantite::FileUtils
 include Adamantite::PWUtils
@@ -41,7 +43,7 @@ class AdamantiteApp
 
     @stored_passwords = get_stored_pws.map do |title|
       pw_info = get_pw_file(title)
-      [title, pw_info["username"], 'Copy', 'Show', 'Delete']
+      [title, pw_info["username"], 'Edit', 'Copy', 'Show', 'Delete']
     end
     @master_password = login_request.master_password
     @master_password_salt = login_request.master_password_salt
@@ -51,13 +53,33 @@ class AdamantiteApp
   end
 
   body {
-    window('Adamantite', 600, 400) {
+    window('Adamantite', 800, 400) {
       margined true
 
       vertical_box {
         table {
           text_column('Title')
           text_column('Username')
+          button_column('Edit') {
+            on_clicked do |row|
+              on_save = lambda { |password_object|
+                stored_password = []
+                stored_password << password_object.website_title
+                stored_password << password_object.username
+                stored_password << 'Edit'
+                stored_password << 'Copy'
+                stored_password << 'Show'
+                stored_password << 'Delete'
+                @stored_passwords[password_object.row_index] = stored_password
+              }
+              password_title = @stored_passwords[row].first
+              username = @stored_passwords[row][1]
+              pw_info = get_pw_file(password_title)
+              stored_pw_selection = decrypt_pw(pw_info["iv"], pw_info["password"], @master_password, @master_password_salt)
+              password_object = Adamantite::Base::PasswordObject.new(password_title, username, stored_pw_selection, stored_pw_selection, row)
+              password_object_form_window(master_pw: @master_password, master_pw_salt: @master_password_salt, on_save: on_save, password_object: password_object).show
+            end
+          }
           button_column('Copy') {
             on_clicked do |row|
               password_title = @stored_passwords[row].first
@@ -80,52 +102,29 @@ class AdamantiteApp
               @stored_passwords.delete_at(row)
             end
           }
-
           cell_rows <=> [self, :stored_passwords]
-
         }
-        vertical_box {
-          form {
-            entry {
-              label 'Website Title'
-              text <=> [@add_password_request, :website_title]
-            }
-            entry {
-              label 'Username'
-              text <=> [@add_password_request, :username]
-            }
-            password_entry {
-              label 'Password'
-              text <=> [@add_password_request, :password]
-            }
-            password_entry {
-              label 'Confirm Password'
-              text <=> [@add_password_request, :password_confirmation]
-            }
+        horizontal_box {
+          button('Add Password') {
+            on_clicked do
+              on_save = lambda { |password_object|
+                stored_password = []
+                stored_password << password_object.website_title
+                stored_password << password_object.username
+                stored_password << 'Edit'
+                stored_password << 'Copy'
+                stored_password << 'Show'
+                stored_password << 'Delete'
+                @stored_passwords << stored_password
+              }
+              password_object_form_window(master_pw: @master_password, master_pw_salt: @master_password_salt, on_save: on_save).show
+            end
           }
-          horizontal_box {
-            button('Add Password') {
-              on_clicked do
-                @add_password_request.confirm_and_add_password!
-                if @add_password_request.password_saved
-                  new_stored_password = [@add_password_request.website_title, @add_password_request.username]
-                  new_stored_password << 'Copy'
-                  new_stored_password << 'Show'
-                  new_stored_password << 'Delete'
-                  @stored_passwords << new_stored_password
-                  @add_password_request.website_title = ''
-                  @add_password_request.username = ''
-                  @add_password_request.password = ''
-                  @add_password_request.password_confirmation = ''
-                end
-              end
-            }
-            button('Update Master Password') {
-              on_clicked do
-                update_master_password_request = Adamantite::GUI::Request::UpdateMasterPasswordRequest.new(@adamantite_object)
-                update_master_password_screen(update_master_password_request: update_master_password_request).show
-              end
-            }
+          button('Update Master Password') {
+            on_clicked do
+              update_master_password_request = Adamantite::GUI::Request::UpdateMasterPasswordRequest.new(@adamantite_object)
+              update_master_password_screen(update_master_password_request: update_master_password_request).show
+            end
           }
         }
       }

data/lib/base/editor/password_object_editor.rb

@@ -0,0 +1,51 @@
+require "base/password_object"
+require "file_utils/file_utils"
+require "pw_utils/pw_utils"
+
+module Adamantite
+  module Base
+    module Editor
+      class PasswordObjectEditor
+        include FileUtils
+        include PWUtils
+
+        # editable_user provides the temporary user object for editing
+        attr_reader :editable_password_object
+
+        # initializes a user editor with nil when creating a new user
+        # or with an existing user when editing an existing user
+        def initialize(master_pw, master_pw_salt, password_object = nil)
+          @password_object = password_object || PasswordObject.new
+          @master_pw = master_pw
+          @master_pw_salt = master_pw_salt
+          reset_editable_password_object
+        end
+
+        def reset_editable_password_object
+          @editable_password_object = PasswordObject.new
+          @editable_password_object.website_title = @password_object.website_title
+          @editable_password_object.username = @password_object.username
+          @editable_password_object.password = @password_object.password
+          @editable_password_object.password_confirmation = @password_object.password_confirmation
+        end
+
+        # saves editable user data and returns final user to add to DB/File/Array/etc...
+        def save
+          return false unless @password_object.password == @password_object.password_confirmation
+          @password_object.website_title = @editable_password_object.website_title
+          @password_object.username = @editable_password_object.username
+          @password_object.password = @editable_password_object.password
+          @password_object.password_confirmation = @editable_password_object.password_confirmation
+          pw_info_for_file = make_pw_info(@password_object.username, @password_object.password, @master_pw, @master_pw_salt)
+          write_pw_to_file(@password_object.website_title, **pw_info_for_file)
+          @password_object
+        end
+
+        def cancel
+          reset_editable_password_object
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/base/password_object.rb

@@ -0,0 +1,15 @@
+module Adamantite
+  module Base
+    class PasswordObject
+      attr_accessor :website_title, :username, :password, :password_confirmation, :row_index
+
+      def initialize(website_title = nil, username = nil, password = nil, password_confirmation = nil, row_index = nil)
+        @website_title = website_title
+        @username = username
+        @password = password
+        @password_confirmation = password_confirmation
+        @row_index = row_index
+      end
+    end
+  end
+end

data/lib/gui/form/password_object_form_window.rb

@@ -0,0 +1,72 @@
+require "base/editor/password_object_editor"
+
+module Adamantite
+  module GUI
+    module Form
+      class PasswordObjectFormWindow
+        include Glimmer::LibUI::CustomWindow
+
+        # This holds the final user produced by the form
+        # And, a user can be optionally passed (e.g. `user_form(user: someuser)`) when editing an existing user
+        option :password_object, default: nil
+        option :on_save, default: lambda { |password_object| }
+        option :master_pw
+        option :master_pw_salt
+
+        before_body do
+          @password_object_editor = Adamantite::Base::Editor::PasswordObjectEditor.new(master_pw, master_pw_salt, password_object)
+        end
+
+        body {
+          window('Password Form', 50, 50) { |password_object_form_editor|
+            margined true
+
+            vertical_box {
+              form {
+                entry {
+                  label 'Website Title'
+                  text <=> [@password_object_editor.editable_password_object, :website_title]
+                }
+                entry {
+                  label 'Username'
+                  text <=> [@password_object_editor.editable_password_object, :username]
+                }
+
+                password_entry {
+                  label 'Password'
+                  text <=> [@password_object_editor.editable_password_object, :password]
+                }
+                password_entry {
+                  label 'Password Confirmation'
+                  text <=> [@password_object_editor.editable_password_object, :password_confirmation]
+                }
+              }
+              horizontal_box {
+                stretchy false
+
+                button('Save') {
+                  on_clicked do
+                    self.password_object = @password_object_editor.save
+                    on_save.call(password_object)
+                    password_object_form_editor.destroy
+                  end
+                }
+
+                button('Cancel') {
+                  on_clicked do
+                    @password_object_editor.cancel
+                    password_object_form_editor.destroy
+                  end
+                }
+              }
+            }
+
+            on_closing do
+              @password_object_editor.cancel
+            end
+          }
+        }
+      end
+    end
+  end
+end

data/lib/gui/screen/copy_screen.rb

@@ -7,7 +7,7 @@ module Adamantite
         option :password_title
 
         body {
-          window('Copy', 400, 100) {
+          window('Adamantite - Copy Password', 400, 100) {
             margined true
             label("Copied password for #{password_title} to your clipboard.")
           }

data/lib/gui/screen/login_screen.rb

@@ -8,7 +8,7 @@ module PWManager
         option :login_request
 
         body {
-          window('Adamantite', 400, 100) {
+          window('Adamantite - Login', 400, 100) {
             margined true
 
             vertical_box {

data/lib/gui/screen/show_screen.rb

@@ -7,7 +7,7 @@ module Adamantite
         option :password
 
         body {
-          window('Show', 400, 100) {
+          window('Adamantite - Show Password', 400, 100) {
             margined true
 
             label("#{password}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adamantite
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jake Bruemmer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-11-11 00:00:00.000000000 Z
 dependencies: []
 description: A local password manager written in Ruby.
 email: jakebruemmer@gmail.com
@@ -21,7 +21,10 @@ files:
 - lib/adamantite.rb
 - lib/adamantite_command_line.rb
 - lib/base/adamantite.rb
+- lib/base/editor/password_object_editor.rb
+- lib/base/password_object.rb
 - lib/file_utils/file_utils.rb
+- lib/gui/form/password_object_form_window.rb
 - lib/gui/request/add_password_request.rb
 - lib/gui/request/login_request.rb
 - lib/gui/request/set_master_password_request.rb