diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo index 634ed88..6d24984 100644 Binary files a/Pepperdash Core/Pepperdash Core.suo and b/Pepperdash Core/Pepperdash Core.suo differ diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo index a59aaca..15cb560 100644 Binary files a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo and b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo differ diff --git a/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-01-11 14-54-45).log b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-01-11 14-54-45).log new file mode 100644 index 0000000..7895b6b --- /dev/null +++ b/Pepperdash Core/Pepperdash Core/SIMPLSharpLogs/(2017-01-11 14-54-45).log @@ -0,0 +1,11 @@ +1/11/2017 2:54:45 PM, Info: Initializing SIMPLSharp Services... +1/11/2017 2:54:46 PM, Info: ProjectInfo successfully initialized. +1/11/2017 3:07:48 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll... +1/11/2017 3:07:48 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll +1/11/2017 3:07:48 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz... +1/11/2017 3:07:49 PM, Info: Saving project information... +1/11/2017 3:24:24 PM, Info: Validating assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll... +1/11/2017 3:24:24 PM, Info: Verifying assembly C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.dll +1/11/2017 3:24:24 PM, Info: Creating Archive C:\Users\hvolmer\Desktop\working\pepperdash-simplsharp-core\Pepperdash Core\Pepperdash Core\bin\PepperDash_Core.clz... +1/11/2017 3:24:25 PM, Info: Saving project information... +1/11/2017 4:49:12 PM, Info: Terminating SIMPLSharp Services diff --git a/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs b/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs index bb7e306..6d0613d 100644 --- a/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs +++ b/Pepperdash Core/Pepperdash Core/WebApi/Presets/WebApiPasscodeClient.cs @@ -2,8 +2,9 @@ using System.Text; using Crestron.SimplSharp; // For Basic SIMPL# Classes using Crestron.SimplSharp.CrestronIO; -using Crestron.SimplSharp.Net; +using Crestron.SimplSharp.Net; using Crestron.SimplSharp.Net.Http; +using Crestron.SimplSharp.Net.Https; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -59,31 +60,35 @@ namespace PepperDash.Core.WebApi.Presets public void GetUserForPasscode(string passcode) { + // Bullshit duplicate code here... These two cases should be the same + // except for https/http and the certificate ignores + if (!UrlBase.StartsWith("https")) + return; + var req = new HttpsClientRequest(); + req.Url = new UrlParser(UrlBase + "/api/users/dopin"); + req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post; + req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json")); + req.Header.AddHeader(new HttpsHeader("Accept", "application/json")); + var jo = new JObject(); + jo.Add("pin", passcode); + req.ContentString = jo.ToString(); - - var req = new HttpClientRequest(); - req.Url = new UrlParser(UrlBase + "/api/users/dopin"); - req.RequestType = RequestType.Post; - req.Header.AddHeader(new HttpHeader("Content-Type", "application/json")); - req.Header.AddHeader(new HttpHeader("Accept", "application/json")); - var jo = new JObject(); - jo.Add("pin", passcode); - req.ContentString = jo.ToString(); - - var client = new HttpClient(); - var resp = client.Dispatch(req); - if (resp.Code == 200) - { - CrestronConsole.PrintLine("Received: {0}", resp.ContentString); - var user = JsonConvert.DeserializeObject(resp.ContentString); + var client = new HttpsClient(); + client.HostVerification = false; + client.PeerVerification = false; + var resp = client.Dispatch(req); + if (resp.Code == 200) + { + CrestronConsole.PrintLine("Received: {0}", resp.ContentString); + var user = JsonConvert.DeserializeObject(resp.ContentString); #warning CHECK for user success here?? - CurrentUser = user; - var handler = UserReceived; - if (handler != null) - UserReceived(this, new UserReceivedEventArgs(user)); - } - else - CrestronConsole.PrintLine("No user received: {0}", resp.Code); + CurrentUser = user; + var handler = UserReceived; + if (handler != null) + UserReceived(this, new UserReceivedEventArgs(user)); + } + else + CrestronConsole.PrintLine("No user received: {0}", resp.Code); } /// @@ -106,37 +111,41 @@ namespace PepperDash.Core.WebApi.Presets PresetNumber = presetNumber }; - var req = new HttpClientRequest(); - req.Url = new UrlParser(UrlBase + "/api/presets/userandroom"); - req.RequestType = RequestType.Post; - req.Header.AddHeader(new HttpHeader("Content-Type", "application/json")); - req.Header.AddHeader(new HttpHeader("Accept", "application/json")); - req.ContentString = JsonConvert.SerializeObject(msg); - - var client = new HttpClient(); try { - var resp = client.Dispatch(req); - if (resp.Code == 200) - { - Debug.Console(1, this, "Received: {0}", resp.ContentString); - var preset = JsonConvert.DeserializeObject(resp.ContentString); + if (!UrlBase.StartsWith("https")) + return; + var req = new HttpsClientRequest(); + req.Url = new UrlParser(UrlBase + "/api/presets/userandroom"); + req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post; + req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json")); + req.Header.AddHeader(new HttpsHeader("Accept", "application/json")); + req.ContentString = JsonConvert.SerializeObject(msg); - CurrentPreset = preset; - - //if there's no preset data, load the template - if (preset.Data == null || preset.Data.Trim() == string.Empty || JObject.Parse(preset.Data).Count == 0) - { - Debug.Console(1, this, "Loaded preset has no data. Loading default template."); - LoadDefaultPresetData(); - return; - } + var client = new HttpsClient(); + client.HostVerification = false; + client.PeerVerification = false; + var resp = client.Dispatch(req); + if (resp.Code == 200) + { + Debug.Console(1, this, "Received: {0}", resp.ContentString); + var preset = JsonConvert.DeserializeObject(resp.ContentString); - J2SMaster.LoadWithJson(preset.Data); - var handler = PresetReceived; - if (handler != null) - PresetReceived(this, new PresetReceivedEventArgs(preset)); - } + CurrentPreset = preset; + + //if there's no preset data, load the template + if (preset.Data == null || preset.Data.Trim() == string.Empty || JObject.Parse(preset.Data).Count == 0) + { + Debug.Console(1, this, "Loaded preset has no data. Loading default template."); + LoadDefaultPresetData(); + return; + } + + J2SMaster.LoadWithJson(preset.Data); + var handler = PresetReceived; + if (handler != null) + PresetReceived(this, new PresetReceivedEventArgs(preset)); + } } catch (HttpException e) { @@ -198,14 +207,18 @@ namespace PepperDash.Core.WebApi.Presets { CurrentPreset.Data = json; - var req = new HttpClientRequest(); - req.RequestType = RequestType.Post; + if (!UrlBase.StartsWith("https")) + return; + var req = new HttpsClientRequest(); + req.RequestType = Crestron.SimplSharp.Net.Https.RequestType.Post; req.Url = new UrlParser(string.Format("{0}/api/presets/addorchange", UrlBase)); - req.Header.AddHeader(new HttpHeader("Content-Type", "application/json")); - req.Header.AddHeader(new HttpHeader("Accept", "application/json")); + req.Header.AddHeader(new HttpsHeader("Content-Type", "application/json")); + req.Header.AddHeader(new HttpsHeader("Accept", "application/json")); req.ContentString = JsonConvert.SerializeObject(CurrentPreset); - var client = new HttpClient(); + var client = new HttpsClient(); + client.HostVerification = false; + client.PeerVerification = false; try { var resp = client.Dispatch(req); diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz index 48b384a..0f0bf11 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.clz differ diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config index 33b2991..f66f7f9 100644 --- a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config +++ b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.config @@ -10,8 +10,8 @@ - 1/6/2017 8:53:46 AM - 1.0.6215.16012 + 1/11/2017 3:24:24 PM + 1.0.6220.27731 Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10 diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll index d4d7cf9..0e3b531 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.dll differ diff --git a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb index 5a830bf..5e24834 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb and b/Pepperdash Core/Pepperdash Core/bin/PepperDash_Core.pdb differ diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.info b/Pepperdash Core/Pepperdash Core/bin/manifest.info index 838d531..c70917c 100644 --- a/Pepperdash Core/Pepperdash Core/bin/manifest.info +++ b/Pepperdash Core/Pepperdash Core/bin/manifest.info @@ -1,4 +1,4 @@ -MainAssembly=PepperDash_Core.dll:5310f2702bb23a35bd60cde6a14b55ba +MainAssembly=PepperDash_Core.dll:2ce705d0617973f5c800064ef6bd32cd MainAssemblyMinFirmwareVersion=1.007.0017 MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e ü diff --git a/Pepperdash Core/Pepperdash Core/bin/manifest.ser b/Pepperdash Core/Pepperdash Core/bin/manifest.ser index 6d339d9..ff50fd7 100644 Binary files a/Pepperdash Core/Pepperdash Core/bin/manifest.ser and b/Pepperdash Core/Pepperdash Core/bin/manifest.ser differ diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll index f1c5960..325d650 100644 Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll and b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.dll differ diff --git a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb index a1dfec6..cc9a3c4 100644 Binary files a/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb and b/Pepperdash Core/Pepperdash Core/obj/Debug/PepperDash_Core.pdb differ