Merge branch 'refactor-auto-update' into 'master'

add update finish endpoints

See merge request mohit.panjvani/crater-web!50
This commit is contained in:
Mohit Panjwani
2019-11-18 15:34:45 +00:00
3 changed files with 27 additions and 6 deletions

View File

@ -12,7 +12,14 @@ class UpdateController extends Controller
{ {
set_time_limit(600); // 10 minutes set_time_limit(600); // 10 minutes
$json = Updater::update($request->installed, $request->version, $request->isMinor); $json = Updater::update($request->installed, $request->version);
return response()->json($json);
}
public function finishUpdate(Request $request)
{
$json = Updater::finishUpdate($request->installed, $request->version);
return response()->json($json); return response()->json($json);
} }

View File

@ -8,12 +8,13 @@ use GuzzleHttp\Exception\RequestException;
use Crater\Space\SiteApi; use Crater\Space\SiteApi;
use Crater\Events\UpdateFinished; use Crater\Events\UpdateFinished;
use Crater\Setting; use Crater\Setting;
use Illuminate\Http\Request;
class Updater class Updater
{ {
use SiteApi; use SiteApi;
public static function update($installed, $version, $isMinor) public static function update($installed, $version)
{ {
$data = null; $data = null;
$path = null; $path = null;
@ -79,10 +80,6 @@ class Updater
File::deleteDirectory($temp_path); File::deleteDirectory($temp_path);
File::deleteDirectory($temp_path2); File::deleteDirectory($temp_path2);
if (!$isMinor) {
event(new UpdateFinished($installed, $version));
}
return [ return [
'success' => true, 'success' => true,
'error' => false, 'error' => false,
@ -104,6 +101,17 @@ class Updater
} }
} }
public static function finishUpdate($installed, $version)
{
event(new UpdateFinished($installed, $version));
return [
'success' => true,
'error' => false,
'data' => []
];
}
public static function checkForUpdate() public static function checkForUpdate()
{ {
$data = null; $data = null;

View File

@ -127,6 +127,7 @@ Route::group(['middleware' => 'api'], function () {
'middleware' => 'admin' 'middleware' => 'admin'
], function () { ], function () {
// Auto update routes // Auto update routes
//---------------------------------- //----------------------------------
Route::post('/update', [ Route::post('/update', [
@ -134,6 +135,11 @@ Route::group(['middleware' => 'api'], function () {
'uses' => 'UpdateController@update' 'uses' => 'UpdateController@update'
]); ]);
Route::post('/finish/update', [
'as' => 'auto.finish.update',
'uses' => 'UpdateController@finishUpdate'
]);
Route::get('/check/update', [ Route::get('/check/update', [
'as' => 'check.update', 'as' => 'check.update',
'uses' => 'UpdateController@checkLatestVersion' 'uses' => 'UpdateController@checkLatestVersion'