FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-18 05:56:03 +00:00
Code Issues Releases Wiki Activity

38_netatmo: improved disconnect handling on auth failure

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28956 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
moises 2024-06-08 21:20:48 +00:00
parent 275fbb0543
commit 070d4ed370
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/38_netatmo.pm
View File

@ -11,7 +11,7 @@
# #
# #
############################################################################## ##############################################################################
# Release 29 / 2023-12-06 # Release 30 / 2024-06-08
package main; package main;
@ -449,7 +449,7 @@ netatmo_Define($$)
$hash->{helper}{password} = $password; $hash->{helper}{password} = $password;
$hash->{helper}{client_id} = $client_id; $hash->{helper}{client_id} = $client_id;
$hash->{helper}{client_secret} = $client_secret; $hash->{helper}{client_secret} = $client_secret;
$hash->{refresh_token} = $refresh_token; $hash->{refresh_token} = $refresh_token if(!defined($hash->{refresh_token}));
$hash->{helper}{refresh_token} = $hash->{refresh_token}; $hash->{helper}{refresh_token} = $hash->{refresh_token};
$hash->{helper}{refresh_token} = $refresh_token if(!$hash->{helper}{refresh_token}); $hash->{helper}{refresh_token} = $refresh_token if(!$hash->{helper}{refresh_token});
@ -2906,6 +2906,7 @@ netatmo_dispatch($$$)
if($json->{error} eq "invalid_grant"){ if($json->{error} eq "invalid_grant"){
$hash->{status} = "error"; $hash->{status} = "error";
$hash->{network} = "disconnected" if($hash->{SUBTYPE} eq "ACCOUNT"); $hash->{network} = "disconnected" if($hash->{SUBTYPE} eq "ACCOUNT");
delete($hash->{refresh_token});
} }
return undef; return undef;
} }
@ -3343,11 +3344,12 @@ netatmo_parseToken($$)
$hash->{expires_at} += int($json->{expires_in}*0.8); $hash->{expires_at} += int($json->{expires_in}*0.8);
if($old_refresh ne $hash->{refresh_token}){ if($old_refresh ne $hash->{refresh_token}){
if($hash->{DEF} =~ /ACCOUNT/){ if($hash->{SUBTYPE} eq "ACCOUNT"){
my @defarray = split(/ /, $hash->{DEF}); my @defarray = split(/ /, $hash->{DEF});
pop(@defarray); pop(@defarray);
push(@defarray, $json->{refresh_token}); push(@defarray, $json->{refresh_token});
$hash->{DEF} = join(' ', @defarray); $hash->{DEF} = join(' ', @defarray);
$hash->{last_refresh} = FmtDateTime(gettimeofday());
} }
} }
@ -6759,7 +6761,7 @@ sub netatmo_weatherIcon()
<a name="netatmo_Define"></a> <a name="netatmo_Define"></a>
<b>Define</b> <b>Define</b>
<ul> <ul>
<code>define &lt;name&gt; netatmo [ACCOUNT] &lt;username&gt; &lt;password&gt; &lt;client_id&gt; &lt;client_secret&gt; &lt;refresh_token&gt;</code><br> <code>define &lt;name&gt; netatmo ACCOUNT &lt;username&gt; &lt;password&gt; &lt;client_id&gt; &lt;client_secret&gt; &lt;refresh_token&gt;</code><br>
<code>define &lt;name&gt; netatmo &lt;device&gt;</code> (you should use autocreate from the account device!)<br> <code>define &lt;name&gt; netatmo &lt;device&gt;</code> (you should use autocreate from the account device!)<br>
<br> <br>