From 7f4cc199149bcc302b99d83ab8a90703a3348785 Mon Sep 17 00:00:00 2001
From: Robert Strouse <rstrouse@truepointsolutions.com>
Date: Thu, 20 Jul 2023 11:10:04 -0700
Subject: [PATCH] Fix login for username/password #108

---
 ConfigSettings.h              |   2 +-
 SomfyController.ino.esp32.bin | Bin 1099104 -> 1099104 bytes
 SomfyController.littlefs.bin  | Bin 1441792 -> 1441792 bytes
 data/appversion               |   2 +-
 data/index.html               |  10 +++++-----
 data/index.js                 |  22 +++++++++++++++-------
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ConfigSettings.h b/ConfigSettings.h
index e88458b..9bd1ca9 100644
--- a/ConfigSettings.h
+++ b/ConfigSettings.h
@@ -3,7 +3,7 @@
 #ifndef configsettings_h
 #define configsettings_h
 
-#define FW_VERSION "v2.0.2"
+#define FW_VERSION "v2.0.3"
 enum DeviceStatus {
   DS_OK = 0,
   DS_ERROR = 1,
diff --git a/SomfyController.ino.esp32.bin b/SomfyController.ino.esp32.bin
index b05f55f28f4a6f8b7c38ca3c8f5a61d4b0f74a99..c3d3c7469d23e45e8595f2b135ddfcc7fe2dd1f3 100644
GIT binary patch
delta 170
zcmaFR<@}(_dBO$-&TFi;$Fy#o=k1r8WhMM=X51ByY5HsI%)TY9F64<kZaBG6F<`R-
zqoM+@F@tMxKyZF;T4hj3@WhLv&B==G$%>3X%ml>DK+FQftU$~L#Oy%K0mPg@%mu{U
zK+FTgyg<wc#QfWn6$S1rR=l9vb@sQmSM>ePBIQTA`?cy+7FI14%RV0TV_)P!y$_))
E00~Jy!2kdN

delta 170
zcmaFR<@}(_dBO&TzV1`+pS*c0dg#sNnvUnS4Hr8O>87nJ+QnsGyLN$7@Px^QiUFGy
z7!?(GjTl^m1A_B&(<*~Pf+t=SZBABfPgZ0EVkRJF24WT<W(8t4AZ7<*4j|?PVlE)&
z24Wr{<^^ItAm-nmtSE42v7%er7TuU{Qu_jr@ZIsxZC>tHku}?<JMg9bZfl<xwm+V5
F00865L!<xz

diff --git a/SomfyController.littlefs.bin b/SomfyController.littlefs.bin
index da4bc31c0d6f1ac2b29223264832f68fe7079eb0..5f9f88b245a54e2635cc7c7b9bfe2be5050f2fb1 100644
GIT binary patch
delta 1595
zcmYjReQZ-z6z^lN+w1n;Id`o4=oq7OkU0fbHitwER3!=tgDqkL5yxOK9gwYrDnbOS
zXfdGOU~vZ_f&O7gG&r`9c|$<#Bt{LXmOoqwCOEPUhQR1VWV*;a_cbv#IZgZfIKO+(
zz3+uWt3#pH-5&^7RRG85AGz@8V8=mGWu6S4+4$<ZabNge@5ddQ*LNsex3Q**ao_c}
z;x`p`+Mm5N&D_`Ta0C{QEGX}8Udh(k9Wl3Veq!54e1qCf)3)cPu%?O;-}BF`yR5Jd
zf9_IK>zl&vp#_HmXP2kktUO@5hkQ>SZh6mk=cTZwiXq>j%S&q&w%4Dx&!4ApP2o!8
z(z%>m>0B9H2A7K~lPgR5^UPgWv?{6@GiT92(wzCf-&5)7F;k>~{aTg0JZ8Rsfx4uX
zt_8{enB|c>dab>g`Y#TLgDy>4`7$?V4X1zko#l?vKq;8i*aP|GJqU~G=N@>RLfMwy
z`7Ai4XCIVh&}amvkw3zcBX5gLI{gh4krhEV)wF_}wkX2y1B2d;z#}v}$l}mbpwsCH
zlu{_pzq-G+bZ&q%%@JP04X$Cel#*e~L$F_DQGWyq$khf9X!BmER(eA&YX?sn@20T>
zHfQNKl_C2$<jbLBP^3vc3O|7H8>2R}Z4fHuWEW_fG`iti&~Gs#<L9AD%k<ix;A_p>
zslwo4l*Ql#bSA(p<3BP_{)><!%MuLgcWl>HMqN$b;LgCNxs5^Uy9V>*q5)_FW0d)n
zW|TG3NUEs2w&@`Qoo8Swl}|!WZ#jMnW|9d-DhFW>meKAwy2$?-=8!;4QuF|1&`HF6
zirt1ny7d(l%6fsVppV%-i;<V-dx=GfcAo0&IXIt^mBRPm-(vDj@Hu#w^A2u%@tS4)
z&PHXXu3CJKL<J_Dn^y5gsBRU<biIz1bf*ptS?^OZ_w1NOD&~zfSR}oE`~t)uj4DR;
zN$qxpQWP%3Li=i{Jiaa*s=kmuTEZI|9k(*5VH>*SeohAcKAUOVGH!aa9`pIY8jug{
zPeyGf(WsafW@sR0Icc&5-LfQrCqaL}8X4cik!G;Ab$fHLxwU0?LphDzux82X5FQ3|
zoFz)8TFH2XrP6H2KG6TNfn#d9xRsZ7d^fmcQ51W?_?xK|-KFR?{b*6Gif%uJ1+uam
zkAgm7+s`XL>mtsfKp)PL^)Vh*X95c-a0ZvC$7DL;1ZGh6Pk50A^7+gYF)N#Df5kGn
zA%R;!|HtlgRrQHpM}x#TkNn|v+~6d*A~I!Y7;9X{LslszU0Nav$U6j0si*N)o$yfL
zF1FK6T?ko_#9q)Rl`v2uJo2hjv}?V)#EW1$G>1bGsXP#B4npu8G$v?lp(v3v7K&<3
zmU+bqFs3kSGbJyGxpHEzaB8%Ep2(BMK5+{4G-ay0kF#jTIm@84Ges#)Un~ac`%*#j
zs9#iq&{?B&s!b|&1*g)$M!tciwc>NoovO>qwW3hos23iMUTMZBsC&K0l{F0_1V%dZ
zN+aVf${AV%m9#Y=fX?0J%TpH+Z-Jhndc4zv)8xn=QJ~S<uy|Rn3yBsm4W<;GY7tQ_
z`maGA#XjU0O|p$&CJj4y!VBAZa~%O;N&i6+vcgdjj%J6WQ^V1maMXPwn%nR%l@bW3

delta 1631
zcmYjQdr(wm6yFPXcQ0`7Ip4yvLZYmKVLosL6DJy3opQ)0X5)yFfC^2Tx)`Qp)@2;g
zoCy|5jy+~vwQ+iAvrMC(m?n;6S<@&s(?c5-iwZ3RdKhX}=Ub+k{x~~(&+qY_^Sj@*
z?M1e|D7sA~<b`lx@|f$zms^@ezPWPUk>yX84+Pq)?rv+*{DB=FJ=Uw9Fc7$qzOYL5
z-Vb_;<IVan9ga{@&y@GtT`#e8TuX;nH+y38p1@zlZ)q`k>R_*WLQkO7X#7I;T7s#?
z=GhZ*tnQxjV&jShgKB1O+n^5b4mj@}=8CC(gT3kr-GNAT;peKiIq2IO^l4miT=85w
zmy^rI<>oTD61Wn%l4Q_lK6g>eqdEQNDC+7nv;X%$nI7yn#b9H*mM6dNH@BS9YAHCz
zN|&1sS(_6R*DPDNs%rH&4u?Y~c33xEEg|7L{ITWjXq^sD`Oa3zansL@FoeXT=%wvv
z_+O|AM$)n4fYjCmSriCE8Xao|lP)!K@A=yZv@i_U%pNxVk?VV9UepW=<9USES71dF
z`3^ubh4=CaLnDx(>DLscU=Mr(G^rf~mAAua3P#~h(sf1@x_ZWXx^ftN^078J0QBw&
zNR-e4_i6f1G3`m##@AM@B|HZOG`ACOwRVD+=6?Vwa`AcC4^r=fe9gMS>}r2)U8pK|
zSuIt52NPw@RcHcwp%e@$`e3YP{K6c?lZE|o8V>20uj#$~ymKy&l4Tmc2{he{Ib??+
zfx-ciLV-A3N^Jrg%|7NSZcJa~!IMDILnx%zk6D`D&j{7O%=wk);$$khi^Wuyiz6t!
zi_`Vb=3z5O;#G?>H(;t97Qo?}@hfYTP8LqY(?CbdtV~+9p6PuB=%#2X7E$kU%SkDR
zF@?I;qeXjzxKsa49rgBN%#aJF;X$C;vv4@s&B93?9hQ&8CG=CY5}maBAxxmiOniWB
zk7cOWPFH4P!GBL~8a4~_Vox-07COc6Y^==HOlnKovkrWNI4>|HwuSmZ`PzJ}=Jm_b
zM@yCnm-JWQ5KaGsHL{=*`Ca>;vD}nc#j9qA7&2}$6oU(EcvY#}D)~QS{CdTo5#}T_
z!knZzz+HvJ=ta#c=cZS22Klc+28DL<a-n^g)>@A`?Tv68x0p-eO^_z%?ZGyn@cq2H
z-VNzw??Xe4ugAz+qnvC;JtCDx@mu3I%al|WwyE%Y)6pptIxtt$?<m8mpW%3VDhJ2Q
z=99PvC~^c*=5%7V*4l|_q*qvc&2xo^I-`&ycb><UK;ymWmPuVWPSfuy=Mg=))=Bm$
zE0JEmfywgp4_KH$Aupy$e;*FjjK7%`V;1(SR0dpvQ~5_7Kh_Y>%7dC%0CaXOdZk~8
zOwDv?4u^tcnj(+jXwFR)N9jYqsM9qD>AX*5$;BhYejxiIj-)qESti}+=1+KfK-@Co
zn4@@n;{-2_hHz7f!56D!D&M$p9Z%YuB`(m}X}sB2*&<tySFV}a;t^?26E+ZxX0PxX
zaM7pvVl2%m5jTa-9K}=4YBahtNu<lN`GP;Et^s}<v(-fyULn#o-KqS-D{vC!KEdbq
zEft2eE0y!gjpAXtTqiQ=>5w>QxR@9t+oh04yK4l<jWuEmPjCi@%1m3NX}VjPHEk7-
z%N_M%HPE~<0P>!&7^Rs8Lkf;rcs{byDYsdea(S~rP1-wzZMBsIwT6gjh<F+z$qkW|
LhKP56B(>sS>68WL

diff --git a/data/appversion b/data/appversion
index f93ea0c..6acdb44 100644
--- a/data/appversion
+++ b/data/appversion
@@ -1 +1 @@
-2.0.2
\ No newline at end of file
+2.0.3
\ No newline at end of file
diff --git a/data/index.html b/data/index.html
index 4765938..801df9a 100644
--- a/data/index.html
+++ b/data/index.html
@@ -3,11 +3,11 @@
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta charset="UTF-8">
-    <link rel="stylesheet" href="main.css?v=2.0.2" type="text/css" />
-    <link rel="stylesheet" href="widgets.css?v=2.0.2" type="text/css" />
-    <link rel="stylesheet" href="icons.css?v=2.0.2" type="text/css" />
+    <link rel="stylesheet" href="main.css?v=2.0.3" type="text/css" />
+    <link rel="stylesheet" href="widgets.css?v=2.0.3" type="text/css" />
+    <link rel="stylesheet" href="icons.css?v=2.0.3" type="text/css" />
     <link rel="icon" type="image/png" href="favicon.png" />
-    <script type="text/javascript" src="index.js?v=2.0.2"></script>
+    <script type="text/javascript" src="index.js?v=2.0.3"></script>
 </head>
 <body>
     <div id="divContainer" class="container main" data-auth="false">
@@ -584,7 +584,7 @@
         <div id="divUnauthenticated">
             <h1 style="text-align: center;"><img src="icon.png" style="width:127px;margin-left:1px;margin-top:-10px;" /></h1>
             <input id="fldLoginPin" type="hidden" name="pin" />
-            <input id="fldLoginType" type="hidden" data-bind="type" data-datatype="int" />
+            <input id="fldLoginType" type="hidden" data-bind="login.type" data-datatype="int" />
             <div id="divLoginPin" style="display:none;">
                 <div class="field-group" style="text-align:center;">
                     <div id="fldPinEntry" style="display:inline-block;" onkeydown="ui.pinKeyPressed(event);">
diff --git a/data/index.js b/data/index.js
index 167328f..bc138db 100644
--- a/data/index.js
+++ b/data/index.js
@@ -1116,6 +1116,8 @@ class Security {
                 resolve();
                 if (err) ui.serviceError(err);
                 else {
+                    console.log(ctx);
+                    document.getElementById('divContainer').setAttribute('data-securitytype', ctx.type);
                     this.type = ctx.type;
                     this.permissions = ctx.permissions;
                     switch (ctx.type) {
@@ -1153,13 +1155,19 @@ class Security {
         let msg = pnl.querySelector('#spanLoginMessage');
         msg.innerHTML = '';
         let sec = ui.fromElement(pnl).login;
-        let pin = '';
-        for (let i = 0; i < 4; i++) {
-            pin += sec.pin[`d${i}`];
-        }
-        if (pin.length !== 4) return;
-        sec.pin = pin;
         console.log(sec);
+        let pin = '';
+        switch (sec.type) {
+            case 1:
+                for (let i = 0; i < 4; i++) {
+                    pin += sec.pin[`d${i}`];
+                }
+                if (pin.length !== 4) return;
+                break;
+            case 2:
+                break;
+        }
+        sec.pin = pin;
         putJSONSync('/login', sec, (err, log) => {
             if (err) ui.serviceError(err);
             else {
@@ -1186,7 +1194,7 @@ var security = new Security();
 
 class General {
     initialized = false;
-    appVersion = 'v2.0.2';
+    appVersion = 'v2.0.3';
     reloadApp = false;
     init() {
         if (this.initialized) return;