Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

認証キー発行処理をcookieに依存しない実装に変更 #5388

Merged
merged 2 commits into from
Jun 23, 2022
+19 −6
Merged

認証キー発行処理をcookieに依存しない実装に変更 #5388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cbec61
認証キー発行処理をcookieに依存しない実装に変更
chihiro-adachi Jun 14, 2022
4f70aa5
package-apiをv42へ更新
chihiro-adachi Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/config/eccube/packages/eccube.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parameters:
env(ECCUBE_COOKIE_PATH): '/'
env(ECCUBE_COOKIE_LIFETIME): '0'
env(ECCUBE_GC_MAXLIFETIME): '1440'
env(ECCUBE_PACKAGE_API_URL): 'https://package-api-c2.ec-cube.net'
env(ECCUBE_PACKAGE_API_URL): 'https://package-api-c2.ec-cube.net/v42'
env(ECCUBE_OWNERS_STORE_URL): 'https://www.ec-cube.net'
env(ECCUBE_MAINTENANCE_FILE_PATH): '%kernel.project_dir%/.maintenance'
env(ECCUBE_2FA_ENABLED): '1'
Expand Down
23 changes: 18 additions & 5 deletions src/Eccube/Resource/template/admin/Store/authentication_setting.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,21 @@ file that was distributed with this source code.
<script>

function refreshCaptchaImage() {
$('#captcha_image').attr('src', "{{ eccube_config.eccube_package_api_url }}/captcha" + '?' + new Date().getTime())
var xhr = new XMLHttpRequest();
xhr.onreadystatechange = function() {
if (this.readyState == 4 && this.status == 200) {
var captcha = document.getElementById("captcha_image");
var url = window.URL || window.webkitURL;
captcha.src = url.createObjectURL(this.response);

var captcha_id = document.getElementById("captcha_id");
captcha_id.value = this.getResponseHeader('x-eccube-captcha-id');
}
}

xhr.open('GET', '{{ eccube_config.eccube_package_api_url }}/captcha' + '?' + new Date().getTime());
xhr.responseType = 'blob';
xhr.send();
}

$('#captcha').on('show.bs.modal', function() {
Expand All @@ -45,13 +59,11 @@ file that was distributed with this source code.
dataType: 'json',
cache: false,
data: {
"captcha_id": $('#captcha_id').val(),
"captcha": $('#captcha_text').val(),
"eccube_url": '{{ eccubeUrl }}',
"eccube_version": "{{ constant('Eccube\\Common\\Constant::VERSION') }}",
"eccube_shop_name": "{{ eccubeShopName }}"
},
xhrFields: {
withCredentials: true
}
}).done(function(data) {
$('#captcha').modal('hide');
Expand Down Expand Up @@ -164,6 +176,7 @@ file that was distributed with this source code.
<img id="captcha_image" class="mb-2" src="#">
<button id="captcha-refresh" type="button" class="btn btn-default"><i class="fa fa-refresh" aria-hidden="true"></i></button>
<input type="text" id="captcha_text" value="" class="form-control" placeholder="{{ 'admin.store.setting.captcha_message'|trans }}"/>
<input type="hidden" id="captcha_id" value=""/>
<span id="captcha_error" class="invalid-feedback" style="display: none">
<span class="mb-0 d-block">
<span class="initialism form-error-icon badge badge-danger">{{ 'admin.store.setting.captcha_error'|trans }}</span> <span class="form-error-message">{{ 'admin.store.setting.invalid_captcha'|trans }}</span>
Expand All @@ -178,4 +191,4 @@ file that was distributed with this source code.
</div>
</form>
</div>
{% endblock %}
{% endblock %}