test(e2e): remove need to fetch deviceIdentity

deviceId and model will be provided in a link

Author: coderbyheart

feature-runner/run-features.ts

@@ -6,13 +6,14 @@ import path from 'node:path'
 import type { StackOutputs as BackendStackOutputs } from '../cdk/stacks/BackendStack.js'
 import { STACK_NAME } from '../cdk/stacks/stackConfig.js'
 import { steps as storageSteps } from '@hello.nrfcloud.com/bdd-markdown-steps/storage'
-import { steps as randomSteps } from '@hello.nrfcloud.com/bdd-markdown-steps/random'
+import {
+	steps as randomSteps,
+	email,
+	IMEI,
+} from '@hello.nrfcloud.com/bdd-markdown-steps/random'
 import { steps as deviceSteps } from './steps/device.js'
 import { steps as RESTSteps } from '@hello.nrfcloud.com/bdd-markdown-steps/REST'
 import { IoTDataPlaneClient } from '@aws-sdk/client-iot-data-plane'
-import { fromEnv } from '@nordicsemiconductor/from-env'
-import { mock as httpApiMock } from '@bifravst/http-api-mock/mock'
-import { DynamoDBClient } from '@aws-sdk/client-dynamodb'
 import { slashless } from '@hello.nrfcloud.com/nrfcloud-api-helpers/api'
 
 /**
@@ -23,18 +24,11 @@ import { slashless } from '@hello.nrfcloud.com/nrfcloud-api-helpers/api'
  */
 
 const iotData = new IoTDataPlaneClient({})
-const db = new DynamoDBClient({})
 
 const backendConfig = await stackOutput(
 	new CloudFormationClient({}),
 )<BackendStackOutputs>(STACK_NAME)
 
-const { mockApiEndpoint, responsesTableName } = fromEnv({
-	mockApiEndpoint: 'HTTP_API_MOCK_API_URL',
-	responsesTableName: 'HTTP_API_MOCK_RESPONSES_TABLE_NAME',
-	requestsTableName: 'HTTP_API_MOCK_REQUESTS_TABLE_NAME',
-})(process.env)
-
 const print = (arg: unknown) =>
 	typeof arg === 'object' ? JSON.stringify(arg) : arg
 const start = Date.now()
@@ -80,27 +74,23 @@ const runner = await runFolder({
 
 const cleaners: (() => Promise<void>)[] = []
 
-const describeOOBDeviceAPIBasePath = 'hello.nrfcloud.com/api/device'
 runner
 	.addStepRunners(...storageSteps)
-	.addStepRunners(...randomSteps())
+	.addStepRunners(
+		...randomSteps({
+			email,
+			'device ID': () => `oob-${IMEI()}`,
+		}),
+	)
 	.addStepRunners(...RESTSteps)
 	.addStepRunners(
 		...deviceSteps({
 			iotData,
-			httpApiMock: httpApiMock({
-				db,
-				responsesTable: responsesTableName,
-			}),
-			describeOOBDeviceAPIBasePath,
 		}),
 	)
 
 const res = await runner.run({
 	API: slashless(new URL(backendConfig.APIURL)),
-	describeOOBDeviceAPI: new URL(
-		`${mockApiEndpoint}${describeOOBDeviceAPIBasePath}`,
-	),
 })
 
 await Promise.all(cleaners.map(async (fn) => fn()))

feature-runner/steps/device.ts

@@ -9,63 +9,6 @@ import {
 	type StepRunner,
 } from '@nordicsemiconductor/bdd-markdown'
 import { Type } from '@sinclair/typebox'
-import { fingerprintGenerator } from '@hello.nrfcloud.com/proto/fingerprint'
-import { IMEI } from '@hello.nrfcloud.com/bdd-markdown-steps/random'
-import type { HttpAPIMock } from '@bifravst/http-api-mock/mock'
-
-const getCurrentWeekNumber = (): number => {
-	const now = new Date()
-	const firstOfJanuary = new Date(now.getFullYear(), 0, 1)
-	return Math.ceil(
-		((now.getTime() - firstOfJanuary.getTime()) / 86400000 +
-			firstOfJanuary.getDay() +
-			1) /
-			7,
-	)
-}
-
-const oobDeviceWithFingerprint = (
-	httpApiMock: HttpAPIMock,
-	describeOOBDeviceAPIBasePath: string,
-) =>
-	regExpMatchedStep(
-		{
-			regExp:
-				/^I have the fingerprint for my device in `(?<storageName>[^`]+)`$/,
-			schema: Type.Object({
-				storageName: Type.String({ minLength: 1 }),
-			}),
-		},
-		async ({ match: { storageName }, log: { progress }, context }) => {
-			const now = new Date()
-			const fingerprint = fingerprintGenerator(
-				parseInt(
-					`${(now.getFullYear() - 2000).toString()}${getCurrentWeekNumber()}`,
-					10,
-				),
-			)()
-			progress(`Fingerprint: ${fingerprint}`)
-			context[storageName] = fingerprint
-			const deviceId = `oob-${IMEI()}`
-			progress(`DeviceID: ${deviceId}`)
-
-			await httpApiMock.response(
-				`GET ${describeOOBDeviceAPIBasePath}?fingerprint=${fingerprint}`,
-				{
-					status: 200,
-					headers: new Headers({
-						'content-type': 'application/json; charset=utf-8',
-					}),
-					body: JSON.stringify({
-						'@context':
-							'https://github.com/hello-nrfcloud/proto/deviceIdentity',
-						id: deviceId,
-						model: 'PCA20035+solar',
-					}),
-				},
-			)
-		},
-	)
 
 const publishDeviceMessage = (iotData: IoTDataPlaneClient) =>
 	regExpMatchedStep(
@@ -97,13 +40,6 @@ const publishDeviceMessage = (iotData: IoTDataPlaneClient) =>
 
 export const steps = ({
 	iotData,
-	httpApiMock,
-	describeOOBDeviceAPIBasePath,
 }: {
 	iotData: IoTDataPlaneClient
-	httpApiMock: HttpAPIMock
-	describeOOBDeviceAPIBasePath: string
-}): Array<StepRunner<Record<string, any>>> => [
-	publishDeviceMessage(iotData),
-	oobDeviceWithFingerprint(httpApiMock, describeOOBDeviceAPIBasePath),
-]
+}): Array<StepRunner<Record<string, any>>> => [publishDeviceMessage(iotData)]

features/OOBMapShare.feature.md

@@ -1,9 +1,7 @@
 ---
 exampleContext:
-  fingerprint: 92b.y7i24q
   deviceId: oob-352656108602296
   publicDeviceId: outfling-swanherd-attaghan
-  describeOOBDeviceAPI: "https://oob-device.lambda-url.eu-west-1.on.aws/"
   API: "https://iiet67bnlmbtuhiblik4wcy4ni0oujot.execute-api.eu-west-1.amazonaws.com/2024-04-12"
   ts: 1694503339523
   tsISO: 2023-09-12T00:00:00.000Z
@@ -15,40 +13,18 @@ exampleContext:
 > compared with other devices and can be observed by users without needing to
 > know the fingerprint.
 >
-> Note: Users need to know the fingerprint of the device in order to prevent
-> them sharing devices they don't have access to by guessing the IMEI.
->
 > This works for the Thingy:91 X because they have credentials that already tie
 > them to the nRF Cloud account that is used by `hello.nrfcloud.com/map`. The
 > only thing the user needs to do is to consent to the sharing.
 
 ## Background
 
-Given I have the fingerprint for my device in `fingerprint`
-
-And I have a random email in `email`
-
-## Get the device ID from `hello.nrfcloud.com`
-
-> Query the `hello.nrfcloud.com` backend to retrieve the device ID using the
-> fingerprint
-
-When I `GET` to `${describeOOBDeviceAPI}?fingerprint=${fingerprint}`
-
-Then I should receive a `https://github.com/hello-nrfcloud/proto/deviceIdentity`
-response
-
-And the last response should match
+> The `deviceId` and `model` is provided in a link from the device page on
+> `hello.nrfcloud.com`.
 
-```json
-{
-  "model": "PCA20035+solar"
-}
-```
-
-And I store `id` of the last response into `deviceId`
+Given I have a random device ID in `deviceId`
 
-And I store `model` of the last response into `model`
+And I have a random email in `email`
 
 ## Share the device
 
@@ -59,7 +35,7 @@ When I `POST` to `${API}/share` with
 ```json
 {
   "deviceId": "${deviceId}",
-  "model": "${model}",
+  "model": "PCA20035+solar",
   "email": "${email}"
 }
 ```