update to 0.2.7

- possibility to deactivate basicAuth (Safari Mode) in Settings to fix Problem with Safari Browser - fixed meter reading via API
CurtRod · Dec 27, 2018 · 46c43b1 · 46c43b1
1 parent 8fdbdf1
commit 46c43b1
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 18 deletions.
diff --git a/SimpleEVSE-WiFi.ino b/SimpleEVSE-WiFi.ino
@@ -133,6 +133,7 @@ bool useRFID = false;
 bool useSMeter = false;
 bool useMMeter = false;
 bool useButton = false;
+bool dontUseWsAuthentication = false;
 bool inAPMode = false;
 bool inFallbackMode = false;
 bool isWifiConnected = false;
@@ -849,6 +850,9 @@ bool ICACHE_FLASH_ATTR deactivateEVSE(bool logUpdate) {
         meteredKWh = readMeter(0x0156) - startTotal;
       }
     }
+    else{
+      startTotal += meteredKWh;
+    }
     if(logUpdate){
       updateLog(false);
     }
@@ -878,7 +882,7 @@ bool ICACHE_FLASH_ATTR setEVSEcurrent(){  // telegram 1: write EVSE current
     Serial.println(" occured while setting current in EVSE - trying again...");
     return false;
   }
-  else{   
+  else{
     // register successufully written
     if(debug) Serial.println("[ ModBus ] Current successfully set");
     evseAmpsConfig = currentToSet;  //foce update in WebUI
@@ -1384,7 +1388,14 @@ bool ICACHE_FLASH_ATTR loadConfiguration() {
   int wmode = json["wmode"];
   adminpass = strdup(json["adminpwd"]);
 
-  ws.setAuthentication("admin", adminpass);
+  if(json.containsKey("wsauth")){
+    dontUseWsAuthentication = json["wsauth"];
+  }
+
+  if(!dontUseWsAuthentication){
+    ws.setAuthentication("admin", adminpass);
+    if(debug)Serial.println("[ Websocket ] Use Basic Authentication for Websocket");
+  }
   server.addHandler(new SPIFFSEditor("admin", adminpass));
 
   queryEVSE();
@@ -1721,7 +1732,7 @@ void ICACHE_FLASH_ATTR startWebserver() {
   // HTTP basic authentication
   server.on("/login", HTTP_GET, [](AsyncWebServerRequest * request) {
       if (!request->authenticate("admin", adminpass)) {
-          return request->requestAuthentication();
+        return request->requestAuthentication();
       }
       request->send(200, "text/plain", "Success");
   });

diff --git a/bin/latest/built.bin b/bin/latest/built.bin
diff --git a/bin/latest/version.json b/bin/latest/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "0.2.6-patch1"
+  "version": "0.2.7"
 }
diff --git a/data/config.json b/data/config.json
@@ -18,4 +18,5 @@
   "maxinstall": "10",
   "buttonactive": false,
   "avgconsumption": "11.5"
-}
+  "wsauth": false
+}
diff --git a/src/websrc.h b/src/websrc.h
diff --git a/websrc/index.htm b/websrc/index.htm
@@ -19,7 +19,7 @@
   <a href="#" onclick="loadUsers()"><nobr><span class="glyphicon glyphicon-user"></span>&nbsp;&nbsp;Users</nobr></a>
   <a href="#" onclick="loadSettings()"><nobr><span class="glyphicon glyphicon-cog"></span>&nbsp;&nbsp;Settings</nobr></a>
   <a href="#" onclick="loadLog()"><nobr><span class="glyphicon glyphicon-list-alt"></span>&nbsp;&nbsp;Log</nobr></a>
-  <div style="position: fixed; bottom: 0px; padding: 10px 10px 10px 10px">v0.2.6-patch1</div>
+  <div style="position: fixed; bottom: 0px; padding: 10px 10px 10px 10px">v0.2.7</div>
 </div>
 <!-- Current Modal -->
 <div class="modal fade" id="currentModal" tabindex="-1" role="dialog" aria-labelledby="currentModalLabel" aria-hidden="true">
@@ -30,7 +30,7 @@
          <h4 class="modal-title" id="current-title">Current&nbsp;<span id="slider_current"></span>&nbsp;A</h4>
       </div>
       <div class="modal-body">
-		<div class="""slidecontainer">
+		<div class="slidecontainer">
 			<input type="range" min="6" max="25" value="20" class="slider" id="myRange" oninput="handleSlider(this.value)">
 		</div>
       </div>
@@ -136,7 +136,7 @@ <h3 class="text-muted">EVSE Control</h3>
 		<div class="panel panel-default table-responsive">
           <table class="table table-hover" >
             <tbody style="transition:0.5s">
-              <tr data-toggle="modal" data-target="#currentModal" style="transition:0.3s">
+              <tr onclick="showCurrentModal()">
                 <th><span class="glyphicon glyphicon-cog"></span>&nbsp;&nbsp;Max. Current >></th>
                 <td id="evse_current_limit" class="text-right"></td>
               </tr>
@@ -366,7 +366,7 @@ <h3 class="text-muted">Settings</h3>
                 <table class="table table-hover table-striped">
                   <caption>
 				  <span style="float: left">EVSE Registers</span>
-				  <span style="float: right" class="glyphicon glyphicon-pencil" data-toggle="modal" data-target="#evseRegModal" style="transition:0.3s"></span>
+				  <span style="float: right" class="glyphicon glyphicon-pencil" onclick="showEvseRegModal()"></span>
 				  </caption>
                   <tr>
                     <th>1000: Configured Current</th>
@@ -701,6 +701,14 @@ <h6 class="text-muted">Please refer the <a href="https://github.com/CurtRod/Simp
                   <label class="checkbox-inline"><input type="checkbox" id="checkboxDebug" value="">Active</label>
                 </form>
               </span>
+            </div>
+			<div class="row form-group">
+               <label data-toggle="tooltip" title="Disables BasicAuthentication for Websocket. This opens a security hole but is necessary when using Safari Browser." class="col-xs-3">Disable BasicAuth (Safari Mode)</label> 
+               <span class="col-xs-9 col-md-5">
+                 <form>
+                   <label class="checkbox-inline"><input type="checkbox" id="checkboxSafari" value="">Active</label>
+                 </form>
+               </span>
             </div>
 			<br>
           </div>
@@ -844,7 +852,7 @@ <h4><a href="https://www.paypal.com/pools/c/85c7xRbeay">Donate now!</a></h4>
 		   </div>
 		   <div>
             <legend>Update Firmware</legend>
-			<h6 class="text-muted">Current Firmware Version:&nbsp;0.2.6-patch1</h6>
+			<h6 class="text-muted">Current Firmware Version:&nbsp;0.2.7</h6>
             <h6 class="text-muted">Download <a href="https://github.com/CurtRod/SimpleEVSE-WiFi/releases" target="_blank">latest version</a> from GitHub.</h6>
             <form class="form-inline" method="POST" action="/update" enctype="multipart/form-data">
               <div class="form-group">
@@ -864,4 +872,4 @@ <h6 class="text-muted"><a href="https://github.com/CurtRod/SimpleEVSE-WiFi" targ
     </div>
   <script src="script.js" type="text/javascript"></script>
 </body>
-</html>
+</html>
diff --git a/websrc/script.js b/websrc/script.js
@@ -506,6 +506,9 @@ function listCONF(obj) {
   document.getElementById("gain").value = obj.rfidgain;
   document.getElementById("gpiobutton").value = obj.buttonpin;
 
+  if (typeof obj.wsauth !== "undefined"){
+	document.getElementById("checkboxSafari").checked = obj.wsauth;
+  }
   if (typeof obj.debug !== "undefined"){
 	document.getElementById("checkboxDebug").checked = obj.debug;
   }
@@ -792,6 +795,7 @@ function saveConf() {
 	datatosend.dns = document.getElementById("dnsch").value;
   }
 
+  datatosend.wsauth = document.getElementById("checkboxSafari").checked;
   datatosend.debug = document.getElementById("checkboxDebug").checked;
 
   datatosend.rfid = document.getElementById("checkboxRfid").checked;
@@ -1030,6 +1034,14 @@ function closeNav() {
     document.getElementById("mySidenav").style.width = "0";
 }
 
+function showCurrentModal() {
+	$("#currentModal").modal();
+}
+
+function showEvseRegModal() {
+	$("#evseRegModal").modal();
+}
+
 $(document).ready(function(){
     $('[data-toggle="tooltip"]').tooltip();
 });
@@ -1135,10 +1147,10 @@ function socketErrorListener(evt) {
 }
 function login() {
     var username = "admin"
-    var password = document.getElementById("password").value;
+    var passwd = document.getElementById("password").value;
     var url = "/login";
     var xhr = new XMLHttpRequest();
-    xhr.open("get", url, true, username, password);
+    xhr.open("get", url, true, username, passwd);
     xhr.onload = function(e) {
       if (xhr.readyState === 4) {
         if (xhr.status === 200) {