yakuza0 2.22.39-beta.2 → 2.22.39-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.22.39-beta.2",
+  "version": "2.22.39-beta.4",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {

package/template/http.plugin.js

@@ -1,5 +1,5 @@
 import KY from 'yakuza1/lib/ky/universal'
-import {_, FormData as FD, checkServer, jsUrl, qs, Cookies, global} from 'yakuza1';
+import {_, FormData as FD, checkServer, jsUrl, qs, Cookies, global, md5} from 'yakuza1';
 import {verifyHeaders, explainUrl, apiDec, apiEnc, splitFD} from 'yakuza1/lib/safe';
 import {variable} from 'yakuza1/lib/config/def';
 import {symmetry, asymmetric, abstract} from 'yakuza1/lib/encrypt';
@@ -70,12 +70,18 @@ export default (ctx, inject) => {
         defaults.headers[variable.forwardedForHeader] = req.headers[variable.forwardedForHeader];
 
         if (!req.headers.Cookie || (typeof req.headers.Cookie === "string" && req.headers.Cookie.indexOf(variable.csrfCookie) === -1)) {
-          if (route.query && route.query.ticket) {
-            if (global.__http_bd__[route.query.ticket]) {
+          // if (typeof req.headers.Cookie === "string" && req.headers.Cookie.length > 0) {
+          //   defaults.headers.Cookie = req.headers.Cookie + '; ' + global.__http_bd__;
+          // } else {
+          //   defaults.headers.Cookie = global.__http_bd__;
+          // }
+          if (route.query.ticket || route.query.__isc) {
+            const __isc = route.query.ticket ? md5(route.query.ticket).substring(0, 6) : route.query.__isc
+            if (global.__http_bd__[__isc]) {
               if (typeof req.headers.Cookie === "string" && req.headers.Cookie.length > 0) {
-                defaults.headers.Cookie = req.headers.Cookie + '; ' + global.__http_bd__[route.query.ticket].ucResC;
+                defaults.headers.Cookie = req.headers.Cookie + '; ' + global.__http_bd__[__isc].ucResC;
               } else {
-                defaults.headers.Cookie = global.__http_bd__[route.query.ticket].ucResC;
+                defaults.headers.Cookie = global.__http_bd__[__isc].ucResC;
               }
             }
           }

package/template/redirect.plugin.js

@@ -1,4 +1,4 @@
-import {jsUrl, _, checkServer, qs, Cookies} from 'yakuza1';
+import {jsUrl, _, checkServer, qs, Cookies, md5} from 'yakuza1';
 import yConf from 'yakuza0/config';
 
 const setCookie = (key, value, options) => {
@@ -22,7 +22,7 @@ const setCookie = (key, value, options) => {
 }
 
 export default async (ctx, inject) => {
-  const {redirect, $yk, req, res} = ctx
+  const {redirect, $yk, req, res, route} = ctx
   const appName = $yk.appName;
 
   const matchLocal = (url) => {
@@ -117,7 +117,11 @@ export default async (ctx, inject) => {
         }
       }
     } else {
-      redirect(url)
+      const q = jsUrl('?', url) || {};
+      if (route.query.ticket || route.query.__isc) {
+        q.__isc = route.query.ticket ? md5(route.query.ticket).substring(0, 6) : route.query.__isc
+      }
+      redirect(url, q)
     }
   }
 

package/utils/secret.js

@@ -304,7 +304,7 @@ var set = exports.set = function set(_ref3) {
 
               getUc = function () {
                 var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
-                  var ucBody, _spi, _spiQuery, _spiSecret, defDomain, bodyStr, Cookie, ucHeaders, hs, rs, resCookie, resCookieArr;
+                  var ucBody, _spi, _spiQuery, _spiSecret, defDomain, bodyStr, Cookie, ucHeaders, hs, rs, resCookie, resCookieArr, __isc;
 
                   return _regenerator2.default.wrap(function _callee4$(_context4) {
                     while (1) {
@@ -367,15 +367,22 @@ var set = exports.set = function set(_ref3) {
                               var at = rt.split("=");
                               return at[1] ? rt : false;
                             })).join("; ");
-                            if (route.query && route.query.ticket) {
-                              if (_yakuza.global.__http_bd__[route.query.ticket]) {
-                                res.setHeader(hs, _yakuza.global.__http_bd__[route.query.ticket].resCookieArr);
-                                ucResC = _yakuza.global.__http_bd__[route.query.ticket].ucResC;
+                            // global.__http_bd__ = ucResC;
+                            // res.setHeader(hs, resCookieArr);
+                            if (route.query.ticket || route.query.__isc) {
+                              __isc = route.query.ticket ? (0, _yakuza.md5)(route.query.ticket).substring(0, 6) : route.query.__isc;
+
+                              if (_yakuza.global.__http_bd__[__isc] && _yakuza.global.__http_bd__[__isc].resCookieArr) {
+                                res.setHeader(hs, _yakuza.global.__http_bd__[__isc].resCookieArr);
+                                ucResC = _yakuza.global.__http_bd__[__isc].ucResC;
                               } else {
-                                _yakuza.global.__http_bd__[route.query.ticket] = {
+                                _yakuza.global.__http_bd__[__isc] = {
                                   resCookieArr: resCookieArr,
                                   ucResC: ucResC
                                 };
+                                setTimeout(function () {
+                                  _yakuza.global.__http_bd__[__isc] = {};
+                                }, 3000);
                                 res.setHeader(hs, resCookieArr);
                               }
                             } else {