diff --git a/FModel/Forms/AESManager.Designer.cs b/FModel/Forms/AESManager.Designer.cs index a2451f53..c05c6cc6 100644 --- a/FModel/Forms/AESManager.Designer.cs +++ b/FModel/Forms/AESManager.Designer.cs @@ -35,6 +35,7 @@ this.OKButton = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.panel1 = new System.Windows.Forms.Panel(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.groupBox3.SuspendLayout(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); @@ -103,11 +104,24 @@ this.panel1.Size = new System.Drawing.Size(559, 200); this.panel1.TabIndex = 0; // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(12, 296); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(124, 13); + this.linkLabel1.TabIndex = 18; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "Latest Fortnite AES Keys"; + this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLabel1_LinkClicked); + // // AESManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(589, 325); + this.Controls.Add(this.linkLabel1); this.Controls.Add(this.groupBox1); this.Controls.Add(this.OKButton); this.Controls.Add(this.groupBox3); @@ -121,6 +135,7 @@ this.groupBox3.PerformLayout(); this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); + this.PerformLayout(); } @@ -132,5 +147,6 @@ private System.Windows.Forms.Button OKButton; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.LinkLabel linkLabel1; } } \ No newline at end of file diff --git a/FModel/Forms/AESManager.cs b/FModel/Forms/AESManager.cs index b44971cc..afeaf3a3 100644 --- a/FModel/Forms/AESManager.cs +++ b/FModel/Forms/AESManager.cs @@ -75,5 +75,10 @@ namespace FModel.Forms Properties.Settings.Default.Save(); Close(); } + + private void LinkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + System.Diagnostics.Process.Start("http://benbotfn.tk:8080/api/aes"); + } } } diff --git a/FModel/Methods/AESManager/DynamicKeysManager.cs b/FModel/Methods/AESManager/DynamicKeysManager.cs index 4d7968f8..db2773f9 100644 --- a/FModel/Methods/AESManager/DynamicKeysManager.cs +++ b/FModel/Methods/AESManager/DynamicKeysManager.cs @@ -39,7 +39,6 @@ namespace FModel } AESEntries = outputList; } - else { throw new Exception("Fail to locate AESManager.xml"); } } } } diff --git a/FModel/Methods/BackPAKs/DynamicPAKs.cs b/FModel/Methods/BackPAKs/DynamicPAKs.cs index 58674b90..20cdf5cf 100644 --- a/FModel/Methods/BackPAKs/DynamicPAKs.cs +++ b/FModel/Methods/BackPAKs/DynamicPAKs.cs @@ -1,7 +1,6 @@ using FModel.Methods.BackupPAKs.Parser.AccessCodeParser; using FModel.Methods.BackupPAKs.Parser.TokenParser; using RestSharp; -using System; using Newtonsoft.Json.Linq; using System.Globalization; using System.Collections.Generic; @@ -20,24 +19,17 @@ namespace FModel /// url content public static string GetEndpoint(string url, bool auth) { - string content = string.Empty; - try - { - RestClient EndpointClient = new RestClient(url); - RestRequest EndpointRequest = new RestRequest(Method.GET); + RestClient EndpointClient = new RestClient(url); + RestRequest EndpointRequest = new RestRequest(Method.GET); - if (auth) - { - EndpointRequest.AddHeader("Authorization", "bearer " + getExchangeToken(getAccessCode(getAccessToken(Properties.Settings.Default.eEmail, Properties.Settings.Default.ePassword)))); - } - - var response = EndpointClient.Execute(EndpointRequest); - content = JToken.Parse(response.Content).ToString(Newtonsoft.Json.Formatting.Indented); - } - catch (Exception ex) + if (auth) { - throw new Exception(ex.Message); + EndpointRequest.AddHeader("Authorization", "bearer " + getExchangeToken(getAccessCode(getAccessToken(Properties.Settings.Default.eEmail, Properties.Settings.Default.ePassword)))); } + + var response = EndpointClient.Execute(EndpointRequest); + string content = JToken.Parse(response.Content).ToString(Newtonsoft.Json.Formatting.Indented); + return content; } private static string getAccessToken(string email, string password) diff --git a/FModel/Methods/Serializer/LocRes/LocResSerializer.cs b/FModel/Methods/Serializer/LocRes/LocResSerializer.cs index fb45e03a..a284176a 100644 --- a/FModel/Methods/Serializer/LocRes/LocResSerializer.cs +++ b/FModel/Methods/Serializer/LocRes/LocResSerializer.cs @@ -64,9 +64,9 @@ namespace FModel } } } - else { throw new Exception("Unsupported LocRes version."); } + else { throw new ArgumentException("Unsupported LocRes version."); } } - else { throw new Exception("Wrong LocResMagic number."); } + else { throw new ArgumentException("Wrong LocResMagic number."); } } return JsonConvert.SerializeObject(LocResDict, Formatting.Indented); diff --git a/FModel/Methods/Utilities/Utilities.cs b/FModel/Methods/Utilities/Utilities.cs index ccf4a67c..a1a9b1df 100644 --- a/FModel/Methods/Utilities/Utilities.cs +++ b/FModel/Methods/Utilities/Utilities.cs @@ -73,7 +73,7 @@ namespace FModel } /// - /// Once upon a time, it was used for shitty stuff + /// /// public static void JohnWickCheck() { diff --git a/README.md b/README.md index 0fcd053d..3c2a82af 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ Also if you find this project useful, feel free to give it a :star: thank you :k | **Waddlesworth** | **AyeTSG** | **FireMonkey** | **Maiky M** | | :---: | :---: | :---: | :---: | | [![Waddlesworth](https://avatars1.githubusercontent.com/u/769399?s=200&v=4)](https://github.com/SirWaddles) | [![AyeTSG](https://avatars1.githubusercontent.com/u/49595354?s=200&v=4)](https://github.com/AyeTSG) | [![FireMonkey](https://avatars2.githubusercontent.com/u/38590471?s=200&v=4)](https://github.com/ItsFireMonkey) | [![Maiky M](https://avatars3.githubusercontent.com/u/51415805?s=200&v=4)](https://github.com/MaikyM) | -| `https://github.com/SirWaddles` | `https://twitter.com/AyeTSG` | `https://twitter.com/FireMonkeyFN` |`https://twitter.com/Mikey_Bad05` | +| `https://github.com/SirWaddles` | `https://twitter.com/AyeTSG` | `https://twitter.com/FireMonkeyFN` |`https://twitter.com/MaikyMOficial` | ### Why FModel This project is mainly based on what [UModel](https://github.com/gildor2/UModel) can do, in a personalized way, in case UModel doesn't work, as a temporary rescue solution. I'd highly suggest you to use [UModel](https://github.com/gildor2/UModel) instead if you wanna use something made professionnaly.