fix: merge conflicts with develop

2022-11-22 13:39:27 +01:00
parent a767624188 ade898d434
commit a4d75f4a40
26 changed files with 105 additions and 58 deletions
@@ -100,7 +100,7 @@ export async function request(method, url, opts = {}) {
  }
  if (opts.clientSession) {
    if (opts.clientSession.jwt) {
-      opts.clientSession.jwt = jwt.sign(
+      opts.clientSession.jwt_store = jwt.sign(
        opts.clientSession.jwt,
        config.projectConfig.jwt_secret,
        {