Skip to content

Commit 52d0a19

Browse files
author
Leonix
committed
Webasyst Framework v.3.5.1
1 parent 3dfe708 commit 52d0a19

28 files changed

+54
-28
lines changed

wa-apps/installer/lib/classes/installerServicesApi.class.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,15 @@ public function serviceCall(
6464
}
6565
$url .= $service_sub_path;
6666
$token = $this->getToken($use_system_token);
67+
if (empty($token)) {
68+
throw new waException('Unable to get access token for Webasyst service API');
69+
}
6770
$resp = $this->requestApiUrl($url, $token, $params, $http_method, $net_options);
6871
if ($resp['status'] == 401) {
6972
$token = $this->getToken($use_system_token, true);
73+
if (empty($token)) {
74+
throw new waException('Unable to get access token for Webasyst service API');
75+
}
7076
$resp = $this->requestApiUrl($url, $token, $params, $http_method, $net_options);
7177
} else if ($resp['status'] == 404) {
7278
// If endpoint URL is invalid, try to refresh endpoint config and repeate call

wa-apps/installer/lib/config/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
'description' => 'Install new apps from the Webasyst Store',
55
'icon' => 'img/installer.svg',
66
'mobile' => false,
7-
'version' => '3.5.0',
8-
'critical' => '3.5.0',
7+
'version' => '3.5.1',
8+
'critical' => '3.5.1',
99
'system' => true,
1010
'vendor' => 'webasyst',
1111
'csrf' => true,
281 Bytes
Binary file not shown.

wa-apps/installer/locale/ru_RU/LC_MESSAGES/installer.po

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,3 +591,6 @@ msgstr "Не настроено подключение к Webasyst ID."
591591

592592
msgid "Webasyst API access error."
593593
msgstr "Нет доступа к API Webasyst."
594+
595+
msgid "Send your Installer ID to a developer to obtain access to their products’ beta versions."
596+
msgstr "Отправьте свой ID Инсталлера разработчику, бета-версии чьих продуктов вы хотите устанавливать."

wa-apps/installer/templates/actions/settings/Settings.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h1>[`System settings`]</h1>
3333
<div class="flexbox middle">
3434
<span class="js-name width-20 custom-mr-12"></span>
3535
<a href="#" class="js-disconnect-beta-test-product small text-gray flexbox middle">
36-
<span class="icon"><i class="fas fa-plug text-red custom-mx-4"></i></span>
36+
<span class="icon custom-mr-4"><i class="fas fa-plug text-red custom-mx-4"></i></span>
3737
[`Disconnect`]
3838
<i class="fas fa-spinner loading custom-ml-4" style="display: none;"></i>
3939
</a>

wa-content/js/login/forgotpassword-backend-form.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-content/js/login/forgotpassword-backend-form.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-content/js/login/forgotpassword-frontend-form.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-content/js/login/forgotpassword-frontend-form.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wa-content/js/login/login-backend-form.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)