@c8y/ngx-components 1024.10.1 → 1024.10.2

package/fesm2022/c8y-ngx-components-ecosystem-shared.mjs

@@ -8,9 +8,9 @@ import { PackageType, Status, WizardHeaderComponent, IconDirective, WizardBodyCo
 import * as i3 from '@ngx-translate/core';
 import { saveAs } from 'file-saver';
 import { groupBy, uniqBy, get, pick, omit, isUndefined, kebabCase, cloneDeep } from 'lodash-es';
-import { BehaviorSubject, defer, merge, combineLatest, Subject, pipe } from 'rxjs';
+import { BehaviorSubject, defer, firstValueFrom, merge, combineLatest, Subject, pipe } from 'rxjs';
 import { map, shareReplay, debounceTime, take, filter, distinctUntilKeyChanged, tap, switchMap, takeUntil } from 'rxjs/operators';
-import { satisfies, gt, coerce, lt } from 'semver';
+import { satisfies, gt, coerce, valid, lt } from 'semver';
 import { NgIf, NgFor, AsyncPipe, NgClass, NgPlural, NgPluralCase, TitleCasePipe } from '@angular/common';
 import { PopoverDirective, PopoverModule } from 'ngx-bootstrap/popover';
 import * as i1$1 from '@angular/forms';
@@ -46,6 +46,7 @@ var ERROR_TYPE;
     ERROR_TYPE["APPLICATION_CREATION_FAILED"] = "APPLICATION_CREATION_FAILED";
     ERROR_TYPE["KEY_OR_CONTEXT_PATH_MISMATCH"] = "KEY_OR_CONTEXT_PATH_MISMATCH";
     ERROR_TYPE["VERSION_NOT_FOUND"] = "VERSION_NOT_FOUND";
+    ERROR_TYPE["PACKAGE_VERSION_INVALID"] = "PACKAGE_VERSION_INVALID";
 })(ERROR_TYPE || (ERROR_TYPE = {}));
 const PRODUCT_EXPERIENCE_ECOSYSTEM = {
     APPLICATIONS: {
@@ -117,7 +118,8 @@ const ERROR_MESSAGES = {
     [ERROR_TYPE.MICROSERVICE_NAME_TOO_LONG]: gettext('Microservice name "{{ name }}" must not be longer than {{ maxChars }} characters.'),
     [ERROR_TYPE.APPLICATION_CREATION_FAILED]: gettext('Application creation failed.'),
     [ERROR_TYPE.KEY_OR_CONTEXT_PATH_MISMATCH]: gettext('The "contextPath`KEEP_ORIGINAL`" or "key`KEEP_ORIGINAL`" of the uploaded archive do not match with the existing application.'),
-    [ERROR_TYPE.VERSION_NOT_FOUND]: gettext('The selected version was not found on the server.')
+    [ERROR_TYPE.VERSION_NOT_FOUND]: gettext('The selected version was not found on the server.'),
+    [ERROR_TYPE.PACKAGE_VERSION_INVALID]: gettext('The package version is missing or invalid. Version field in the manifest must follow semantic versioning.')
 };
 const APP_STATE = {
     SUBSCRIBED: {
@@ -538,7 +540,7 @@ class EcosystemService {
             const fileBinary = new Blob([binary], { type: 'application/x-zip-compressed' });
             saveAs(fileBinary, archive.name);
         }
-        catch (e) {
+        catch {
             // empty
         }
     }
@@ -601,10 +603,27 @@ class EcosystemService {
                 return true;
             }
         }
-        catch (ex) {
+        catch {
             throw new EcosystemError(ERROR_TYPE.TYPE_VALIDATION);
         }
     }
+    async isValidPackageVersion(archive) {
+        let manifest;
+        try {
+            manifest = await firstValueFrom(this.getCumulocityJson$(archive));
+        }
+        catch {
+            throw new EcosystemError(ERROR_TYPE.TYPE_VALIDATION);
+        }
+        if (!manifest?.version) {
+            throw new EcosystemError(ERROR_TYPE.PACKAGE_VERSION_INVALID);
+        }
+        const version = manifest.version;
+        if (!valid(version)) {
+            throw new EcosystemError(ERROR_TYPE.PACKAGE_VERSION_INVALID);
+        }
+        return true;
+    }
     async uploadArchiveToApp(archive, app, isNewVersion = false, queryParams) {
         let uploadOverrides;
         if (isNewVersion) {
@@ -644,6 +663,9 @@ class EcosystemService {
         if (!manifest) {
             return;
         }
+        if (this.isPackage(app)) {
+            await this.isValidPackageVersion(archive);
+        }
         await this.validatePackageKeyAndContextPath(manifest, app);
     }
     async getCumulocityJson(archive) {
@@ -651,7 +673,7 @@ class EcosystemService {
             const c8yManifest = await this.getCumulocityJson$(archive).toPromise();
             return c8yManifest;
         }
-        catch (ex) {
+        catch {
             return null;
         }
     }
@@ -665,7 +687,7 @@ class EcosystemService {
                 appModel = await this.getCumulocityJson$(archive).toPromise();
                 isPackage = appModel.isPackage;
             }
-            catch (e) {
+            catch {
                 // do nothing, we allow having HOSTED applications without the manifest file
             }
         }
@@ -736,7 +758,7 @@ class EcosystemService {
             const manifest = await this.applicationService.getAppManifest(selectedPackage, requestedVersion);
             cleanManifest = omit(manifest, ['name', 'contextPath', 'key']);
         }
-        catch (ex) {
+        catch {
             throw new EcosystemError(ERROR_TYPE.VERSION_NOT_FOUND);
         }
         config.isSetup = true;
@@ -856,7 +878,7 @@ class EcosystemService {
             const res = await this.applicationService.binary(app).downloadArchive(archive.id);
             binary = await res.arrayBuffer();
         }
-        catch (ex) {
+        catch {
             const msg = gettext('Could not get the binary.');
             this.alertService.danger(msg);
         }
@@ -908,7 +930,7 @@ class EcosystemService {
                 const versionedAppManifest = await this.applicationService.getAppManifest(selectedPackage, requestedVersion);
                 manifest = versionedAppManifest;
             }
-            catch (ex) {
+            catch {
                 throw new EcosystemError(ERROR_TYPE.VERSION_NOT_FOUND);
             }
         }