Merge pull request #530 from ForgeRock/device-client-sdk

feat: add-device-client
ForgeRock · Jan 27, 2025 · 74d2352 · 74d2352
2 parents fca1545 + 5d68b9f
commit 74d2352
Show file tree

Hide file tree

Showing 46 changed files with 1,454 additions and 1,037 deletions.
diff --git a/.changeset/config.json b/.changeset/config.json
@@ -13,7 +13,6 @@
   "baseBranch": "master",
   "updateInternalDependencies": "patch",
   "ignore": [
-    "@forgerock/device-client",
     "autoscript-apps",
     "autoscript-suites",
     "davinci-app",

diff --git a/.changeset/little-grapes-end.md b/.changeset/little-grapes-end.md
@@ -0,0 +1,5 @@
+---
+'@forgerock/javascript-sdk': minor
+---
+
+add-device-client
diff --git a/e2e/autoscript-apps/package.json b/e2e/autoscript-apps/package.json
@@ -5,7 +5,6 @@
   "type": "module",
   "dependencies": {
     "@forgerock/javascript-sdk": "workspace:*",
-    "@forgerock/device-client": "workspace:*",
     "@forgerock/ping-protect": "workspace:*",
     "rxjs": "^7.4.0"
   },

diff --git a/e2e/autoscript-apps/src/authn-basic-self-service/autoscript.ts b/e2e/autoscript-apps/src/authn-basic-self-service/autoscript.ts
@@ -7,9 +7,8 @@
  * This software may be modified and distributed under the terms
  * of the MIT license. See the LICENSE file for details.
  */
-// @ts-nocheck
 import * as forgerock from '@forgerock/javascript-sdk';
-import { deviceClient } from '@forgerock/device-client';
+import { deviceClient } from '@forgerock/javascript-sdk/device-client';
 import { delay as rxDelay, map, mergeMap } from 'rxjs/operators';
 import { from } from 'rxjs';
 
@@ -19,9 +18,14 @@ function autoscript() {
   const url = new URL(window.location.href);
   const amUrl = url.searchParams.get('amUrl') || 'https://openam-sdks.forgeblocks.com/am';
   const realmPath = url.searchParams.get('realmPath') || 'alpha';
-  const un = url.searchParams.get('un') || 'demo';
+  /**
+   * Make sure this `un` is a real user
+   * this is a manual test and requires a real tenant and a real user
+   * that has devices.
+   */
+  const un = url.searchParams.get('un') || 'demouser';
   const platformHeader = url.searchParams.get('platformHeader') === 'true' ? true : false;
-  const pw = url.searchParams.get('pw') || 'Demo1234!';
+  const pw = url.searchParams.get('pw') || '1111';
   const tree = url.searchParams.get('tree') || 'selfservice';
 
   console.log('Configure the SDK');
@@ -100,65 +104,27 @@ function autoscript() {
           try {
             const user = await forgerock.UserManager.getCurrentUser();
 
-            //const { result: deviceArr } = await client.oath.get({
-            //  userId: user.sub,
-            //  realm: 'alpha',
-            //});
-            //
-            //console.log('retrieveOathDevices', deviceArr);
-            //
-            //const [{ _id: id, _rev, deviceManagementStatus, ...device }] = deviceArr;
+            const query = { userId: user.sub, realm: 'alpha' };
 
-            //const oathDeviceDeleted = await client.oath.delete({ userId: user.sub, id, ...device });
+            const boundArr = await client.bound.get(query);
+            console.log('BOUND GET', boundArr);
+            if (Array.isArray(boundArr)) {
+              const [bound] = boundArr;
+              console.log('updated bound', bound);
+              const updatedBound = await client.bound.update({
+                ...query,
+                device: { ...bound, deviceName: 'BoundDeviceRyan' },
+              });
+              console.log('updated', updatedBound);
 
-            //console.log(oathDeviceDeleted);
+              if ('error' in updatedBound) return;
 
-            //const { result: pushDevices } = await client.push.get({
-            //  userId: user.sub,
-            //  realm: 'alpha',
-            //});
-            //
-            const bindingDevices = await client.boundDevices.get({
-              userId: user.sub,
-              realm: 'alpha',
-            });
-            //console.log('bindingDevices', bindingDevices);
-            //
-            //const webauthnDevices = await client.webauthn.get({
-            //  userId: user.sub,
-            //  realm: 'alpha',
-            //});
-            //console.log('webauthn devices', webauthnDevices);
-            //const {
-            //  _id: userId,
-            //  _rev: ignoreThis,
-            //  deviceManagementStatus: ignoreDeviceManagementStatus,
-            //  ...rest
-            //} = webauthnDevices.result[0];
-            //
-            //const updatedDevice = await client.webauthn.update({
-            //  userId: user.sub,
-            //  realm: 'alpha',
-            //  ...rest,
-            //  deviceName: 'RyansDeviceUpdated!!',
-            //});
-            //console.log('updatedDevice', updatedDevice);
-            //
-            const bindingDeviceNameUpdated = await client.boundDevices.update({
-              userId: user.sub,
-              realm: 'alpha',
-              ...bindingDevices.result[0],
-              deviceName: 'RyanDevice',
-            });
-
-            console.log('bindingDeviceNameUpdated', bindingDeviceNameUpdated);
-
-            const removedDevice = await client.boundDevices.delete({
-              realm: 'alpha',
-              userId: user.sub,
-              ...bindingDeviceNameUpdated,
-            });
-            //console.log('removeDevice', removedDevice);
+              const deletedBound = await client.bound.delete({
+                ...query,
+                device: updatedBound,
+              });
+              console.log(updatedBound);
+            }
           } catch (err) {
             console.log('failed', err);
           }

diff --git a/e2e/autoscript-apps/tsconfig.json b/e2e/autoscript-apps/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.base.json",
   "files": [],
-  "include": [],
   "compilerOptions": {
     "forceConsistentCasingInFileNames": true,
     "strict": false,

diff --git a/packages/device-client/.eslintignore b/packages/device-client/.eslintignore
diff --git a/packages/device-client/.eslintrc.json b/packages/device-client/.eslintrc.json