@labdigital/commercetools-mock 2.17.0 → 2.17.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@labdigital/commercetools-mock",
   "author": "Michael van Tellingen",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "license": "MIT",
   "main": "dist/index.cjs",
   "module": "dist/index.js",

package/src/oauth/server.test.ts

@@ -2,15 +2,26 @@ import { describe, it, expect, beforeEach } from 'vitest'
 import express from 'express'
 import supertest from 'supertest'
 import { OAuth2Server } from './server'
+import { CustomerRepository } from '../repositories/customer'
+import { AbstractStorage, InMemoryStorage } from '../storage'
+import { getBaseResourceProperties } from '../helpers'
+import { hashPassword } from '../lib/password'
 
 describe('OAuth2Server', () => {
 	let app: express.Express
 	let server: OAuth2Server
 
+	let storage: AbstractStorage
+	let customerRepository: CustomerRepository
+
 	beforeEach(() => {
 		server = new OAuth2Server({ enabled: true, validate: false })
 		app = express()
 		app.use(server.createRouter())
+
+		storage = new InMemoryStorage()
+		customerRepository = new CustomerRepository(storage)
+		server.setCustomerRepository(customerRepository)
 	})
 
 	describe('POST /token', () => {
@@ -74,16 +85,48 @@ describe('OAuth2Server', () => {
 
 			expect(response.status).toBe(200)
 			expect(response.body).toHaveProperty('access_token')
+			expect(response.body).toEqual({
+				scope: expect.stringMatching(/anonymous_id:([^\s]+)/),
+				access_token: expect.stringMatching(/\S{8,}==$/),
+				refresh_token: expect.stringMatching(/test-project:\S{8,}==$/),
+				expires_in: 172800,
+				token_type: 'Bearer',
+			})
+		})
+	})
+
+	describe('POST /:projectKey/customers/token', () => {
+		it('should return a token for customer access', async () => {
+			const projectKey = 'test-project'
 
-			const matches = response.body.scope?.match(
-				/(customer_id|anonymous_id):([^\s]+)/
-			)
-			if (matches) {
-				expect(matches[1]).toBe('anonymous_id')
-				expect(matches[2]).toBeDefined()
-			} else {
-				expect(response.body.scope).toBe('')
-			}
+			storage.add(projectKey, 'customer', {
+				...getBaseResourceProperties(),
+				email: 'j.doe@example.org',
+				password: hashPassword('password'),
+				addresses: [],
+				authenticationMode: 'password',
+				isEmailVerified: true,
+			})
+
+			const response = await supertest(app)
+				.post(`/${projectKey}/customers/token`)
+				.auth('validClientId', 'validClientSecret')
+				.query({
+					grant_type: 'password',
+					username: 'j.doe@example.org',
+					password: 'password',
+					scope: `${projectKey}:manage_my_profile`,
+				})
+				.send()
+
+			expect(response.status).toBe(200)
+			expect(response.body).toEqual({
+				scope: expect.stringMatching(/customer_id:([^\s]+)/),
+				access_token: expect.stringMatching(/\S{8,}==$/),
+				refresh_token: expect.stringMatching(/test-project:\S{8,}==$/),
+				expires_in: 172800,
+				token_type: 'Bearer',
+			})
 		})
 	})
 })

package/src/oauth/server.ts

@@ -221,6 +221,7 @@ export class OAuth2Server {
 		response: Response,
 		next: NextFunction
 	) {
+		const projectKey = request.params.projectKey
 		const grantType = request.query.grant_type || request.body.grant_type
 		if (!grantType) {
 			return next(
@@ -262,7 +263,7 @@ export class OAuth2Server {
 			}
 
 			const customer = result.results[0]
-			const token = this.store.getCustomerToken(scope, customer.id)
+			const token = this.store.getCustomerToken(projectKey, customer.id, scope)
 			return response.status(200).send(token)
 		}
 	}
@@ -288,6 +289,7 @@ export class OAuth2Server {
 		response: Response,
 		next: NextFunction
 	) {
+		const projectKey = request.params.projectKey
 		const grantType = request.query.grant_type || request.body.grant_type
 		if (!grantType) {
 			return next(
@@ -307,7 +309,11 @@ export class OAuth2Server {
 
 			const anonymous_id = undefined
 
-			const token = this.store.getAnonymousToken(scope, anonymous_id)
+			const token = this.store.getAnonymousToken(
+				projectKey,
+				anonymous_id,
+				scope
+			)
 			return response.status(200).send(token)
 		}
 	}

package/src/oauth/store.ts

@@ -33,7 +33,11 @@ export class OAuth2Store {
 		return token
 	}
 
-	getAnonymousToken(scope: string, anonymousId: string | undefined) {
+	getAnonymousToken(
+		projectKey: string,
+		anonymousId: string | undefined,
+		scope: string
+	) {
 		if (!anonymousId) {
 			anonymousId = uuidv4()
 		}
@@ -44,13 +48,13 @@ export class OAuth2Store {
 			scope: scope
 				? `${scope} anonymous_id:${anonymousId}`
 				: `anonymous_id:${anonymousId}`,
-			refresh_token: `my-project-${randomBytes(16).toString('base64')}`,
+			refresh_token: `${projectKey}:${randomBytes(16).toString('base64')}`,
 		}
 		this.addToken(token)
 		return token
 	}
 
-	getCustomerToken(scope: string, customerId: string) {
+	getCustomerToken(projectKey: string, customerId: string, scope: string) {
 		const token: Token = {
 			access_token: randomBytes(16).toString('base64'),
 			token_type: 'Bearer',
@@ -58,7 +62,7 @@ export class OAuth2Store {
 			scope: scope
 				? `${scope} customer_id:${customerId}`
 				: `customer_id:${customerId}`,
-			refresh_token: `my-project-${randomBytes(16).toString('base64')}`,
+			refresh_token: `${projectKey}:${randomBytes(16).toString('base64')}`,
 		}
 		this.addToken(token)
 		return token

package/src/services/customer.ts

@@ -1,9 +1,10 @@
-import { Router } from 'express'
+import { type Request, type Response, Router } from 'express'
 import { v4 as uuidv4 } from 'uuid'
 import { getBaseResourceProperties } from '../helpers.js'
 import { CustomerRepository } from '../repositories/customer.js'
 import { getRepositoryContext } from '../repositories/helpers.js'
 import AbstractService from './abstract.js'
+import { CustomerSignInResult } from '@commercetools/platform-sdk'
 
 export class CustomerService extends AbstractService {
 	public repository: CustomerRepository
@@ -17,6 +18,20 @@ export class CustomerService extends AbstractService {
 		return 'customers'
 	}
 
+	post(request: Request, response: Response) {
+		const draft = request.body
+		const resource = this.repository.create(
+			getRepositoryContext(request),
+			draft
+		)
+		const expanded = this._expandWithId(request, resource.id)
+
+		const result: CustomerSignInResult = {
+			customer: expanded,
+		}
+		return response.status(this.createStatusCode).send(result)
+	}
+
 	extraRoutes(parent: Router) {
 		parent.post('/password-token', (request, response) => {
 			const customer = this.repository.query(getRepositoryContext(request), {