Throw new error for wrong device id, and add test to test for it

rokucommunity · Mar 18, 2024 · 2ad743a · 2ad743a
1 parent 0da4110
commit 2ad743a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/RokuDeploy.spec.ts b/src/RokuDeploy.spec.ts
@@ -1377,6 +1377,24 @@ describe('index', () => {
                 'Unknown error signing package'
             );
         });
+
+        it('should return our fallback error if neither error or package link was detected', async () => {
+            mockDoGetRequest(`
+                <device-info>
+                    <keyed-developer-id>789</keyed-developer-id>
+                </device-info>
+                `);
+            await expectThrowsAsync(
+                rokuDeploy.createSignedPackage({
+                    host: '1.2.3.4',
+                    password: 'password',
+                    signingPassword: options.signingPassword,
+                    stagingDir: stagingDir,
+                    devId: '123'
+                }),
+                `Package signing cancelled: provided devId '123' does not match on-device devId '789'`
+            );
+        });
     });
 
     describe('prepublishToStaging', () => {

diff --git a/src/RokuDeploy.ts b/src/RokuDeploy.ts
@@ -423,8 +423,11 @@ export class RokuDeploy {
         let appName = parsedManifest.title + '/' + parsedManifest.major_version + '.' + parsedManifest.minor_version;
 
         //prevent devId mismatch (if devId is specified)
-        if (options.devId && options.devId !== await this.getDevId()) {
-            throw new Error('devId mismatch. nope, not gonna sign');
+        if (options.devId) {
+            const deviceDevId = await this.getDevId();
+            if (options.devId !== deviceDevId) {
+                throw new Error(`Package signing cancelled: provided devId '${options.devId}' does not match on-device devId '${deviceDevId}'`);
+            }
         }
 
         let requestOptions = this.generateBaseRequestOptions('plugin_package', options as any, {