From 3757e5e281719ed7a9954cf8248c97a894997c0d Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Sat, 27 Feb 2021 14:08:04 +0100 Subject: [PATCH] fix compose uri in CreateUri Fn --- FHEM/46_TeslaPowerwall2AC.pm | 16 +++++++++------- controls_TeslaPowerwall2AC.txt | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/FHEM/46_TeslaPowerwall2AC.pm b/FHEM/46_TeslaPowerwall2AC.pm index 9bda73d..476e881 100644 --- a/FHEM/46_TeslaPowerwall2AC.pm +++ b/FHEM/46_TeslaPowerwall2AC.pm @@ -385,7 +385,8 @@ sub Get { $list .= 'statusSOE:noArg aggregates:noArg siteinfo:noArg sitemaster:noArg powerwalls:noArg registration:noArg status:noArg' if( AttrVal($name,'emailaddr','none') ne 'none' - && defined(ReadPassword($hash, $name)) ); + && defined(ReadPassword($hash, $name)) + && defined($hash->{TOKEN}) ); return 'Unknown argument ' . $cmd . ', choose one of ' . $list; } @@ -865,18 +866,19 @@ sub CreateUri { my $host = $hash->{HOST}; my $header = ( defined($hash->{TOKEN}) ? 'Cookie: AuthCookie=' . $hash->{TOKEN} : undef ); my $method = 'GET'; - my $uri = ( $path ne 'login' ? $host . '/api/' . $paths{$path} : undef ); + my $uri = ( $path ne 'login' ? $host . '/api/' . $paths{$path} : $host . '/api/login/Basic' ); my $data; if ( $path eq 'login' ) { $method = 'POST'; $header = 'Content-Type: application/json'; - $uri = 'login/Basic', - $data = '{"username":"customer","password":"' . ReadPassword( $hash, $name ) . '","email":"' . AttrVal($name,'emailaddr','test@test.de') . '","force_sm_off":false}' - - - + $data = + '{"username":"customer","password":"' + . ReadPassword( $hash, $name ) + . '","email":"' + . AttrVal($name,'emailaddr','test@test.de') + . '","force_sm_off":false}' } elsif ( $path eq 'powerwallsstop' || $path eq 'powerwallsruns' ) diff --git a/controls_TeslaPowerwall2AC.txt b/controls_TeslaPowerwall2AC.txt index d0ee2cd..70c3db9 100644 --- a/controls_TeslaPowerwall2AC.txt +++ b/controls_TeslaPowerwall2AC.txt @@ -1 +1 @@ -UPD 2021-02-27_12:10:30 30701 FHEM/46_TeslaPowerwall2AC.pm +UPD 2021-02-27_14:06:51 30728 FHEM/46_TeslaPowerwall2AC.pm