@unchainedshop/api 1.2.40 → 2.0.0-beta2

package/lib/user-context.js

@@ -1,14 +1,24 @@
+import cookie from 'cookie';
 function isString(input) {
     return typeof input === 'string' && Object.prototype.toString.call(input) === '[object String]';
 }
-export const getUserContext = async (req, unchainedAPI) => {
+export const getUserContext = async (req, res, unchainedAPI) => {
     // there is a possible current user connected!
-    let loginToken = req.headers['meteor-login-token'];
-    if (req.cookies?.meteor_login_token) {
-        loginToken = req.cookies.meteor_login_token;
-    }
-    if (req.cookies?.token) {
-        loginToken = req.cookies.token;
+    const cookieName = process.env.UNCHAINED_COOKIE_NAME || 'unchained_token';
+    const domain = process.env.UNCHAINED_COOKIE_DOMAIN;
+    let loginToken = req.cookies?.[cookieName];
+    function setLoginToken(token, expires) {
+        if (!domain)
+            return;
+        const authCookie = cookie.serialize(cookieName, token || null, {
+            domain,
+            httpOnly: true,
+            expires: token ? expires : undefined,
+            maxAge: token ? undefined : -1,
+            sameSite: 'lax',
+            secure: process.env.NODE_ENV === 'production',
+        });
+        res.setHeader('Set-Cookie', authCookie);
     }
     if (req.headers.authorization) {
         const [type, token] = req.headers.authorization.split(' ');
@@ -40,11 +50,12 @@ export const getUserContext = async (req, unchainedAPI) => {
                     user: currentUser,
                     userId: currentUser._id,
                     loginToken: loginToken,
+                    setLoginToken,
                 };
             }
         }
-        return { loginToken: loginToken };
+        return { loginToken: loginToken, setLoginToken };
     }
-    return {};
+    return { setLoginToken };
 };
 //# sourceMappingURL=user-context.js.map

package/lib/user-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-context.js","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"AAIA,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,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,GAAwC,EACxC,YAA2B,EACI,EAAE;IACjC,8CAA8C;IAC9C,IAAI,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnD,IAAI,GAAG,CAAC,OAAO,EAAE,kBAAkB,EAAE;QACnC,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,kBAAkB,CAAC;KAC7C;IACD,IAAI,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE;QACtB,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;KAChC;IACD,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE;QAC7B,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,IAAI,KAAK,QAAQ,EAAE;YACrB,UAAU,GAAG,KAAK,CAAC;SACpB;KACF;IACD,IAAI,UAAU,EAAE;QACd,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;YACf,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;gBACd,6DAA6D;gBAC7D,OAAO;oBACL,IAAI,EAAE,WAAW;oBACjB,MAAM,EAAE,WAAW,CAAC,GAAG;oBACvB,UAAU,EAAE,UAAoB;iBACjC,CAAC;aACH;SACF;QACD,OAAO,EAAE,UAAU,EAAE,UAAoB,EAAE,CAAC;KAC7C;IAED,OAAO,EAAE,CAAC;AACZ,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,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,GAAwC,EACxC,GAAoB,EACpB,YAA2B,EACI,EAAE;IACjC,8CAA8C;IAC9C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,iBAAiB,CAAC;IAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IAEnD,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,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,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;SAC9C,CAAC,CAAC;QACH,GAAG,CAAC,SAAS,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE;QAC7B,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,IAAI,KAAK,QAAQ,EAAE;YACrB,UAAU,GAAG,KAAK,CAAC;SACpB;KACF;IACD,IAAI,UAAU,EAAE;QACd,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;YACf,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;gBACd,6DAA6D;gBAC7D,OAAO;oBACL,IAAI,EAAE,WAAW;oBACjB,MAAM,EAAE,WAAW,CAAC,GAAG;oBACvB,UAAU,EAAE,UAAoB;oBAChC,aAAa;iBACd,CAAC;aACH;SACF;QACD,OAAO,EAAE,UAAU,EAAE,UAAoB,EAAE,aAAa,EAAE,CAAC;KAC5D;IAED,OAAO,EAAE,aAAa,EAAE,CAAC;AAC3B,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "1.2.40",
+  "version": "2.0.0-beta2",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -31,14 +31,16 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
     "apollo-server-express": "2.x",
+    "cookie": "^0.5.0",
     "graphql": "^15.x"
   },
   "dependencies": {
-    "@unchainedshop/core": "^1.2.40",
-    "@unchainedshop/events": "^1.2.40",
-    "@unchainedshop/logger": "^1.2.40",
-    "@unchainedshop/roles": "^1.2.40",
-    "@unchainedshop/utils": "^1.2.40",
+    "@metamask/eth-sig-util": "^5.0.0",
+    "@unchainedshop/core": "^2.0.0-beta2",
+    "@unchainedshop/events": "^2.0.0-beta2",
+    "@unchainedshop/logger": "^2.0.0-beta2",
+    "@unchainedshop/roles": "^2.0.0-beta2",
+    "@unchainedshop/utils": "^2.0.0-beta2",
     "accounting": "0.4.1",
     "dataloader": "^2.1.0",
     "graphql-scalars": "^1.19.0",
@@ -50,11 +52,11 @@
   "devDependencies": {
     "@types/graphql-upload": "^8.0.11",
     "@types/locale": "^0.1.1",
-    "@types/node": "^16.11.66",
-    "@unchainedshop/types": "^1.2.40",
+    "@types/node": "^16.11.68",
+    "@unchainedshop/types": "^2.0.0-beta2",
     "apollo-server-express": "^2.26.0",
     "graphql": "^15.8.0",
-    "jest": "^29.2.0",
+    "jest": "^29.2.1",
     "ts-jest": "^29.0.3",
     "typescript": "^4.8.4"
   }

package/src/api-index.ts

@@ -3,6 +3,7 @@ import { ApolloServer } from 'apollo-server-express';
 import createBulkImportServer from './createBulkImportServer';
 import createGraphQLServer from './createGraphQLServer';
 import { createContextResolver, getCurrentContextResolver, setCurrentContextResolver } from './context';
+import createERCMetadataServer from './createERCMetadataServer';
 
 export * from './context';
 export * as acl from './acl';
@@ -19,6 +20,7 @@ export const startAPIServer = (
 ): {
   apolloGraphQLServer: ApolloServer;
   bulkImportServer: any;
+  ercMetadataServer: any;
 } => {
   const {
     unchainedAPI,
@@ -40,9 +42,11 @@ export const startAPIServer = (
 
   const apolloGraphQLServer = createGraphQLServer(expressApp, apolloServerOptions);
   const bulkImportServer = createBulkImportServer(expressApp);
+  const ercMetadataServer = createERCMetadataServer(expressApp);
 
   return {
     apolloGraphQLServer,
     bulkImportServer,
+    ercMetadataServer,
   };
 };

package/src/context.ts

@@ -16,9 +16,9 @@ export const setCurrentContextResolver = (newContext: UnchainedContextResolver)
 export const createContextResolver =
   (unchainedAPI: UnchainedCore, roles: any, version: string): UnchainedContextResolver =>
   async ({ req, res, ...apolloContext }) => {
-    const loaders = await instantiateLoaders(req, unchainedAPI);
-    const userContext = await getUserContext(req, unchainedAPI);
-    const localeContext = await getLocaleContext(req, unchainedAPI);
+    const loaders = await instantiateLoaders(req, res, unchainedAPI);
+    const userContext = await getUserContext(req, res, unchainedAPI);
+    const localeContext = await getLocaleContext(req, res, unchainedAPI);
 
     return {
       req,

package/src/createBulkImportServer.ts

@@ -14,7 +14,7 @@ const { BULK_IMPORT_API_PATH = '/bulk-import', BULK_IMPORT_PAYLOAD_CACHE_DIRECTO
 const errorHandler = (res) => (e) => {
   logger.error(e.message);
   res.writeHead(503);
-  res.end(JSON.stringify(e));
+  res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
 };
 
 const methodWrongHandler = (res) => () => {

package/src/createERCMetadataServer.ts

@@ -0,0 +1,71 @@
+import { createLogger } from '@unchainedshop/logger';
+import { UnchainedCore } from '@unchainedshop/types/core';
+import { systemLocale } from '@unchainedshop/utils';
+import { IncomingMessage } from 'http';
+import localePkg from 'locale';
+import path from 'path';
+import { useMiddlewareWithCurrentContext } from './context';
+
+const { Locale } = localePkg;
+
+const logger = createLogger('unchained:erc-metadata');
+
+const { ERC_METADATA_API_PATH = '/erc-metadata' } = process.env;
+
+const errorHandler = (res) => (e) => {
+  logger.error(e.message);
+  res.writeHead(503);
+  res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+};
+
+const methodWrongHandler = (res) => () => {
+  logger.error('Method not supported, return 404');
+  res.writeHead(404);
+  res.end();
+};
+
+const ercMetadataMiddleware = async (
+  req: IncomingMessage & { unchainedContext?: UnchainedCore },
+  res,
+) => {
+  try {
+    if (req.method !== 'GET') {
+      methodWrongHandler(res)();
+      return;
+    }
+
+    const resolvedContext = req.unchainedContext;
+
+    const url = new URL(req.url, process.env.ROOT_URL);
+    const parsedPath = path.parse(url.pathname);
+
+    if (parsedPath.ext !== '.json') throw new Error('Invalid ERC Metadata URI');
+
+    const locale = parsedPath.dir === '/' ? systemLocale.language : parsedPath.name;
+    const tokenId = parsedPath.dir === '/' ? parsedPath.name : parsedPath.dir.substring(1);
+
+    const [product] = await resolvedContext.modules.products.findProducts({
+      productSelector: { 'tokenization.tokenId': tokenId },
+    });
+
+    const ercMetadata = await resolvedContext.services.products.ercMetadata(
+      {
+        product,
+        locale: new Locale(locale),
+      },
+      resolvedContext,
+    );
+    const body = JSON.stringify(ercMetadata);
+    res.writeHead(200, {
+      'Content-Length': Buffer.byteLength(body),
+      'Content-Type': 'text/plain',
+    });
+    res.end(body);
+  } catch (e) {
+    errorHandler(res)(e);
+  }
+};
+
+export default (expressApp) => {
+  useMiddlewareWithCurrentContext(expressApp, ERC_METADATA_API_PATH, ercMetadataMiddleware);
+};

package/src/errors.ts

@@ -69,6 +69,26 @@ export const DeliverProviderNotFoundError = createError(
 export const LanguageNotFoundError = createError('LanguageNotFoundError', 'Language not found');
 
 export const UserNotFoundError = createError('UserNotFoundError', 'User not found');
+export const UserWebAuthnCredentialsNotFoundError = createError(
+  'UserWebAuthnCredentialsNotFoundError',
+  'User WebAuth Credentials not found',
+);
+
+export const UserWeb3AddressNotFoundError = createError(
+  'UserWeb3AddressNotFoundError',
+  'Web3 Account not found for User',
+);
+
+export const UserWeb3InvalidAddressError = createError(
+  'UserWeb3InvalidAddressError',
+  'Invalid address provided',
+);
+
+export const UserWeb3AddressSignatureError = createError(
+  'UserWeb3AddressSignatureError',
+  'Signature does not match web3 account / is invalid',
+);
+
 export const UserNoCartError = createError('UserNoCartError', 'No open cart available to checkout');
 export const OrderItemNotFoundError = createError('OrderItemNotFoundError', 'Order Item not found');
 export const OrderNotFoundError = createError('OrderNotFoundError', 'Order not found');

package/src/loaders/index.ts

@@ -1,6 +1,6 @@
 import { UnchainedLoaders } from '@unchainedshop/types/api';
 import DataLoader from 'dataloader';
-import { IncomingMessage } from 'http';
+import { IncomingMessage, OutgoingMessage } from 'http';
 import { systemLocale } from '@unchainedshop/utils';
 import localePkg from 'locale';
 import { AssortmentText } from '@unchainedshop/types/assortments';
@@ -12,6 +12,7 @@ const { Locale } = localePkg;
 
 export default async (
   req: IncomingMessage,
+  res: OutgoingMessage,
   unchainedAPI: UnchainedCore,
 ): Promise<UnchainedLoaders['loaders']> => {
   return {

package/src/locale-context.ts

@@ -1,5 +1,5 @@
 import { UnchainedLocaleContext } from '@unchainedshop/types/api';
-import { IncomingMessage } from 'http';
+import { IncomingMessage, OutgoingMessage } from 'http';
 import localePkg from 'locale';
 import 'abort-controller/polyfill';
 import LRU from 'lru-cache';
@@ -25,6 +25,7 @@ const localeContextCache = new LRU({
 
 export const getLocaleContext = async (
   req: IncomingMessage,
+  res: OutgoingMessage,
   unchainedAPI: UnchainedCore,
 ): Promise<UnchainedLocaleContext> => {
   const cacheKey = `${req.headers['accept-language']}:${req.headers['x-shop-country']}`;

package/src/resolvers/index.ts

@@ -3,9 +3,11 @@ import { JSONResolver, TimestampResolver, DateTimeResolver, DateResolver } from
 import Query from './queries';
 import Mutation from './mutations';
 import Types from './type';
+import CustomScalars from './scalars';
 
 export default {
   ...Types,
+  ...CustomScalars,
   Upload: GraphQLUpload,
   JSON: JSONResolver,
   Query,

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

@@ -0,0 +1,33 @@
+import { log } from '@unchainedshop/logger';
+import { Context, Root } from '@unchainedshop/types/api';
+import { UserWeb3InvalidAddressError } from '../../../errors';
+
+export default async function addWeb3Address(
+  root: Root,
+  { address }: { address: any },
+  { modules, userId, user }: Context,
+) {
+  log(`mutation addWeb3Address ${user.username}`, {
+    userId,
+  });
+
+  if (!address) {
+    throw new UserWeb3InvalidAddressError({ userId, address });
+  }
+
+  const nonce = Math.floor(Math.random() * 1000000).toString();
+  await modules.users.updateUser(
+    { _id: userId },
+    {
+      $push: {
+        'services.web3': {
+          address,
+          nonce,
+        },
+      },
+    },
+    {},
+  );
+
+  return modules.users.findUserById(userId);
+}

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

@@ -0,0 +1,29 @@
+import { log } from '@unchainedshop/logger';
+import { Context, Root } from '@unchainedshop/types/api';
+
+export default async function addWebAuthnCredentials(
+  root: Root,
+  { credentials }: { credentials: any },
+  { modules, userId, user }: Context,
+) {
+  log(`mutation addWebAuthnCredentials ${user.username}`, {
+    userId,
+  });
+
+  const webAuthnService = await modules.accounts.webAuthn.verifyCredentialCreation(
+    user.username,
+    credentials,
+  );
+
+  await modules.users.updateUser(
+    { _id: userId },
+    {
+      $push: {
+        'services.webAuthn': webAuthnService,
+      },
+    },
+    {},
+  );
+
+  return modules.users.findUserById(userId);
+}

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

@@ -6,19 +6,41 @@ import { hashPassword } from '../../../hashPassword';
 export default async function createUser(root: Root, params: UserData, context: Context) {
   const { modules, userId } = context;
 
-  log('mutation createUser', { email: params.email, userId });
+  log('mutation createUser', { email: params.email, username: params.username, userId });
 
-  if (!params.password && !params.plainPassword) {
-    throw new Error('Password is required');
+  if (!params.password && !params.plainPassword && !params.webAuthnPublicKeyCredentials) {
+    throw new Error('Password or Public Key is required');
   }
 
-  const mappedUser = params;
-  if (!mappedUser.password) {
+  const mappedUser = { ...params };
+  if (!mappedUser.password && mappedUser.plainPassword) {
     mappedUser.password = hashPassword(mappedUser.plainPassword);
   }
   delete mappedUser.plainPassword;
+  delete mappedUser.webAuthnPublicKeyCredentials;
 
-  const newUserId = await modules.accounts.createUser(mappedUser, {});
+  const webAuthnService =
+    params.webAuthnPublicKeyCredentials &&
+    (await modules.accounts.webAuthn.verifyCredentialCreation(
+      params.username,
+      params.webAuthnPublicKeyCredentials,
+    ));
+
+  const newUserId = await modules.accounts.createUser(mappedUser, {
+    skipPasswordEnrollment: !!webAuthnService,
+  });
+
+  if (newUserId && webAuthnService) {
+    await modules.users.updateUser(
+      { _id: newUserId },
+      {
+        $push: {
+          'services.webAuthn': webAuthnService,
+        },
+      },
+      {},
+    );
+  }
 
   return modules.accounts.createLoginToken(newUserId, context);
 }

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

@@ -0,0 +1,20 @@
+import { log } from '@unchainedshop/logger';
+import { Context, Root } from '@unchainedshop/types/api';
+
+export default async function createWebAuthnCredentialCreationOptions(
+  root: Root,
+  { extensionOptions, username }: { username: string; extensionOptions: any },
+  { modules, userId, req }: Context,
+) {
+  log(`mutation createWebAuthnCredentialCreationOptions ${username}`, {
+    userId,
+  });
+
+  const options = await modules.accounts.webAuthn.createCredentialCreationOptions(
+    req.headers.origin,
+    username,
+    extensionOptions,
+  );
+
+  return options;
+}

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

@@ -0,0 +1,28 @@
+import { log } from '@unchainedshop/logger';
+import { Context, Root } from '@unchainedshop/types/api';
+
+export default async function createWebAuthnCredentialRequestOptions(
+  root: Root,
+  { extensionOptions, username }: { username: string; extensionOptions: any },
+  { modules, userId, req }: Context,
+) {
+  log(`mutation createWebAuthnCredentialRequestOptions ${username}`, {
+    userId,
+  });
+
+  const options = await modules.accounts.webAuthn.createCredentialRequestOptions(
+    req.headers.origin,
+    username,
+    extensionOptions,
+  );
+
+  if (username) {
+    const user = await modules.users.findUser({ username });
+    options.allowCredentials = user?.services?.webAuthn?.map(({ id, type }) => ({
+      id,
+      type: type || options.type || 'public-key',
+    }));
+  }
+
+  return options;
+}

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

@@ -0,0 +1,16 @@
+import { log } from '@unchainedshop/logger';
+import { Context, Root } from '@unchainedshop/types/api';
+
+export default async function loginWithWebAuthn(
+  root: Root,
+  params: {
+    webAuthnPublicKeyCredentials?: any;
+  },
+  context: Context,
+) {
+  const { modules } = context;
+
+  log('mutation loginWithWebAuthn');
+
+  return modules.accounts.loginWithService({ service: 'webAuthn', ...params }, context);
+}

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

@@ -2,17 +2,20 @@ import { Context, Root } from '@unchainedshop/types/api';
 import { log, LogLevel } from '@unchainedshop/logger';
 
 export default async function logout(root: Root, params: { token: string }, context: Context) {
-  const { modules, userId } = context;
+  const { modules, userId, setLoginToken } = context;
 
   log('mutation logout', { userId });
 
   const loggedOut = await modules.accounts.logout(params, context);
 
-  if (loggedOut.error)
+  if (loggedOut.error) {
     log('Error while logging out', {
       logLevel: LogLevel.Error,
       ...loggedOut.error,
     });
+  } else {
+    setLoginToken(null);
+  }
 
   return { success: loggedOut.success };
 }

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

@@ -2,17 +2,20 @@ import { Context, Root } from '@unchainedshop/types/api';
 import { log, LogLevel } from '@unchainedshop/logger';
 
 export default async function logoutAllSessions(root: Root, _: any, context: Context) {
-  const { modules, userId } = context;
+  const { modules, userId, setLoginToken } = context;
 
   log('mutation logoutAllSessions', { userId });
 
   const loggedOut = await modules.accounts.logout({}, context);
 
-  if (loggedOut.error)
+  if (loggedOut.error) {
     log('Error while logging out', {
       logLevel: LogLevel.Error,
       ...loggedOut.error,
     });
+  } else {
+    setLoginToken(null);
+  }
 
   return { success: loggedOut.success };
 }

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

@@ -0,0 +1,32 @@
+import { log } from '@unchainedshop/logger';
+import { Context, Root } from '@unchainedshop/types/api';
+import { UserWeb3AddressNotFoundError } from '../../../errors';
+
+export default async function removeWeb3Address(
+  root: Root,
+  { address }: { address: string },
+  { modules, userId, user }: Context,
+) {
+  log(`mutation removeWeb3Address ${address} ${user.username}`, {
+    userId,
+  });
+
+  const foundCredentials = user.services?.web3?.find(
+    (service) => service.address.toLowerCase() === address.toLowerCase(),
+  );
+  if (!foundCredentials) {
+    throw new UserWeb3AddressNotFoundError({ userId, address });
+  }
+
+  await modules.users.updateUser(
+    { _id: userId },
+    {
+      $pull: {
+        'services.web3': { address: foundCredentials.address },
+      },
+    },
+    {},
+  );
+
+  return modules.users.findUserById(userId);
+}

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

@@ -0,0 +1,30 @@
+import { log } from '@unchainedshop/logger';
+import { Context, Root } from '@unchainedshop/types/api';
+import { UserWebAuthnCredentialsNotFoundError } from '../../../errors';
+
+export default async function removeWebAuthnCredentials(
+  root: Root,
+  { credentialsId }: { credentialsId: string },
+  { modules, userId, user }: Context,
+) {
+  log(`mutation removeWebAuthnCredentials ${credentialsId} ${user.username}`, {
+    userId,
+  });
+
+  const foundCredentials = user.services?.webAuthn?.find((service) => service.id === credentialsId);
+  if (!foundCredentials) {
+    throw new UserWebAuthnCredentialsNotFoundError({ userId, credentialsId });
+  }
+
+  await modules.users.updateUser(
+    { _id: userId },
+    {
+      $pull: {
+        'services.webAuthn': { id: credentialsId },
+      },
+    },
+    {},
+  );
+
+  return modules.users.findUserById(userId);
+}

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

@@ -0,0 +1,60 @@
+import { log } from '@unchainedshop/logger';
+import { Context, Root } from '@unchainedshop/types/api';
+import { recoverPersonalSignature } from '@metamask/eth-sig-util';
+import { UserWeb3AddressNotFoundError, UserWeb3AddressSignatureError } from '../../../errors';
+
+export default async function verifyWeb3Address(
+  root: Root,
+  { address, hash }: { address: string; hash: string },
+  { modules, userId, user }: Context,
+) {
+  log(`mutation verifyWeb3Address ${address} ${user.username}`, {
+    userId,
+  });
+
+  const foundCredentials = user.services?.web3?.find(
+    (service) => service.address.toLowerCase() === address.toLowerCase(),
+  );
+  if (!foundCredentials) {
+    throw new UserWeb3AddressNotFoundError({ userId, address });
+  }
+
+  const msg = `0x${Buffer.from(foundCredentials.nonce, 'utf8').toString('hex')}`;
+
+  const recoveredAddr = recoverPersonalSignature({
+    data: msg,
+    signature: hash,
+  });
+
+  const signatureCorrectForAddress =
+    recoveredAddr.toLowerCase() === foundCredentials.address.toLowerCase();
+
+  if (!signatureCorrectForAddress) {
+    throw new UserWeb3AddressSignatureError({ userId, address: foundCredentials.address });
+  }
+
+  const web3Services: any[] = user.services.web3.map((service) => {
+    if (foundCredentials.address === service.address) {
+      return {
+        ...service,
+        nonce: undefined,
+        verified: true,
+      };
+    }
+    return service;
+  });
+
+  await modules.users.updateUser(
+    { _id: userId },
+    {
+      $set: {
+        // eslint-disable-next-line
+        // @ts-ignore
+        'services.web3': web3Services,
+      },
+    },
+    {},
+  );
+
+  return modules.users.findUserById(userId);
+}