yakuza0 2.22.34-beta.25 → 2.22.34-beta.26

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/server/proxy/csrf.js +1 -1
  3. package/template/http.plugin.js +7 -6
  4. package/utils/secret.js +5 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "yakuza0",
3
- "version": "2.22.34-beta.25",
3
+ "version": "2.22.34-beta.26",
4
4
  "description": "yakuza0 with nuxt",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/server/proxy/csrf.js CHANGED
@@ -744,7 +744,7 @@ exports.default = function () {
744
744
  break;
745
745
  }
746
746
 
747
- ctx.cookies.set(_config2.default.server.sslify.openKey, ';', {
747
+ ctx.cookies.set(_config2.default.server.sslify.openKey, '_', {
748
748
  signed: false,
749
749
  sameSite: _config2.default.server.cookieSameSite
750
750
  });
package/template/http.plugin.js CHANGED
@@ -5,6 +5,7 @@ import {variable} from 'yakuza1/lib/config/def';
5
5
  import {symmetry, asymmetric, abstract} from 'yakuza1/lib/encrypt';
6
6
  import urlib from 'yakuza1/lib/http';
7
7
 
8
+ global.__yk_gu__ = global.__yk_gu__ || {};
8
9
  export default (ctx, inject) => {
9
10
  const {$yk, req, $utils} = ctx;
10
11
  const cookieStr = Cookies.koaGetCookieStr({req});
@@ -62,12 +63,12 @@ export default (ctx, inject) => {
62
63
  // defaults.headers[variable.adjoinIpHeader] = getClientIP(req, {stupid: true});
63
64
 
64
65
  if (req.headers) {
65
- global.__gu_group__ = req.headers[variable.guRouteGroupHeader] || global.__gu_group__;
66
- global.__gu_name__ = req.headers[variable.guRouteNameHeader] || global.__gu_name__;
67
- global.__gu_ver__ = req.headers[variable.guRouteVerHeader] || global.__gu_ver__;
68
- defaults.headers[variable.guRouteGroupHeader] = global.__gu_group__;
69
- defaults.headers[variable.guRouteNameHeader] = global.__gu_name__;
70
- defaults.headers[variable.guRouteVerHeader] = global.__gu_ver__;
66
+ global.__yk_gu__[variable.guRouteGroupHeader] = req.headers[variable.guRouteGroupHeader] || global.__yk_gu__[variable.guRouteGroupHeader];
67
+ global.__yk_gu__[variable.guRouteNameHeader] = req.headers[variable.guRouteNameHeader] || global.__yk_gu__[variable.guRouteNameHeader];
68
+ global.__yk_gu__[variable.guRouteVerHeader] = req.headers[variable.guRouteVerHeader] || global.__yk_gu__[variable.guRouteVerHeader];
69
+ defaults.headers[variable.guRouteGroupHeader] = global.__yk_gu__[variable.guRouteGroupHeader];
70
+ defaults.headers[variable.guRouteNameHeader] = global.__yk_gu__[variable.guRouteNameHeader];
71
+ defaults.headers[variable.guRouteVerHeader] = global.__yk_gu__[variable.guRouteVerHeader];
71
72
  defaults.headers[variable.adjoinIpHeader] = req.headers[variable.adjoinIpHeader];
72
73
  defaults.headers[variable.forwardedForHeader] = req.headers[variable.forwardedForHeader];
73
74
  }
package/utils/secret.js CHANGED
@@ -61,7 +61,7 @@ var secret = {};
61
61
  // import {mixin} from "yakuza1/lib/encrypt";
62
62
  // import {asymmetric, getKey, symmetry} from "yakuza1/lib/encrypt/sm";
63
63
 
64
- var secret_gu = {};
64
+ _yakuza.global.__yk_gu__ = _yakuza.global.__yk_gu__ || {};
65
65
 
66
66
  // const allowHeaders = {
67
67
  // 'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36',
@@ -273,11 +273,11 @@ var set = exports.set = function set(_ref3) {
273
273
  // name: h['x-gu-route-name'] || secret_gu['x-gu-route-name'],
274
274
  // ver: h['x-gu-route-ver'] || secret_gu['x-gu-route-ver'],
275
275
  // };
276
- ['x-gu-route-group', 'x-gu-route-name', 'x-gu-route-ver'].forEach(function (v) {
277
- secret_gu[v] = h[v] || secret_gu[v];
276
+ [_def.variable.guRouteVerHeader, _def.variable.guRouteNameHeader, _def.variable.guRouteGroupHeader].forEach(function (v) {
277
+ _yakuza.global.__yk_gu__[v] = h[v] || _yakuza.global.__yk_gu__[v];
278
278
  });
279
- store.dispatch('__yk_init__/setGU', secret_gu);
280
- $yk.gu = secret_gu;
279
+ store.dispatch('__yk_init__/setGU', _yakuza.global.__yk_gu__);
280
+ $yk.gu = _yakuza.global.__yk_gu__;
281
281
  } else {
282
282
  $yk.gu = store.state.__yk_init__ && store.state.__yk_init__.gu || {};
283
283
  }