@unchainedshop/api 2.13.0 → 2.13.1

package/lib/resolvers/mutations/accounts/logout.js

@@ -14,7 +14,7 @@ export default async function logout(root, { token }, context) {
         });
     }
     else {
-        setLoginToken(null);
+        setLoginToken(context.res, null);
     }
     return { success: loggedOut.success };
 }

package/lib/resolvers/mutations/accounts/logout.js.map

@@ -1 +1 @@
-{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAAC,IAAU,EAAE,EAAE,KAAK,EAAqB,EAAE,OAAgB;IAC7F,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEnD,GAAG,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEnC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC7C;QACE,KAAK;QACL,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,EACD,OAAO,CACR,CAAC;IAEF,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,GAAG,CAAC,yBAAyB,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,GAAG,SAAS,CAAC,KAAK;SACnB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,aAAa,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;AACxC,CAAC"}
+{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAAC,IAAU,EAAE,EAAE,KAAK,EAAqB,EAAE,OAAgB;IAC7F,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEnD,GAAG,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEnC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC7C;QACE,KAAK;QACL,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,EACD,OAAO,CACR,CAAC;IAEF,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,GAAG,CAAC,yBAAyB,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,GAAG,SAAS,CAAC,KAAK;SACnB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;AACxC,CAAC"}

package/lib/resolvers/mutations/accounts/logoutAllSessions.js

@@ -13,7 +13,7 @@ export default async function logoutAllSessions(root, _, context) {
         });
     }
     else {
-        setLoginToken(null);
+        setLoginToken(context.res, null);
     }
     return { success: loggedOut.success };
 }

package/lib/resolvers/mutations/accounts/logoutAllSessions.js.map

@@ -1 +1 @@
-{"version":3,"file":"logoutAllSessions.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logoutAllSessions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAU,EAAE,CAAM,EAAE,OAAgB;IAClF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEnD,GAAG,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9C,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC7C;QACE,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,EACD,OAAO,CACR,CAAC;IAEF,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,GAAG,CAAC,yBAAyB,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,GAAG,SAAS,CAAC,KAAK;SACnB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,aAAa,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;AACxC,CAAC"}
+{"version":3,"file":"logoutAllSessions.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/logoutAllSessions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAU,EAAE,CAAM,EAAE,OAAgB;IAClF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEnD,GAAG,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE9C,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAC7C;QACE,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,EACD,OAAO,CACR,CAAC;IAEF,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,GAAG,CAAC,yBAAyB,EAAE;YAC7B,QAAQ,EAAE,QAAQ,CAAC,KAAK;YACxB,GAAG,SAAS,CAAC,KAAK;SACnB,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,CAAC;AACxC,CAAC"}

package/lib/resolvers/type/index.d.ts

@@ -216,7 +216,7 @@ declare const types: {
         token({ token, tokenExpires }: {
             token: any;
             tokenExpires: any;
-        }, _: any, { setLoginToken }: import("@unchainedshop/types/api.js").Context): any;
+        }, _: any, { res, setLoginToken }: import("@unchainedshop/types/api.js").Context): any;
     };
     Order: {
         supportedDeliveryProviders(order: import("@unchainedshop/types/orders.js").Order, _: any, context: import("@unchainedshop/types/api.js").Context): Promise<Array<import("@unchainedshop/types/delivery.js").DeliveryProvider>>;

package/lib/resolvers/type/login-method-response-types.d.ts

@@ -25,6 +25,6 @@ export declare const LoginMethodResponse: {
     token({ token, tokenExpires }: {
         token: any;
         tokenExpires: any;
-    }, _: any, { setLoginToken }: Context): any;
+    }, _: any, { res, setLoginToken }: Context): any;
 };
 //# sourceMappingURL=login-method-response-types.d.ts.map

package/lib/resolvers/type/login-method-response-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"login-method-response-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/login-method-response-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,eAAO,MAAM,mBAAmB;mBACT;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,KAAK,eAAe,OAAO;;;;;;;;;;;;;;;;;;gCAEvC,OAAO;;;;;kCAMkB,OAAO;CAI7D,CAAC"}
+{"version":3,"file":"login-method-response-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/login-method-response-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,eAAO,MAAM,mBAAmB;mBACT;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,KAAK,KAAK,eAAe,OAAO;;;;;;;;;;;;;;;;;;gCAEvC,OAAO;;;;;uCAMuB,OAAO;CAIlE,CAAC"}

package/lib/resolvers/type/login-method-response-types.js

@@ -4,8 +4,8 @@ export const LoginMethodResponse = {
         user._inLoginMethodResponse = true; // eslint-disable-line
         return user;
     },
-    token({ token, tokenExpires }, _, { setLoginToken }) {
-        setLoginToken(token, tokenExpires);
+    token({ token, tokenExpires }, _, { res, setLoginToken }) {
+        setLoginToken(res, token, tokenExpires);
         return token;
     },
 };

package/lib/resolvers/type/login-method-response-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"login-method-response-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/login-method-response-types.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,EAAkB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QACrE,MAAM,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAEjD,CAAC;QACF,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAC,sBAAsB;QAE1D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,aAAa,EAAW;QAC1D,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QACnC,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAC"}
+{"version":3,"file":"login-method-response-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/login-method-response-types.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,EAAkB,EAAE,CAAQ,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QACrE,MAAM,IAAI,GAAG,CAAC,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAEjD,CAAC;QACF,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAC,sBAAsB;QAE1D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,aAAa,EAAW;QAC/D,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;CACF,CAAC"}

package/lib/user-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-context.d.ts","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAc7D,eAAO,MAAM,cAAc,QACpB,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,OACnC,eAAe,gBACN,aAAa,KAC1B,OAAO,CAAC,oBAAoB,CAkE9B,CAAC"}
+{"version":3,"file":"user-context.d.ts","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAiC7D,eAAO,MAAM,cAAc,QACpB,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,OACnC,eAAe,gBACN,aAAa,KAC1B,OAAO,CAAC,oBAAoB,CAsD9B,CAAC"}

package/lib/user-context.js

@@ -3,26 +3,27 @@ function isString(input) {
     return typeof input === 'string' && Object.prototype.toString.call(input) === '[object String]';
 }
 const { UNCHAINED_COOKIE_NAME = 'unchained_token', UNCHAINED_COOKIE_PATH = '/', UNCHAINED_COOKIE_DOMAIN, NODE_ENV, } = process.env;
-export const getUserContext = async (req, res, unchainedAPI) => {
-    // there is a possible current user connected!
+function setLoginToken(res, token, expires) {
     const cookieName = UNCHAINED_COOKIE_NAME;
     const domain = UNCHAINED_COOKIE_DOMAIN;
     const path = UNCHAINED_COOKIE_PATH;
+    if (!domain)
+        return;
+    const authCookie = cookie.serialize(cookieName, token || null, {
+        domain,
+        httpOnly: true,
+        path,
+        expires: token && expires ? expires : undefined,
+        maxAge: token ? undefined : -1,
+        sameSite: 'lax',
+        secure: NODE_ENV === 'production',
+    });
+    res.setHeader('Set-Cookie', authCookie);
+}
+export const getUserContext = async (req, res, unchainedAPI) => {
+    // there is a possible current user connected!
+    const cookieName = UNCHAINED_COOKIE_NAME;
     let loginToken = req.cookies?.[cookieName];
-    function setLoginToken(token, expires) {
-        if (!domain)
-            return;
-        const authCookie = cookie.serialize(cookieName, token || null, {
-            domain,
-            httpOnly: true,
-            path,
-            expires: token ? expires : undefined,
-            maxAge: token ? undefined : -1,
-            sameSite: 'lax',
-            secure: NODE_ENV === 'production',
-        });
-        res.setHeader('Set-Cookie', authCookie);
-    }
     if (req.headers.authorization) {
         const [type, token] = req.headers.authorization.split(' ');
         if (type === 'Bearer') {
@@ -57,6 +58,9 @@ export const getUserContext = async (req, res, unchainedAPI) => {
                 };
             }
         }
+        // If there is no user with this token or the token is expires/invalid,
+        // we should remove that cookie from the client
+        setLoginToken(res, null);
         return { loginToken: loginToken, setLoginToken };
     }
     return { setLoginToken };

package/lib/user-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-context.js","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,SAAS,QAAQ,CAAC,KAAK;IACrB,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,iBAAiB,CAAC;AAClG,CAAC;AAED,MAAM,EACJ,qBAAqB,GAAG,iBAAiB,EACzC,qBAAqB,GAAG,GAAG,EAC3B,uBAAuB,EACvB,QAAQ,GACT,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,GAAwC,EACxC,GAAoB,EACpB,YAA2B,EACI,EAAE;IACjC,8CAA8C;IAC9C,MAAM,UAAU,GAAG,qBAAqB,CAAC;IACzC,MAAM,MAAM,GAAG,uBAAuB,CAAC;IACvC,MAAM,IAAI,GAAG,qBAAqB,CAAC;IAEnC,IAAI,UAAU,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC;IAE3C,SAAS,aAAa,CAAC,KAAa,EAAE,OAAa;QACjD,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,IAAI,IAAI,EAAE;YAC7D,MAAM;YACN,QAAQ,EAAE,IAAI;YACd,IAAI;YACJ,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;YACpC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,QAAQ,EAAE,KAAK;YACf,MAAM,EAAE,QAAQ,KAAK,YAAY;SAClC,CAAC,CAAC;QACH,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC;IACH,CAAC;IACD,IAAI,UAAU,EAAE,CAAC;QACf,8CAA8C;QAC9C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAE3E,0EAA0E;QAC1E,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,UAAoB,CAAC,CAAC;QAE7F,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC;YACnE,WAAW;SACZ,CAAC,CAAC;QAEH,0BAA0B;QAC1B,IAAI,WAAW,EAAE,CAAC;YAChB,sEAAsE;YACtE,4DAA4D;YAC5D,MAAM,gBAAgB,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CACnE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,KAAK,WAAW,CACrD,CAAC,CAAC,sBAAsB;YAEzB,+BAA+B;YAC/B,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;YAE/D,+DAA+D;YAC/D,uCAAuC;YACvC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,6DAA6D;gBAC7D,OAAO;oBACL,IAAI,EAAE,WAAW;oBACjB,MAAM,EAAE,WAAW,CAAC,GAAG;oBACvB,UAAU,EAAE,UAAoB;oBAChC,aAAa;iBACd,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,EAAE,UAAU,EAAE,UAAoB,EAAE,aAAa,EAAE,CAAC;IAC7D,CAAC;IAED,OAAO,EAAE,aAAa,EAAE,CAAC;AAC3B,CAAC,CAAC"}
+{"version":3,"file":"user-context.js","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"AAGA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAE5B,SAAS,QAAQ,CAAC,KAAK;IACrB,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,iBAAiB,CAAC;AAClG,CAAC;AAED,MAAM,EACJ,qBAAqB,GAAG,iBAAiB,EACzC,qBAAqB,GAAG,GAAG,EAC3B,uBAAuB,EACvB,QAAQ,GACT,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,SAAS,aAAa,CAAC,GAAoB,EAAE,KAAoB,EAAE,OAAc;IAC/E,MAAM,UAAU,GAAG,qBAAqB,CAAC;IACzC,MAAM,MAAM,GAAG,uBAAuB,CAAC;IACvC,MAAM,IAAI,GAAG,qBAAqB,CAAC;IAEnC,IAAI,CAAC,MAAM;QAAE,OAAO;IAEpB,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,IAAI,IAAI,EAAE;QAC7D,MAAM;QACN,QAAQ,EAAE,IAAI;QACd,IAAI;QACJ,OAAO,EAAE,KAAK,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QAC/C,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,QAAQ,KAAK,YAAY;KAClC,CAAC,CAAC;IACH,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,GAAwC,EACxC,GAAoB,EACpB,YAA2B,EACI,EAAE;IACjC,8CAA8C;IAC9C,MAAM,UAAU,GAAG,qBAAqB,CAAC;IACzC,IAAI,UAAU,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC;IAE3C,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC9B,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,UAAU,GAAG,KAAK,CAAC;QACrB,CAAC;IACH,CAAC;IACD,IAAI,UAAU,EAAE,CAAC;QACf,8CAA8C;QAC9C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAE3E,0EAA0E;QAC1E,MAAM,WAAW,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,UAAoB,CAAC,CAAC;QAE7F,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC;YACnE,WAAW;SACZ,CAAC,CAAC;QAEH,0BAA0B;QAC1B,IAAI,WAAW,EAAE,CAAC;YAChB,sEAAsE;YACtE,4DAA4D;YAC5D,MAAM,gBAAgB,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CACnE,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,KAAK,WAAW,CACrD,CAAC,CAAC,sBAAsB;YAEzB,+BAA+B;YAC/B,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;YAE/D,+DAA+D;YAC/D,uCAAuC;YACvC,IAAI,CAAC,SAAS,EAAE,CAAC;gBACf,6DAA6D;gBAC7D,OAAO;oBACL,IAAI,EAAE,WAAW;oBACjB,MAAM,EAAE,WAAW,CAAC,GAAG;oBACvB,UAAU,EAAE,UAAoB;oBAChC,aAAa;iBACd,CAAC;YACJ,CAAC;QACH,CAAC;QAED,uEAAuE;QACvE,+CAA+C;QAC/C,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAEzB,OAAO,EAAE,UAAU,EAAE,UAAoB,EAAE,aAAa,EAAE,CAAC;IAC7D,CAAC;IAED,OAAO,EAAE,aAAa,EAAE,CAAC;AAC3B,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",

package/src/resolvers/mutations/accounts/logout.ts

@@ -21,7 +21,7 @@ export default async function logout(root: Root, { token }: { token: string }, c
       ...loggedOut.error,
     });
   } else {
-    setLoginToken(null);
+    setLoginToken(context.res, null);
   }
 
   return { success: loggedOut.success };

package/src/resolvers/mutations/accounts/logoutAllSessions.ts

@@ -20,7 +20,7 @@ export default async function logoutAllSessions(root: Root, _: any, context: Con
       ...loggedOut.error,
     });
   } else {
-    setLoginToken(null);
+    setLoginToken(context.res, null);
   }
 
   return { success: loggedOut.success };

package/src/resolvers/type/login-method-response-types.ts

@@ -10,8 +10,8 @@ export const LoginMethodResponse = {
 
     return user;
   },
-  token({ token, tokenExpires }, _, { setLoginToken }: Context) {
-    setLoginToken(token, tokenExpires);
+  token({ token, tokenExpires }, _, { res, setLoginToken }: Context) {
+    setLoginToken(res, token, tokenExpires);
     return token;
   },
 };

package/src/user-context.ts

@@ -14,6 +14,25 @@ const {
   NODE_ENV,
 } = process.env;
 
+function setLoginToken(res: OutgoingMessage, token: string | null, expires?: Date) {
+  const cookieName = UNCHAINED_COOKIE_NAME;
+  const domain = UNCHAINED_COOKIE_DOMAIN;
+  const path = UNCHAINED_COOKIE_PATH;
+
+  if (!domain) return;
+
+  const authCookie = cookie.serialize(cookieName, token || null, {
+    domain,
+    httpOnly: true,
+    path,
+    expires: token && expires ? expires : undefined,
+    maxAge: token ? undefined : -1,
+    sameSite: 'lax',
+    secure: NODE_ENV === 'production',
+  });
+  res.setHeader('Set-Cookie', authCookie);
+}
+
 export const getUserContext = async (
   req: IncomingMessage & { cookies?: any },
   res: OutgoingMessage,
@@ -21,25 +40,8 @@ export const getUserContext = async (
 ): Promise<UnchainedUserContext> => {
   // there is a possible current user connected!
   const cookieName = UNCHAINED_COOKIE_NAME;
-  const domain = UNCHAINED_COOKIE_DOMAIN;
-  const path = UNCHAINED_COOKIE_PATH;
-
   let loginToken = req.cookies?.[cookieName];
 
-  function setLoginToken(token: string, expires: Date) {
-    if (!domain) return;
-    const authCookie = cookie.serialize(cookieName, token || null, {
-      domain,
-      httpOnly: true,
-      path,
-      expires: token ? expires : undefined,
-      maxAge: token ? undefined : -1,
-      sameSite: 'lax',
-      secure: NODE_ENV === 'production',
-    });
-    res.setHeader('Set-Cookie', authCookie);
-  }
-
   if (req.headers.authorization) {
     const [type, token] = req.headers.authorization.split(' ');
     if (type === 'Bearer') {
@@ -80,6 +82,11 @@ export const getUserContext = async (
         };
       }
     }
+
+    // If there is no user with this token or the token is expires/invalid,
+    // we should remove that cookie from the client
+    setLoginToken(res, null);
+
     return { loginToken: loginToken as string, setLoginToken };
   }