FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-25 09:55:38 +00:00
Code Issues Releases Wiki Activity

37_echodevice.pm: bugfixing login

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28139 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
michael.winkler 2023-11-08 18:45:04 +00:00
parent e21a184397
commit 74ed39e7bc
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/37_echodevice.pm
View File

@ -2,6 +2,9 @@
# #
############################################## ##############################################
# #
# 2023.11.08 v0.2.26
# - BUG: User-Agent https://forum.fhem.de/index.php?topic=82631.msg1292057#msg1292057
#
# 2023.10.31 v0.2.25 # 2023.10.31 v0.2.25
# - FEATURE: Unterstützung ASQZWP4GPYUT7 Echo Plus 2 Gen2 # - FEATURE: Unterstützung ASQZWP4GPYUT7 Echo Plus 2 Gen2
# #
@ -516,7 +519,7 @@ use lib ('./FHEM/lib', './lib');
use MP3::Info; use MP3::Info;
use MIME::Base64; use MIME::Base64;
my $ModulVersion = "0.2.25"; my $ModulVersion = "0.2.26";
my $AWSPythonVersion = "0.0.3"; my $AWSPythonVersion = "0.0.3";
my $NPMLoginTyp = "unbekannt"; my $NPMLoginTyp = "unbekannt";
my $QueueNumber = 0; my $QueueNumber = 0;
@ -1728,6 +1731,11 @@ sub echodevice_SendCommand($$$) {
$SendUrl .= "/api/bluetooth?cached=true&_=".int(time); $SendUrl .= "/api/bluetooth?cached=true&_=".int(time);
} }
elsif ($type eq "endpoints") {
$SendUrl = "https://alexa.amazon.de/api/endpoints";
$SendMetode = "GET";
}
elsif ($type eq "notifications") { elsif ($type eq "notifications") {
$SendUrl .= "/api/notifications?cached=true&_=".int(time); $SendUrl .= "/api/notifications?cached=true&_=".int(time);
} }
@ -2493,7 +2501,7 @@ sub echodevice_SendLoginCommand($$$) {
if ($type eq "cookielogin6" ) { if ($type eq "cookielogin6" ) {
$param->{url} = "https://".$hash->{helper}{SERVER}."/api/bootstrap"; $param->{url} = "https://".$hash->{helper}{SERVER}."/api/bootstrap";
$param->{header} = 'Cookie: '.$hash->{helper}{".COOKIE"}; $param->{header} = "User-Agent: ".$UserAgent."\r\nCookie: ".$hash->{helper}{'.COOKIE'};
$param->{callback} = \&echodevice_ParseAuth; $param->{callback} = \&echodevice_ParseAuth;
$param->{noshutdown} = 1; $param->{noshutdown} = 1;
$param->{keepalive} = 1; $param->{keepalive} = 1;
@ -2734,6 +2742,10 @@ sub echodevice_Parse($$$) {
return; return;
} }
if ($msgtype eq "endpoints") {
#Log3 $name, 3, "[$name] [echodevice_Parse] [$msgtype] [$msgnumber] $data";
}
if($msgtype eq "notifications_delete" || $msgtype eq "alarm_on" || $msgtype eq "alarm_off" || $msgtype eq "reminderitem") { if($msgtype eq "notifications_delete" || $msgtype eq "alarm_on" || $msgtype eq "alarm_off" || $msgtype eq "reminderitem") {
my $IODev = $hash->{IODev}->{NAME}; my $IODev = $hash->{IODev}->{NAME};
@ -4149,6 +4161,7 @@ sub echodevice_GetSettings($) {
if ($ConnectState eq "connected") { if ($ConnectState eq "connected") {
if($hash->{model} eq "ACCOUNT") { if($hash->{model} eq "ACCOUNT") {
echodevice_SendCommand($hash,"endpoints","");
echodevice_SendCommand($hash,"getnotifications",""); echodevice_SendCommand($hash,"getnotifications","");
echodevice_SendCommand($hash,"alarmvolume",""); echodevice_SendCommand($hash,"alarmvolume","");
echodevice_SendCommand($hash,"bluetoothstate",""); echodevice_SendCommand($hash,"bluetoothstate","");
@ -4274,7 +4287,7 @@ sub echodevice_FirstStart($) {
if (index($hash->{helper}{".COOKIE"}, "{") != -1) { if (index($hash->{helper}{".COOKIE"}, "{") != -1) {
# NPM Login erkannt # NPM Login erkannt
readingsSingleUpdate ($hash, "COOKIE_TYPE", "READING_NPM" ,0); readingsSingleUpdate ($hash, "COOKIE_TYPE", "READING_NPM" ,0);
$hash->{helper}{".COOKIE"} =~ /"localCookie":".*session-id=(.*)","?/; $hash->{helper}{".COOKIE"} =~ /"localCookie":".*session-id=(.*?)","?/;
$hash->{helper}{".COOKIE"} = "session-id=" . $1; $hash->{helper}{".COOKIE"} = "session-id=" . $1;
$hash->{helper}{".COOKIE"} =~ /csrf=([-\w]+)[;\s]?(.*)?$/ if(defined($hash->{helper}{".COOKIE"})); $hash->{helper}{".COOKIE"} =~ /csrf=([-\w]+)[;\s]?(.*)?$/ if(defined($hash->{helper}{".COOKIE"}));
$hash->{helper}{".CSRF"} = $1 if(defined($hash->{helper}{".COOKIE"})); $hash->{helper}{".CSRF"} = $1 if(defined($hash->{helper}{".COOKIE"}));
@ -5247,7 +5260,7 @@ sub echodevice_NPMWaitForCookie($){
readingsSingleUpdate( $hash, "COOKIE_TYPE", "NPM_Login",1 ); readingsSingleUpdate( $hash, "COOKIE_TYPE", "NPM_Login",1 );
$hash->{helper}{".COOKIE"} = $CookieResult; $hash->{helper}{".COOKIE"} = $CookieResult;
$hash->{helper}{".COOKIE"} =~ /"localCookie":".*session-id=(.*)","?/; $hash->{helper}{".COOKIE"} =~ /"localCookie":".*session-id=(.*?)","?/;
$hash->{helper}{".COOKIE"} = "session-id=" . $1; $hash->{helper}{".COOKIE"} = "session-id=" . $1;
$hash->{helper}{".COOKIE"} =~ /csrf=([-\w]+)[;\s]?(.*)?$/ if(defined($hash->{helper}{".COOKIE"})); $hash->{helper}{".COOKIE"} =~ /csrf=([-\w]+)[;\s]?(.*)?$/ if(defined($hash->{helper}{".COOKIE"}));
$hash->{helper}{".CSRF"} = $1 if(defined($hash->{helper}{".COOKIE"})); $hash->{helper}{".CSRF"} = $1 if(defined($hash->{helper}{".COOKIE"}));