WIP

Author: Marcelo Amancio de Lima Santos

lib/account/websocket/channel/account.ex

@@ -14,7 +14,7 @@ channel Helix.Account.Websocket.Channel.Account do
   alias Helix.Network.Websocket.Requests.Bounce.Remove, as: BounceRemoveRequest
   alias Helix.Software.Websocket.Requests.Virus.Collect, as: VirusCollectRequest
   alias Helix.Story.Websocket.Requests.Email.Reply, as: EmailReplyRequest
-  alias Helix.Universe.Websocket.Channel.Requests.CreateAccount,
+  alias Helix.Universe.Bank.Websocket.Requests.CreateAccount,
     as: BankAccountCreateRequest
 
   @doc """

lib/core/validator/validator.ex

@@ -5,6 +5,7 @@ defmodule Helix.Core.Validator do
     | :hostname
     | :bounce_name
     | :reply_id
+    | :token
 
   @regex_hostname ~r/^[a-zA-Z0-9-_.@#]{1,20}$/
 

lib/event/dispatcher.ex

@@ -272,23 +272,28 @@ defmodule Helix.Event.Dispatcher do
   # All
   event BankEvent.Bank.Account.Login
   event BankEvent.Bank.Account.Updated
+  event BankEvent.Bank.Account.Removed
   event BankEvent.Bank.Account.Password.Revealed
+  event BankEvent.Bank.Account.Password.Changed
   event BankEvent.Bank.Account.Token.Acquired
   event BankEvent.Bank.Transfer.Processed
   event BankEvent.Bank.Transfer.Aborted
   event BankEvent.RevealPassword.Processed
+  event BankEvent.ChangePassword.Processed
 
   # Custom handlers
   event BankEvent.Bank.Transfer.Processed,
     BankHandler.Bank.Transfer,
     :transfer_processed
+
   event BankEvent.Bank.Transfer.Processed,
     NetworkHandler.Connection,
     :bank_transfer_processed
 
   event BankEvent.Bank.Transfer.Aborted,
     BankHandler.Bank.Transfer,
     :transfer_aborted
+
   event BankEvent.Bank.Transfer.Aborted,
     SoftwareHandler.Cracker,
     :bank_transfer_aborted
@@ -311,9 +316,10 @@ defmodule Helix.Event.Dispatcher do
 
   event BankEvent.Bank.Account.Password.Changed,
     BankHandler.Bank.Account,
-    :bank_password_changed
+    :password_changed
 
   event BankEvent.Bank.Account.Login,
     EntityHandler.Database,
     :bank_account_login
+
 end

lib/event/notificable/notificable.ex

@@ -63,7 +63,7 @@ defprotocol Helix.Event.Notificable do
   action, also receive special treatment. Hence:
 
   - third AT attack_target - Third party on victim's server
-  - third AT attack_source - Third party on attacker's server. 
+  - third AT attack_source - Third party on attacker's server.
   - third AT random_server - Third party on unrelated (random) server.
 
   Last but not least, in some cases we do not have an attacker/victim
@@ -98,6 +98,8 @@ defprotocol Helix.Event.Notificable do
 
   alias Helix.Account.Model.Account
   alias Helix.Server.Model.Server
+  alias Helix.Universe.Bank.Model.ATM
+  alias Helix.Universe.Bank.Model.BankAccount
 
   @type whom_to_notify ::
     %{

lib/event/notification_handler.ex

@@ -8,6 +8,8 @@ defmodule Helix.Event.NotificationHandler do
   alias Helix.Entity.Model.Entity
   alias Helix.Server.Model.Server
   alias Helix.Server.State.Websocket.Channel, as: ServerWebsocketChannelState
+  alias Helix.Universe.Bank.Model.ATM
+  alias Helix.Universe.Bank.Model.BankAccount
 
   @type channel_account_id :: Account.id | Entity.id
 

lib/universe/bank/action/bank.ex

@@ -27,11 +27,17 @@ defmodule Helix.Universe.Bank.Action.Bank do
     as: BankAccountPasswordChangedEvent
   alias Helix.Universe.Bank.Event.Bank.Account.Token.Acquired,
     as: BankAccountTokenAcquiredEvent
+  alias Helix.Universe.Bank.Event.Bank.Account.Removed,
+    as: BankAccountRemovedEvent
+  alias Helix.Universe.Bank.Event.Bank.Transfer.Successful,
+    as: BankTransferSuccessfulEvent
+  alias Helix.Universe.Bank.Event.Bank.Transfer.Failed,
+    as: BankTransferFailedEvent
 
   @spec start_transfer(BankAccount.t, BankAccount.t, pos_integer, Account.idt) ::
     {:ok, BankTransfer.t}
     | {:error, {:funds, :insufficient}}
-    | {:error, {:account, :notfound}}
+    | {:error, {:bank_account, :not_found}}
     | {:error, Ecto.Changeset.t}
   @doc """
   Starts a bank transfer.
@@ -51,9 +57,8 @@ defmodule Helix.Universe.Bank.Action.Bank do
     as: :start
 
   @spec complete_transfer(BankTransfer.t) ::
-    :ok
-    | {:error, {:transfer, :notfound}}
-    | {:error, :internal}
+    {:ok, BankTransfer.t, [BankTransferSuccessfulEvent.t]}
+    | {:error, term, [BankTransferFailedEvent.t]}
   @doc """
   Completes the transfer.
 
@@ -66,9 +71,19 @@ defmodule Helix.Universe.Bank.Action.Bank do
   This function should not be called directly by Public. Instead, it must be
   triggered by the BankTransferCompletedEvent.
   """
-  defdelegate complete_transfer(transfer),
-    to: BankTransferInternal,
-    as: :complete
+  def complete_transfer(transfer) do
+    case BankTransferInternal.complete(transfer) do
+      :ok ->
+        {:ok, transfer, [BankTransferSuccessfulEvent.new(transfer)]}
+
+      {:error, reason} ->
+        {
+          :error,
+          reason,
+          [BankTransferFailedEvent.new(transfer, reason)]
+        }
+    end
+  end
 
   @spec abort_transfer(BankTransfer.t) ::
     :ok
@@ -91,7 +106,7 @@ defmodule Helix.Universe.Bank.Action.Bank do
     as: :abort
 
   @spec open_account(Account.idt, ATM.id) ::
-    {:ok, BankAccount.t}
+    {:ok, BankAccount.t, [BankAccountUpdatedEvent.t]}
     | {:error, Ecto.Changeset.t}
   @doc """
   Opens a bank account.
@@ -103,23 +118,34 @@ defmodule Helix.Universe.Bank.Action.Bank do
       |> Map.get(:entity_id)
       |> NPCQuery.fetch()
 
-    %{owner_id: owner, atm_id: atm, bank_id: bank}
-    |> BankAccountInternal.create()
+    case BankAccountInternal.create(owner, atm, bank) do
+      {:ok, bank_acc} ->
+        {:ok, bank_acc, [BankAccountUpdatedEvent.new(bank_acc, :created)]}
+
+      error ->
+        error
+    end
   end
 
   @spec close_account(BankAccount.t) ::
     :ok
-    | {:error, {:account, :notfound}}
-    | {:error, {:account, :notempty}}
+    | {:error, {:bank_account, :not_found}}
+    | {:error, {:bank_account, :not_empty}}
   @doc """
   Closes a bank account.
 
   May fail if the account is invalid or not empty. In order to close an account,
   its balance must be empty.
   """
-  defdelegate close_account(account),
-    to: BankAccountInternal,
-    as: :close
+  def close_account(account) do
+    case BankAccountInternal.close(account) do
+      :ok ->
+        {:ok, [BankAccountRemovedEvent.new(account)]}
+
+      {:error, reason} ->
+        {:error, reason}
+    end
+  end
 
   @spec direct_deposit(BankAccount.t, BankAccount.amount) ::
     {:ok, BankAccount.t, [BankAccountUpdatedEvent.t]}
@@ -203,8 +229,14 @@ defmodule Helix.Universe.Bank.Action.Bank do
   {:ok, BankAccount.t, [BankAccountPasswordChangedEvent.t]}
    | {:error, :internal}
    def change_password(account, changed_by) do
-     event = BankAccountPasswordChangedEvent.new(account, changed_by)
-     {:ok, account, [event]}
+     with {:ok, account} <- update_password(account) do
+       event = BankAccountPasswordChangedEvent.new(account, changed_by)
+
+       {:ok, account, [event]}
+     else
+      _ ->
+        {:error, :internal}
+     end
    end
 
   @spec update_password(BankAccount.t) ::

lib/universe/bank/action/flow/bank_account.ex

@@ -5,7 +5,6 @@ defmodule Helix.Universe.Bank.Action.Flow.BankAccount do
   alias Helix.Event
   alias Helix.Entity.Query.Entity, as: EntityQuery
   alias Helix.Network.Action.Flow.Tunnel, as: TunnelFlow
-  alias Helix.Network.Model.Connection
   alias Helix.Network.Query.Network, as: NetworkQuery
   alias Helix.Process.Model.Process
   alias Helix.Server.Model.Server
@@ -61,21 +60,46 @@ defmodule Helix.Universe.Bank.Action.Flow.BankAccount do
   Opens a new BankAccount to given Account.id
   """
   def open(account_id, atm_id) do
-    bank_account =
-      BankAction.open_account(account_id, atm_id)
-    case bank_account do
-      {:ok, bank_account} ->
-        {:ok, bank_account}
-      {:error, _} ->
-        {:error, :internal}
+    flowing do
+      with \
+        {:ok, bank_acc, events} <- BankAction.open_account(account_id, atm_id),
+        on_success(fn -> Event.emit(events) end)
+      do
+        {:ok, bank_acc}
+      else
+        _ ->
+          {:error, :internal}
+      end
+    end
+  end
+
+  @spec close(BankAccount.t) ::
+  :ok
+  | {:error, {:bank_account, :not_found}}
+  | {:error, {:bank_account, :not_empty}}
+  def close(bank_account) do
+    flowing do
+      with \
+        true <- not is_nil(bank_account),
+        {:ok, events} <- BankAction.close_account(bank_account),
+        on_success(fn -> Event.emit(events) end)
+      do
+        :ok
+      end
     end
   end
 
   @spec change_password(BankAccount.t, Server.t, Server.t, relay) ::
   {:ok, Process.t}
   | BankAccountChangePasswordProcess.executable_error
   @doc """
-  Starts a ChangePasswordProcess
+  Starts the `bank_change_password` process.
+
+  This game mechanic happens on the BankAccount control panel where the
+  BankAccount's owner can change the BankAccount's Password
+
+  It is a process managed by TOP. in the sense that the password change does not
+  happen instantly. Completion is handled by `BankAccountEvent`.
 
   Emits: ProcessCreatedEvent
   """
@@ -152,9 +176,9 @@ defmodule Helix.Universe.Bank.Action.Flow.BankAccount do
         {:ok, _, events} <- BankAction.login_token(acc, token, entity),
         on_success(fn -> Event.emit(events) end),
 
-        {:ok, _, connection} <- start_connection.()
+        {:ok, tunnel, connection} <- start_connection.()
       do
-        {:ok, connection}
+        {:ok, tunnel, connection}
       end
     end
   end