From 1609cd36cf1c517bc1fe2962a53d75953c37a178 Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori" <exkazuu@gmail.com>
Date: Tue, 25 Feb 2020 20:20:23 +0900
Subject: [PATCH 1/3] fix: don't use cache when using flash message

---
 Controller/Component/AuthorizationKeyComponent.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Controller/Component/AuthorizationKeyComponent.php b/Controller/Component/AuthorizationKeyComponent.php
index 2c5a913..ce8e247 100644
--- a/Controller/Component/AuthorizationKeyComponent.php
+++ b/Controller/Component/AuthorizationKeyComponent.php
@@ -320,7 +320,11 @@ protected function _popupStartup(Controller $controller) {
 					$authKey['AuthorizationKey']['authorization_key'] !==
 					$data['AuthorizationKey']['authorization_key']) {
 					$this->_setErrorMessage();
-					$controller->redirect($controller->referer());	// 元に戻す
+					$url = $controller->referer();
+					if (strpos($url, '?no-cache=1') === false) {
+						$url .= '?no-cache=1';
+					}
+					$controller->redirect($url);
 				}
 			} else {
 				// POPUP型のガード処理でPOST以外で来ているということはURL強制HACK!

From f82d394cc3da980dcfd0dc6b3f5b29c0f8cc167f Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Fri, 10 Sep 2021 21:48:21 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E7=99=BB=E9=8C=B2=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=BC=E3=83=A0=EF=BC=88=E3=82=A2=E3=83=B3=E3=82=B1=E3=83=BC?=
 =?UTF-8?q?=E3=83=88=EF=BC=89=E3=81=AE=E8=AA=8D=E8=A8=BC=E3=82=AD=E3=83=BC?=
 =?UTF-8?q?=E3=81=8C=E3=82=A6=E3=82=A7=E3=83=96=E3=82=A2=E3=82=AF=E3=82=BB?=
 =?UTF-8?q?=E3=83=A9=E3=83=AC=E3=83=BC=E3=82=BF=E3=81=AB=E5=AF=BE=E5=BF=9C?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=20https://github.?=
 =?UTF-8?q?com/edumap-jp/Edumap2/issues/139?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webroot/js/key_auth_init.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 webroot/js/key_auth_init.js

diff --git a/webroot/js/key_auth_init.js b/webroot/js/key_auth_init.js
new file mode 100644
index 0000000..8ed3f42
--- /dev/null
+++ b/webroot/js/key_auth_init.js
@@ -0,0 +1,23 @@
+/**
+ * Created by AllCreator on 2015/11/06.
+ */
+
+
+/**
+ * LikeSettings Controller Javascript
+ *
+ * @param {string} Controller name
+ * @param {function($scope)} Controller
+ */
+NetCommonsApp.controller('AuthorizationKey',
+['$scope', '$http', 'NC3_URL', function($scope, $http, NC3_URL) {
+
+    /**
+     * initialize
+     *
+     * @return {void}
+     */
+    $scope.initialize = function(url) {
+      $http.get(NC3_URL + url);
+    };
+  }]);

From d1e3544bc8d8d88d6586c906daa288268b97cda8 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Fri, 10 Sep 2021 21:55:46 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20gjslink=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20https://github.com/edumap-jp/Edumap2/issue?=
 =?UTF-8?q?s/139?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webroot/js/key_auth_init.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/webroot/js/key_auth_init.js b/webroot/js/key_auth_init.js
index 8ed3f42..5a48c85 100644
--- a/webroot/js/key_auth_init.js
+++ b/webroot/js/key_auth_init.js
@@ -10,14 +10,14 @@
  * @param {function($scope)} Controller
  */
 NetCommonsApp.controller('AuthorizationKey',
-['$scope', '$http', 'NC3_URL', function($scope, $http, NC3_URL) {
+    ['$scope', '$http', 'NC3_URL', function($scope, $http, NC3_URL) {
 
-    /**
-     * initialize
-     *
-     * @return {void}
-     */
-    $scope.initialize = function(url) {
-      $http.get(NC3_URL + url);
-    };
-  }]);
+      /**
+       * initialize
+       *
+       * @return {void}
+       */
+      $scope.initialize = function(url) {
+        $http.get(NC3_URL + url);
+      };
+    }]);