Remove out-by-one license workround (#54)

nowsecure · Aug 1, 2023 · b07b6b0 · b07b6b0
1 parent 5459f15
commit b07b6b0
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 45 deletions.
diff --git a/dist/nowsecure-convert-sarif/index.js b/dist/nowsecure-convert-sarif/index.js
@@ -38930,7 +38930,7 @@ class NowSecure {
      * Checks if the assessment limit has been reached. Throws an exception if
      * an error occurs.
      */
-    isLicenseValid(licenseWorkaround) {
+    isLicenseValid() {
         return __awaiter(this, void 0, void 0, function* () {
             const r = yield __classPrivateFieldGet(this, _NowSecure_client, "f").getJson(`${__classPrivateFieldGet(this, _NowSecure_apiUrl, "f")}/graphql?query={${LICENSE_GQL}}`);
             if (r.statusCode !== 200) {
@@ -38940,13 +38940,8 @@ class NowSecure {
                 const error = r.result.errors[0];
                 throw new Error(`Report request failed with error: ${error}`);
             }
-            const { total, limit, reached } = r.result.data.my.user.organization.usage.assessment;
-            let limitReached = reached;
-            if (licenseWorkaround) {
-                // FIXME: Workaround platform license counting issue.
-                limitReached = limit !== -1 && total + 1 >= limit;
-            }
-            return !limitReached;
+            const { reached } = r.result.data.my.user.organization.usage.assessment;
+            return !reached;
         });
     }
 }

diff --git a/dist/nowsecure-convert-sarif/index.js.map b/dist/nowsecure-convert-sarif/index.js.map
diff --git a/dist/nowsecure-create-issues/index.js b/dist/nowsecure-create-issues/index.js
@@ -46065,7 +46065,7 @@ class NowSecure {
      * Checks if the assessment limit has been reached. Throws an exception if
      * an error occurs.
      */
-    isLicenseValid(licenseWorkaround) {
+    isLicenseValid() {
         return __awaiter(this, void 0, void 0, function* () {
             const r = yield __classPrivateFieldGet(this, _NowSecure_client, "f").getJson(`${__classPrivateFieldGet(this, _NowSecure_apiUrl, "f")}/graphql?query={${LICENSE_GQL}}`);
             if (r.statusCode !== 200) {
@@ -46075,13 +46075,8 @@ class NowSecure {
                 const error = r.result.errors[0];
                 throw new Error(`Report request failed with error: ${error}`);
             }
-            const { total, limit, reached } = r.result.data.my.user.organization.usage.assessment;
-            let limitReached = reached;
-            if (licenseWorkaround) {
-                // FIXME: Workaround platform license counting issue.
-                limitReached = limit !== -1 && total + 1 >= limit;
-            }
-            return !limitReached;
+            const { reached } = r.result.data.my.user.organization.usage.assessment;
+            return !reached;
         });
     }
 }

diff --git a/dist/nowsecure-create-issues/index.js.map b/dist/nowsecure-create-issues/index.js.map
diff --git a/dist/nowsecure-upload-app/index.js b/dist/nowsecure-upload-app/index.js
@@ -32021,7 +32021,7 @@ class NowSecure {
      * Checks if the assessment limit has been reached. Throws an exception if
      * an error occurs.
      */
-    isLicenseValid(licenseWorkaround) {
+    isLicenseValid() {
         return __awaiter(this, void 0, void 0, function* () {
             const r = yield __classPrivateFieldGet(this, _NowSecure_client, "f").getJson(`${__classPrivateFieldGet(this, _NowSecure_apiUrl, "f")}/graphql?query={${LICENSE_GQL}}`);
             if (r.statusCode !== 200) {
@@ -32031,13 +32031,8 @@ class NowSecure {
                 const error = r.result.errors[0];
                 throw new Error(`Report request failed with error: ${error}`);
             }
-            const { total, limit, reached } = r.result.data.my.user.organization.usage.assessment;
-            let limitReached = reached;
-            if (licenseWorkaround) {
-                // FIXME: Workaround platform license counting issue.
-                limitReached = limit !== -1 && total + 1 >= limit;
-            }
-            return !limitReached;
+            const { reached } = r.result.data.my.user.organization.usage.assessment;
+            return !reached;
         });
     }
 }
@@ -32497,9 +32492,8 @@ function run() {
             const groupId = core.getInput("group_id");
             const appFile = core.getInput("app_file");
             const versionString = core.getInput("version_string");
-            const licenseWorkaround = core.getBooleanInput("license_workaround");
             const analysisType = core.getInput("analysis_type");
-            const licenseValid = yield ns.isLicenseValid(licenseWorkaround);
+            const licenseValid = yield ns.isLicenseValid();
             if (!licenseValid) {
                 throw new Error("Assessment limit reached");
             }

diff --git a/dist/nowsecure-upload-app/index.js.map b/dist/nowsecure-upload-app/index.js.map
diff --git a/src/nowsecure-client.ts b/src/nowsecure-client.ts
@@ -236,7 +236,7 @@ export class NowSecure {
    * Checks if the assessment limit has been reached. Throws an exception if
    * an error occurs.
    */
-  async isLicenseValid(licenseWorkaround: boolean): Promise<boolean> {
+  async isLicenseValid(): Promise<boolean> {
     const r = await this.#client.getJson<PullReportResponse>(
       `${this.#apiUrl}/graphql?query={${LICENSE_GQL}}`
     );
@@ -250,15 +250,8 @@ export class NowSecure {
       throw new Error(`Report request failed with error: ${error}`);
     }
 
-    const { total, limit, reached } =
-      r.result.data.my.user.organization.usage.assessment;
+    const { reached } = r.result.data.my.user.organization.usage.assessment;
 
-    let limitReached = reached;
-    if (licenseWorkaround) {
-      // FIXME: Workaround platform license counting issue.
-      limitReached = limit !== -1 && total + 1 >= limit;
-    }
-
-    return !limitReached;
+    return !reached;
   }
 }
diff --git a/src/nowsecure-upload-app.ts b/src/nowsecure-upload-app.ts
@@ -16,10 +16,9 @@ async function run() {
     const groupId = core.getInput("group_id");
     const appFile = core.getInput("app_file");
     const versionString = core.getInput("version_string");
-    const licenseWorkaround = core.getBooleanInput("license_workaround");
     const analysisType = core.getInput("analysis_type");
 
-    const licenseValid = await ns.isLicenseValid(licenseWorkaround);
+    const licenseValid = await ns.isLicenseValid();
     if (!licenseValid) {
       throw new Error("Assessment limit reached");
     }

diff --git a/upload-app/action.yml b/upload-app/action.yml
@@ -19,10 +19,6 @@ inputs:
   group_id:
     required: true
     description: "Group ID for the application in Platform."
-  license_workaround:
-    required: true
-    description: "Workaround for improved license limit reached UX."
-    default: true
   version_string:
     required: false
     description: "Version string to associate with the build"