Robot
/
freebox_api_php
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update Login

This commit is contained in:
alphayax 2016-02-03 21:50:19 +01:00
parent 52cb85786d
commit 2d5f28643f
2 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
freebox/api/v3/login/Authorize.php
View File

@ -2,7 +2,7 @@
namespace alphayax\freebox\api\v3\login; namespace alphayax\freebox\api\v3\login;
use alphayax\freebox\api\v3\Service; use alphayax\freebox\api\v3\Service;
use alphayax\freebox\utils\Application; use alphayax\freebox\utils\Application;
use alphayax\utils\Cli; use alphayax\utils\cli\IO;
/** /**
* Class Authorize * Class Authorize
@ -56,9 +56,9 @@ class Authorize extends Service {
/// For verbose /// For verbose
switch( $this->status){ switch( $this->status){
case self::STATUS_GRANTED : Cli::stdout('Access granted !', 0, true, Cli::COLOR_GREEN); break; case self::STATUS_GRANTED : IO::stdout('Access granted !', 0, true, IO::COLOR_GREEN); break;
case self::STATUS_TIMEOUT : Cli::stdout('Access denied. You take to long to authorize app', 0, true, Cli::COLOR_RED); break; case self::STATUS_TIMEOUT : IO::stdout('Access denied. You take to long to authorize app', 0, true, IO::COLOR_RED); break;
case self::STATUS_DENIED : Cli::stdout('Access denied. Freebox denied app connexion', 0, true, Cli::COLOR_RED); break; case self::STATUS_DENIED : IO::stdout('Access denied. Freebox denied app connexion', 0, true, IO::COLOR_RED); break;
} }
} }
} }
@ -78,34 +78,28 @@ class Authorize extends Service {
]); ]);
$response = $rest->getCurlResponse(); $response = $rest->getCurlResponse();
if( ! $response->success) {
throw new \Exception('Authorize fail. Unable to contact the freebox');
}
Cli::stdout( 'Authorization send to Freebox. Waiting for response...', 0, true, Cli::COLOR_YELLOW); IO::stdout( 'Authorization send to Freebox. Waiting for response...', 0, true, IO::COLOR_YELLOW);
$this->app_token = $response->result->app_token; $this->app_token = $response['result']['app_token'];
$this->track_id = $response->result->track_id; $this->track_id = $response['result']['track_id'];
} }
/** /**
* @throws \Exception * @throws \Exception
*/ */
public function get_authorization_status(){ public function get_authorization_status(){
Cli::stdout( 'Check authorization status... ', 0, false, Cli::COLOR_YELLOW); IO::stdout( 'Check authorization status... ', 0, false, IO::COLOR_YELLOW);
$rest = $this->getService( self::API_LOGIN_AUTHORIZE . $this->track_id); $rest = $this->getService( self::API_LOGIN_AUTHORIZE . $this->track_id);
$rest->GET(); $rest->GET();
$response = $rest->getCurlResponse(); $result = $rest->getCurlResponse()['result'];
if( ! $response->success) {
throw new \Exception(__FUNCTION__ . ' Fail');
}
$this->status = $response->result->status; $this->status = $result['status'];
$this->challenge = $response->result->challenge; $this->challenge = $result['challenge'];
Cli::stdout( $this->status, 0, true, Cli::COLOR_BLUE); IO::stdout( $this->status, 0, true, IO::COLOR_BLUE);
} }
/** /**

21
freebox/api/v3/login/Login.php
View File

@ -1,7 +1,6 @@
<?php <?php
namespace alphayax\freebox\api\v3\login; namespace alphayax\freebox\api\v3\login;
use alphayax\freebox\api\v3\Service; use alphayax\freebox\api\v3\Service;
use alphayax\freebox\DNS_changer;
/** /**
@ -32,14 +31,11 @@ class Login extends Service {
$rest = $this->getService( static::API_LOGIN); $rest = $this->getService( static::API_LOGIN);
$rest->GET(); $rest->GET();
$response = $rest->getCurlResponse(); $result = $rest->getCurlResponse()['result'];
if( ! $response->success){
throw new \Exception( __FUNCTION__ . ' Fail');
}
$this->logged_in = $response->result->logged_in; $this->logged_in = $result['logged_in'];
$this->challenge = $response->result->challenge; $this->challenge = $result['challenge'];
$this->password_salt = $response->result->password_salt; $this->password_salt = $result['password_salt'];
} }
/** /**
@ -48,16 +44,11 @@ class Login extends Service {
public function create_session(){ public function create_session(){
$rest = $this->getService( static::API_LOGIN_SESSION); $rest = $this->getService( static::API_LOGIN_SESSION);
$rest->POST([ $rest->POST([
'app_id' => DNS_changer::APP_ID, 'app_id' => $this->application->getId(),
'password' => hash_hmac( 'sha1', $this->challenge, $this->application->getAppToken()), 'password' => hash_hmac( 'sha1', $this->challenge, $this->application->getAppToken()),
]); ]);
$response = $rest->getCurlResponse(); $this->session_token = $rest->getCurlResponse()['result']['session_token'];
if( ! $response->success){
throw new \Exception( @$response->msg . ' '. @$response->error_code);
}
$this->session_token = $response->result->session_token;
} }
/** /**