GabrielTofvesson/BankProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

* Added flush command to server to flush database

Browse Source 
* Fixed how database manages user removal
* Added serverside user removal
* Added UI and netcode for user removal on clientside
* Fixed text rendering for TextView and InputView
* Removed redundant properties from TextView
* Simplified event system in Intro
This commit is contained in:
Gabriel Tofvesson 2018-05-15 23:21:58 +02:00
parent fdad3be98d
commit 9755f06120
15 changed files with 155 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Client/BankNetInteractor.cs
View File

@ -139,6 +139,17 @@ namespace Client
});
}
public async virtual Task<Promise> DeleteUser()
{
await StatusCheck(true);
client.Send(CreateCommandMessage("RmUsr", sessionID, out var pID));
return RegisterEventPromise(pID, p =>
{
PostPromise(p.handler, !p.Value.StartsWith("ERROR"));
return false;
});
}
public async virtual Task<Promise> UpdatePassword(string newPass)
{
await StatusCheck(true);

2
Client/ConsoleForms/Graphics/DialogView.cs
View File

@ -67,7 +67,7 @@ namespace Client.ConsoleForms.Graphics
int pl = padding.Left(), pr = padding.Right();
Console.SetCursorPosition(left, top++);
int pad = MaxWidth - options.CollectiveLength() - options.Length;// + pl + pr;
int pad = ContentWidth - options.CollectiveLength() - options.Length;// + pl + pr;
int lpad = (int)(pad / 2f);
Console.BackgroundColor = BackgroundColor;
Console.Write(Filler(' ', lpad));

21
Client/ConsoleForms/Graphics/InputView.cs
View File

@ -32,6 +32,7 @@ namespace Client.ConsoleForms.Graphics
}
}
private string[][] splitInputs;
protected ViewData data;
public InputView(ViewData parameters, LangManager lang) : base(parameters, lang)
@ -47,6 +48,8 @@ namespace Client.ConsoleForms.Graphics
DefaultSelectBackgroundColor = (ConsoleColor)sBC;
DefaultSelectTextColor = (ConsoleColor)sTC;
this.data = parameters;
List<InputField> fields = new List<InputField>();
foreach (var data in parameters.nestedData.GetFirst(d => d.Name.Equals("Fields")).nestedData)
if (!data.Name.Equals("Field")) continue;
@ -63,14 +66,19 @@ namespace Client.ConsoleForms.Graphics
Inputs = fields.ToArray();
int max = ContentWidth;
int computedSize = 0;
splitInputs = new string[Inputs.Length][];
for (int i = 0; i < Inputs.Length; ++i)
{
splitInputs[i] = ComputeTextDimensions(Inputs[i].Label.Split(' '));
foreach (var input in splitInputs[i])
if (input.Length > max)
max = input.Length;
computedSize += splitInputs[i].Length;
}
ContentHeight += computedSize + Inputs.Length * 2;
if (ContentWidth < max) ContentWidth = max;
}
public int IndexOf(InputField field)
@ -98,7 +106,7 @@ namespace Client.ConsoleForms.Graphics
{
Console.SetCursorPosition(left, top++);
Console.BackgroundColor = BackgroundColor;
Console.Write(splitInputs[j][i] + Filler(' ', MaxWidth - splitInputs[j][i].Length));
Console.Write(splitInputs[j][i] + Filler(' ', ContentWidth - splitInputs[j][i].Length));
}
Console.SetCursorPosition(left, top++);
@ -114,10 +122,10 @@ namespace Client.ConsoleForms.Graphics
if (Inputs[j].SelectIndex < Inputs[j].Text.Length)
Console.Write(
Inputs[j].ShowText ?
Inputs[j].Text.Substring(Inputs[j].SelectIndex + 1, drawn = Math.Min(maxWidth + Inputs[j].SelectIndex - Inputs[j].RenderStart - 1, Inputs[j].Text.Length - Inputs[j].SelectIndex - 1)) :
Filler('*', drawn = Math.Min(maxWidth + Inputs[j].SelectIndex - Inputs[j].RenderStart - 1, Inputs[j].Text.Length - Inputs[j].SelectIndex - 1))
Inputs[j].Text.Substring(Inputs[j].SelectIndex + 1, drawn = Math.Min(ContentWidth + Inputs[j].SelectIndex - Inputs[j].RenderStart - 1, Inputs[j].Text.Length - Inputs[j].SelectIndex - 1)) :
Filler('*', drawn = Math.Min(ContentWidth + Inputs[j].SelectIndex - Inputs[j].RenderStart - 1, Inputs[j].Text.Length - Inputs[j].SelectIndex - 1))
);
Console.Write(Filler(' ', maxWidth - 1 - drawn - Inputs[j].SelectIndex + Inputs[j].RenderStart));
Console.Write(Filler(' ', ContentWidth - 1 - drawn - Inputs[j].SelectIndex + Inputs[j].RenderStart));
Console.ForegroundColor = ConsoleColor.Black;
}
}
@ -140,7 +148,7 @@ namespace Client.ConsoleForms.Graphics
case ConsoleKey.RightArrow:
if (Inputs[selectedField].SelectIndex < Inputs[selectedField].Text.Length)
{
if (++Inputs[selectedField].SelectIndex - Inputs[selectedField].RenderStart == maxWidth) ++Inputs[selectedField].RenderStart;
if (++Inputs[selectedField].SelectIndex - Inputs[selectedField].RenderStart == ContentWidth) ++Inputs[selectedField].RenderStart;
}
else return changed;
break;
@ -175,6 +183,7 @@ namespace Client.ConsoleForms.Graphics
else return changed;
break;
case ConsoleKey.Enter:
ParseAction(data)();
SubmissionsListener?.Invoke(this);
return changed;
case ConsoleKey.Escape:
@ -184,7 +193,7 @@ namespace Client.ConsoleForms.Graphics
{
if (InputListener?.Invoke(this, Inputs[selectedField], info, triggered) == false) break;
Inputs[selectedField].Text = Inputs[selectedField].Text.Substring(0, Inputs[selectedField].SelectIndex) + info.KeyChar + Inputs[selectedField].Text.Substring(Inputs[selectedField].SelectIndex);
if (++Inputs[selectedField].SelectIndex - Inputs[selectedField].RenderStart == maxWidth) ++Inputs[selectedField].RenderStart;
if (++Inputs[selectedField].SelectIndex - Inputs[selectedField].RenderStart == ContentWidth) ++Inputs[selectedField].RenderStart;
}
else return changed;
break;

28
Client/ConsoleForms/Graphics/TextView.cs
View File

@ -32,29 +32,7 @@ namespace Client.ConsoleForms.Graphics
Dirty = true;
}
}
public int MaxWidth
{
get => maxWidth;
set
{
maxWidth = value;
text_render = ComputeTextDimensions(text);
Dirty = true;
}
}
public int MaxHeight
{
get => maxHeight;
set
{
maxHeight = value;
text_render = ComputeTextDimensions(text);
Dirty = true;
}
}
public override Region Occlusion => new Region(
new Rectangle(
-padding.Left() - (DrawBorder ? 2 : 0), // Left bound
@ -231,7 +209,7 @@ namespace Client.ConsoleForms.Graphics
for (int i = 0; i < text_render.Length; ++i)
{
Console.SetCursorPosition(left, top++);
Console.Write(/*Filler(' ', pl) + */text_render[i] + Filler(' ', MaxWidth - text_render[i].Length)/* + Filler(' ', pr)*/);
Console.Write(/*Filler(' ', pl) + */text_render[i] + Filler(' ', ContentWidth - text_render[i].Length)/* + Filler(' ', pr)*/);
}
}
@ -243,7 +221,7 @@ namespace Client.ConsoleForms.Graphics
{
Console.SetCursorPosition(left, top++);
Console.BackgroundColor = BackgroundColor;
Console.Write(Filler(' ', maxWidth/* + pl + pr*/));
Console.Write(Filler(' ', ContentWidth/* + pl + pr*/));
}
}
}

2
Client/ConsoleForms/Graphics/View.cs
View File

@ -139,7 +139,7 @@ namespace Client.ConsoleForms.Graphics
}
protected EventAction ParseAction(ViewData data)
{
bool.TryParse(data.GetAttribute("close"), out bool close);
bool.TryParse(data?.GetAttribute("close")??"", out bool close);
return ParseAction(data.GetAttribute("event"), close);
}
protected EventAction ParseAction(string action, bool close)

70
Client/Context/IntroContext.cs
View File

@ -13,56 +13,11 @@ namespace Client
public IntroContext(ContextManager manager, Action onComplete) : base(manager, "Intro", "Common")
{
GetView<DialogView>("welcome").RegisterSelectListener((v, i, s) =>
{
if (i == 1)
{
Hide(v);
onComplete();
}
else
{
Hide(v);
Show("describe1");
}
});
GetView<DialogView>("describe1").RegisterSelectListener((v, i, s) =>
{
if (i == 1) v.TriggerKeyEvent(new ConsoleKeyInfo('\0', ConsoleKey.Escape, false, false, false));
else
{
Hide(v);
Show("describe2");
}
});
GetView<DialogView>("describe2").RegisterSelectListener((v, i, s) =>
{
if (i == 1) v.TriggerKeyEvent(new ConsoleKeyInfo('\0', ConsoleKey.Escape, false, false, false));
else
{
Hide(v);
Show("describe3");
}
});
GetView<InputView>("describe3").SubmissionsListener = v =>
{
Hide(v);
Show("describe4");
};
GetView<InputView>("describe4").SubmissionsListener = v =>
{
Hide(v);
Show("describe4_1");
};
GetView<InputView>("describe4_1").SubmissionsListener = v =>
{
Hide(v);
Show("describe5");
};
if (i == 1) onComplete();
else Show("describe1");
});
GetView<DialogView>("describe5").RegisterSelectListener((v, i, s) =>
{
@ -77,22 +32,7 @@ namespace Client
};
}
public override void OnCreate()
{
Show("welcome");
}
public override void OnDestroy()
{
}
// Graphics update trigger
public override bool Update(ConsoleController.KeyEvent keypress, bool hasKeypress = true)
{
// Return: whether or not to redraw graphics
return base.Update(keypress, hasKeypress);
}
public override void OnCreate() => Show("welcome");
public override void OnDestroy() { }
}
}

20
Client/Context/SessionContext.cs
View File

@ -148,6 +148,26 @@ namespace Client
};
};
options.GetView<ButtonView>("delete").SetEvent(v => Show("account_delete"));
GetView<DialogView>("account_delete").RegisterSelectListener((v, i, s) =>
{
Hide(v);
if (i == 1)
{
Show("delete_stall");
Promise deletion = Promise.AwaitPromise(interactor.DeleteUser());
deletion.Subscribe = p =>
{
Hide("delete_stall");
if (bool.Parse(p.Value))
controller.Popup(GetIntlString("SE_delete_success"), 2500, ConsoleColor.Green, () => manager.LoadContext(new NetContext(manager)));
else
controller.Popup(GetIntlString("SE_delete_failure"), 1500, ConsoleColor.Red);
};
}
});
// Actual "create account" input box thingy
var input = GetView<InputView>("account_create");
input.SubmissionsListener = __ =>

2
Client/Context/WelcomeContext.cs
View File

@ -25,6 +25,8 @@ namespace Client
// Just close when anything is selected and "submitted"
RegisterSelectListeners((s, i, v) => controller.CloseView(s), "DuplicateAccountError", "EmptyFieldError", "IPError", "PortError", "AuthError", "PasswordMismatchError");
// If Escape key is pressed, suggest to controller to terminate
GetView("WelcomeScreen").OnBackEvent = v => controller.ShouldExit = true;
GetView<InputView>("Login").SubmissionsListener = i =>
{

18
Client/Resources/Layout/Intro.xml
View File

@ -22,7 +22,7 @@
padding_bottom="1"
back="Intro:welcome">
<Options>
<Option>@string/WS_continue</Option>
<Option event="Intro:describe2" close="true">@string/WS_continue</Option>
</Options>
<Text>@string/WS_describe1</Text>
</DialogView>
@ -35,8 +35,8 @@
padding_bottom="1"
back="Intro:describe1">
<Options>
<Option>@string/WS_continue</Option>
<Option>@string/WS_back</Option>
<Option event="Intro:describe3" close="true">@string/WS_continue</Option>
<Option event="Intro:describe3" close="true">@string/WS_back</Option>
</Options>
<Text>@string/WS_describe2</Text>
</DialogView>
@ -47,7 +47,9 @@
padding_right="2"
padding_top="1"
padding_bottom="1"
back="Intro:describe2">
back="Intro:describe2"
event="Intro:describe4"
close="true">
<Fields>
<Field>@string/WS_input</Field>
<Field>@string/WS_input</Field>
@ -62,7 +64,9 @@
padding_right="2"
padding_top="1"
padding_bottom="1"
back="Intro:describe3">
back="Intro:describe3"
event="Intro:describe4_1"
close="true">
<Fields>
<Field>@string/WS_input</Field>
<Field input_type="integer">@string/WS_input_integer</Field>
@ -77,7 +81,9 @@
padding_right="2"
padding_top="1"
padding_bottom="1"
back="Intro:describe4">
back="Intro:describe4"
event="Intro:describe5"
close="true">
<Fields>
<Field input_type="alphanumeric">@string/WS_input_alphanum</Field>
<Field hide="true">@string/WS_input_password</Field>

25
Client/Resources/Layout/Session.xml
View File

@ -90,12 +90,37 @@
<Text>@string/SE_pwdu</Text>
</ButtonView>
<ButtonView id="delete">
<Text>@string/SE_delete</Text>
</ButtonView>
<ButtonView id="exit">
<Text>@string/SE_exit</Text>
</ButtonView>
</Views>
</ListView>
<TextView id="delete_stall"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1">
<Text>@string/SE_delete_stall</Text>
</TextView>
<DialogView id="account_delete"
padding_left="2"
padding_right="2"
padding_top="1"
padding_bottom="1"
border="4">
<Options>
<Option>@string/GENERIC_negative</Option>
<Option>@string/GENERIC_positive</Option>
</Options>
<Text>@string/SE_delete_warn</Text>
</DialogView>
<InputView id="account_create"
padding_left="2"
padding_right="2"

8
Client/Resources/Strings/en_GB/strings.xml
View File

@ -79,7 +79,7 @@ To go back, press [ESCAPE]</Entry>
<Entry name="SE_hist">Transaction history</Entry>
<Entry name="SE_tx">Transfer funds</Entry>
<Entry name="SE_tx_success">Funds transferred!</Entry>
<Entry name="SE_who">Send to</Entry>
<Entry name="SE_who">Send to:</Entry>
<Entry name="SE_where">Account</Entry>
<Entry name="SE_where_f">From Account:</Entry>
<Entry name="SE_where_t">To Account:</Entry>
@ -98,6 +98,12 @@ Is this correct?</Entry>
<Entry name="SE_exit">Log out</Entry>
<Entry name="SE_open">Open an account</Entry>
<Entry name="SE_close">Close account</Entry>
<Entry name="SE_delete">Delete user account</Entry>
<Entry name="SE_delete_warn">WARNING: This will delete the current user and all connected accounts!
Are you sure you would like to continue?</Entry>
<Entry name="SE_delete_stall">Deleting...</Entry>
<Entry name="SE_delete_success">User deleted</Entry>
<Entry name="SE_delete_failure">User could not be deleted</Entry>
<Entry name="SE_accounts">Show accounts</Entry>
<Entry name="SE_balance_toohigh">Supplied balance is higher than available amount in source account!
Available balance: $0 SEK</Entry>

8
Client/Resources/Strings/en_US/strings.xml
View File

@ -79,7 +79,7 @@ To go back, press [ESCAPE]</Entry>
<Entry name="SE_hist">Transaction history</Entry>
<Entry name="SE_tx">Transfer funds</Entry>
<Entry name="SE_tx_success">Funds transferred!</Entry>
<Entry name="SE_who">Send to</Entry>
<Entry name="SE_who">Send to:</Entry>
<Entry name="SE_where">Account</Entry>
<Entry name="SE_where_f">From Account:</Entry>
<Entry name="SE_where_t">To Account:</Entry>
@ -98,6 +98,12 @@ Is this correct?</Entry>
<Entry name="SE_exit">Log out</Entry>
<Entry name="SE_open">Open an account</Entry>
<Entry name="SE_close">Close account</Entry>
<Entry name="SE_delete">Delete user account</Entry>
<Entry name="SE_delete_warn">WARNING: This will delete the current user and all connected accounts!
Are you sure you would like to continue?</Entry>
<Entry name="SE_delete_stall">Deleting...</Entry>
<Entry name="SE_delete_success">User deleted</Entry>
<Entry name="SE_delete_failure">User could not be deleted</Entry>
<Entry name="SE_accounts">Show accounts</Entry>
<Entry name="SE_balance_toohigh">Supplied balance is higher than available amount in source account!
Available balance: $0 SEK</Entry>

9
Client/Resources/Strings/sv_SE/strings.xml
View File

@ -84,7 +84,7 @@ För att backa, tryck [ESCAPE]</Entry>
<Entry name="SE_hist">Transaktionshistorik</Entry>
<Entry name="SE_tx">Överför pengar</Entry>
<Entry name="SE_tx_success">Belopp överfört!</Entry>
<Entry name="SE_who">Skicka till</Entry>
<Entry name="SE_who">Skicka till:</Entry>
<Entry name="SE_where">Konto</Entry>
<Entry name="SE_where_f">Från konto:</Entry>
<Entry name="SE_where_t">Till konto:</Entry>
@ -103,6 +103,13 @@ Till kontot: $2
<Entry name="SE_exit">Logga ut</Entry>
<Entry name="SE_open">Öppna ett konto</Entry>
<Entry name="SE_close">Stäng konto</Entry>
<Entry name="SE_delete">Radera användare</Entry>
<Entry name="SE_delete_warn">VARNING: Detta kommer att radera den nuvarande användaren
och alla kopplade konton!
Vill du fortsätta?</Entry>
<Entry name="SE_delete_stall">Raderar...</Entry>
<Entry name="SE_delete_success">Användare raderad</Entry>
<Entry name="SE_delete_failure">Användare kunde inte raderas</Entry>
<Entry name="SE_accounts">Visa konton</Entry>
<Entry name="SE_balance_toohigh">Angivet belopp är högre än det tillgängliga beloppet i ursprungskontot!
Tillgängligt saldo: $0 SEK</Entry>

27
Server/Database.cs
View File

@ -73,17 +73,19 @@ namespace Server
public void RemoveUser(User entry) => RemoveUser(entry, true);
private void RemoveUser(User entry, bool withFlush)
{
entry = ToEncoded(entry);
// Remove from loaded users collection
for (int i = 0; i < loadedUsers.Count; ++i)
if (entry.Equals(loadedUsers[i]))
if (entry.Name.Equals(loadedUsers[i].Name))
loadedUsers.RemoveAt(i);
// Changes are retracted from change collectino
for (int i = changeList.Count - 1; i >= 0; --i)
if (changeList[i].Equals(entry.Name))
if (changeList[i].Name.Equals(entry.Name))
changeList.RemoveAt(i);
// Check if user already is scheduled for deletion
for (int i = toRemove.Count - 1; i >= 0; --i)
if (toRemove[i].Equals(entry.Name))
if (toRemove[i].Name.Equals(entry.Name))
return;
toRemove.Add(entry);
@ -104,9 +106,10 @@ namespace Server
using(var reader = XmlReader.Create(DatabaseName))
{
int masterDepth = 0;
bool trigger = false, wn = false, recent = false;
while (wn || reader.Read())
bool trigger = false, wn = false, recent = false, justTriggered = false;
while (wn || reader.Read() || (reader.NodeType==XmlNodeType.None && justTriggered))
{
justTriggered = false;
wn = false;
if (trigger)
{
@ -114,7 +117,7 @@ namespace Server
WriteUser(writer, user);
bool wroteNode = false;
while ((wroteNode || reader.Name.Equals("User") || reader.Read()) && reader.NodeType != XmlNodeType.EndElement)
while ((wroteNode || reader.Name.Equals("User") || reader.Read()) && reader.NodeType != XmlNodeType.EndElement && reader.NodeType != XmlNodeType.None)
{
wroteNode = false;
if (reader.Name.Equals("User"))
@ -154,6 +157,7 @@ namespace Server
if (masterDepth != MasterEntry.Length && reader.Name.Equals(MasterEntry[masterDepth]))
{
trigger = reader.NodeType == XmlNodeType.Element && ++masterDepth == MasterEntry.Length;
justTriggered = true;
reader.MoveToContent();
writer.WriteStartElement(MasterEntry[masterDepth - 1]);
}
@ -241,10 +245,18 @@ namespace Server
public User FirstUser(Predicate<User> p)
{
if (p == null) return null; // Done to conveniently handle system insertions
// Check if user is scheduled for removal
foreach (var entry in toRemove)
if (p(entry))
return null;
// Check loaded users
foreach (var entry in loadedUsers)
if (p(entry))
return entry;
// Check modified users
foreach (var entry in changeList)
if (p(entry))
{
@ -252,6 +264,7 @@ namespace Server
return entry;
}
// Read from database
using (var reader = XmlReader.Create(DatabaseName))
{
if (!Traverse(reader, MasterEntry)) return null;

21
Server/Program.cs
View File

@ -147,11 +147,23 @@ Use command 'help' to get a list of available commands";
// Server endpoints
switch (cmd[0])
{
case "RmUsr":
{
if (!GetUser(cmd[1], out var user))
{
if(verbosity > 0) Output.Error($"Could not delete user from session as session isn't valid. (SessionID=\"{cmd[1]}\")");
return ErrorResponse(id, "badsession");
}
manager.Expire(user);
db.RemoveUser(user);
if (verbosity > 0) Output.Info($"Removed user \"{user.Name}\" (SessionID={cmd[1]})");
return GenerateResponse(id, true);
}
case "Auth": // Log in to a user account (get a session id)
{
if(!ParseDataPair(cmd[1], out string user, out string pass))
{
Output.Error($"Recieved problematic username or password! (User: \"{user}\")");
if(verbosity > 0) Output.Error($"Recieved problematic username or password! (User: \"{user}\")");
return ErrorResponse(id);
}
Database.User usr = db.GetUser(user);
@ -447,7 +459,9 @@ Use command 'help' to get a list of available commands";
}
Output.Raw($"Current verbosity level: {(verbosity<1?"FATAL":verbosity==1?"INFO":"DEBUG")}");
}), "Get or set verbosity level: DEBUG, INFO, FATAL (alternatively enter 0, 1 or 2 respectively)")
.Append(new Command("sess").WithParameter("sessionID", 'r', Parameter.ParamType.STRING, true).SetAction( // Display active sessions
.Append(new Command("sess") // Display active sessions
.WithParameter("sessionID", 'r', Parameter.ParamType.STRING, true)
.SetAction(
(c, l) => {
StringBuilder builder = new StringBuilder();
manager.Update(); // Ensure that we don't show expired sessions (artifacts exist until it is necessary to remove them)
@ -498,7 +512,8 @@ Use command 'help' to get a list of available commands";
db.AddUser(user);
}
else Output.Raw(user.IsAdministrator);
}), "Show or set admin status for a user");
}), "Show or set admin status for a user")
.Append(new Command("flush").SetAction(() => { db.Flush(); Output.Raw("Database flushed"); }), "Flush database");// Flush database to database file
// Set up a persistent terminal-esque input design
Output.OnNewLine = () => Output.WriteOverwritable(">> ");