Merged
11 changes: 11 additions & 0 deletions ProcessMaker/Enums/ExporterMap.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Enums;

use ProcessMaker\Models\ProcessMakerModel;

enum ExporterMap
{
const TYPES = [
Expand DownExpand Up@@ -30,4 +32,13 @@ public static function getExporterClass(string $type): ?string
{
return self::TYPES[$type][1] ?? null;
}

public static function getExporterClassForModel(ProcessMakerModel $model): string | null
{
$class = get_class($model);

return collect(self::TYPES)->first(function ($type) use ($class) {
return $type[0] == $class;
})[1] ?? null;
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Exception/ExporterNotSupported.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?php

namespace ProcessMaker\Exception;

use Exception;

class ExporterNotSupported extends Exception
{
}
105 changes: 105 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
<?php

namespace ProcessMaker\Http\Controllers\Admin;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Laravel\Passport\Client;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index(Request $request)
{
$updatedDevLink = $this->storeClientCredentials($request);

if ($updatedDevLink) {
return redirect($updatedDevLink->getOauthRedirectUrl());
}

$updatedDevLink = $this->storeOauthCredentials($request);
if ($updatedDevLink) {
return redirect(route('devlink.index'));
}

return view('admin.devlink.index');
}

public function getOauthClient(Request $request)
{
$request->validate([
'devlink_id' => 'required',
'redirect_uri' => ['required', 'url'],
]);

$devLinkId = $request->input('devlink_id');
$redirectUri = $request->input('redirect_uri');

$client = Client::where([
'name' => 'devlink',
'redirect' => $redirectUri,
])->first();

if (!$client) {
$clientRepository = app('Laravel\Passport\ClientRepository');
$client = $clientRepository->create(null, 'devlink', $redirectUri);
}

$query = http_build_query([
'devlink_id' => $devLinkId,
'client_id' => $client->id,
'client_secret' => $client->secret,
]);

return redirect($redirectUri . '?' . $query);
}

private function storeClientCredentials(Request $request)
{
if (
$request->has('devlink_id') &&
$request->has('client_id') &&
$request->has('client_secret')
) {
$devlink = DevLink::findOrFail($request->input('devlink_id'));
$devlink->update([
'client_id' => $request->input('client_id'),
'client_secret' => $request->input('client_secret'),
]);

return $devlink;
}

return false;
}

private function storeOauthCredentials(Request $request)
{
if (
$request->has('state') &&
$request->has('code')
) {
$devlink = DevLink::where('state', $request->input('state'))->firstOrFail();

$response = Http::asForm()->post($devlink->url . '/oauth/token', [
'grant_type' => 'authorization_code',
'client_id' => $devlink->client_id,
'client_secret' => $devlink->client_secret,
'redirect_uri' => route('devlink.index'),
'code' => $request->input('code'),
]);

$response = $response->json();
$devlink->update([
'access_token' => $response['access_token'],
'refresh_token' => $response['refresh_token'],
'expires_in' => $response['expires_in'],
]);

return $devlink;
}

return false;
}
}
154 changes: 154 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
<?php

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index()
{
return DevLink::all();
}

public function show(DevLink $devLink)
{
return $devLink;
}

public function store(Request $request)
{
$request->validate([
'name' => ['required', 'unique:dev_links,name'],
'url' => ['required', 'url', 'unique:dev_links,url'],
]);

$devLink = new DevLink();
$devLink->name = $request->input('name');
$devLink->url = $request->input('url');
$devLink->saveOrFail();

return [
...$devLink->toArray(),
'redirect_uri' => route('devlink.index'),
];
}

public function update(Request $request, DevLink $devLink)
{
$devLink->name = $request->input('name');
$devLink->saveOrFail();

return $devLink;
}

public function destroy(DevLink $devLink)
{
$devLink->delete();
}

public function ping(DevLink $devLink)
{
return $devLink->client()->get(route('api.devlink.pong', [], false));
}

public function pong()
{
return ['status' => 'ok'];
}

public function localBundles(Request $request)
{
if ($request->has('published')) {
return Bundle::published()->get();
}

return Bundle::get();
}

public function showBundle(Bundle $bundle)
{
return $bundle->load('assets');
}

public function remoteBundles(DevLink $devLink)
{
return $devLink->remoteBundles();
}

public function createBundle(Request $request)
{
$bundle = new Bundle();
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = 1;
$bundle->saveOrFail();

return $bundle;
}

public function updateBundle(Request $request, Bundle $bundle)
{
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
}

public function installRemoteBundle(DevLink $devLink, $remoteBundleId)
{
return $devLink->installRemoteBundle($remoteBundleId);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
}

public function exportLocalAsset(Request $request)
{
$asset = $request->input('class')::findOrFail($request->input('id'));

return $asset->export();
}

public function addAsset(Request $request, Bundle $bundle)
{
$request->validate([
'type' => ['required', 'string'],
'id' => Rule::unique('bundle_assets', 'asset_id')->where(function ($query) use ($request) {
$query->where([
'asset_id' => $request->input('id'),
'asset_type' => $request->input('type'),
]);
}),
],
[
'id.unique' => __('Asset already exists in bundle'),
]);

$asset = $request->input('type')::findOrFail($request->input('id'));
$bundle->addAsset($asset);
}

public function installRemoteAsset(Request $request, DevLink $devLink)
{
return $devLink->installRemoteAsset(
$request->input('class'),
$request->input('id')
);
}
}
51 changes: 26 additions & 25 deletions ProcessMaker/Http/Kernel.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,10 @@ class Kernel extends HttpKernel
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\ProcessMaker\Http\Middleware\TrimStrings::class,
Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\ProcessMaker\Http\Middleware\TrustProxies::class,
\ProcessMaker\Http\Middleware\BrowserCache::class,
Middleware\TrustProxies::class,
Middleware\BrowserCache::class,
];

/**
Expand All@@ -29,17 +29,17 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
\ProcessMaker\Http\Middleware\EncryptCookies::class,
Middleware\EncryptCookies::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\ProcessMaker\Http\Middleware\SessionStarted::class,
\ProcessMaker\Http\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\SessionControlKill::class,
Middleware\SessionStarted::class,
Middleware\AuthenticateSession::class,
Middleware\SessionControlKill::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
//\ProcessMaker\Http\Middleware\VerifyCsrfToken::class,
\ProcessMaker\Http\Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\ProcessMaker\Http\Middleware\GenerateMenus::class,
Middleware\GenerateMenus::class,
\Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
],
'api' => [
Expand All@@ -62,25 +62,26 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
'auth' => Middleware\ProcessMakerAuthenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \ProcessMaker\Http\Middleware\CustomAuthorize::class,
'force_change_password' => \ProcessMaker\Http\Middleware\VerifyChangePasswordNeeded::class,
'guest' => \ProcessMaker\Http\Middleware\RedirectIfAuthenticated::class,
'permission' => \ProcessMaker\Http\Middleware\PermissionCheck::class,
'can' => Middleware\CustomAuthorize::class,
'force_change_password' => Middleware\VerifyChangePasswordNeeded::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'permission' => Middleware\PermissionCheck::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'sanitize' => \ProcessMaker\Http\Middleware\SanitizeInput::class,
'setlocale' => \ProcessMaker\Http\Middleware\SetLocale::class,
'setskin' => \ProcessMaker\Http\Middleware\SetSkin::class,
'sanitize' => Middleware\SanitizeInput::class,
'setlocale' => Middleware\SetLocale::class,
'setskin' => Middleware\SetSkin::class,
'client' => \Laravel\Passport\Http\Middleware\CheckClientCredentials::class,
'template-authorization' => \ProcessMaker\Http\Middleware\TemplateAuthorization::class,
'edit_username_password' => \ProcessMaker\Http\Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => \ProcessMaker\Http\Middleware\TwoFactorAuthentication::class,
'saml_request' => \ProcessMaker\Http\Middleware\SamlRequest::class,
'session_block' => \ProcessMaker\Http\Middleware\SessionControlBlock::class,
'session_kill' => \ProcessMaker\Http\Middleware\SessionControlKill::class,
'no-cache' => \ProcessMaker\Http\Middleware\NoCache::class,
'template-authorization' => Middleware\TemplateAuthorization::class,
'edit_username_password' => Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => Middleware\TwoFactorAuthentication::class,
'saml_request' => Middleware\SamlRequest::class,
'session_block' => Middleware\SessionControlBlock::class,
'session_kill' => Middleware\SessionControlKill::class,
'no-cache' => Middleware\NoCache::class,
'admin' => Middleware\IsAdmin::class,
];

/**
Expand All@@ -95,6 +96,6 @@ class Kernel extends HttpKernel
*/
protected $middlewarePriority = [
\Illuminate\Session\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
Middleware\ProcessMakerAuthenticate::class,
];
}
Loading
, '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
11 changes: 11 additions & 0 deletions ProcessMaker/Enums/ExporterMap.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Enums;

use ProcessMaker\Models\ProcessMakerModel;

enum ExporterMap
{
const TYPES = [
Expand DownExpand Up@@ -30,4 +32,13 @@ public static function getExporterClass(string $type): ?string
{
return self::TYPES[$type][1] ?? null;
}

public static function getExporterClassForModel(ProcessMakerModel $model): string | null
{
$class = get_class($model);

return collect(self::TYPES)->first(function ($type) use ($class) {
return $type[0] == $class;
})[1] ?? null;
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Exception/ExporterNotSupported.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?php

namespace ProcessMaker\Exception;

use Exception;

class ExporterNotSupported extends Exception
{
}
105 changes: 105 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
<?php

namespace ProcessMaker\Http\Controllers\Admin;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Laravel\Passport\Client;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index(Request $request)
{
$updatedDevLink = $this->storeClientCredentials($request);

if ($updatedDevLink) {
return redirect($updatedDevLink->getOauthRedirectUrl());
}

$updatedDevLink = $this->storeOauthCredentials($request);
if ($updatedDevLink) {
return redirect(route('devlink.index'));
}

return view('admin.devlink.index');
}

public function getOauthClient(Request $request)
{
$request->validate([
'devlink_id' => 'required',
'redirect_uri' => ['required', 'url'],
]);

$devLinkId = $request->input('devlink_id');
$redirectUri = $request->input('redirect_uri');

$client = Client::where([
'name' => 'devlink',
'redirect' => $redirectUri,
])->first();

if (!$client) {
$clientRepository = app('Laravel\Passport\ClientRepository');
$client = $clientRepository->create(null, 'devlink', $redirectUri);
}

$query = http_build_query([
'devlink_id' => $devLinkId,
'client_id' => $client->id,
'client_secret' => $client->secret,
]);

return redirect($redirectUri . '?' . $query);
}

private function storeClientCredentials(Request $request)
{
if (
$request->has('devlink_id') &&
$request->has('client_id') &&
$request->has('client_secret')
) {
$devlink = DevLink::findOrFail($request->input('devlink_id'));
$devlink->update([
'client_id' => $request->input('client_id'),
'client_secret' => $request->input('client_secret'),
]);

return $devlink;
}

return false;
}

private function storeOauthCredentials(Request $request)
{
if (
$request->has('state') &&
$request->has('code')
) {
$devlink = DevLink::where('state', $request->input('state'))->firstOrFail();

$response = Http::asForm()->post($devlink->url . '/oauth/token', [
'grant_type' => 'authorization_code',
'client_id' => $devlink->client_id,
'client_secret' => $devlink->client_secret,
'redirect_uri' => route('devlink.index'),
'code' => $request->input('code'),
]);

$response = $response->json();
$devlink->update([
'access_token' => $response['access_token'],
'refresh_token' => $response['refresh_token'],
'expires_in' => $response['expires_in'],
]);

return $devlink;
}

return false;
}
}
154 changes: 154 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
<?php

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index()
{
return DevLink::all();
}

public function show(DevLink $devLink)
{
return $devLink;
}

public function store(Request $request)
{
$request->validate([
'name' => ['required', 'unique:dev_links,name'],
'url' => ['required', 'url', 'unique:dev_links,url'],
]);

$devLink = new DevLink();
$devLink->name = $request->input('name');
$devLink->url = $request->input('url');
$devLink->saveOrFail();

return [
...$devLink->toArray(),
'redirect_uri' => route('devlink.index'),
];
}

public function update(Request $request, DevLink $devLink)
{
$devLink->name = $request->input('name');
$devLink->saveOrFail();

return $devLink;
}

public function destroy(DevLink $devLink)
{
$devLink->delete();
}

public function ping(DevLink $devLink)
{
return $devLink->client()->get(route('api.devlink.pong', [], false));
}

public function pong()
{
return ['status' => 'ok'];
}

public function localBundles(Request $request)
{
if ($request->has('published')) {
return Bundle::published()->get();
}

return Bundle::get();
}

public function showBundle(Bundle $bundle)
{
return $bundle->load('assets');
}

public function remoteBundles(DevLink $devLink)
{
return $devLink->remoteBundles();
}

public function createBundle(Request $request)
{
$bundle = new Bundle();
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = 1;
$bundle->saveOrFail();

return $bundle;
}

public function updateBundle(Request $request, Bundle $bundle)
{
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
}

public function installRemoteBundle(DevLink $devLink, $remoteBundleId)
{
return $devLink->installRemoteBundle($remoteBundleId);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
}

public function exportLocalAsset(Request $request)
{
$asset = $request->input('class')::findOrFail($request->input('id'));

return $asset->export();
}

public function addAsset(Request $request, Bundle $bundle)
{
$request->validate([
'type' => ['required', 'string'],
'id' => Rule::unique('bundle_assets', 'asset_id')->where(function ($query) use ($request) {
$query->where([
'asset_id' => $request->input('id'),
'asset_type' => $request->input('type'),
]);
}),
],
[
'id.unique' => __('Asset already exists in bundle'),
]);

$asset = $request->input('type')::findOrFail($request->input('id'));
$bundle->addAsset($asset);
}

public function installRemoteAsset(Request $request, DevLink $devLink)
{
return $devLink->installRemoteAsset(
$request->input('class'),
$request->input('id')
);
}
}
51 changes: 26 additions & 25 deletions ProcessMaker/Http/Kernel.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,10 @@ class Kernel extends HttpKernel
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\ProcessMaker\Http\Middleware\TrimStrings::class,
Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\ProcessMaker\Http\Middleware\TrustProxies::class,
\ProcessMaker\Http\Middleware\BrowserCache::class,
Middleware\TrustProxies::class,
Middleware\BrowserCache::class,
];

/**
Expand All@@ -29,17 +29,17 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
\ProcessMaker\Http\Middleware\EncryptCookies::class,
Middleware\EncryptCookies::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\ProcessMaker\Http\Middleware\SessionStarted::class,
\ProcessMaker\Http\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\SessionControlKill::class,
Middleware\SessionStarted::class,
Middleware\AuthenticateSession::class,
Middleware\SessionControlKill::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
//\ProcessMaker\Http\Middleware\VerifyCsrfToken::class,
\ProcessMaker\Http\Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\ProcessMaker\Http\Middleware\GenerateMenus::class,
Middleware\GenerateMenus::class,
\Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
],
'api' => [
Expand All@@ -62,25 +62,26 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
'auth' => Middleware\ProcessMakerAuthenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \ProcessMaker\Http\Middleware\CustomAuthorize::class,
'force_change_password' => \ProcessMaker\Http\Middleware\VerifyChangePasswordNeeded::class,
'guest' => \ProcessMaker\Http\Middleware\RedirectIfAuthenticated::class,
'permission' => \ProcessMaker\Http\Middleware\PermissionCheck::class,
'can' => Middleware\CustomAuthorize::class,
'force_change_password' => Middleware\VerifyChangePasswordNeeded::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'permission' => Middleware\PermissionCheck::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'sanitize' => \ProcessMaker\Http\Middleware\SanitizeInput::class,
'setlocale' => \ProcessMaker\Http\Middleware\SetLocale::class,
'setskin' => \ProcessMaker\Http\Middleware\SetSkin::class,
'sanitize' => Middleware\SanitizeInput::class,
'setlocale' => Middleware\SetLocale::class,
'setskin' => Middleware\SetSkin::class,
'client' => \Laravel\Passport\Http\Middleware\CheckClientCredentials::class,
'template-authorization' => \ProcessMaker\Http\Middleware\TemplateAuthorization::class,
'edit_username_password' => \ProcessMaker\Http\Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => \ProcessMaker\Http\Middleware\TwoFactorAuthentication::class,
'saml_request' => \ProcessMaker\Http\Middleware\SamlRequest::class,
'session_block' => \ProcessMaker\Http\Middleware\SessionControlBlock::class,
'session_kill' => \ProcessMaker\Http\Middleware\SessionControlKill::class,
'no-cache' => \ProcessMaker\Http\Middleware\NoCache::class,
'template-authorization' => Middleware\TemplateAuthorization::class,
'edit_username_password' => Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => Middleware\TwoFactorAuthentication::class,
'saml_request' => Middleware\SamlRequest::class,
'session_block' => Middleware\SessionControlBlock::class,
'session_kill' => Middleware\SessionControlKill::class,
'no-cache' => Middleware\NoCache::class,
'admin' => Middleware\IsAdmin::class,
];

/**
Expand All@@ -95,6 +96,6 @@ class Kernel extends HttpKernel
*/
protected $middlewarePriority = [
\Illuminate\Session\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
Middleware\ProcessMakerAuthenticate::class,
];
}
Loading
, '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
11 changes: 11 additions & 0 deletions ProcessMaker/Enums/ExporterMap.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Enums;

use ProcessMaker\Models\ProcessMakerModel;

enum ExporterMap
{
const TYPES = [
Expand DownExpand Up@@ -30,4 +32,13 @@ public static function getExporterClass(string $type): ?string
{
return self::TYPES[$type][1] ?? null;
}

public static function getExporterClassForModel(ProcessMakerModel $model): string | null
{
$class = get_class($model);

return collect(self::TYPES)->first(function ($type) use ($class) {
return $type[0] == $class;
})[1] ?? null;
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Exception/ExporterNotSupported.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?php

namespace ProcessMaker\Exception;

use Exception;

class ExporterNotSupported extends Exception
{
}
105 changes: 105 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
<?php

namespace ProcessMaker\Http\Controllers\Admin;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Laravel\Passport\Client;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index(Request $request)
{
$updatedDevLink = $this->storeClientCredentials($request);

if ($updatedDevLink) {
return redirect($updatedDevLink->getOauthRedirectUrl());
}

$updatedDevLink = $this->storeOauthCredentials($request);
if ($updatedDevLink) {
return redirect(route('devlink.index'));
}

return view('admin.devlink.index');
}

public function getOauthClient(Request $request)
{
$request->validate([
'devlink_id' => 'required',
'redirect_uri' => ['required', 'url'],
]);

$devLinkId = $request->input('devlink_id');
$redirectUri = $request->input('redirect_uri');

$client = Client::where([
'name' => 'devlink',
'redirect' => $redirectUri,
])->first();

if (!$client) {
$clientRepository = app('Laravel\Passport\ClientRepository');
$client = $clientRepository->create(null, 'devlink', $redirectUri);
}

$query = http_build_query([
'devlink_id' => $devLinkId,
'client_id' => $client->id,
'client_secret' => $client->secret,
]);

return redirect($redirectUri . '?' . $query);
}

private function storeClientCredentials(Request $request)
{
if (
$request->has('devlink_id') &&
$request->has('client_id') &&
$request->has('client_secret')
) {
$devlink = DevLink::findOrFail($request->input('devlink_id'));
$devlink->update([
'client_id' => $request->input('client_id'),
'client_secret' => $request->input('client_secret'),
]);

return $devlink;
}

return false;
}

private function storeOauthCredentials(Request $request)
{
if (
$request->has('state') &&
$request->has('code')
) {
$devlink = DevLink::where('state', $request->input('state'))->firstOrFail();

$response = Http::asForm()->post($devlink->url . '/oauth/token', [
'grant_type' => 'authorization_code',
'client_id' => $devlink->client_id,
'client_secret' => $devlink->client_secret,
'redirect_uri' => route('devlink.index'),
'code' => $request->input('code'),
]);

$response = $response->json();
$devlink->update([
'access_token' => $response['access_token'],
'refresh_token' => $response['refresh_token'],
'expires_in' => $response['expires_in'],
]);

return $devlink;
}

return false;
}
}
154 changes: 154 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
<?php

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index()
{
return DevLink::all();
}

public function show(DevLink $devLink)
{
return $devLink;
}

public function store(Request $request)
{
$request->validate([
'name' => ['required', 'unique:dev_links,name'],
'url' => ['required', 'url', 'unique:dev_links,url'],
]);

$devLink = new DevLink();
$devLink->name = $request->input('name');
$devLink->url = $request->input('url');
$devLink->saveOrFail();

return [
...$devLink->toArray(),
'redirect_uri' => route('devlink.index'),
];
}

public function update(Request $request, DevLink $devLink)
{
$devLink->name = $request->input('name');
$devLink->saveOrFail();

return $devLink;
}

public function destroy(DevLink $devLink)
{
$devLink->delete();
}

public function ping(DevLink $devLink)
{
return $devLink->client()->get(route('api.devlink.pong', [], false));
}

public function pong()
{
return ['status' => 'ok'];
}

public function localBundles(Request $request)
{
if ($request->has('published')) {
return Bundle::published()->get();
}

return Bundle::get();
}

public function showBundle(Bundle $bundle)
{
return $bundle->load('assets');
}

public function remoteBundles(DevLink $devLink)
{
return $devLink->remoteBundles();
}

public function createBundle(Request $request)
{
$bundle = new Bundle();
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = 1;
$bundle->saveOrFail();

return $bundle;
}

public function updateBundle(Request $request, Bundle $bundle)
{
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
}

public function installRemoteBundle(DevLink $devLink, $remoteBundleId)
{
return $devLink->installRemoteBundle($remoteBundleId);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
}

public function exportLocalAsset(Request $request)
{
$asset = $request->input('class')::findOrFail($request->input('id'));

return $asset->export();
}

public function addAsset(Request $request, Bundle $bundle)
{
$request->validate([
'type' => ['required', 'string'],
'id' => Rule::unique('bundle_assets', 'asset_id')->where(function ($query) use ($request) {
$query->where([
'asset_id' => $request->input('id'),
'asset_type' => $request->input('type'),
]);
}),
],
[
'id.unique' => __('Asset already exists in bundle'),
]);

$asset = $request->input('type')::findOrFail($request->input('id'));
$bundle->addAsset($asset);
}

public function installRemoteAsset(Request $request, DevLink $devLink)
{
return $devLink->installRemoteAsset(
$request->input('class'),
$request->input('id')
);
}
}
51 changes: 26 additions & 25 deletions ProcessMaker/Http/Kernel.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,10 @@ class Kernel extends HttpKernel
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\ProcessMaker\Http\Middleware\TrimStrings::class,
Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\ProcessMaker\Http\Middleware\TrustProxies::class,
\ProcessMaker\Http\Middleware\BrowserCache::class,
Middleware\TrustProxies::class,
Middleware\BrowserCache::class,
];

/**
Expand All@@ -29,17 +29,17 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
\ProcessMaker\Http\Middleware\EncryptCookies::class,
Middleware\EncryptCookies::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\ProcessMaker\Http\Middleware\SessionStarted::class,
\ProcessMaker\Http\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\SessionControlKill::class,
Middleware\SessionStarted::class,
Middleware\AuthenticateSession::class,
Middleware\SessionControlKill::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
//\ProcessMaker\Http\Middleware\VerifyCsrfToken::class,
\ProcessMaker\Http\Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\ProcessMaker\Http\Middleware\GenerateMenus::class,
Middleware\GenerateMenus::class,
\Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
],
'api' => [
Expand All@@ -62,25 +62,26 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
'auth' => Middleware\ProcessMakerAuthenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \ProcessMaker\Http\Middleware\CustomAuthorize::class,
'force_change_password' => \ProcessMaker\Http\Middleware\VerifyChangePasswordNeeded::class,
'guest' => \ProcessMaker\Http\Middleware\RedirectIfAuthenticated::class,
'permission' => \ProcessMaker\Http\Middleware\PermissionCheck::class,
'can' => Middleware\CustomAuthorize::class,
'force_change_password' => Middleware\VerifyChangePasswordNeeded::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'permission' => Middleware\PermissionCheck::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'sanitize' => \ProcessMaker\Http\Middleware\SanitizeInput::class,
'setlocale' => \ProcessMaker\Http\Middleware\SetLocale::class,
'setskin' => \ProcessMaker\Http\Middleware\SetSkin::class,
'sanitize' => Middleware\SanitizeInput::class,
'setlocale' => Middleware\SetLocale::class,
'setskin' => Middleware\SetSkin::class,
'client' => \Laravel\Passport\Http\Middleware\CheckClientCredentials::class,
'template-authorization' => \ProcessMaker\Http\Middleware\TemplateAuthorization::class,
'edit_username_password' => \ProcessMaker\Http\Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => \ProcessMaker\Http\Middleware\TwoFactorAuthentication::class,
'saml_request' => \ProcessMaker\Http\Middleware\SamlRequest::class,
'session_block' => \ProcessMaker\Http\Middleware\SessionControlBlock::class,
'session_kill' => \ProcessMaker\Http\Middleware\SessionControlKill::class,
'no-cache' => \ProcessMaker\Http\Middleware\NoCache::class,
'template-authorization' => Middleware\TemplateAuthorization::class,
'edit_username_password' => Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => Middleware\TwoFactorAuthentication::class,
'saml_request' => Middleware\SamlRequest::class,
'session_block' => Middleware\SessionControlBlock::class,
'session_kill' => Middleware\SessionControlKill::class,
'no-cache' => Middleware\NoCache::class,
'admin' => Middleware\IsAdmin::class,
];

/**
Expand All@@ -95,6 +96,6 @@ class Kernel extends HttpKernel
*/
protected $middlewarePriority = [
\Illuminate\Session\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
Middleware\ProcessMakerAuthenticate::class,
];
}
Loading
, '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
11 changes: 11 additions & 0 deletions ProcessMaker/Enums/ExporterMap.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Enums;

use ProcessMaker\Models\ProcessMakerModel;

enum ExporterMap
{
const TYPES = [
Expand DownExpand Up@@ -30,4 +32,13 @@ public static function getExporterClass(string $type): ?string
{
return self::TYPES[$type][1] ?? null;
}

public static function getExporterClassForModel(ProcessMakerModel $model): string | null
{
$class = get_class($model);

return collect(self::TYPES)->first(function ($type) use ($class) {
return $type[0] == $class;
})[1] ?? null;
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Exception/ExporterNotSupported.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?php

namespace ProcessMaker\Exception;

use Exception;

class ExporterNotSupported extends Exception
{
}
105 changes: 105 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
<?php

namespace ProcessMaker\Http\Controllers\Admin;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Laravel\Passport\Client;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index(Request $request)
{
$updatedDevLink = $this->storeClientCredentials($request);

if ($updatedDevLink) {
return redirect($updatedDevLink->getOauthRedirectUrl());
}

$updatedDevLink = $this->storeOauthCredentials($request);
if ($updatedDevLink) {
return redirect(route('devlink.index'));
}

return view('admin.devlink.index');
}

public function getOauthClient(Request $request)
{
$request->validate([
'devlink_id' => 'required',
'redirect_uri' => ['required', 'url'],
]);

$devLinkId = $request->input('devlink_id');
$redirectUri = $request->input('redirect_uri');

$client = Client::where([
'name' => 'devlink',
'redirect' => $redirectUri,
])->first();

if (!$client) {
$clientRepository = app('Laravel\Passport\ClientRepository');
$client = $clientRepository->create(null, 'devlink', $redirectUri);
}

$query = http_build_query([
'devlink_id' => $devLinkId,
'client_id' => $client->id,
'client_secret' => $client->secret,
]);

return redirect($redirectUri . '?' . $query);
}

private function storeClientCredentials(Request $request)
{
if (
$request->has('devlink_id') &&
$request->has('client_id') &&
$request->has('client_secret')
) {
$devlink = DevLink::findOrFail($request->input('devlink_id'));
$devlink->update([
'client_id' => $request->input('client_id'),
'client_secret' => $request->input('client_secret'),
]);

return $devlink;
}

return false;
}

private function storeOauthCredentials(Request $request)
{
if (
$request->has('state') &&
$request->has('code')
) {
$devlink = DevLink::where('state', $request->input('state'))->firstOrFail();

$response = Http::asForm()->post($devlink->url . '/oauth/token', [
'grant_type' => 'authorization_code',
'client_id' => $devlink->client_id,
'client_secret' => $devlink->client_secret,
'redirect_uri' => route('devlink.index'),
'code' => $request->input('code'),
]);

$response = $response->json();
$devlink->update([
'access_token' => $response['access_token'],
'refresh_token' => $response['refresh_token'],
'expires_in' => $response['expires_in'],
]);

return $devlink;
}

return false;
}
}
154 changes: 154 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
<?php

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index()
{
return DevLink::all();
}

public function show(DevLink $devLink)
{
return $devLink;
}

public function store(Request $request)
{
$request->validate([
'name' => ['required', 'unique:dev_links,name'],
'url' => ['required', 'url', 'unique:dev_links,url'],
]);

$devLink = new DevLink();
$devLink->name = $request->input('name');
$devLink->url = $request->input('url');
$devLink->saveOrFail();

return [
...$devLink->toArray(),
'redirect_uri' => route('devlink.index'),
];
}

public function update(Request $request, DevLink $devLink)
{
$devLink->name = $request->input('name');
$devLink->saveOrFail();

return $devLink;
}

public function destroy(DevLink $devLink)
{
$devLink->delete();
}

public function ping(DevLink $devLink)
{
return $devLink->client()->get(route('api.devlink.pong', [], false));
}

public function pong()
{
return ['status' => 'ok'];
}

public function localBundles(Request $request)
{
if ($request->has('published')) {
return Bundle::published()->get();
}

return Bundle::get();
}

public function showBundle(Bundle $bundle)
{
return $bundle->load('assets');
}

public function remoteBundles(DevLink $devLink)
{
return $devLink->remoteBundles();
}

public function createBundle(Request $request)
{
$bundle = new Bundle();
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = 1;
$bundle->saveOrFail();

return $bundle;
}

public function updateBundle(Request $request, Bundle $bundle)
{
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
}

public function installRemoteBundle(DevLink $devLink, $remoteBundleId)
{
return $devLink->installRemoteBundle($remoteBundleId);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
}

public function exportLocalAsset(Request $request)
{
$asset = $request->input('class')::findOrFail($request->input('id'));

return $asset->export();
}

public function addAsset(Request $request, Bundle $bundle)
{
$request->validate([
'type' => ['required', 'string'],
'id' => Rule::unique('bundle_assets', 'asset_id')->where(function ($query) use ($request) {
$query->where([
'asset_id' => $request->input('id'),
'asset_type' => $request->input('type'),
]);
}),
],
[
'id.unique' => __('Asset already exists in bundle'),
]);

$asset = $request->input('type')::findOrFail($request->input('id'));
$bundle->addAsset($asset);
}

public function installRemoteAsset(Request $request, DevLink $devLink)
{
return $devLink->installRemoteAsset(
$request->input('class'),
$request->input('id')
);
}
}
51 changes: 26 additions & 25 deletions ProcessMaker/Http/Kernel.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,10 @@ class Kernel extends HttpKernel
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\ProcessMaker\Http\Middleware\TrimStrings::class,
Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\ProcessMaker\Http\Middleware\TrustProxies::class,
\ProcessMaker\Http\Middleware\BrowserCache::class,
Middleware\TrustProxies::class,
Middleware\BrowserCache::class,
];

/**
Expand All@@ -29,17 +29,17 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
\ProcessMaker\Http\Middleware\EncryptCookies::class,
Middleware\EncryptCookies::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\ProcessMaker\Http\Middleware\SessionStarted::class,
\ProcessMaker\Http\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\SessionControlKill::class,
Middleware\SessionStarted::class,
Middleware\AuthenticateSession::class,
Middleware\SessionControlKill::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
//\ProcessMaker\Http\Middleware\VerifyCsrfToken::class,
\ProcessMaker\Http\Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\ProcessMaker\Http\Middleware\GenerateMenus::class,
Middleware\GenerateMenus::class,
\Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
],
'api' => [
Expand All@@ -62,25 +62,26 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
'auth' => Middleware\ProcessMakerAuthenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \ProcessMaker\Http\Middleware\CustomAuthorize::class,
'force_change_password' => \ProcessMaker\Http\Middleware\VerifyChangePasswordNeeded::class,
'guest' => \ProcessMaker\Http\Middleware\RedirectIfAuthenticated::class,
'permission' => \ProcessMaker\Http\Middleware\PermissionCheck::class,
'can' => Middleware\CustomAuthorize::class,
'force_change_password' => Middleware\VerifyChangePasswordNeeded::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'permission' => Middleware\PermissionCheck::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'sanitize' => \ProcessMaker\Http\Middleware\SanitizeInput::class,
'setlocale' => \ProcessMaker\Http\Middleware\SetLocale::class,
'setskin' => \ProcessMaker\Http\Middleware\SetSkin::class,
'sanitize' => Middleware\SanitizeInput::class,
'setlocale' => Middleware\SetLocale::class,
'setskin' => Middleware\SetSkin::class,
'client' => \Laravel\Passport\Http\Middleware\CheckClientCredentials::class,
'template-authorization' => \ProcessMaker\Http\Middleware\TemplateAuthorization::class,
'edit_username_password' => \ProcessMaker\Http\Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => \ProcessMaker\Http\Middleware\TwoFactorAuthentication::class,
'saml_request' => \ProcessMaker\Http\Middleware\SamlRequest::class,
'session_block' => \ProcessMaker\Http\Middleware\SessionControlBlock::class,
'session_kill' => \ProcessMaker\Http\Middleware\SessionControlKill::class,
'no-cache' => \ProcessMaker\Http\Middleware\NoCache::class,
'template-authorization' => Middleware\TemplateAuthorization::class,
'edit_username_password' => Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => Middleware\TwoFactorAuthentication::class,
'saml_request' => Middleware\SamlRequest::class,
'session_block' => Middleware\SessionControlBlock::class,
'session_kill' => Middleware\SessionControlKill::class,
'no-cache' => Middleware\NoCache::class,
'admin' => Middleware\IsAdmin::class,
];

/**
Expand All@@ -95,6 +96,6 @@ class Kernel extends HttpKernel
*/
protected $middlewarePriority = [
\Illuminate\Session\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
Middleware\ProcessMakerAuthenticate::class,
];
}
Loading
, '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
11 changes: 11 additions & 0 deletions ProcessMaker/Enums/ExporterMap.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Enums;

use ProcessMaker\Models\ProcessMakerModel;

enum ExporterMap
{
const TYPES = [
Expand DownExpand Up@@ -30,4 +32,13 @@ public static function getExporterClass(string $type): ?string
{
return self::TYPES[$type][1] ?? null;
}

public static function getExporterClassForModel(ProcessMakerModel $model): string | null
{
$class = get_class($model);

return collect(self::TYPES)->first(function ($type) use ($class) {
return $type[0] == $class;
})[1] ?? null;
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Exception/ExporterNotSupported.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?php

namespace ProcessMaker\Exception;

use Exception;

class ExporterNotSupported extends Exception
{
}
105 changes: 105 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
<?php

namespace ProcessMaker\Http\Controllers\Admin;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Laravel\Passport\Client;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index(Request $request)
{
$updatedDevLink = $this->storeClientCredentials($request);

if ($updatedDevLink) {
return redirect($updatedDevLink->getOauthRedirectUrl());
}

$updatedDevLink = $this->storeOauthCredentials($request);
if ($updatedDevLink) {
return redirect(route('devlink.index'));
}

return view('admin.devlink.index');
}

public function getOauthClient(Request $request)
{
$request->validate([
'devlink_id' => 'required',
'redirect_uri' => ['required', 'url'],
]);

$devLinkId = $request->input('devlink_id');
$redirectUri = $request->input('redirect_uri');

$client = Client::where([
'name' => 'devlink',
'redirect' => $redirectUri,
])->first();

if (!$client) {
$clientRepository = app('Laravel\Passport\ClientRepository');
$client = $clientRepository->create(null, 'devlink', $redirectUri);
}

$query = http_build_query([
'devlink_id' => $devLinkId,
'client_id' => $client->id,
'client_secret' => $client->secret,
]);

return redirect($redirectUri . '?' . $query);
}

private function storeClientCredentials(Request $request)
{
if (
$request->has('devlink_id') &&
$request->has('client_id') &&
$request->has('client_secret')
) {
$devlink = DevLink::findOrFail($request->input('devlink_id'));
$devlink->update([
'client_id' => $request->input('client_id'),
'client_secret' => $request->input('client_secret'),
]);

return $devlink;
}

return false;
}

private function storeOauthCredentials(Request $request)
{
if (
$request->has('state') &&
$request->has('code')
) {
$devlink = DevLink::where('state', $request->input('state'))->firstOrFail();

$response = Http::asForm()->post($devlink->url . '/oauth/token', [
'grant_type' => 'authorization_code',
'client_id' => $devlink->client_id,
'client_secret' => $devlink->client_secret,
'redirect_uri' => route('devlink.index'),
'code' => $request->input('code'),
]);

$response = $response->json();
$devlink->update([
'access_token' => $response['access_token'],
'refresh_token' => $response['refresh_token'],
'expires_in' => $response['expires_in'],
]);

return $devlink;
}

return false;
}
}
154 changes: 154 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
<?php

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index()
{
return DevLink::all();
}

public function show(DevLink $devLink)
{
return $devLink;
}

public function store(Request $request)
{
$request->validate([
'name' => ['required', 'unique:dev_links,name'],
'url' => ['required', 'url', 'unique:dev_links,url'],
]);

$devLink = new DevLink();
$devLink->name = $request->input('name');
$devLink->url = $request->input('url');
$devLink->saveOrFail();

return [
...$devLink->toArray(),
'redirect_uri' => route('devlink.index'),
];
}

public function update(Request $request, DevLink $devLink)
{
$devLink->name = $request->input('name');
$devLink->saveOrFail();

return $devLink;
}

public function destroy(DevLink $devLink)
{
$devLink->delete();
}

public function ping(DevLink $devLink)
{
return $devLink->client()->get(route('api.devlink.pong', [], false));
}

public function pong()
{
return ['status' => 'ok'];
}

public function localBundles(Request $request)
{
if ($request->has('published')) {
return Bundle::published()->get();
}

return Bundle::get();
}

public function showBundle(Bundle $bundle)
{
return $bundle->load('assets');
}

public function remoteBundles(DevLink $devLink)
{
return $devLink->remoteBundles();
}

public function createBundle(Request $request)
{
$bundle = new Bundle();
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = 1;
$bundle->saveOrFail();

return $bundle;
}

public function updateBundle(Request $request, Bundle $bundle)
{
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
}

public function installRemoteBundle(DevLink $devLink, $remoteBundleId)
{
return $devLink->installRemoteBundle($remoteBundleId);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
}

public function exportLocalAsset(Request $request)
{
$asset = $request->input('class')::findOrFail($request->input('id'));

return $asset->export();
}

public function addAsset(Request $request, Bundle $bundle)
{
$request->validate([
'type' => ['required', 'string'],
'id' => Rule::unique('bundle_assets', 'asset_id')->where(function ($query) use ($request) {
$query->where([
'asset_id' => $request->input('id'),
'asset_type' => $request->input('type'),
]);
}),
],
[
'id.unique' => __('Asset already exists in bundle'),
]);

$asset = $request->input('type')::findOrFail($request->input('id'));
$bundle->addAsset($asset);
}

public function installRemoteAsset(Request $request, DevLink $devLink)
{
return $devLink->installRemoteAsset(
$request->input('class'),
$request->input('id')
);
}
}
51 changes: 26 additions & 25 deletions ProcessMaker/Http/Kernel.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,10 @@ class Kernel extends HttpKernel
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\ProcessMaker\Http\Middleware\TrimStrings::class,
Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\ProcessMaker\Http\Middleware\TrustProxies::class,
\ProcessMaker\Http\Middleware\BrowserCache::class,
Middleware\TrustProxies::class,
Middleware\BrowserCache::class,
];

/**
Expand All@@ -29,17 +29,17 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
\ProcessMaker\Http\Middleware\EncryptCookies::class,
Middleware\EncryptCookies::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\ProcessMaker\Http\Middleware\SessionStarted::class,
\ProcessMaker\Http\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\SessionControlKill::class,
Middleware\SessionStarted::class,
Middleware\AuthenticateSession::class,
Middleware\SessionControlKill::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
//\ProcessMaker\Http\Middleware\VerifyCsrfToken::class,
\ProcessMaker\Http\Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\ProcessMaker\Http\Middleware\GenerateMenus::class,
Middleware\GenerateMenus::class,
\Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
],
'api' => [
Expand All@@ -62,25 +62,26 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
'auth' => Middleware\ProcessMakerAuthenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \ProcessMaker\Http\Middleware\CustomAuthorize::class,
'force_change_password' => \ProcessMaker\Http\Middleware\VerifyChangePasswordNeeded::class,
'guest' => \ProcessMaker\Http\Middleware\RedirectIfAuthenticated::class,
'permission' => \ProcessMaker\Http\Middleware\PermissionCheck::class,
'can' => Middleware\CustomAuthorize::class,
'force_change_password' => Middleware\VerifyChangePasswordNeeded::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'permission' => Middleware\PermissionCheck::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'sanitize' => \ProcessMaker\Http\Middleware\SanitizeInput::class,
'setlocale' => \ProcessMaker\Http\Middleware\SetLocale::class,
'setskin' => \ProcessMaker\Http\Middleware\SetSkin::class,
'sanitize' => Middleware\SanitizeInput::class,
'setlocale' => Middleware\SetLocale::class,
'setskin' => Middleware\SetSkin::class,
'client' => \Laravel\Passport\Http\Middleware\CheckClientCredentials::class,
'template-authorization' => \ProcessMaker\Http\Middleware\TemplateAuthorization::class,
'edit_username_password' => \ProcessMaker\Http\Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => \ProcessMaker\Http\Middleware\TwoFactorAuthentication::class,
'saml_request' => \ProcessMaker\Http\Middleware\SamlRequest::class,
'session_block' => \ProcessMaker\Http\Middleware\SessionControlBlock::class,
'session_kill' => \ProcessMaker\Http\Middleware\SessionControlKill::class,
'no-cache' => \ProcessMaker\Http\Middleware\NoCache::class,
'template-authorization' => Middleware\TemplateAuthorization::class,
'edit_username_password' => Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => Middleware\TwoFactorAuthentication::class,
'saml_request' => Middleware\SamlRequest::class,
'session_block' => Middleware\SessionControlBlock::class,
'session_kill' => Middleware\SessionControlKill::class,
'no-cache' => Middleware\NoCache::class,
'admin' => Middleware\IsAdmin::class,
];

/**
Expand All@@ -95,6 +96,6 @@ class Kernel extends HttpKernel
*/
protected $middlewarePriority = [
\Illuminate\Session\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
Middleware\ProcessMakerAuthenticate::class,
];
}
Loading
, '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
11 changes: 11 additions & 0 deletions ProcessMaker/Enums/ExporterMap.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Enums;

use ProcessMaker\Models\ProcessMakerModel;

enum ExporterMap
{
const TYPES = [
Expand DownExpand Up@@ -30,4 +32,13 @@ public static function getExporterClass(string $type): ?string
{
return self::TYPES[$type][1] ?? null;
}

public static function getExporterClassForModel(ProcessMakerModel $model): string | null
{
$class = get_class($model);

return collect(self::TYPES)->first(function ($type) use ($class) {
return $type[0] == $class;
})[1] ?? null;
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Exception/ExporterNotSupported.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?php

namespace ProcessMaker\Exception;

use Exception;

class ExporterNotSupported extends Exception
{
}
105 changes: 105 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
<?php

namespace ProcessMaker\Http\Controllers\Admin;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Laravel\Passport\Client;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index(Request $request)
{
$updatedDevLink = $this->storeClientCredentials($request);

if ($updatedDevLink) {
return redirect($updatedDevLink->getOauthRedirectUrl());
}

$updatedDevLink = $this->storeOauthCredentials($request);
if ($updatedDevLink) {
return redirect(route('devlink.index'));
}

return view('admin.devlink.index');
}

public function getOauthClient(Request $request)
{
$request->validate([
'devlink_id' => 'required',
'redirect_uri' => ['required', 'url'],
]);

$devLinkId = $request->input('devlink_id');
$redirectUri = $request->input('redirect_uri');

$client = Client::where([
'name' => 'devlink',
'redirect' => $redirectUri,
])->first();

if (!$client) {
$clientRepository = app('Laravel\Passport\ClientRepository');
$client = $clientRepository->create(null, 'devlink', $redirectUri);
}

$query = http_build_query([
'devlink_id' => $devLinkId,
'client_id' => $client->id,
'client_secret' => $client->secret,
]);

return redirect($redirectUri . '?' . $query);
}

private function storeClientCredentials(Request $request)
{
if (
$request->has('devlink_id') &&
$request->has('client_id') &&
$request->has('client_secret')
) {
$devlink = DevLink::findOrFail($request->input('devlink_id'));
$devlink->update([
'client_id' => $request->input('client_id'),
'client_secret' => $request->input('client_secret'),
]);

return $devlink;
}

return false;
}

private function storeOauthCredentials(Request $request)
{
if (
$request->has('state') &&
$request->has('code')
) {
$devlink = DevLink::where('state', $request->input('state'))->firstOrFail();

$response = Http::asForm()->post($devlink->url . '/oauth/token', [
'grant_type' => 'authorization_code',
'client_id' => $devlink->client_id,
'client_secret' => $devlink->client_secret,
'redirect_uri' => route('devlink.index'),
'code' => $request->input('code'),
]);

$response = $response->json();
$devlink->update([
'access_token' => $response['access_token'],
'refresh_token' => $response['refresh_token'],
'expires_in' => $response['expires_in'],
]);

return $devlink;
}

return false;
}
}
154 changes: 154 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
<?php

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index()
{
return DevLink::all();
}

public function show(DevLink $devLink)
{
return $devLink;
}

public function store(Request $request)
{
$request->validate([
'name' => ['required', 'unique:dev_links,name'],
'url' => ['required', 'url', 'unique:dev_links,url'],
]);

$devLink = new DevLink();
$devLink->name = $request->input('name');
$devLink->url = $request->input('url');
$devLink->saveOrFail();

return [
...$devLink->toArray(),
'redirect_uri' => route('devlink.index'),
];
}

public function update(Request $request, DevLink $devLink)
{
$devLink->name = $request->input('name');
$devLink->saveOrFail();

return $devLink;
}

public function destroy(DevLink $devLink)
{
$devLink->delete();
}

public function ping(DevLink $devLink)
{
return $devLink->client()->get(route('api.devlink.pong', [], false));
}

public function pong()
{
return ['status' => 'ok'];
}

public function localBundles(Request $request)
{
if ($request->has('published')) {
return Bundle::published()->get();
}

return Bundle::get();
}

public function showBundle(Bundle $bundle)
{
return $bundle->load('assets');
}

public function remoteBundles(DevLink $devLink)
{
return $devLink->remoteBundles();
}

public function createBundle(Request $request)
{
$bundle = new Bundle();
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = 1;
$bundle->saveOrFail();

return $bundle;
}

public function updateBundle(Request $request, Bundle $bundle)
{
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
}

public function installRemoteBundle(DevLink $devLink, $remoteBundleId)
{
return $devLink->installRemoteBundle($remoteBundleId);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
}

public function exportLocalAsset(Request $request)
{
$asset = $request->input('class')::findOrFail($request->input('id'));

return $asset->export();
}

public function addAsset(Request $request, Bundle $bundle)
{
$request->validate([
'type' => ['required', 'string'],
'id' => Rule::unique('bundle_assets', 'asset_id')->where(function ($query) use ($request) {
$query->where([
'asset_id' => $request->input('id'),
'asset_type' => $request->input('type'),
]);
}),
],
[
'id.unique' => __('Asset already exists in bundle'),
]);

$asset = $request->input('type')::findOrFail($request->input('id'));
$bundle->addAsset($asset);
}

public function installRemoteAsset(Request $request, DevLink $devLink)
{
return $devLink->installRemoteAsset(
$request->input('class'),
$request->input('id')
);
}
}
51 changes: 26 additions & 25 deletions ProcessMaker/Http/Kernel.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,10 @@ class Kernel extends HttpKernel
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\ProcessMaker\Http\Middleware\TrimStrings::class,
Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\ProcessMaker\Http\Middleware\TrustProxies::class,
\ProcessMaker\Http\Middleware\BrowserCache::class,
Middleware\TrustProxies::class,
Middleware\BrowserCache::class,
];

/**
Expand All@@ -29,17 +29,17 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
\ProcessMaker\Http\Middleware\EncryptCookies::class,
Middleware\EncryptCookies::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\ProcessMaker\Http\Middleware\SessionStarted::class,
\ProcessMaker\Http\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\SessionControlKill::class,
Middleware\SessionStarted::class,
Middleware\AuthenticateSession::class,
Middleware\SessionControlKill::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
//\ProcessMaker\Http\Middleware\VerifyCsrfToken::class,
\ProcessMaker\Http\Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\ProcessMaker\Http\Middleware\GenerateMenus::class,
Middleware\GenerateMenus::class,
\Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
],
'api' => [
Expand All@@ -62,25 +62,26 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
'auth' => Middleware\ProcessMakerAuthenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \ProcessMaker\Http\Middleware\CustomAuthorize::class,
'force_change_password' => \ProcessMaker\Http\Middleware\VerifyChangePasswordNeeded::class,
'guest' => \ProcessMaker\Http\Middleware\RedirectIfAuthenticated::class,
'permission' => \ProcessMaker\Http\Middleware\PermissionCheck::class,
'can' => Middleware\CustomAuthorize::class,
'force_change_password' => Middleware\VerifyChangePasswordNeeded::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'permission' => Middleware\PermissionCheck::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'sanitize' => \ProcessMaker\Http\Middleware\SanitizeInput::class,
'setlocale' => \ProcessMaker\Http\Middleware\SetLocale::class,
'setskin' => \ProcessMaker\Http\Middleware\SetSkin::class,
'sanitize' => Middleware\SanitizeInput::class,
'setlocale' => Middleware\SetLocale::class,
'setskin' => Middleware\SetSkin::class,
'client' => \Laravel\Passport\Http\Middleware\CheckClientCredentials::class,
'template-authorization' => \ProcessMaker\Http\Middleware\TemplateAuthorization::class,
'edit_username_password' => \ProcessMaker\Http\Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => \ProcessMaker\Http\Middleware\TwoFactorAuthentication::class,
'saml_request' => \ProcessMaker\Http\Middleware\SamlRequest::class,
'session_block' => \ProcessMaker\Http\Middleware\SessionControlBlock::class,
'session_kill' => \ProcessMaker\Http\Middleware\SessionControlKill::class,
'no-cache' => \ProcessMaker\Http\Middleware\NoCache::class,
'template-authorization' => Middleware\TemplateAuthorization::class,
'edit_username_password' => Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => Middleware\TwoFactorAuthentication::class,
'saml_request' => Middleware\SamlRequest::class,
'session_block' => Middleware\SessionControlBlock::class,
'session_kill' => Middleware\SessionControlKill::class,
'no-cache' => Middleware\NoCache::class,
'admin' => Middleware\IsAdmin::class,
];

/**
Expand All@@ -95,6 +96,6 @@ class Kernel extends HttpKernel
*/
protected $middlewarePriority = [
\Illuminate\Session\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
Middleware\ProcessMakerAuthenticate::class,
];
}
Loading
, '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
11 changes: 11 additions & 0 deletions ProcessMaker/Enums/ExporterMap.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Enums;

use ProcessMaker\Models\ProcessMakerModel;

enum ExporterMap
{
const TYPES = [
Expand DownExpand Up@@ -30,4 +32,13 @@ public static function getExporterClass(string $type): ?string
{
return self::TYPES[$type][1] ?? null;
}

public static function getExporterClassForModel(ProcessMakerModel $model): string | null
{
$class = get_class($model);

return collect(self::TYPES)->first(function ($type) use ($class) {
return $type[0] == $class;
})[1] ?? null;
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Exception/ExporterNotSupported.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?php

namespace ProcessMaker\Exception;

use Exception;

class ExporterNotSupported extends Exception
{
}
105 changes: 105 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
<?php

namespace ProcessMaker\Http\Controllers\Admin;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Laravel\Passport\Client;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index(Request $request)
{
$updatedDevLink = $this->storeClientCredentials($request);

if ($updatedDevLink) {
return redirect($updatedDevLink->getOauthRedirectUrl());
}

$updatedDevLink = $this->storeOauthCredentials($request);
if ($updatedDevLink) {
return redirect(route('devlink.index'));
}

return view('admin.devlink.index');
}

public function getOauthClient(Request $request)
{
$request->validate([
'devlink_id' => 'required',
'redirect_uri' => ['required', 'url'],
]);

$devLinkId = $request->input('devlink_id');
$redirectUri = $request->input('redirect_uri');

$client = Client::where([
'name' => 'devlink',
'redirect' => $redirectUri,
])->first();

if (!$client) {
$clientRepository = app('Laravel\Passport\ClientRepository');
$client = $clientRepository->create(null, 'devlink', $redirectUri);
}

$query = http_build_query([
'devlink_id' => $devLinkId,
'client_id' => $client->id,
'client_secret' => $client->secret,
]);

return redirect($redirectUri . '?' . $query);
}

private function storeClientCredentials(Request $request)
{
if (
$request->has('devlink_id') &&
$request->has('client_id') &&
$request->has('client_secret')
) {
$devlink = DevLink::findOrFail($request->input('devlink_id'));
$devlink->update([
'client_id' => $request->input('client_id'),
'client_secret' => $request->input('client_secret'),
]);

return $devlink;
}

return false;
}

private function storeOauthCredentials(Request $request)
{
if (
$request->has('state') &&
$request->has('code')
) {
$devlink = DevLink::where('state', $request->input('state'))->firstOrFail();

$response = Http::asForm()->post($devlink->url . '/oauth/token', [
'grant_type' => 'authorization_code',
'client_id' => $devlink->client_id,
'client_secret' => $devlink->client_secret,
'redirect_uri' => route('devlink.index'),
'code' => $request->input('code'),
]);

$response = $response->json();
$devlink->update([
'access_token' => $response['access_token'],
'refresh_token' => $response['refresh_token'],
'expires_in' => $response['expires_in'],
]);

return $devlink;
}

return false;
}
}
154 changes: 154 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
<?php

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index()
{
return DevLink::all();
}

public function show(DevLink $devLink)
{
return $devLink;
}

public function store(Request $request)
{
$request->validate([
'name' => ['required', 'unique:dev_links,name'],
'url' => ['required', 'url', 'unique:dev_links,url'],
]);

$devLink = new DevLink();
$devLink->name = $request->input('name');
$devLink->url = $request->input('url');
$devLink->saveOrFail();

return [
...$devLink->toArray(),
'redirect_uri' => route('devlink.index'),
];
}

public function update(Request $request, DevLink $devLink)
{
$devLink->name = $request->input('name');
$devLink->saveOrFail();

return $devLink;
}

public function destroy(DevLink $devLink)
{
$devLink->delete();
}

public function ping(DevLink $devLink)
{
return $devLink->client()->get(route('api.devlink.pong', [], false));
}

public function pong()
{
return ['status' => 'ok'];
}

public function localBundles(Request $request)
{
if ($request->has('published')) {
return Bundle::published()->get();
}

return Bundle::get();
}

public function showBundle(Bundle $bundle)
{
return $bundle->load('assets');
}

public function remoteBundles(DevLink $devLink)
{
return $devLink->remoteBundles();
}

public function createBundle(Request $request)
{
$bundle = new Bundle();
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = 1;
$bundle->saveOrFail();

return $bundle;
}

public function updateBundle(Request $request, Bundle $bundle)
{
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
}

public function installRemoteBundle(DevLink $devLink, $remoteBundleId)
{
return $devLink->installRemoteBundle($remoteBundleId);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
}

public function exportLocalAsset(Request $request)
{
$asset = $request->input('class')::findOrFail($request->input('id'));

return $asset->export();
}

public function addAsset(Request $request, Bundle $bundle)
{
$request->validate([
'type' => ['required', 'string'],
'id' => Rule::unique('bundle_assets', 'asset_id')->where(function ($query) use ($request) {
$query->where([
'asset_id' => $request->input('id'),
'asset_type' => $request->input('type'),
]);
}),
],
[
'id.unique' => __('Asset already exists in bundle'),
]);

$asset = $request->input('type')::findOrFail($request->input('id'));
$bundle->addAsset($asset);
}

public function installRemoteAsset(Request $request, DevLink $devLink)
{
return $devLink->installRemoteAsset(
$request->input('class'),
$request->input('id')
);
}
}
51 changes: 26 additions & 25 deletions ProcessMaker/Http/Kernel.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,10 @@ class Kernel extends HttpKernel
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\ProcessMaker\Http\Middleware\TrimStrings::class,
Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\ProcessMaker\Http\Middleware\TrustProxies::class,
\ProcessMaker\Http\Middleware\BrowserCache::class,
Middleware\TrustProxies::class,
Middleware\BrowserCache::class,
];

/**
Expand All@@ -29,17 +29,17 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
\ProcessMaker\Http\Middleware\EncryptCookies::class,
Middleware\EncryptCookies::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\ProcessMaker\Http\Middleware\SessionStarted::class,
\ProcessMaker\Http\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\SessionControlKill::class,
Middleware\SessionStarted::class,
Middleware\AuthenticateSession::class,
Middleware\SessionControlKill::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
//\ProcessMaker\Http\Middleware\VerifyCsrfToken::class,
\ProcessMaker\Http\Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\ProcessMaker\Http\Middleware\GenerateMenus::class,
Middleware\GenerateMenus::class,
\Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
],
'api' => [
Expand All@@ -62,25 +62,26 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
'auth' => Middleware\ProcessMakerAuthenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \ProcessMaker\Http\Middleware\CustomAuthorize::class,
'force_change_password' => \ProcessMaker\Http\Middleware\VerifyChangePasswordNeeded::class,
'guest' => \ProcessMaker\Http\Middleware\RedirectIfAuthenticated::class,
'permission' => \ProcessMaker\Http\Middleware\PermissionCheck::class,
'can' => Middleware\CustomAuthorize::class,
'force_change_password' => Middleware\VerifyChangePasswordNeeded::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'permission' => Middleware\PermissionCheck::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'sanitize' => \ProcessMaker\Http\Middleware\SanitizeInput::class,
'setlocale' => \ProcessMaker\Http\Middleware\SetLocale::class,
'setskin' => \ProcessMaker\Http\Middleware\SetSkin::class,
'sanitize' => Middleware\SanitizeInput::class,
'setlocale' => Middleware\SetLocale::class,
'setskin' => Middleware\SetSkin::class,
'client' => \Laravel\Passport\Http\Middleware\CheckClientCredentials::class,
'template-authorization' => \ProcessMaker\Http\Middleware\TemplateAuthorization::class,
'edit_username_password' => \ProcessMaker\Http\Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => \ProcessMaker\Http\Middleware\TwoFactorAuthentication::class,
'saml_request' => \ProcessMaker\Http\Middleware\SamlRequest::class,
'session_block' => \ProcessMaker\Http\Middleware\SessionControlBlock::class,
'session_kill' => \ProcessMaker\Http\Middleware\SessionControlKill::class,
'no-cache' => \ProcessMaker\Http\Middleware\NoCache::class,
'template-authorization' => Middleware\TemplateAuthorization::class,
'edit_username_password' => Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => Middleware\TwoFactorAuthentication::class,
'saml_request' => Middleware\SamlRequest::class,
'session_block' => Middleware\SessionControlBlock::class,
'session_kill' => Middleware\SessionControlKill::class,
'no-cache' => Middleware\NoCache::class,
'admin' => Middleware\IsAdmin::class,
];

/**
Expand All@@ -95,6 +96,6 @@ class Kernel extends HttpKernel
*/
protected $middlewarePriority = [
\Illuminate\Session\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
Middleware\ProcessMakerAuthenticate::class,
];
}
Loading
, '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
11 changes: 11 additions & 0 deletions ProcessMaker/Enums/ExporterMap.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,8 @@

namespace ProcessMaker\Enums;

use ProcessMaker\Models\ProcessMakerModel;

enum ExporterMap
{
const TYPES = [
Expand DownExpand Up@@ -30,4 +32,13 @@ public static function getExporterClass(string $type): ?string
{
return self::TYPES[$type][1] ?? null;
}

public static function getExporterClassForModel(ProcessMakerModel $model): string | null
{
$class = get_class($model);

return collect(self::TYPES)->first(function ($type) use ($class) {
return $type[0] == $class;
})[1] ?? null;
}
}
9 changes: 9 additions & 0 deletions ProcessMaker/Exception/ExporterNotSupported.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
<?php

namespace ProcessMaker\Exception;

use Exception;

class ExporterNotSupported extends Exception
{
}
105 changes: 105 additions & 0 deletions ProcessMaker/Http/Controllers/Admin/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
<?php

namespace ProcessMaker\Http\Controllers\Admin;

use Illuminate\Http\Request;
use Illuminate\Support\Facades\Http;
use Laravel\Passport\Client;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index(Request $request)
{
$updatedDevLink = $this->storeClientCredentials($request);

if ($updatedDevLink) {
return redirect($updatedDevLink->getOauthRedirectUrl());
}

$updatedDevLink = $this->storeOauthCredentials($request);
if ($updatedDevLink) {
return redirect(route('devlink.index'));
}

return view('admin.devlink.index');
}

public function getOauthClient(Request $request)
{
$request->validate([
'devlink_id' => 'required',
'redirect_uri' => ['required', 'url'],
]);

$devLinkId = $request->input('devlink_id');
$redirectUri = $request->input('redirect_uri');

$client = Client::where([
'name' => 'devlink',
'redirect' => $redirectUri,
])->first();

if (!$client) {
$clientRepository = app('Laravel\Passport\ClientRepository');
$client = $clientRepository->create(null, 'devlink', $redirectUri);
}

$query = http_build_query([
'devlink_id' => $devLinkId,
'client_id' => $client->id,
'client_secret' => $client->secret,
]);

return redirect($redirectUri . '?' . $query);
}

private function storeClientCredentials(Request $request)
{
if (
$request->has('devlink_id') &&
$request->has('client_id') &&
$request->has('client_secret')
) {
$devlink = DevLink::findOrFail($request->input('devlink_id'));
$devlink->update([
'client_id' => $request->input('client_id'),
'client_secret' => $request->input('client_secret'),
]);

return $devlink;
}

return false;
}

private function storeOauthCredentials(Request $request)
{
if (
$request->has('state') &&
$request->has('code')
) {
$devlink = DevLink::where('state', $request->input('state'))->firstOrFail();

$response = Http::asForm()->post($devlink->url . '/oauth/token', [
'grant_type' => 'authorization_code',
'client_id' => $devlink->client_id,
'client_secret' => $devlink->client_secret,
'redirect_uri' => route('devlink.index'),
'code' => $request->input('code'),
]);

$response = $response->json();
$devlink->update([
'access_token' => $response['access_token'],
'refresh_token' => $response['refresh_token'],
'expires_in' => $response['expires_in'],
]);

return $devlink;
}

return false;
}
}
154 changes: 154 additions & 0 deletions ProcessMaker/Http/Controllers/Api/DevLinkController.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
<?php

namespace ProcessMaker\Http\Controllers\Api;

use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use ProcessMaker\Http\Controllers\Controller;
use ProcessMaker\Models\Bundle;
use ProcessMaker\Models\DevLink;

class DevLinkController extends Controller
{
public function index()
{
return DevLink::all();
}

public function show(DevLink $devLink)
{
return $devLink;
}

public function store(Request $request)
{
$request->validate([
'name' => ['required', 'unique:dev_links,name'],
'url' => ['required', 'url', 'unique:dev_links,url'],
]);

$devLink = new DevLink();
$devLink->name = $request->input('name');
$devLink->url = $request->input('url');
$devLink->saveOrFail();

return [
...$devLink->toArray(),
'redirect_uri' => route('devlink.index'),
];
}

public function update(Request $request, DevLink $devLink)
{
$devLink->name = $request->input('name');
$devLink->saveOrFail();

return $devLink;
}

public function destroy(DevLink $devLink)
{
$devLink->delete();
}

public function ping(DevLink $devLink)
{
return $devLink->client()->get(route('api.devlink.pong', [], false));
}

public function pong()
{
return ['status' => 'ok'];
}

public function localBundles(Request $request)
{
if ($request->has('published')) {
return Bundle::published()->get();
}

return Bundle::get();
}

public function showBundle(Bundle $bundle)
{
return $bundle->load('assets');
}

public function remoteBundles(DevLink $devLink)
{
return $devLink->remoteBundles();
}

public function createBundle(Request $request)
{
$bundle = new Bundle();
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = 1;
$bundle->saveOrFail();

return $bundle;
}

public function updateBundle(Request $request, Bundle $bundle)
{
$bundle->name = $request->input('name');
$bundle->published = (bool) $request->input('published', false);
$bundle->locked = (bool) $request->input('locked', false);
$bundle->version = $bundle->version + 1;
$bundle->saveOrFail();

return $bundle;
}

public function deleteBundle(Bundle $bundle)
{
$bundle->delete();
}

public function installRemoteBundle(DevLink $devLink, $remoteBundleId)
{
return $devLink->installRemoteBundle($remoteBundleId);
}

public function exportLocalBundle(Bundle $bundle)
{
return ['payloads' => $bundle->export()];
}

public function exportLocalAsset(Request $request)
{
$asset = $request->input('class')::findOrFail($request->input('id'));

return $asset->export();
}

public function addAsset(Request $request, Bundle $bundle)
{
$request->validate([
'type' => ['required', 'string'],
'id' => Rule::unique('bundle_assets', 'asset_id')->where(function ($query) use ($request) {
$query->where([
'asset_id' => $request->input('id'),
'asset_type' => $request->input('type'),
]);
}),
],
[
'id.unique' => __('Asset already exists in bundle'),
]);

$asset = $request->input('type')::findOrFail($request->input('id'));
$bundle->addAsset($asset);
}

public function installRemoteAsset(Request $request, DevLink $devLink)
{
return $devLink->installRemoteAsset(
$request->input('class'),
$request->input('id')
);
}
}
51 changes: 26 additions & 25 deletions ProcessMaker/Http/Kernel.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,10 +16,10 @@ class Kernel extends HttpKernel
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\ProcessMaker\Http\Middleware\TrimStrings::class,
Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\ProcessMaker\Http\Middleware\TrustProxies::class,
\ProcessMaker\Http\Middleware\BrowserCache::class,
Middleware\TrustProxies::class,
Middleware\BrowserCache::class,
];

/**
Expand All@@ -29,17 +29,17 @@ class Kernel extends HttpKernel
*/
protected $middlewareGroups = [
'web' => [
\ProcessMaker\Http\Middleware\EncryptCookies::class,
Middleware\EncryptCookies::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\ProcessMaker\Http\Middleware\SessionStarted::class,
\ProcessMaker\Http\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\SessionControlKill::class,
Middleware\SessionStarted::class,
Middleware\AuthenticateSession::class,
Middleware\SessionControlKill::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
//\ProcessMaker\Http\Middleware\VerifyCsrfToken::class,
\ProcessMaker\Http\Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
Middleware\SetLocale::class, // This is disabled until all routes are handled by our new engine
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\ProcessMaker\Http\Middleware\GenerateMenus::class,
Middleware\GenerateMenus::class,
\Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
],
'api' => [
Expand All@@ -62,25 +62,26 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
'auth' => Middleware\ProcessMakerAuthenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \ProcessMaker\Http\Middleware\CustomAuthorize::class,
'force_change_password' => \ProcessMaker\Http\Middleware\VerifyChangePasswordNeeded::class,
'guest' => \ProcessMaker\Http\Middleware\RedirectIfAuthenticated::class,
'permission' => \ProcessMaker\Http\Middleware\PermissionCheck::class,
'can' => Middleware\CustomAuthorize::class,
'force_change_password' => Middleware\VerifyChangePasswordNeeded::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'permission' => Middleware\PermissionCheck::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'sanitize' => \ProcessMaker\Http\Middleware\SanitizeInput::class,
'setlocale' => \ProcessMaker\Http\Middleware\SetLocale::class,
'setskin' => \ProcessMaker\Http\Middleware\SetSkin::class,
'sanitize' => Middleware\SanitizeInput::class,
'setlocale' => Middleware\SetLocale::class,
'setskin' => Middleware\SetSkin::class,
'client' => \Laravel\Passport\Http\Middleware\CheckClientCredentials::class,
'template-authorization' => \ProcessMaker\Http\Middleware\TemplateAuthorization::class,
'edit_username_password' => \ProcessMaker\Http\Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => \ProcessMaker\Http\Middleware\TwoFactorAuthentication::class,
'saml_request' => \ProcessMaker\Http\Middleware\SamlRequest::class,
'session_block' => \ProcessMaker\Http\Middleware\SessionControlBlock::class,
'session_kill' => \ProcessMaker\Http\Middleware\SessionControlKill::class,
'no-cache' => \ProcessMaker\Http\Middleware\NoCache::class,
'template-authorization' => Middleware\TemplateAuthorization::class,
'edit_username_password' => Middleware\ValidateEditUserAndPasswordPermission::class,
'2fa' => Middleware\TwoFactorAuthentication::class,
'saml_request' => Middleware\SamlRequest::class,
'session_block' => Middleware\SessionControlBlock::class,
'session_kill' => Middleware\SessionControlKill::class,
'no-cache' => Middleware\NoCache::class,
'admin' => Middleware\IsAdmin::class,
];

/**
Expand All@@ -95,6 +96,6 @@ class Kernel extends HttpKernel
*/
protected $middlewarePriority = [
\Illuminate\Session\Middleware\AuthenticateSession::class,
\ProcessMaker\Http\Middleware\ProcessMakerAuthenticate::class,
Middleware\ProcessMakerAuthenticate::class,
];
}
Loading