Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,22 @@

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
use ProcessMaker\Models\BundleInstance;
use ProcessMaker\Models\BundleSetting;
use ProcessMaker\Models\DevLink;
use ProcessMaker\Models\Setting;
use ProcessMaker\Models\User;
use ProcessMaker\Notifications\BundleUpdatedNotification;

class DevLinkController extends Controller
{
Expand DownExpand Up@@ -154,12 +159,34 @@ public function updateBundle(Request $request, Bundle $bundle)

public function increaseBundleVersion(Bundle $bundle)
{
$bundle->notifyBundleUpdated();

$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function bundleUpdated($bundleId, $token)
{
try {
$bundle = Bundle::where('remote_id', $bundleId)->firstOrFail();
} catch (ModelNotFoundException $e) {
return response()->json(['error' => 'Bundle not found'], 403);
}

$storedToken = $bundle->webhook_token;

if ($token !== $storedToken) {
return response()->json(['error' => 'Invalid token'], 403);
}
$adminUsers = User::where('is_administrator', true)->get();

Notification::send($adminUsers, new BundleUpdatedNotification($bundle));

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
Expand DownExpand Up@@ -198,6 +225,14 @@ public function reinstallBundle(Request $request, Bundle $bundle)
];
}

public function addBundleInstance(Request $request, Bundle $bundle)
{
BundleInstance::create([
'bundle_id' => $bundle->id,
'instance_url' => $request->input('instance_url'),
]);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
Expand Down
2 changes: 2 additions & 0 deletions ProcessMaker/Jobs/DevLinkInstall.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,8 @@ public function __construct(
*/
public function handle(): void
{
//log
\Log::info('DevLinkInstall job started: ' . $this->devLinkId);
$devLink = DevLink::findOrFail($this->devLinkId);
$logger = new Logger($this->userId);

Expand Down
19 changes: 19 additions & 0 deletions ProcessMaker/Models/Bundle.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Support\Facades\Http;
use ProcessMaker\Exception\ExporterNotSupported;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\ImportExport\Importer;
Expand DownExpand Up@@ -400,4 +401,22 @@ public function reinstall(string $mode, Logger $logger = null)

$logger?->setStatus('done');
}

public function notifyBundleUpdated()
{
$bundleInstances = BundleInstance::where('bundle_id', $this->id)->get();
foreach ($bundleInstances as $bundleInstance) {
$url = $bundleInstance->instance_url;

try {
$response = Http::post($url);

if ($response->status() === 403) {
\Log::error("Failed to notify bundle update for URL: $url " . $response);
}
} catch (\Exception $e) {
\Log::error('Error notifying bundle update: ' . $e->getMessage());
}
}
}
}
21 changes: 21 additions & 0 deletions ProcessMaker/Models/BundleInstance.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
<?php

namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use ProcessMaker\Models\ProcessMakerModel;

class BundleInstance extends ProcessMakerModel
{
use HasFactory;

protected $fillable = [
'bundle_id',
'instance_url',
];

public function bundle()
{
return $this->belongsTo(Bundle::class);
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Models/DevLink.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,14 @@ public function installRemoteBundle($remoteBundleId, $updateType)
$this->logger->status(__('Downloading bundle from remote instance'));

$bundleInfo = $this->remoteBundle($remoteBundleId)->json();
$token = Str::random(60);

$addBundleInstance = $this->client()->post(
route('api.devlink.add-bundle-instance', ['bundle' => $remoteBundleId], false),
[
'instance_url' => env('APP_URL') . '/devlink/bundle-updated/' . $remoteBundleId . '/' . $token,
]
);

$bundleExport = $this->client()->get(
route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
Expand All@@ -160,6 +168,7 @@ public function installRemoteBundle($remoteBundleId, $updateType)
'name' => $bundleInfo['name'],
'published' => $bundleInfo['published'],
'version' => $bundleInfo['version'],
'webhook_token' => $token,
]
);

Expand Down
81 changes: 81 additions & 0 deletions ProcessMaker/Notifications/BundleUpdatedNotification.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
<?php

namespace ProcessMaker\Notifications;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\BroadcastMessage;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use ProcessMaker\Models\Bundle;

class BundleUpdatedNotification extends Notification
{
use Queueable;

private $bundleName;

private $bundleUid;

/**
* Create a new notification instance.
*/
public function __construct(Bundle $bundle)
{
$this->bundleName = $bundle->name;
$this->bundleUid = $bundle->id;
}

/**
* Get the notification's delivery channels.
*
* @return array<int, string>
*/
public function via(object $notifiable): array
{
return ['broadcast', NotificationChannel::class];
}

/**
* Get the mail representation of the notification.
*/
public function toMail(object $notifiable): MailMessage
{
return (new MailMessage)
->line('The introduction to the notification.')
->action('Notification Action', url('/'))
->line('Thank you for using our application!');
}

/**
* Get the array representation of the notification.
*
* @return array<string, mixed>
*/
public function toArray($notifiable)
{
$bundle = Bundle::find($this->bundleUid);

return [
'type' => 'BUNDLE_UPDATED',
'message' => sprintf('Bundle updated: %s', $this->bundleName),
'dateTime' => $bundle->updated_at->toIso8601String(),
'name' => $this->bundleName,
'bundleName' => $this->bundleName,
'url' => sprintf(
'/admin/devlink/local-bundles/%s/',
$this->bundleUid
),
];
}

public function toDatabase($notifiable)
{
return $this->toArray($notifiable);
}

public function toBroadcast($notifiable)
{
return new BroadcastMessage($this->toArray($notifiable));
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('bundle_instances', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('bundle_id');
$table->string('instance_url');
$table->timestamps();

$table->index(['bundle_id']);
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('bundle_instances');
}
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->string('webhook_token')->nullable();
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->dropColumn('webhook_token');
});
}
};
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,8 +31,4 @@ export default [
type: "public_files",
name: "Public Files",
},
{
type: "translations",
name: "Translations",
},
];
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ const messages = {
TASK_OVERDUE: "Task {{- subject }} is overdue. Originally due on {{- due }}",
PROCESS_CREATED: "{{- user}} started the process {{- subject }}",
PROCESS_COMPLETED: "{{- subject }} completed",
BUNDLE_UPDATED: "The bundle {{- subject }} has a new version. Click to check it",
ERROR_EXECUTION: "{{- subject }} caused an error",
COMMENT: "{{- user}} commented on {{- subject}}",
"ProcessMaker\\Notifications\\ImportReady": "Imported {{- subject }}",
Expand Down
3 changes: 3 additions & 0 deletions routes/api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,8 @@
Route::post('devlink/local-bundles', [DevLinkController::class, 'createBundle'])->name('devlink.create-bundle');
Route::put('devlink/local-bundles/{bundle}', [DevLinkController::class, 'updateBundle'])->name('devlink.update-bundle');
Route::post('devlink/local-bundles/{bundle}/increase-version', [DevLinkController::class, 'increaseBundleVersion'])->name('devlink.increase-bundle-version');
Route::post('devlink/local-bundles/{bundle}/add-bundle-instance', [DevLinkController::class, 'addBundleInstance'])->name('devlink.add-bundle-instance');
Route::post('devlink/bundle-updated/{bundle}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
Route::post('devlink/local-bundles/{bundle}/add-assets', [DevLinkController::class, 'addAsset'])->name('devlink.add-asset');
Route::post('devlink/local-bundles/{bundle}/add-settings', [DevLinkController::class, 'addSettings'])->name('devlink.add-settings');
Route::post('devlink/local-bundles/add-asset-to-bundles', [DevLinkController::class, 'addAssetToBundles'])->name('devlink.add-asset-to-bundles');
Expand All@@ -417,3 +419,4 @@
Route::get('devlink/{devLink}', [DevLinkController::class, 'show'])->name('devlink.show');
});
});
Route::post('devlink/bundle-updated/{bundle}/{token}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
2 changes: 2 additions & 0 deletions tests/Model/DevLinkTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public function testInstallRemoteBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink = DevLink::factory()->create([
Expand DownExpand Up@@ -237,6 +238,7 @@ public function testUpdateBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink->installRemoteBundle(123, 'update');
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,22 @@

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
use ProcessMaker\Models\BundleInstance;
use ProcessMaker\Models\BundleSetting;
use ProcessMaker\Models\DevLink;
use ProcessMaker\Models\Setting;
use ProcessMaker\Models\User;
use ProcessMaker\Notifications\BundleUpdatedNotification;

class DevLinkController extends Controller
{
Expand DownExpand Up@@ -154,12 +159,34 @@ public function updateBundle(Request $request, Bundle $bundle)

public function increaseBundleVersion(Bundle $bundle)
{
$bundle->notifyBundleUpdated();

$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function bundleUpdated($bundleId, $token)
{
try {
$bundle = Bundle::where('remote_id', $bundleId)->firstOrFail();
} catch (ModelNotFoundException $e) {
return response()->json(['error' => 'Bundle not found'], 403);
}

$storedToken = $bundle->webhook_token;

if ($token !== $storedToken) {
return response()->json(['error' => 'Invalid token'], 403);
}
$adminUsers = User::where('is_administrator', true)->get();

Notification::send($adminUsers, new BundleUpdatedNotification($bundle));

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
Expand DownExpand Up@@ -198,6 +225,14 @@ public function reinstallBundle(Request $request, Bundle $bundle)
];
}

public function addBundleInstance(Request $request, Bundle $bundle)
{
BundleInstance::create([
'bundle_id' => $bundle->id,
'instance_url' => $request->input('instance_url'),
]);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
Expand Down
2 changes: 2 additions & 0 deletions ProcessMaker/Jobs/DevLinkInstall.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,8 @@ public function __construct(
*/
public function handle(): void
{
//log
\Log::info('DevLinkInstall job started: ' . $this->devLinkId);
$devLink = DevLink::findOrFail($this->devLinkId);
$logger = new Logger($this->userId);

Expand Down
19 changes: 19 additions & 0 deletions ProcessMaker/Models/Bundle.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Support\Facades\Http;
use ProcessMaker\Exception\ExporterNotSupported;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\ImportExport\Importer;
Expand DownExpand Up@@ -400,4 +401,22 @@ public function reinstall(string $mode, Logger $logger = null)

$logger?->setStatus('done');
}

public function notifyBundleUpdated()
{
$bundleInstances = BundleInstance::where('bundle_id', $this->id)->get();
foreach ($bundleInstances as $bundleInstance) {
$url = $bundleInstance->instance_url;

try {
$response = Http::post($url);

if ($response->status() === 403) {
\Log::error("Failed to notify bundle update for URL: $url " . $response);
}
} catch (\Exception $e) {
\Log::error('Error notifying bundle update: ' . $e->getMessage());
}
}
}
}
21 changes: 21 additions & 0 deletions ProcessMaker/Models/BundleInstance.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
<?php

namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use ProcessMaker\Models\ProcessMakerModel;

class BundleInstance extends ProcessMakerModel
{
use HasFactory;

protected $fillable = [
'bundle_id',
'instance_url',
];

public function bundle()
{
return $this->belongsTo(Bundle::class);
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Models/DevLink.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,14 @@ public function installRemoteBundle($remoteBundleId, $updateType)
$this->logger->status(__('Downloading bundle from remote instance'));

$bundleInfo = $this->remoteBundle($remoteBundleId)->json();
$token = Str::random(60);

$addBundleInstance = $this->client()->post(
route('api.devlink.add-bundle-instance', ['bundle' => $remoteBundleId], false),
[
'instance_url' => env('APP_URL') . '/devlink/bundle-updated/' . $remoteBundleId . '/' . $token,
]
);

$bundleExport = $this->client()->get(
route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
Expand All@@ -160,6 +168,7 @@ public function installRemoteBundle($remoteBundleId, $updateType)
'name' => $bundleInfo['name'],
'published' => $bundleInfo['published'],
'version' => $bundleInfo['version'],
'webhook_token' => $token,
]
);

Expand Down
81 changes: 81 additions & 0 deletions ProcessMaker/Notifications/BundleUpdatedNotification.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
<?php

namespace ProcessMaker\Notifications;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\BroadcastMessage;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use ProcessMaker\Models\Bundle;

class BundleUpdatedNotification extends Notification
{
use Queueable;

private $bundleName;

private $bundleUid;

/**
* Create a new notification instance.
*/
public function __construct(Bundle $bundle)
{
$this->bundleName = $bundle->name;
$this->bundleUid = $bundle->id;
}

/**
* Get the notification's delivery channels.
*
* @return array<int, string>
*/
public function via(object $notifiable): array
{
return ['broadcast', NotificationChannel::class];
}

/**
* Get the mail representation of the notification.
*/
public function toMail(object $notifiable): MailMessage
{
return (new MailMessage)
->line('The introduction to the notification.')
->action('Notification Action', url('/'))
->line('Thank you for using our application!');
}

/**
* Get the array representation of the notification.
*
* @return array<string, mixed>
*/
public function toArray($notifiable)
{
$bundle = Bundle::find($this->bundleUid);

return [
'type' => 'BUNDLE_UPDATED',
'message' => sprintf('Bundle updated: %s', $this->bundleName),
'dateTime' => $bundle->updated_at->toIso8601String(),
'name' => $this->bundleName,
'bundleName' => $this->bundleName,
'url' => sprintf(
'/admin/devlink/local-bundles/%s/',
$this->bundleUid
),
];
}

public function toDatabase($notifiable)
{
return $this->toArray($notifiable);
}

public function toBroadcast($notifiable)
{
return new BroadcastMessage($this->toArray($notifiable));
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('bundle_instances', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('bundle_id');
$table->string('instance_url');
$table->timestamps();

$table->index(['bundle_id']);
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('bundle_instances');
}
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->string('webhook_token')->nullable();
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->dropColumn('webhook_token');
});
}
};
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,8 +31,4 @@ export default [
type: "public_files",
name: "Public Files",
},
{
type: "translations",
name: "Translations",
},
];
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ const messages = {
TASK_OVERDUE: "Task {{- subject }} is overdue. Originally due on {{- due }}",
PROCESS_CREATED: "{{- user}} started the process {{- subject }}",
PROCESS_COMPLETED: "{{- subject }} completed",
BUNDLE_UPDATED: "The bundle {{- subject }} has a new version. Click to check it",
ERROR_EXECUTION: "{{- subject }} caused an error",
COMMENT: "{{- user}} commented on {{- subject}}",
"ProcessMaker\\Notifications\\ImportReady": "Imported {{- subject }}",
Expand Down
3 changes: 3 additions & 0 deletions routes/api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,8 @@
Route::post('devlink/local-bundles', [DevLinkController::class, 'createBundle'])->name('devlink.create-bundle');
Route::put('devlink/local-bundles/{bundle}', [DevLinkController::class, 'updateBundle'])->name('devlink.update-bundle');
Route::post('devlink/local-bundles/{bundle}/increase-version', [DevLinkController::class, 'increaseBundleVersion'])->name('devlink.increase-bundle-version');
Route::post('devlink/local-bundles/{bundle}/add-bundle-instance', [DevLinkController::class, 'addBundleInstance'])->name('devlink.add-bundle-instance');
Route::post('devlink/bundle-updated/{bundle}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
Route::post('devlink/local-bundles/{bundle}/add-assets', [DevLinkController::class, 'addAsset'])->name('devlink.add-asset');
Route::post('devlink/local-bundles/{bundle}/add-settings', [DevLinkController::class, 'addSettings'])->name('devlink.add-settings');
Route::post('devlink/local-bundles/add-asset-to-bundles', [DevLinkController::class, 'addAssetToBundles'])->name('devlink.add-asset-to-bundles');
Expand All@@ -417,3 +419,4 @@
Route::get('devlink/{devLink}', [DevLinkController::class, 'show'])->name('devlink.show');
});
});
Route::post('devlink/bundle-updated/{bundle}/{token}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
2 changes: 2 additions & 0 deletions tests/Model/DevLinkTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public function testInstallRemoteBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink = DevLink::factory()->create([
Expand DownExpand Up@@ -237,6 +238,7 @@ public function testUpdateBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink->installRemoteBundle(123, 'update');
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,22 @@

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
use ProcessMaker\Models\BundleInstance;
use ProcessMaker\Models\BundleSetting;
use ProcessMaker\Models\DevLink;
use ProcessMaker\Models\Setting;
use ProcessMaker\Models\User;
use ProcessMaker\Notifications\BundleUpdatedNotification;

class DevLinkController extends Controller
{
Expand DownExpand Up@@ -154,12 +159,34 @@ public function updateBundle(Request $request, Bundle $bundle)

public function increaseBundleVersion(Bundle $bundle)
{
$bundle->notifyBundleUpdated();

$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function bundleUpdated($bundleId, $token)
{
try {
$bundle = Bundle::where('remote_id', $bundleId)->firstOrFail();
} catch (ModelNotFoundException $e) {
return response()->json(['error' => 'Bundle not found'], 403);
}

$storedToken = $bundle->webhook_token;

if ($token !== $storedToken) {
return response()->json(['error' => 'Invalid token'], 403);
}
$adminUsers = User::where('is_administrator', true)->get();

Notification::send($adminUsers, new BundleUpdatedNotification($bundle));

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
Expand DownExpand Up@@ -198,6 +225,14 @@ public function reinstallBundle(Request $request, Bundle $bundle)
];
}

public function addBundleInstance(Request $request, Bundle $bundle)
{
BundleInstance::create([
'bundle_id' => $bundle->id,
'instance_url' => $request->input('instance_url'),
]);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
Expand Down
2 changes: 2 additions & 0 deletions ProcessMaker/Jobs/DevLinkInstall.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,8 @@ public function __construct(
*/
public function handle(): void
{
//log
\Log::info('DevLinkInstall job started: ' . $this->devLinkId);
$devLink = DevLink::findOrFail($this->devLinkId);
$logger = new Logger($this->userId);

Expand Down
19 changes: 19 additions & 0 deletions ProcessMaker/Models/Bundle.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Support\Facades\Http;
use ProcessMaker\Exception\ExporterNotSupported;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\ImportExport\Importer;
Expand DownExpand Up@@ -400,4 +401,22 @@ public function reinstall(string $mode, Logger $logger = null)

$logger?->setStatus('done');
}

public function notifyBundleUpdated()
{
$bundleInstances = BundleInstance::where('bundle_id', $this->id)->get();
foreach ($bundleInstances as $bundleInstance) {
$url = $bundleInstance->instance_url;

try {
$response = Http::post($url);

if ($response->status() === 403) {
\Log::error("Failed to notify bundle update for URL: $url " . $response);
}
} catch (\Exception $e) {
\Log::error('Error notifying bundle update: ' . $e->getMessage());
}
}
}
}
21 changes: 21 additions & 0 deletions ProcessMaker/Models/BundleInstance.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
<?php

namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use ProcessMaker\Models\ProcessMakerModel;

class BundleInstance extends ProcessMakerModel
{
use HasFactory;

protected $fillable = [
'bundle_id',
'instance_url',
];

public function bundle()
{
return $this->belongsTo(Bundle::class);
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Models/DevLink.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,14 @@ public function installRemoteBundle($remoteBundleId, $updateType)
$this->logger->status(__('Downloading bundle from remote instance'));

$bundleInfo = $this->remoteBundle($remoteBundleId)->json();
$token = Str::random(60);

$addBundleInstance = $this->client()->post(
route('api.devlink.add-bundle-instance', ['bundle' => $remoteBundleId], false),
[
'instance_url' => env('APP_URL') . '/devlink/bundle-updated/' . $remoteBundleId . '/' . $token,
]
);

$bundleExport = $this->client()->get(
route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
Expand All@@ -160,6 +168,7 @@ public function installRemoteBundle($remoteBundleId, $updateType)
'name' => $bundleInfo['name'],
'published' => $bundleInfo['published'],
'version' => $bundleInfo['version'],
'webhook_token' => $token,
]
);

Expand Down
81 changes: 81 additions & 0 deletions ProcessMaker/Notifications/BundleUpdatedNotification.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
<?php

namespace ProcessMaker\Notifications;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\BroadcastMessage;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use ProcessMaker\Models\Bundle;

class BundleUpdatedNotification extends Notification
{
use Queueable;

private $bundleName;

private $bundleUid;

/**
* Create a new notification instance.
*/
public function __construct(Bundle $bundle)
{
$this->bundleName = $bundle->name;
$this->bundleUid = $bundle->id;
}

/**
* Get the notification's delivery channels.
*
* @return array<int, string>
*/
public function via(object $notifiable): array
{
return ['broadcast', NotificationChannel::class];
}

/**
* Get the mail representation of the notification.
*/
public function toMail(object $notifiable): MailMessage
{
return (new MailMessage)
->line('The introduction to the notification.')
->action('Notification Action', url('/'))
->line('Thank you for using our application!');
}

/**
* Get the array representation of the notification.
*
* @return array<string, mixed>
*/
public function toArray($notifiable)
{
$bundle = Bundle::find($this->bundleUid);

return [
'type' => 'BUNDLE_UPDATED',
'message' => sprintf('Bundle updated: %s', $this->bundleName),
'dateTime' => $bundle->updated_at->toIso8601String(),
'name' => $this->bundleName,
'bundleName' => $this->bundleName,
'url' => sprintf(
'/admin/devlink/local-bundles/%s/',
$this->bundleUid
),
];
}

public function toDatabase($notifiable)
{
return $this->toArray($notifiable);
}

public function toBroadcast($notifiable)
{
return new BroadcastMessage($this->toArray($notifiable));
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('bundle_instances', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('bundle_id');
$table->string('instance_url');
$table->timestamps();

$table->index(['bundle_id']);
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('bundle_instances');
}
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->string('webhook_token')->nullable();
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->dropColumn('webhook_token');
});
}
};
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,8 +31,4 @@ export default [
type: "public_files",
name: "Public Files",
},
{
type: "translations",
name: "Translations",
},
];
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ const messages = {
TASK_OVERDUE: "Task {{- subject }} is overdue. Originally due on {{- due }}",
PROCESS_CREATED: "{{- user}} started the process {{- subject }}",
PROCESS_COMPLETED: "{{- subject }} completed",
BUNDLE_UPDATED: "The bundle {{- subject }} has a new version. Click to check it",
ERROR_EXECUTION: "{{- subject }} caused an error",
COMMENT: "{{- user}} commented on {{- subject}}",
"ProcessMaker\\Notifications\\ImportReady": "Imported {{- subject }}",
Expand Down
3 changes: 3 additions & 0 deletions routes/api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,8 @@
Route::post('devlink/local-bundles', [DevLinkController::class, 'createBundle'])->name('devlink.create-bundle');
Route::put('devlink/local-bundles/{bundle}', [DevLinkController::class, 'updateBundle'])->name('devlink.update-bundle');
Route::post('devlink/local-bundles/{bundle}/increase-version', [DevLinkController::class, 'increaseBundleVersion'])->name('devlink.increase-bundle-version');
Route::post('devlink/local-bundles/{bundle}/add-bundle-instance', [DevLinkController::class, 'addBundleInstance'])->name('devlink.add-bundle-instance');
Route::post('devlink/bundle-updated/{bundle}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
Route::post('devlink/local-bundles/{bundle}/add-assets', [DevLinkController::class, 'addAsset'])->name('devlink.add-asset');
Route::post('devlink/local-bundles/{bundle}/add-settings', [DevLinkController::class, 'addSettings'])->name('devlink.add-settings');
Route::post('devlink/local-bundles/add-asset-to-bundles', [DevLinkController::class, 'addAssetToBundles'])->name('devlink.add-asset-to-bundles');
Expand All@@ -417,3 +419,4 @@
Route::get('devlink/{devLink}', [DevLinkController::class, 'show'])->name('devlink.show');
});
});
Route::post('devlink/bundle-updated/{bundle}/{token}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
2 changes: 2 additions & 0 deletions tests/Model/DevLinkTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public function testInstallRemoteBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink = DevLink::factory()->create([
Expand DownExpand Up@@ -237,6 +238,7 @@ public function testUpdateBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink->installRemoteBundle(123, 'update');
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,22 @@

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
use ProcessMaker\Models\BundleInstance;
use ProcessMaker\Models\BundleSetting;
use ProcessMaker\Models\DevLink;
use ProcessMaker\Models\Setting;
use ProcessMaker\Models\User;
use ProcessMaker\Notifications\BundleUpdatedNotification;

class DevLinkController extends Controller
{
Expand DownExpand Up@@ -154,12 +159,34 @@ public function updateBundle(Request $request, Bundle $bundle)

public function increaseBundleVersion(Bundle $bundle)
{
$bundle->notifyBundleUpdated();

$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function bundleUpdated($bundleId, $token)
{
try {
$bundle = Bundle::where('remote_id', $bundleId)->firstOrFail();
} catch (ModelNotFoundException $e) {
return response()->json(['error' => 'Bundle not found'], 403);
}

$storedToken = $bundle->webhook_token;

if ($token !== $storedToken) {
return response()->json(['error' => 'Invalid token'], 403);
}
$adminUsers = User::where('is_administrator', true)->get();

Notification::send($adminUsers, new BundleUpdatedNotification($bundle));

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
Expand DownExpand Up@@ -198,6 +225,14 @@ public function reinstallBundle(Request $request, Bundle $bundle)
];
}

public function addBundleInstance(Request $request, Bundle $bundle)
{
BundleInstance::create([
'bundle_id' => $bundle->id,
'instance_url' => $request->input('instance_url'),
]);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
Expand Down
2 changes: 2 additions & 0 deletions ProcessMaker/Jobs/DevLinkInstall.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,8 @@ public function __construct(
*/
public function handle(): void
{
//log
\Log::info('DevLinkInstall job started: ' . $this->devLinkId);
$devLink = DevLink::findOrFail($this->devLinkId);
$logger = new Logger($this->userId);

Expand Down
19 changes: 19 additions & 0 deletions ProcessMaker/Models/Bundle.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Support\Facades\Http;
use ProcessMaker\Exception\ExporterNotSupported;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\ImportExport\Importer;
Expand DownExpand Up@@ -400,4 +401,22 @@ public function reinstall(string $mode, Logger $logger = null)

$logger?->setStatus('done');
}

public function notifyBundleUpdated()
{
$bundleInstances = BundleInstance::where('bundle_id', $this->id)->get();
foreach ($bundleInstances as $bundleInstance) {
$url = $bundleInstance->instance_url;

try {
$response = Http::post($url);

if ($response->status() === 403) {
\Log::error("Failed to notify bundle update for URL: $url " . $response);
}
} catch (\Exception $e) {
\Log::error('Error notifying bundle update: ' . $e->getMessage());
}
}
}
}
21 changes: 21 additions & 0 deletions ProcessMaker/Models/BundleInstance.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
<?php

namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use ProcessMaker\Models\ProcessMakerModel;

class BundleInstance extends ProcessMakerModel
{
use HasFactory;

protected $fillable = [
'bundle_id',
'instance_url',
];

public function bundle()
{
return $this->belongsTo(Bundle::class);
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Models/DevLink.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,14 @@ public function installRemoteBundle($remoteBundleId, $updateType)
$this->logger->status(__('Downloading bundle from remote instance'));

$bundleInfo = $this->remoteBundle($remoteBundleId)->json();
$token = Str::random(60);

$addBundleInstance = $this->client()->post(
route('api.devlink.add-bundle-instance', ['bundle' => $remoteBundleId], false),
[
'instance_url' => env('APP_URL') . '/devlink/bundle-updated/' . $remoteBundleId . '/' . $token,
]
);

$bundleExport = $this->client()->get(
route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
Expand All@@ -160,6 +168,7 @@ public function installRemoteBundle($remoteBundleId, $updateType)
'name' => $bundleInfo['name'],
'published' => $bundleInfo['published'],
'version' => $bundleInfo['version'],
'webhook_token' => $token,
]
);

Expand Down
81 changes: 81 additions & 0 deletions ProcessMaker/Notifications/BundleUpdatedNotification.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
<?php

namespace ProcessMaker\Notifications;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\BroadcastMessage;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use ProcessMaker\Models\Bundle;

class BundleUpdatedNotification extends Notification
{
use Queueable;

private $bundleName;

private $bundleUid;

/**
* Create a new notification instance.
*/
public function __construct(Bundle $bundle)
{
$this->bundleName = $bundle->name;
$this->bundleUid = $bundle->id;
}

/**
* Get the notification's delivery channels.
*
* @return array<int, string>
*/
public function via(object $notifiable): array
{
return ['broadcast', NotificationChannel::class];
}

/**
* Get the mail representation of the notification.
*/
public function toMail(object $notifiable): MailMessage
{
return (new MailMessage)
->line('The introduction to the notification.')
->action('Notification Action', url('/'))
->line('Thank you for using our application!');
}

/**
* Get the array representation of the notification.
*
* @return array<string, mixed>
*/
public function toArray($notifiable)
{
$bundle = Bundle::find($this->bundleUid);

return [
'type' => 'BUNDLE_UPDATED',
'message' => sprintf('Bundle updated: %s', $this->bundleName),
'dateTime' => $bundle->updated_at->toIso8601String(),
'name' => $this->bundleName,
'bundleName' => $this->bundleName,
'url' => sprintf(
'/admin/devlink/local-bundles/%s/',
$this->bundleUid
),
];
}

public function toDatabase($notifiable)
{
return $this->toArray($notifiable);
}

public function toBroadcast($notifiable)
{
return new BroadcastMessage($this->toArray($notifiable));
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('bundle_instances', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('bundle_id');
$table->string('instance_url');
$table->timestamps();

$table->index(['bundle_id']);
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('bundle_instances');
}
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->string('webhook_token')->nullable();
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->dropColumn('webhook_token');
});
}
};
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,8 +31,4 @@ export default [
type: "public_files",
name: "Public Files",
},
{
type: "translations",
name: "Translations",
},
];
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ const messages = {
TASK_OVERDUE: "Task {{- subject }} is overdue. Originally due on {{- due }}",
PROCESS_CREATED: "{{- user}} started the process {{- subject }}",
PROCESS_COMPLETED: "{{- subject }} completed",
BUNDLE_UPDATED: "The bundle {{- subject }} has a new version. Click to check it",
ERROR_EXECUTION: "{{- subject }} caused an error",
COMMENT: "{{- user}} commented on {{- subject}}",
"ProcessMaker\\Notifications\\ImportReady": "Imported {{- subject }}",
Expand Down
3 changes: 3 additions & 0 deletions routes/api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,8 @@
Route::post('devlink/local-bundles', [DevLinkController::class, 'createBundle'])->name('devlink.create-bundle');
Route::put('devlink/local-bundles/{bundle}', [DevLinkController::class, 'updateBundle'])->name('devlink.update-bundle');
Route::post('devlink/local-bundles/{bundle}/increase-version', [DevLinkController::class, 'increaseBundleVersion'])->name('devlink.increase-bundle-version');
Route::post('devlink/local-bundles/{bundle}/add-bundle-instance', [DevLinkController::class, 'addBundleInstance'])->name('devlink.add-bundle-instance');
Route::post('devlink/bundle-updated/{bundle}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
Route::post('devlink/local-bundles/{bundle}/add-assets', [DevLinkController::class, 'addAsset'])->name('devlink.add-asset');
Route::post('devlink/local-bundles/{bundle}/add-settings', [DevLinkController::class, 'addSettings'])->name('devlink.add-settings');
Route::post('devlink/local-bundles/add-asset-to-bundles', [DevLinkController::class, 'addAssetToBundles'])->name('devlink.add-asset-to-bundles');
Expand All@@ -417,3 +419,4 @@
Route::get('devlink/{devLink}', [DevLinkController::class, 'show'])->name('devlink.show');
});
});
Route::post('devlink/bundle-updated/{bundle}/{token}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
2 changes: 2 additions & 0 deletions tests/Model/DevLinkTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public function testInstallRemoteBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink = DevLink::factory()->create([
Expand DownExpand Up@@ -237,6 +238,7 @@ public function testUpdateBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink->installRemoteBundle(123, 'update');
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,22 @@

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
use ProcessMaker\Models\BundleInstance;
use ProcessMaker\Models\BundleSetting;
use ProcessMaker\Models\DevLink;
use ProcessMaker\Models\Setting;
use ProcessMaker\Models\User;
use ProcessMaker\Notifications\BundleUpdatedNotification;

class DevLinkController extends Controller
{
Expand DownExpand Up@@ -154,12 +159,34 @@ public function updateBundle(Request $request, Bundle $bundle)

public function increaseBundleVersion(Bundle $bundle)
{
$bundle->notifyBundleUpdated();

$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function bundleUpdated($bundleId, $token)
{
try {
$bundle = Bundle::where('remote_id', $bundleId)->firstOrFail();
} catch (ModelNotFoundException $e) {
return response()->json(['error' => 'Bundle not found'], 403);
}

$storedToken = $bundle->webhook_token;

if ($token !== $storedToken) {
return response()->json(['error' => 'Invalid token'], 403);
}
$adminUsers = User::where('is_administrator', true)->get();

Notification::send($adminUsers, new BundleUpdatedNotification($bundle));

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
Expand DownExpand Up@@ -198,6 +225,14 @@ public function reinstallBundle(Request $request, Bundle $bundle)
];
}

public function addBundleInstance(Request $request, Bundle $bundle)
{
BundleInstance::create([
'bundle_id' => $bundle->id,
'instance_url' => $request->input('instance_url'),
]);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
Expand Down
2 changes: 2 additions & 0 deletions ProcessMaker/Jobs/DevLinkInstall.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,8 @@ public function __construct(
*/
public function handle(): void
{
//log
\Log::info('DevLinkInstall job started: ' . $this->devLinkId);
$devLink = DevLink::findOrFail($this->devLinkId);
$logger = new Logger($this->userId);

Expand Down
19 changes: 19 additions & 0 deletions ProcessMaker/Models/Bundle.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Support\Facades\Http;
use ProcessMaker\Exception\ExporterNotSupported;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\ImportExport\Importer;
Expand DownExpand Up@@ -400,4 +401,22 @@ public function reinstall(string $mode, Logger $logger = null)

$logger?->setStatus('done');
}

public function notifyBundleUpdated()
{
$bundleInstances = BundleInstance::where('bundle_id', $this->id)->get();
foreach ($bundleInstances as $bundleInstance) {
$url = $bundleInstance->instance_url;

try {
$response = Http::post($url);

if ($response->status() === 403) {
\Log::error("Failed to notify bundle update for URL: $url " . $response);
}
} catch (\Exception $e) {
\Log::error('Error notifying bundle update: ' . $e->getMessage());
}
}
}
}
21 changes: 21 additions & 0 deletions ProcessMaker/Models/BundleInstance.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
<?php

namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use ProcessMaker\Models\ProcessMakerModel;

class BundleInstance extends ProcessMakerModel
{
use HasFactory;

protected $fillable = [
'bundle_id',
'instance_url',
];

public function bundle()
{
return $this->belongsTo(Bundle::class);
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Models/DevLink.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,14 @@ public function installRemoteBundle($remoteBundleId, $updateType)
$this->logger->status(__('Downloading bundle from remote instance'));

$bundleInfo = $this->remoteBundle($remoteBundleId)->json();
$token = Str::random(60);

$addBundleInstance = $this->client()->post(
route('api.devlink.add-bundle-instance', ['bundle' => $remoteBundleId], false),
[
'instance_url' => env('APP_URL') . '/devlink/bundle-updated/' . $remoteBundleId . '/' . $token,
]
);

$bundleExport = $this->client()->get(
route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
Expand All@@ -160,6 +168,7 @@ public function installRemoteBundle($remoteBundleId, $updateType)
'name' => $bundleInfo['name'],
'published' => $bundleInfo['published'],
'version' => $bundleInfo['version'],
'webhook_token' => $token,
]
);

Expand Down
81 changes: 81 additions & 0 deletions ProcessMaker/Notifications/BundleUpdatedNotification.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
<?php

namespace ProcessMaker\Notifications;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\BroadcastMessage;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use ProcessMaker\Models\Bundle;

class BundleUpdatedNotification extends Notification
{
use Queueable;

private $bundleName;

private $bundleUid;

/**
* Create a new notification instance.
*/
public function __construct(Bundle $bundle)
{
$this->bundleName = $bundle->name;
$this->bundleUid = $bundle->id;
}

/**
* Get the notification's delivery channels.
*
* @return array<int, string>
*/
public function via(object $notifiable): array
{
return ['broadcast', NotificationChannel::class];
}

/**
* Get the mail representation of the notification.
*/
public function toMail(object $notifiable): MailMessage
{
return (new MailMessage)
->line('The introduction to the notification.')
->action('Notification Action', url('/'))
->line('Thank you for using our application!');
}

/**
* Get the array representation of the notification.
*
* @return array<string, mixed>
*/
public function toArray($notifiable)
{
$bundle = Bundle::find($this->bundleUid);

return [
'type' => 'BUNDLE_UPDATED',
'message' => sprintf('Bundle updated: %s', $this->bundleName),
'dateTime' => $bundle->updated_at->toIso8601String(),
'name' => $this->bundleName,
'bundleName' => $this->bundleName,
'url' => sprintf(
'/admin/devlink/local-bundles/%s/',
$this->bundleUid
),
];
}

public function toDatabase($notifiable)
{
return $this->toArray($notifiable);
}

public function toBroadcast($notifiable)
{
return new BroadcastMessage($this->toArray($notifiable));
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('bundle_instances', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('bundle_id');
$table->string('instance_url');
$table->timestamps();

$table->index(['bundle_id']);
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('bundle_instances');
}
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->string('webhook_token')->nullable();
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->dropColumn('webhook_token');
});
}
};
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,8 +31,4 @@ export default [
type: "public_files",
name: "Public Files",
},
{
type: "translations",
name: "Translations",
},
];
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ const messages = {
TASK_OVERDUE: "Task {{- subject }} is overdue. Originally due on {{- due }}",
PROCESS_CREATED: "{{- user}} started the process {{- subject }}",
PROCESS_COMPLETED: "{{- subject }} completed",
BUNDLE_UPDATED: "The bundle {{- subject }} has a new version. Click to check it",
ERROR_EXECUTION: "{{- subject }} caused an error",
COMMENT: "{{- user}} commented on {{- subject}}",
"ProcessMaker\\Notifications\\ImportReady": "Imported {{- subject }}",
Expand Down
3 changes: 3 additions & 0 deletions routes/api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,8 @@
Route::post('devlink/local-bundles', [DevLinkController::class, 'createBundle'])->name('devlink.create-bundle');
Route::put('devlink/local-bundles/{bundle}', [DevLinkController::class, 'updateBundle'])->name('devlink.update-bundle');
Route::post('devlink/local-bundles/{bundle}/increase-version', [DevLinkController::class, 'increaseBundleVersion'])->name('devlink.increase-bundle-version');
Route::post('devlink/local-bundles/{bundle}/add-bundle-instance', [DevLinkController::class, 'addBundleInstance'])->name('devlink.add-bundle-instance');
Route::post('devlink/bundle-updated/{bundle}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
Route::post('devlink/local-bundles/{bundle}/add-assets', [DevLinkController::class, 'addAsset'])->name('devlink.add-asset');
Route::post('devlink/local-bundles/{bundle}/add-settings', [DevLinkController::class, 'addSettings'])->name('devlink.add-settings');
Route::post('devlink/local-bundles/add-asset-to-bundles', [DevLinkController::class, 'addAssetToBundles'])->name('devlink.add-asset-to-bundles');
Expand All@@ -417,3 +419,4 @@
Route::get('devlink/{devLink}', [DevLinkController::class, 'show'])->name('devlink.show');
});
});
Route::post('devlink/bundle-updated/{bundle}/{token}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
2 changes: 2 additions & 0 deletions tests/Model/DevLinkTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public function testInstallRemoteBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink = DevLink::factory()->create([
Expand DownExpand Up@@ -237,6 +238,7 @@ public function testUpdateBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink->installRemoteBundle(123, 'update');
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,22 @@

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
use ProcessMaker\Models\BundleInstance;
use ProcessMaker\Models\BundleSetting;
use ProcessMaker\Models\DevLink;
use ProcessMaker\Models\Setting;
use ProcessMaker\Models\User;
use ProcessMaker\Notifications\BundleUpdatedNotification;

class DevLinkController extends Controller
{
Expand DownExpand Up@@ -154,12 +159,34 @@ public function updateBundle(Request $request, Bundle $bundle)

public function increaseBundleVersion(Bundle $bundle)
{
$bundle->notifyBundleUpdated();

$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function bundleUpdated($bundleId, $token)
{
try {
$bundle = Bundle::where('remote_id', $bundleId)->firstOrFail();
} catch (ModelNotFoundException $e) {
return response()->json(['error' => 'Bundle not found'], 403);
}

$storedToken = $bundle->webhook_token;

if ($token !== $storedToken) {
return response()->json(['error' => 'Invalid token'], 403);
}
$adminUsers = User::where('is_administrator', true)->get();

Notification::send($adminUsers, new BundleUpdatedNotification($bundle));

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
Expand DownExpand Up@@ -198,6 +225,14 @@ public function reinstallBundle(Request $request, Bundle $bundle)
];
}

public function addBundleInstance(Request $request, Bundle $bundle)
{
BundleInstance::create([
'bundle_id' => $bundle->id,
'instance_url' => $request->input('instance_url'),
]);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
Expand Down
2 changes: 2 additions & 0 deletions ProcessMaker/Jobs/DevLinkInstall.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,8 @@ public function __construct(
*/
public function handle(): void
{
//log
\Log::info('DevLinkInstall job started: ' . $this->devLinkId);
$devLink = DevLink::findOrFail($this->devLinkId);
$logger = new Logger($this->userId);

Expand Down
19 changes: 19 additions & 0 deletions ProcessMaker/Models/Bundle.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Support\Facades\Http;
use ProcessMaker\Exception\ExporterNotSupported;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\ImportExport\Importer;
Expand DownExpand Up@@ -400,4 +401,22 @@ public function reinstall(string $mode, Logger $logger = null)

$logger?->setStatus('done');
}

public function notifyBundleUpdated()
{
$bundleInstances = BundleInstance::where('bundle_id', $this->id)->get();
foreach ($bundleInstances as $bundleInstance) {
$url = $bundleInstance->instance_url;

try {
$response = Http::post($url);

if ($response->status() === 403) {
\Log::error("Failed to notify bundle update for URL: $url " . $response);
}
} catch (\Exception $e) {
\Log::error('Error notifying bundle update: ' . $e->getMessage());
}
}
}
}
21 changes: 21 additions & 0 deletions ProcessMaker/Models/BundleInstance.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
<?php

namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use ProcessMaker\Models\ProcessMakerModel;

class BundleInstance extends ProcessMakerModel
{
use HasFactory;

protected $fillable = [
'bundle_id',
'instance_url',
];

public function bundle()
{
return $this->belongsTo(Bundle::class);
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Models/DevLink.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,14 @@ public function installRemoteBundle($remoteBundleId, $updateType)
$this->logger->status(__('Downloading bundle from remote instance'));

$bundleInfo = $this->remoteBundle($remoteBundleId)->json();
$token = Str::random(60);

$addBundleInstance = $this->client()->post(
route('api.devlink.add-bundle-instance', ['bundle' => $remoteBundleId], false),
[
'instance_url' => env('APP_URL') . '/devlink/bundle-updated/' . $remoteBundleId . '/' . $token,
]
);

$bundleExport = $this->client()->get(
route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
Expand All@@ -160,6 +168,7 @@ public function installRemoteBundle($remoteBundleId, $updateType)
'name' => $bundleInfo['name'],
'published' => $bundleInfo['published'],
'version' => $bundleInfo['version'],
'webhook_token' => $token,
]
);

Expand Down
81 changes: 81 additions & 0 deletions ProcessMaker/Notifications/BundleUpdatedNotification.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
<?php

namespace ProcessMaker\Notifications;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\BroadcastMessage;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use ProcessMaker\Models\Bundle;

class BundleUpdatedNotification extends Notification
{
use Queueable;

private $bundleName;

private $bundleUid;

/**
* Create a new notification instance.
*/
public function __construct(Bundle $bundle)
{
$this->bundleName = $bundle->name;
$this->bundleUid = $bundle->id;
}

/**
* Get the notification's delivery channels.
*
* @return array<int, string>
*/
public function via(object $notifiable): array
{
return ['broadcast', NotificationChannel::class];
}

/**
* Get the mail representation of the notification.
*/
public function toMail(object $notifiable): MailMessage
{
return (new MailMessage)
->line('The introduction to the notification.')
->action('Notification Action', url('/'))
->line('Thank you for using our application!');
}

/**
* Get the array representation of the notification.
*
* @return array<string, mixed>
*/
public function toArray($notifiable)
{
$bundle = Bundle::find($this->bundleUid);

return [
'type' => 'BUNDLE_UPDATED',
'message' => sprintf('Bundle updated: %s', $this->bundleName),
'dateTime' => $bundle->updated_at->toIso8601String(),
'name' => $this->bundleName,
'bundleName' => $this->bundleName,
'url' => sprintf(
'/admin/devlink/local-bundles/%s/',
$this->bundleUid
),
];
}

public function toDatabase($notifiable)
{
return $this->toArray($notifiable);
}

public function toBroadcast($notifiable)
{
return new BroadcastMessage($this->toArray($notifiable));
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('bundle_instances', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('bundle_id');
$table->string('instance_url');
$table->timestamps();

$table->index(['bundle_id']);
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('bundle_instances');
}
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->string('webhook_token')->nullable();
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->dropColumn('webhook_token');
});
}
};
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,8 +31,4 @@ export default [
type: "public_files",
name: "Public Files",
},
{
type: "translations",
name: "Translations",
},
];
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ const messages = {
TASK_OVERDUE: "Task {{- subject }} is overdue. Originally due on {{- due }}",
PROCESS_CREATED: "{{- user}} started the process {{- subject }}",
PROCESS_COMPLETED: "{{- subject }} completed",
BUNDLE_UPDATED: "The bundle {{- subject }} has a new version. Click to check it",
ERROR_EXECUTION: "{{- subject }} caused an error",
COMMENT: "{{- user}} commented on {{- subject}}",
"ProcessMaker\\Notifications\\ImportReady": "Imported {{- subject }}",
Expand Down
3 changes: 3 additions & 0 deletions routes/api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,8 @@
Route::post('devlink/local-bundles', [DevLinkController::class, 'createBundle'])->name('devlink.create-bundle');
Route::put('devlink/local-bundles/{bundle}', [DevLinkController::class, 'updateBundle'])->name('devlink.update-bundle');
Route::post('devlink/local-bundles/{bundle}/increase-version', [DevLinkController::class, 'increaseBundleVersion'])->name('devlink.increase-bundle-version');
Route::post('devlink/local-bundles/{bundle}/add-bundle-instance', [DevLinkController::class, 'addBundleInstance'])->name('devlink.add-bundle-instance');
Route::post('devlink/bundle-updated/{bundle}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
Route::post('devlink/local-bundles/{bundle}/add-assets', [DevLinkController::class, 'addAsset'])->name('devlink.add-asset');
Route::post('devlink/local-bundles/{bundle}/add-settings', [DevLinkController::class, 'addSettings'])->name('devlink.add-settings');
Route::post('devlink/local-bundles/add-asset-to-bundles', [DevLinkController::class, 'addAssetToBundles'])->name('devlink.add-asset-to-bundles');
Expand All@@ -417,3 +419,4 @@
Route::get('devlink/{devLink}', [DevLinkController::class, 'show'])->name('devlink.show');
});
});
Route::post('devlink/bundle-updated/{bundle}/{token}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
2 changes: 2 additions & 0 deletions tests/Model/DevLinkTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public function testInstallRemoteBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink = DevLink::factory()->create([
Expand DownExpand Up@@ -237,6 +238,7 @@ public function testUpdateBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink->installRemoteBundle(123, 'update');
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,22 @@

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
use ProcessMaker\Models\BundleInstance;
use ProcessMaker\Models\BundleSetting;
use ProcessMaker\Models\DevLink;
use ProcessMaker\Models\Setting;
use ProcessMaker\Models\User;
use ProcessMaker\Notifications\BundleUpdatedNotification;

class DevLinkController extends Controller
{
Expand DownExpand Up@@ -154,12 +159,34 @@ public function updateBundle(Request $request, Bundle $bundle)

public function increaseBundleVersion(Bundle $bundle)
{
$bundle->notifyBundleUpdated();

$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function bundleUpdated($bundleId, $token)
{
try {
$bundle = Bundle::where('remote_id', $bundleId)->firstOrFail();
} catch (ModelNotFoundException $e) {
return response()->json(['error' => 'Bundle not found'], 403);
}

$storedToken = $bundle->webhook_token;

if ($token !== $storedToken) {
return response()->json(['error' => 'Invalid token'], 403);
}
$adminUsers = User::where('is_administrator', true)->get();

Notification::send($adminUsers, new BundleUpdatedNotification($bundle));

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
Expand DownExpand Up@@ -198,6 +225,14 @@ public function reinstallBundle(Request $request, Bundle $bundle)
];
}

public function addBundleInstance(Request $request, Bundle $bundle)
{
BundleInstance::create([
'bundle_id' => $bundle->id,
'instance_url' => $request->input('instance_url'),
]);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
Expand Down
2 changes: 2 additions & 0 deletions ProcessMaker/Jobs/DevLinkInstall.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,8 @@ public function __construct(
*/
public function handle(): void
{
//log
\Log::info('DevLinkInstall job started: ' . $this->devLinkId);
$devLink = DevLink::findOrFail($this->devLinkId);
$logger = new Logger($this->userId);

Expand Down
19 changes: 19 additions & 0 deletions ProcessMaker/Models/Bundle.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Support\Facades\Http;
use ProcessMaker\Exception\ExporterNotSupported;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\ImportExport\Importer;
Expand DownExpand Up@@ -400,4 +401,22 @@ public function reinstall(string $mode, Logger $logger = null)

$logger?->setStatus('done');
}

public function notifyBundleUpdated()
{
$bundleInstances = BundleInstance::where('bundle_id', $this->id)->get();
foreach ($bundleInstances as $bundleInstance) {
$url = $bundleInstance->instance_url;

try {
$response = Http::post($url);

if ($response->status() === 403) {
\Log::error("Failed to notify bundle update for URL: $url " . $response);
}
} catch (\Exception $e) {
\Log::error('Error notifying bundle update: ' . $e->getMessage());
}
}
}
}
21 changes: 21 additions & 0 deletions ProcessMaker/Models/BundleInstance.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
<?php

namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use ProcessMaker\Models\ProcessMakerModel;

class BundleInstance extends ProcessMakerModel
{
use HasFactory;

protected $fillable = [
'bundle_id',
'instance_url',
];

public function bundle()
{
return $this->belongsTo(Bundle::class);
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Models/DevLink.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,14 @@ public function installRemoteBundle($remoteBundleId, $updateType)
$this->logger->status(__('Downloading bundle from remote instance'));

$bundleInfo = $this->remoteBundle($remoteBundleId)->json();
$token = Str::random(60);

$addBundleInstance = $this->client()->post(
route('api.devlink.add-bundle-instance', ['bundle' => $remoteBundleId], false),
[
'instance_url' => env('APP_URL') . '/devlink/bundle-updated/' . $remoteBundleId . '/' . $token,
]
);

$bundleExport = $this->client()->get(
route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
Expand All@@ -160,6 +168,7 @@ public function installRemoteBundle($remoteBundleId, $updateType)
'name' => $bundleInfo['name'],
'published' => $bundleInfo['published'],
'version' => $bundleInfo['version'],
'webhook_token' => $token,
]
);

Expand Down
81 changes: 81 additions & 0 deletions ProcessMaker/Notifications/BundleUpdatedNotification.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
<?php

namespace ProcessMaker\Notifications;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\BroadcastMessage;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use ProcessMaker\Models\Bundle;

class BundleUpdatedNotification extends Notification
{
use Queueable;

private $bundleName;

private $bundleUid;

/**
* Create a new notification instance.
*/
public function __construct(Bundle $bundle)
{
$this->bundleName = $bundle->name;
$this->bundleUid = $bundle->id;
}

/**
* Get the notification's delivery channels.
*
* @return array<int, string>
*/
public function via(object $notifiable): array
{
return ['broadcast', NotificationChannel::class];
}

/**
* Get the mail representation of the notification.
*/
public function toMail(object $notifiable): MailMessage
{
return (new MailMessage)
->line('The introduction to the notification.')
->action('Notification Action', url('/'))
->line('Thank you for using our application!');
}

/**
* Get the array representation of the notification.
*
* @return array<string, mixed>
*/
public function toArray($notifiable)
{
$bundle = Bundle::find($this->bundleUid);

return [
'type' => 'BUNDLE_UPDATED',
'message' => sprintf('Bundle updated: %s', $this->bundleName),
'dateTime' => $bundle->updated_at->toIso8601String(),
'name' => $this->bundleName,
'bundleName' => $this->bundleName,
'url' => sprintf(
'/admin/devlink/local-bundles/%s/',
$this->bundleUid
),
];
}

public function toDatabase($notifiable)
{
return $this->toArray($notifiable);
}

public function toBroadcast($notifiable)
{
return new BroadcastMessage($this->toArray($notifiable));
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('bundle_instances', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('bundle_id');
$table->string('instance_url');
$table->timestamps();

$table->index(['bundle_id']);
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('bundle_instances');
}
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->string('webhook_token')->nullable();
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->dropColumn('webhook_token');
});
}
};
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,8 +31,4 @@ export default [
type: "public_files",
name: "Public Files",
},
{
type: "translations",
name: "Translations",
},
];
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ const messages = {
TASK_OVERDUE: "Task {{- subject }} is overdue. Originally due on {{- due }}",
PROCESS_CREATED: "{{- user}} started the process {{- subject }}",
PROCESS_COMPLETED: "{{- subject }} completed",
BUNDLE_UPDATED: "The bundle {{- subject }} has a new version. Click to check it",
ERROR_EXECUTION: "{{- subject }} caused an error",
COMMENT: "{{- user}} commented on {{- subject}}",
"ProcessMaker\\Notifications\\ImportReady": "Imported {{- subject }}",
Expand Down
3 changes: 3 additions & 0 deletions routes/api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,8 @@
Route::post('devlink/local-bundles', [DevLinkController::class, 'createBundle'])->name('devlink.create-bundle');
Route::put('devlink/local-bundles/{bundle}', [DevLinkController::class, 'updateBundle'])->name('devlink.update-bundle');
Route::post('devlink/local-bundles/{bundle}/increase-version', [DevLinkController::class, 'increaseBundleVersion'])->name('devlink.increase-bundle-version');
Route::post('devlink/local-bundles/{bundle}/add-bundle-instance', [DevLinkController::class, 'addBundleInstance'])->name('devlink.add-bundle-instance');
Route::post('devlink/bundle-updated/{bundle}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
Route::post('devlink/local-bundles/{bundle}/add-assets', [DevLinkController::class, 'addAsset'])->name('devlink.add-asset');
Route::post('devlink/local-bundles/{bundle}/add-settings', [DevLinkController::class, 'addSettings'])->name('devlink.add-settings');
Route::post('devlink/local-bundles/add-asset-to-bundles', [DevLinkController::class, 'addAssetToBundles'])->name('devlink.add-asset-to-bundles');
Expand All@@ -417,3 +419,4 @@
Route::get('devlink/{devLink}', [DevLinkController::class, 'show'])->name('devlink.show');
});
});
Route::post('devlink/bundle-updated/{bundle}/{token}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
2 changes: 2 additions & 0 deletions tests/Model/DevLinkTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public function testInstallRemoteBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink = DevLink::factory()->create([
Expand DownExpand Up@@ -237,6 +238,7 @@ public function testUpdateBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink->installRemoteBundle(123, 'update');
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,17 +2,22 @@

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Notification;
use Illuminate\Validation\Rule;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Http\Resources\ApiCollection;
use ProcessMaker\Jobs\DevLinkInstall;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\BundleAsset;
use ProcessMaker\Models\BundleInstance;
use ProcessMaker\Models\BundleSetting;
use ProcessMaker\Models\DevLink;
use ProcessMaker\Models\Setting;
use ProcessMaker\Models\User;
use ProcessMaker\Notifications\BundleUpdatedNotification;

class DevLinkController extends Controller
{
Expand DownExpand Up@@ -154,12 +159,34 @@ public function updateBundle(Request $request, Bundle $bundle)

public function increaseBundleVersion(Bundle $bundle)
{
$bundle->notifyBundleUpdated();

$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function bundleUpdated($bundleId, $token)
{
try {
$bundle = Bundle::where('remote_id', $bundleId)->firstOrFail();
} catch (ModelNotFoundException $e) {
return response()->json(['error' => 'Bundle not found'], 403);
}

$storedToken = $bundle->webhook_token;

if ($token !== $storedToken) {
return response()->json(['error' => 'Invalid token'], 403);
}
$adminUsers = User::where('is_administrator', true)->get();

Notification::send($adminUsers, new BundleUpdatedNotification($bundle));

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
Expand DownExpand Up@@ -198,6 +225,14 @@ public function reinstallBundle(Request $request, Bundle $bundle)
];
}

public function addBundleInstance(Request $request, Bundle $bundle)
{
BundleInstance::create([
'bundle_id' => $bundle->id,
'instance_url' => $request->input('instance_url'),
]);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
Expand Down
2 changes: 2 additions & 0 deletions ProcessMaker/Jobs/DevLinkInstall.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,8 @@ public function __construct(
*/
public function handle(): void
{
//log
\Log::info('DevLinkInstall job started: ' . $this->devLinkId);
$devLink = DevLink::findOrFail($this->devLinkId);
$logger = new Logger($this->userId);

Expand Down
19 changes: 19 additions & 0 deletions ProcessMaker/Models/Bundle.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Support\Facades\Http;
use ProcessMaker\Exception\ExporterNotSupported;
use ProcessMaker\Exception\ValidationException;
use ProcessMaker\ImportExport\Importer;
Expand DownExpand Up@@ -400,4 +401,22 @@ public function reinstall(string $mode, Logger $logger = null)

$logger?->setStatus('done');
}

public function notifyBundleUpdated()
{
$bundleInstances = BundleInstance::where('bundle_id', $this->id)->get();
foreach ($bundleInstances as $bundleInstance) {
$url = $bundleInstance->instance_url;

try {
$response = Http::post($url);

if ($response->status() === 403) {
\Log::error("Failed to notify bundle update for URL: $url " . $response);
}
} catch (\Exception $e) {
\Log::error('Error notifying bundle update: ' . $e->getMessage());
}
}
}
}
21 changes: 21 additions & 0 deletions ProcessMaker/Models/BundleInstance.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
<?php

namespace ProcessMaker\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use ProcessMaker\Models\ProcessMakerModel;

class BundleInstance extends ProcessMakerModel
{
use HasFactory;

protected $fillable = [
'bundle_id',
'instance_url',
];

public function bundle()
{
return $this->belongsTo(Bundle::class);
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Models/DevLink.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,14 @@ public function installRemoteBundle($remoteBundleId, $updateType)
$this->logger->status(__('Downloading bundle from remote instance'));

$bundleInfo = $this->remoteBundle($remoteBundleId)->json();
$token = Str::random(60);

$addBundleInstance = $this->client()->post(
route('api.devlink.add-bundle-instance', ['bundle' => $remoteBundleId], false),
[
'instance_url' => env('APP_URL') . '/devlink/bundle-updated/' . $remoteBundleId . '/' . $token,
]
);

$bundleExport = $this->client()->get(
route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
Expand All@@ -160,6 +168,7 @@ public function installRemoteBundle($remoteBundleId, $updateType)
'name' => $bundleInfo['name'],
'published' => $bundleInfo['published'],
'version' => $bundleInfo['version'],
'webhook_token' => $token,
]
);

Expand Down
81 changes: 81 additions & 0 deletions ProcessMaker/Notifications/BundleUpdatedNotification.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
<?php

namespace ProcessMaker\Notifications;

use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\BroadcastMessage;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use ProcessMaker\Models\Bundle;

class BundleUpdatedNotification extends Notification
{
use Queueable;

private $bundleName;

private $bundleUid;

/**
* Create a new notification instance.
*/
public function __construct(Bundle $bundle)
{
$this->bundleName = $bundle->name;
$this->bundleUid = $bundle->id;
}

/**
* Get the notification's delivery channels.
*
* @return array<int, string>
*/
public function via(object $notifiable): array
{
return ['broadcast', NotificationChannel::class];
}

/**
* Get the mail representation of the notification.
*/
public function toMail(object $notifiable): MailMessage
{
return (new MailMessage)
->line('The introduction to the notification.')
->action('Notification Action', url('/'))
->line('Thank you for using our application!');
}

/**
* Get the array representation of the notification.
*
* @return array<string, mixed>
*/
public function toArray($notifiable)
{
$bundle = Bundle::find($this->bundleUid);

return [
'type' => 'BUNDLE_UPDATED',
'message' => sprintf('Bundle updated: %s', $this->bundleName),
'dateTime' => $bundle->updated_at->toIso8601String(),
'name' => $this->bundleName,
'bundleName' => $this->bundleName,
'url' => sprintf(
'/admin/devlink/local-bundles/%s/',
$this->bundleUid
),
];
}

public function toDatabase($notifiable)
{
return $this->toArray($notifiable);
}

public function toBroadcast($notifiable)
{
return new BroadcastMessage($this->toArray($notifiable));
}
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('bundle_instances', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('bundle_id');
$table->string('instance_url');
$table->timestamps();

$table->index(['bundle_id']);
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('bundle_instances');
}
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->string('webhook_token')->nullable();
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('bundles', function (Blueprint $table) {
$table->dropColumn('webhook_token');
});
}
};
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,8 +31,4 @@ export default [
type: "public_files",
name: "Public Files",
},
{
type: "translations",
name: "Translations",
},
];
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,6 +36,7 @@ const messages = {
TASK_OVERDUE: "Task {{- subject }} is overdue. Originally due on {{- due }}",
PROCESS_CREATED: "{{- user}} started the process {{- subject }}",
PROCESS_COMPLETED: "{{- subject }} completed",
BUNDLE_UPDATED: "The bundle {{- subject }} has a new version. Click to check it",
ERROR_EXECUTION: "{{- subject }} caused an error",
COMMENT: "{{- user}} commented on {{- subject}}",
"ProcessMaker\\Notifications\\ImportReady": "Imported {{- subject }}",
Expand Down
3 changes: 3 additions & 0 deletions routes/api.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -397,6 +397,8 @@
Route::post('devlink/local-bundles', [DevLinkController::class, 'createBundle'])->name('devlink.create-bundle');
Route::put('devlink/local-bundles/{bundle}', [DevLinkController::class, 'updateBundle'])->name('devlink.update-bundle');
Route::post('devlink/local-bundles/{bundle}/increase-version', [DevLinkController::class, 'increaseBundleVersion'])->name('devlink.increase-bundle-version');
Route::post('devlink/local-bundles/{bundle}/add-bundle-instance', [DevLinkController::class, 'addBundleInstance'])->name('devlink.add-bundle-instance');
Route::post('devlink/bundle-updated/{bundle}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
Route::post('devlink/local-bundles/{bundle}/add-assets', [DevLinkController::class, 'addAsset'])->name('devlink.add-asset');
Route::post('devlink/local-bundles/{bundle}/add-settings', [DevLinkController::class, 'addSettings'])->name('devlink.add-settings');
Route::post('devlink/local-bundles/add-asset-to-bundles', [DevLinkController::class, 'addAssetToBundles'])->name('devlink.add-asset-to-bundles');
Expand All@@ -417,3 +419,4 @@
Route::get('devlink/{devLink}', [DevLinkController::class, 'show'])->name('devlink.show');
});
});
Route::post('devlink/bundle-updated/{bundle}/{token}', [DevLinkController::class, 'bundleUpdated'])->name('devlink.bundle-updated');
2 changes: 2 additions & 0 deletions tests/Model/DevLinkTest.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -93,6 +93,7 @@ public function testInstallRemoteBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink = DevLink::factory()->create([
Expand DownExpand Up@@ -237,6 +238,7 @@ public function testUpdateBundle()
'http://remote-instance.test/api/1.0/devlink/export-local-bundle/123/settings-payloads' => Http::response([
'payloads' => $exportsSettingsPayloads,
]),
'http://remote-instance.test/api/1.0/devlink/local-bundles/123/add-bundle-instance' => Http::response([], 200),
]);

$devLink->installRemoteBundle(123, 'update');
Expand Down