Added support for Nightscout Access Tokens (#6)

Did a basic test, looks like it should work, thanks to @jees1234!. This Fixes #2
dabear · Aug 5, 2019 · 9e7e6a1 · 9e7e6a1
1 parent 920755d
commit 9e7e6a1
Show file tree

Hide file tree

Showing 4 changed files with 256 additions and 172 deletions.
diff --git a/FloatingGlucose/Classes/DataSources/Plugins/DexcomShare/DexcomShareUS.cs b/FloatingGlucose/Classes/DataSources/Plugins/DexcomShare/DexcomShareUS.cs
@@ -1,4 +1,4 @@
-using FloatingGlucose.Classes.Extensions;
+using FloatingGlucose.Classes.Extensions;
 using ShareClientDotNet;
 using System;
 using System.Collections.Generic;
@@ -136,6 +136,10 @@ public virtual void OnPluginSelected(FormGlucoseSettings form)
         {
             form.lblDataSourceLocation.Text = "Dexcom share server";
             form.txtDataSourceLocation.Text = this.shareClient.CurrentDexcomServer;
+
+            form.lblUsername.Text = "User Name";
+            form.lblPassword.Enabled = true;
+            form.txtPassword.Enabled = true;
         }
 
         public virtual bool VerifyConfig(Properties.Settings settings)
@@ -179,4 +183,4 @@ public virtual async Task<IDataSourcePlugin> GetDataSourceDataAsync(NameValueCol
             return this;
         }
     }
-}
+}
diff --git a/...gGlucose/Classes/DataSources/Plugins/NightscoutPebbleEndpoint/NightscoutPebbleEndpoint.cs b/...gGlucose/Classes/DataSources/Plugins/NightscoutPebbleEndpoint/NightscoutPebbleEndpoint.cs
@@ -1,4 +1,4 @@
-using FloatingGlucose.Classes.Extensions;
+using FloatingGlucose.Classes.Extensions;
 using FloatingGlucose.Classes.Utils;
 using Newtonsoft.Json;
 using System;
@@ -24,7 +24,7 @@ internal class NightscoutPebbleEndpoint : IDataSourcePlugin
 
         public List<string> HandleFormatting() => null;
 
-        public virtual bool RequiresUserNameAndPassword => false;
+        public virtual bool RequiresUserNameAndPassword => true;
         public virtual bool PluginDisabled => false;
         public virtual bool RequiresBrowseButton => false;
         public virtual string BrowseDialogFileFilter => "";
@@ -138,6 +138,9 @@ public double RawGlucose
         public virtual void OnPluginSelected(FormGlucoseSettings form)
         {
             form.lblDataSourceLocation.Text = "Your Nightscout installation URL";
+            form.lblUsername.Text = "Access Token";
+            form.lblPassword.Enabled = false;
+            form.txtPassword.Enabled = false;
 
             var source = form.txtDataSourceLocation.Text.ToLower();
             //for this plugin, we handle only http:// and https://
@@ -187,4 +190,4 @@ public virtual async Task<IDataSourcePlugin> GetDataSourceDataAsync(NameValueCol
             return this;
         }
     }
-}
+}
diff --git a/FloatingGlucose/FloatingGlucose.cs b/FloatingGlucose/FloatingGlucose.cs
@@ -33,11 +33,21 @@ private NameValueCollection datasourceLocation
                 // data points to calculate raw glucose diff
                 var count = Default.EnableRawGlucoseDisplay ? 2 : 1;
                 var units = Default.GlucoseUnits;
-                var urlstripped = Default.DataPathLocation.TrimEnd('/');
+                var url = Default.DataPathLocation.TrimEnd('/');
+                var username = Default.UserName;
+                if (username == "")
+                {
+                    url += $"/pebble?count={count}&units={units}";
+                } else
+                {
+                    // username not empty -> use as Accees Token
+                    url += $"/pebble?count={count}&units={units}&token={username}";
+                }
+
                 return new NameValueCollection()
                 {
                     { "raw", Default.DataPathLocation },
-                    { "location", $"{urlstripped}/pebble?count={count}&units={units}"}
+                    { "location", url}
                 };
             }
         }
@@ -740,7 +750,13 @@ private void reenableAlarmsToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void openNightscoutSiteToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var url = Default.DataPathLocation;
+            var url = Default.DataPathLocation.TrimEnd('/');
+            var username = Default.UserName;
+            if (username != "")
+            {
+                // username not empty -> use as Access Token
+                url += $"/?token={username}";
+            }
             if (Validators.IsUrl(url))
             {
                 try
@@ -763,4 +779,4 @@ private void reloadToolStripMenuItem_Click(object sender, EventArgs e)
             this.LoadGlucoseValue();
         }
     }
-}
+}