nativescript 8.8.3 → 8.9.0-alpha.0

package/lib/services/android-project-service.js

@@ -27,40 +27,7 @@ const constants_1 = require("../common/constants");
 const helpers_1 = require("../common/helpers");
 const decorators_1 = require(".././common/decorators");
 const yok_1 = require("../common/yok");
-//
-// we sort the native dependencies topologically to make sure they are processed in the right order
-// native dependenciess need to be sorted so the deepst dependencies are built before it's parents
-//
-// for example, given this dep structure (assuming these are all native dependencies that need to be built)
-// (note: we list all dependencies at the root level, so the leaf nodes are essentially references to the root nodes)
-//
-//   |- dep1
-//   |- dep2
-//   |- |- dep3
-//   |- |- dep4
-//   |- |- |- dep5
-//   |- dep3
-//   |- dep4
-//   |- |- dep5
-//   |- dep5
-//
-// It is sorted:
-//
-//   |- dep1
-//   |- dep3
-//   |- dep5
-//   |- dep4        # depends on dep5, so dep5 must be built first, ie above ^
-//   |- |- dep5
-//   |- dep2        # depends on dep3, dep4 (and dep5 through dep4) so all of them must be built first before dep2 is built
-//   |- |- dep3
-//   |- |- dep4
-//   |- |- |- dep5
-//
-// for more details see: https://wikiless.org/wiki/Topological_sorting?lang=en
-//
-function topologicalSortNativeDependencies(dependencies, start = [], depth = 0, total = 0 // do not pass in, we calculate it in the initial run!
-) {
-    // we set the total on the initial call - and never increment it, as it's used for esacaping the recursion
+function topologicalSortNativeDependencies(dependencies, start = [], depth = 0, total = 0) {
     if (total === 0) {
         total = dependencies.length;
     }
@@ -74,8 +41,6 @@ function topologicalSortNativeDependencies(dependencies, start = [], depth = 0,
         return sortedDeps;
     }, start);
     const remainingDeps = dependencies.filter((nativeDep) => !sortedDeps.includes(nativeDep));
-    // recurse if we still have remaining deps
-    // the second condition here prevents infinite recursion
     if (remainingDeps.length && sortedDeps.length < total) {
         return topologicalSortNativeDependencies(remainingDeps, sortedDeps, depth + 1, total);
     }
@@ -129,7 +94,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 constants.APK_DIR,
             ];
             const packageName = this.getProjectNameFromId(projectData);
-            const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, "android" /* constants.PlatformTypes.android */);
+            const runtimePackage = this.$projectDataService.getRuntimePackage(projectData.projectDir, "android");
             this._platformData = {
                 frameworkPackageName: runtimePackage.name,
                 normalizedPlatformName: "Android",
@@ -170,7 +135,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 configurationFileName: constants.MANIFEST_FILE_NAME,
                 configurationFilePath: path.join(...configurationsDirectoryArr),
                 relativeToFrameworkConfigurationFilePath: path.join(constants.SRC_DIR, constants.MAIN_DIR, constants.MANIFEST_FILE_NAME),
-                fastLivesyncFileExtensions: [".jpg", ".gif", ".png", ".bmp", ".webp"], // http://developer.android.com/guide/appendix/media-formats.html
+                fastLivesyncFileExtensions: [".jpg", ".gif", ".png", ".bmp", ".webp"],
             };
         }
         return this._platformData;
@@ -225,7 +190,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             const targetSdkVersion = androidToolsInfo && androidToolsInfo.targetSdkVersion;
             this.$logger.trace(`Using Android SDK '${targetSdkVersion}'.`);
             this.copy(this.getPlatformData(projectData).projectRoot, frameworkDir, "*", "-R");
-            // TODO: Check if we actually need this and if it should be targetSdk or compileSdk
             this.cleanResValues(targetSdkVersion, projectData);
         });
     }
@@ -259,7 +223,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     interpolateData(projectData) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Interpolate the apilevel and package
             this.interpolateConfigurationFile(projectData);
             const appResourcesDirectoryPath = projectData.getAppResourcesDirectoryPath();
             let stringsFilePath;
@@ -275,10 +238,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             const gradleSettingsFilePath = path.join(this.getPlatformData(projectData).projectRoot, "settings.gradle");
             shell.sed("-i", /__PROJECT_NAME__/, this.getProjectNameFromId(projectData), gradleSettingsFilePath);
             try {
-                // will replace applicationId in app/App_Resources/Android/app.gradle if it has not been edited by the user
                 const appGradleContent = this.$fs.readText(projectData.appGradlePath);
                 if (appGradleContent.indexOf(constants.PACKAGE_PLACEHOLDER_NAME) !== -1) {
-                    //TODO: For compatibility with old templates. Once all templates are updated should delete.
                     shell.sed("-i", new RegExp(constants.PACKAGE_PLACEHOLDER_NAME), projectData.projectIdentifiers.android, projectData.appGradlePath);
                 }
             }
@@ -337,7 +298,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     prepareProject() {
         return __awaiter(this, void 0, void 0, function* () {
-            // Intentionally left empty.
         });
     }
     ensureConfigurationFileInAppResources(projectData) {
@@ -355,7 +315,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
             this.$logger.warn("No manifest found in " + originalAndroidManifestFilePath);
             return;
         }
-        // Overwrite the AndroidManifest from runtime.
         if (!appResourcesDirStructureHasMigrated) {
             this.$fs.copyFile(originalAndroidManifestFilePath, this.getPlatformData(projectData).configurationFilePath);
         }
@@ -372,8 +331,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         }
         else {
             this.$fs.copyFile(path.join(projectAppResourcesPath, platformData.normalizedPlatformName, "*"), platformsAppResourcesPath);
-            // https://github.com/NativeScript/android-runtime/issues/899
-            // App_Resources/Android/libs is reserved to user's aars and jars, but they should not be copied as resources
             this.$fs.deleteDirectory(path.join(platformsAppResourcesPath, "libs"));
         }
         const androidToolsInfo = this.$androidToolsInfo.getToolsInfo({
@@ -384,7 +341,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     preparePluginNativeCode(pluginData, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
-            // build Android plugins which contain AndroidManifest.xml and/or resources
             const pluginPlatformsFolderPath = this.getPluginPlatformsFolderPath(pluginData, AndroidProjectService.ANDROID_PLATFORM_NAME);
             if (this.$fs.exists(pluginPlatformsFolderPath)) {
                 const options = {
@@ -410,7 +366,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     removePluginNativeCode(pluginData, projectData) {
         return __awaiter(this, void 0, void 0, function* () {
-            // not implemented
         });
     }
     beforePrepareAllPlugins(projectData, dependencies) {
@@ -429,7 +384,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     filterUniqueDependencies(dependencies) {
         const depsDictionary = dependencies.reduce((dict, dep) => {
             const collision = dict[dep.name];
-            // in case there are multiple dependencies to the same module, the one declared in the package.json takes precedence
             if (!collision || collision.depth > dep.depth) {
                 dict[dep.name] = dep;
             }
@@ -448,7 +402,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                 name,
                 directory: path.relative(platformDir, directory),
                 dependencies: dependencies.filter((dep) => {
-                    // filter out transient dependencies that don't have native dependencies
                     return (nativeDependencyData.findIndex((nativeDep) => nativeDep.name === dep) !== -1);
                 }),
             };
@@ -456,7 +409,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         nativeDependencies = topologicalSortNativeDependencies(nativeDependencies);
         const jsonContent = JSON.stringify(nativeDependencies, null, 4);
         this.$fs.writeFile(dependenciesJsonPath, jsonContent);
-        // we sort all the dependencies to respect the topological sorting of the native dependencies
         return dependencies.sort(function (a, b) {
             return (nativeDependencies.findIndex((n) => n.name === a.name) -
                 nativeDependencies.findIndex((n) => n.name === b.name));
@@ -495,7 +447,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
     }
     checkForChanges() {
         return __awaiter(this, void 0, void 0, function* () {
-            // Nothing android specific to check yet.
         });
     }
     getDeploymentTarget(projectData) {
@@ -506,12 +457,9 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         shell.cp(cpArg, paths, projectRoot);
     }
     validatePackageName(packageName) {
-        //Make the package conform to Java package types
-        //Enforce underscore limitation
         if (!/^[a-zA-Z]+(\.[a-zA-Z0-9][a-zA-Z0-9_]*)+$/.test(packageName)) {
             this.$errors.fail(`Package name must look like: com.company.Name. Got: ${packageName}`);
         }
-        //Class is a reserved word
         if (/\b[Cc]lass\b/.test(packageName)) {
             this.$errors.fail("class is a reserved word");
         }
@@ -520,7 +468,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         if (projectName === "") {
             this.$errors.fail("Project name cannot be empty");
         }
-        //Classes in Java don't begin with numbers
         if (/^[0-9]/.test(projectName)) {
             this.$errors.fail("Project name must not begin with a number");
         }
@@ -541,19 +488,6 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
         ];
         return path.join(this.getPlatformData(projectData).projectRoot, ...resourcePath);
     }
-    /**
-     * The purpose of this method is to delete the previously prepared user resources.
-     * The content of the `<platforms>/android/.../res` directory is based on user's resources and gradle project template from android-runtime.
-     * During preparation of the `<path to user's App_Resources>/Android` we want to clean all the users files from previous preparation,
-     * but keep the ones that were introduced during `platform add` of the android-runtime.
-     * Currently the Gradle project template contains resources only in values and values-v21 directories.
-     * So the current logic of the method is cleaning al resources from `<platforms>/android/.../res` that are not in `values.*` directories
-     * and that exist in the `<path to user's App_Resources>/Android/.../res` directory
-     * This means that if user has a resource file in values-v29 for example, builds the project and then deletes this resource,
-     * it will be kept in platforms directory. Reference issue: `https://github.com/NativeScript/nativescript-cli/issues/5083`
-     * Same is valid for files in `drawable-<resolution>` directories - in case in user's resources there's drawable-hdpi directory,
-     * which is deleted after the first build of app, it will remain in platforms directory.
-     */
     cleanUpPreparedResources(projectData) {
         let resourcesDirPath = path.join(projectData.appResourcesDirectoryPath, this.getPlatformData(projectData).normalizedPlatformName);
         if (this.$androidResourcesMigrationService.hasMigrated(projectData.appResourcesDirectoryPath)) {
@@ -579,7 +513,7 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
                     const hasUseKotlinPropertyInAppData = `hasUseKotlinPropertyInApp${analyticsDelimiter}${buildStatistics.kotlinUsage.hasUseKotlinPropertyInApp}`;
                     const hasKotlinRuntimeClassesData = `hasKotlinRuntimeClasses${analyticsDelimiter}${buildStatistics.kotlinUsage.hasKotlinRuntimeClasses}`;
                     yield this.$analyticsService.trackEventActionInGoogleAnalytics({
-                        action: "Using Kotlin" /* constants.TrackActionNames.UsingKotlin */,
+                        action: "Using Kotlin",
                         additionalData: `${hasUseKotlinPropertyInAppData}${analyticsDelimiter}${hasKotlinRuntimeClassesData}`,
                     });
                 }
@@ -613,4 +547,3 @@ __decorate([
 ], AndroidProjectService.prototype, "buildProject", null);
 exports.AndroidProjectService = AndroidProjectService;
 yok_1.injector.register("androidProjectService", AndroidProjectService);
-//# sourceMappingURL=android-project-service.js.map

package/lib/services/android-resources-migration-service.js

@@ -58,7 +58,6 @@ class AndroidResourcesMigrationService {
             const appResourcesMainSourceSetResourcesDestination = path.join(appMainSourceSet, constants.RESOURCES_DIR);
             this.$fs.ensureDirectoryExists(appResourcesDestination);
             this.$fs.ensureDirectoryExists(appMainSourceSet);
-            // create /java, /res and /assets in the App_Resources/Android/src/main directory
             this.$fs.ensureDirectoryExists(appResourcesMainSourceSetResourcesDestination);
             this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, "java"));
             this.$fs.ensureDirectoryExists(path.join(appMainSourceSet, constants.ASSETS_DIR));
@@ -72,25 +71,20 @@ class AndroidResourcesMigrationService {
             const resourceFiles = getFiles(appResourcesFiles);
             resourceDirectories.forEach((dir) => {
                 if (path.basename(dir) !== "libs") {
-                    // don't copy /App_Resources/Android/libs into the src/main/res/libs directory
                     this.$fs.copyFile(dir, appResourcesMainSourceSetResourcesDestination);
                 }
                 else {
-                    // copy App_Resources/Android/libs to App_ResourcesNew/Android/libs
                     this.$fs.copyFile(dir, path.join(appResourcesDestination));
                 }
             });
             resourceFiles.forEach((file) => {
                 const fileName = path.basename(file);
                 if (fileName !== constants.MANIFEST_FILE_NAME) {
-                    // don't copy AndroidManifest into /App_Resources/Android as it needs to be inside src/main/
                     this.$fs.copyFile(file, path.join(appResourcesDestination, fileName));
                 }
             });
             this.$fs.copyFile(path.join(originalAppResources, constants.MANIFEST_FILE_NAME), path.join(appMainSourceSet, constants.MANIFEST_FILE_NAME));
-            // rename the legacy app_resources to ANDROID_DIR_OLD
             this.$fs.rename(originalAppResources, appResourcesBackup);
-            // move the new, updated app_resources to App_Resources/Android, as  the de facto resources
             this.$fs.rename(appResourcesDestination, originalAppResources);
         });
     }
@@ -108,4 +102,3 @@ AndroidResourcesMigrationService.ANDROID_DIR_TEMP = "Android-Updated";
 AndroidResourcesMigrationService.ANDROID_DIR_OLD = "Android-Pre-v4";
 exports.AndroidResourcesMigrationService = AndroidResourcesMigrationService;
 yok_1.injector.register("androidResourcesMigrationService", AndroidResourcesMigrationService);
-//# sourceMappingURL=android-resources-migration-service.js.map

package/lib/services/apple-portal/apple-portal-application-service.js

@@ -33,7 +33,7 @@ class ApplePortalApplicationService {
         return __awaiter(this, void 0, void 0, function* () {
             const webSessionCookie = yield this.$applePortalSessionService.createWebSession(contentProviderId);
             const summaries = [];
-            yield this.getApplicationsByUrl(webSessionCookie, "https://appstoreconnect.apple.com/iris/v1/apps?include=appStoreVersions,prices", summaries);
+            yield this.getApplicationsByUrl(webSessionCookie, "https://appstoreconnect.apple.com/iris/v1/apps?include=appStoreVersions", summaries);
             return { summaries: summaries };
         });
     }
@@ -80,4 +80,3 @@ class ApplePortalApplicationService {
 }
 exports.ApplePortalApplicationService = ApplePortalApplicationService;
 yok_1.injector.register("applePortalApplicationService", ApplePortalApplicationService);
-//# sourceMappingURL=apple-portal-application-service.js.map

package/lib/services/apple-portal/apple-portal-cookie-service.js

@@ -51,4 +51,3 @@ class ApplePortalCookieService {
 }
 exports.ApplePortalCookieService = ApplePortalCookieService;
 yok_1.injector.register("applePortalCookieService", ApplePortalCookieService);
-//# sourceMappingURL=apple-portal-cookie-service.js.map

package/lib/services/apple-portal/apple-portal-session-service.js

@@ -13,6 +13,7 @@ exports.ApplePortalSessionService = void 0;
 const helpers_1 = require("../../common/helpers");
 const yok_1 = require("../../common/yok");
 const crypto = require("crypto");
+const srp_wrapper_1 = require("./srp/srp-wrapper");
 class ApplePortalSessionService {
     constructor($applePortalCookieService, $errors, $httpClient, $logger, $prompter) {
         this.$applePortalCookieService = $applePortalCookieService;
@@ -135,26 +136,41 @@ For more details how to set up your environment, please execute "ns publish ios
     }
     loginCore(credentials) {
         return __awaiter(this, void 0, void 0, function* () {
+            const wrapper = new srp_wrapper_1.GSASRPAuthenticator(credentials.username);
+            const initData = yield wrapper.getInit();
             const loginConfig = yield this.getLoginConfig();
-            const loginUrl = `${loginConfig.authServiceUrl}/auth/signin`;
+            const loginUrl = `${loginConfig.authServiceUrl}/auth/signin/init`;
             const headers = {
                 "Content-Type": "application/json",
                 "X-Requested-With": "XMLHttpRequest",
                 "X-Apple-Widget-Key": loginConfig.authServiceKey,
                 Accept: "application/json, text/javascript",
             };
-            const body = {
-                accountName: credentials.username,
-                password: credentials.password,
-                rememberMe: true,
-            };
-            const loginResponse = yield this.$httpClient.httpRequest({
+            const initResponse = yield this.$httpClient.httpRequest({
                 url: loginUrl,
                 method: "POST",
-                body,
+                body: initData,
                 headers,
             });
-            this.$applePortalCookieService.updateUserSessionCookie(loginResponse.headers["set-cookie"]);
+            const body = JSON.parse(initResponse.response.body);
+            const completeData = yield wrapper.getComplete(credentials.password, body);
+            const hashcash = yield this.fetchHashcash(loginConfig.authServiceUrl, loginConfig.authServiceKey);
+            const completeUrl = `${loginConfig.authServiceUrl}/auth/signin/complete?isRememberMeEnabled=false`;
+            const completeHeaders = {
+                "Content-Type": "application/json",
+                "X-Requested-With": "XMLHttpRequest",
+                "X-Apple-Widget-Key": loginConfig.authServiceKey,
+                Accept: "application/json, text/javascript",
+                "X-Apple-HC": hashcash || "",
+            };
+            const completeResponse = yield this.$httpClient.httpRequest({
+                url: completeUrl,
+                method: "POST",
+                completeHeaders,
+                body: completeData,
+                headers: completeHeaders,
+            });
+            this.$applePortalCookieService.updateUserSessionCookie(completeResponse.headers["set-cookie"]);
         });
     }
     getLoginConfig() {
@@ -173,6 +189,19 @@ For more details how to set up your environment, please execute "ns publish ios
             return config || this.defaultLoginConfig;
         });
     }
+    fetchHashcash(authServiceUrl, authServiceKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const loginUrl = `${authServiceUrl}/auth/signin?widgetKey=${authServiceKey}`;
+            const response = yield this.$httpClient.httpRequest({
+                url: loginUrl,
+                method: "GET",
+            });
+            const headers = response.headers;
+            const bits = headers["X-Apple-HC-Bits"];
+            const challenge = headers["X-Apple-HC-Challenge"];
+            return makeHashCash(bits, challenge);
+        });
+    }
     handleTwoFactorAuthentication(scnt, xAppleIdSessionId, authServiceKey, hashcash) {
         return __awaiter(this, void 0, void 0, function* () {
             const headers = {
@@ -190,10 +219,10 @@ For more details how to set up your environment, please execute "ns publish ios
             const data = JSON.parse(authResponse.body);
             const isSMS = data.trustedPhoneNumbers &&
                 data.trustedPhoneNumbers.length === 1 &&
-                data.noTrustedDevices; // 1 device and no trusted devices means sms was automatically sent.
+                data.noTrustedDevices;
             const multiSMS = data.trustedPhoneNumbers &&
                 data.trustedPhoneNumbers.length !== 1 &&
-                data.noTrustedDevices; // Not handling more than 1 sms device and no trusted devices.
+                data.noTrustedDevices;
             let token;
             if (data.trustedPhoneNumbers &&
                 data.trustedPhoneNumbers.length &&
@@ -207,7 +236,6 @@ For more details how to set up your environment, please execute "ns publish ios
                 };
                 let url = `https://idmsa.apple.com/appleauth/auth/verify/trusteddevice/securitycode`;
                 if (isSMS) {
-                    // No trusted devices means it must be sms.
                     body.mode = "sms";
                     body.phoneNumber = {
                         id: data.trustedPhoneNumbers[0].id,
@@ -271,9 +299,8 @@ function checkBits(bits, digest) {
     return result;
 }
 function checkBit(position, buffer) {
-    const bitOffset = position & 7; // in byte
-    const byteIndex = position >> 3; // in buffer
+    const bitOffset = position & 7;
+    const byteIndex = position >> 3;
     const bit = (buffer[byteIndex] >> bitOffset) & 1;
     return bit === 0;
 }
-//# sourceMappingURL=apple-portal-session-service.js.map

package/lib/services/apple-portal/srp/srp-wrapper.js

@@ -0,0 +1,76 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GSASRPAuthenticator = void 0;
+const js_srp_1 = require("@foxt/js-srp");
+const crypto = require("crypto");
+let srp = new js_srp_1.Srp(js_srp_1.Mode.GSA, js_srp_1.Hash.SHA256, 2048);
+const stringToU8Array = (str) => new TextEncoder().encode(str);
+const base64ToU8Array = (str) => Uint8Array.from(Buffer.from(str, "base64"));
+class GSASRPAuthenticator {
+    constructor(username) {
+        this.username = username;
+        this.srpClient = undefined;
+    }
+    derivePassword(protocol, password, salt, iterations) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let passHash = new Uint8Array(yield js_srp_1.util.hash(srp.h, stringToU8Array(password)));
+            if (protocol == "s2k_fo") {
+                passHash = stringToU8Array(js_srp_1.util.toHex(passHash));
+            }
+            let imported = yield crypto.subtle.importKey("raw", passHash, { name: "PBKDF2" }, false, ["deriveBits"]);
+            let derived = yield crypto.subtle.deriveBits({
+                name: "PBKDF2",
+                hash: { name: "SHA-256" },
+                iterations,
+                salt,
+            }, imported, 256);
+            return new Uint8Array(derived);
+        });
+    }
+    getInit() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.srpClient)
+                throw new Error("Already initialized");
+            this.srpClient = yield srp.newClient(stringToU8Array(this.username), new Uint8Array());
+            let a = Buffer.from(js_srp_1.util.bytesFromBigint(this.srpClient.A)).toString("base64");
+            return {
+                a,
+                protocols: ["s2k", "s2k_fo"],
+                accountName: this.username,
+            };
+        });
+    }
+    getComplete(password, serverData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.srpClient)
+                throw new Error("Not initialized");
+            if (serverData.protocol != "s2k" && serverData.protocol != "s2k_fo")
+                throw new Error("Unsupported protocol " + serverData.protocol);
+            let salt = base64ToU8Array(serverData.salt);
+            let serverPub = base64ToU8Array(serverData.b);
+            let iterations = serverData.iteration;
+            let derived = yield this.derivePassword(serverData.protocol, password, salt, iterations);
+            this.srpClient.p = derived;
+            yield this.srpClient.generate(salt, serverPub);
+            let m1 = Buffer.from(this.srpClient._M).toString("base64");
+            let M2 = yield this.srpClient.generateM2();
+            let m2 = Buffer.from(M2).toString("base64");
+            return {
+                accountName: this.username,
+                m1,
+                m2,
+                c: serverData.c,
+            };
+        });
+    }
+}
+exports.GSASRPAuthenticator = GSASRPAuthenticator;

package/lib/services/assets-generation/assets-generation-service.js

@@ -96,7 +96,7 @@ class AssetsGenerationService {
                     }
                     continue;
                 }
-                const operation = assetItem.resizeOperation || "resize" /* Operations.Resize */;
+                const operation = assetItem.resizeOperation || "resize";
                 let tempScale = null;
                 if (assetItem.scale) {
                     if (_.isNumber(assetItem.scale)) {
@@ -121,36 +121,27 @@ class AssetsGenerationService {
                 }
                 let image;
                 switch (operation) {
-                    case "overlayWith" /* Operations.OverlayWith */:
+                    case "overlayWith":
                         const overlayImageScale = assetItem.overlayImageScale ||
                             constants_1.AssetConstants.defaultOverlayImageScale;
                         const imageResize = Math.round(Math.min(width, height) * overlayImageScale);
                         image = yield this.resize(generationData.imagePath, imageResize, imageResize);
                         image = this.generateImage(background, width, height, outputPath, image);
                         break;
-                    case "blank" /* Operations.Blank */:
+                    case "blank":
                         image = this.generateImage(background, width, height, outputPath);
                         break;
-                    case "resize" /* Operations.Resize */:
+                    case "resize":
                         image = yield this.resize(generationData.imagePath, width, height);
                         break;
-                    case "outerScale" /* Operations.OuterScale */:
-                        // Resize image without applying scale
+                    case "outerScale":
                         image = yield this.resize(generationData.imagePath, assetItem.width, assetItem.height);
-                        // The scale will apply to the underlying layer of the generated image
                         image = this.generateImage("#00000000", width, height, outputPath, image);
                         break;
                     default:
                         throw new Error(`Invalid image generation operation: ${operation}`);
                 }
-                // This code disables the alpha chanel, as some images for the Apple App Store must not have transparency.
                 if (assetItem.rgba === false) {
-                    //
-                    // The original code here became broken at some time and there is an issue posted here..
-                    //    https://github.com/oliver-moran/jimp/issues/954
-                    // But NathanaelA recommended the below change and it works so maybe that's just what we go with.
-                    //
-                    // image = image.rgba(false);
                     image = image.colorType(2);
                 }
                 image.write(outputPath);
@@ -164,7 +155,6 @@ class AssetsGenerationService {
         });
     }
     generateImage(background, width, height, outputPath, overlayImage) {
-        // Typescript declarations for Jimp are not updated to define the constructor with backgroundColor so we workaround it by casting it to <any> for this case only.
         const J = Jimp;
         const backgroundColor = this.getRgbaNumber(background);
         let image = new J(width, height, backgroundColor);
@@ -190,4 +180,3 @@ __decorate([
 ], AssetsGenerationService.prototype, "generateSplashScreens", null);
 exports.AssetsGenerationService = AssetsGenerationService;
 yok_1.injector.register("assetsGenerationService", AssetsGenerationService);
-//# sourceMappingURL=assets-generation-service.js.map

package/lib/services/build-artifacts-service.js

@@ -75,7 +75,7 @@ class BuildArtifactsService {
         if (packages.length > 1) {
             this.$logger.warn(`More than one ${packageExtName} found in ${buildOutputPath} directory. Using the last one produced from build.`);
         }
-        packages = _.sortBy(packages, (pkg) => pkg.time).reverse(); // We need to reverse because sortBy always sorts in ascending order
+        packages = _.sortBy(packages, (pkg) => pkg.time).reverse();
         return packages[0];
     }
     getApplicationPackagesCore(candidates, validPackageNames) {
@@ -96,4 +96,3 @@ class BuildArtifactsService {
 }
 exports.BuildArtifactsService = BuildArtifactsService;
 yok_1.injector.register("buildArtifactsService", BuildArtifactsService);
-//# sourceMappingURL=build-artifacts-service.js.map

package/lib/services/build-data-service.js

@@ -18,4 +18,3 @@ class BuildDataService {
 }
 exports.BuildDataService = BuildDataService;
 yok_1.injector.register("buildDataService", BuildDataService);
-//# sourceMappingURL=build-data-service.js.map

package/lib/services/build-info-file-service.js

@@ -77,4 +77,3 @@ class BuildInfoFileService {
 }
 exports.BuildInfoFileService = BuildInfoFileService;
 yok_1.injector.register("buildInfoFileService", BuildInfoFileService);
-//# sourceMappingURL=build-info-file-service.js.map

package/lib/services/cleanup-service.js

@@ -30,7 +30,7 @@ class CleanupService {
         return __awaiter(this, void 0, void 0, function* () {
             const cleanupProcess = yield this.getCleanupProcess();
             cleanupProcess.send({
-                messageType: "AddCleanCommand" /* CleanupProcessMessage.AddCleanCommand */,
+                messageType: "AddCleanCommand",
                 commandInfo,
             });
         });
@@ -39,7 +39,7 @@ class CleanupService {
         return __awaiter(this, void 0, void 0, function* () {
             const cleanupProcess = yield this.getCleanupProcess();
             cleanupProcess.send({
-                messageType: "RemoveCleanCommand" /* CleanupProcessMessage.RemoveCleanCommand */,
+                messageType: "RemoveCleanCommand",
                 commandInfo,
             });
         });
@@ -48,7 +48,7 @@ class CleanupService {
         return __awaiter(this, void 0, void 0, function* () {
             const cleanupProcess = yield this.getCleanupProcess();
             cleanupProcess.send({
-                messageType: "AddRequest" /* CleanupProcessMessage.AddRequest */,
+                messageType: "AddRequest",
                 requestInfo,
             });
         });
@@ -57,7 +57,7 @@ class CleanupService {
         return __awaiter(this, void 0, void 0, function* () {
             const cleanupProcess = yield this.getCleanupProcess();
             cleanupProcess.send({
-                messageType: "RemoveRequest" /* CleanupProcessMessage.RemoveRequest */,
+                messageType: "RemoveRequest",
                 requestInfo,
             });
         });
@@ -66,7 +66,7 @@ class CleanupService {
         return __awaiter(this, void 0, void 0, function* () {
             const cleanupProcess = yield this.getCleanupProcess();
             cleanupProcess.send({
-                messageType: "AddDeleteFileAction" /* CleanupProcessMessage.AddDeleteFileAction */,
+                messageType: "AddDeleteFileAction",
                 filePath,
             });
         });
@@ -75,7 +75,7 @@ class CleanupService {
         return __awaiter(this, void 0, void 0, function* () {
             const cleanupProcess = yield this.getCleanupProcess();
             cleanupProcess.send({
-                messageType: "RemoveDeleteFileAction" /* CleanupProcessMessage.RemoveDeleteFileAction */,
+                messageType: "RemoveDeleteFileAction",
                 filePath,
             });
         });
@@ -84,7 +84,7 @@ class CleanupService {
         return __awaiter(this, void 0, void 0, function* () {
             const cleanupProcess = yield this.getCleanupProcess();
             cleanupProcess.send({
-                messageType: "AddJSFileToRequire" /* CleanupProcessMessage.AddJSFileToRequire */,
+                messageType: "AddJSFileToRequire",
                 jsCommand,
             });
         });
@@ -93,7 +93,7 @@ class CleanupService {
         return __awaiter(this, void 0, void 0, function* () {
             const cleanupProcess = yield this.getCleanupProcess();
             cleanupProcess.send({
-                messageType: "RemoveJSFileToRequire" /* CleanupProcessMessage.RemoveJSFileToRequire */,
+                messageType: "RemoveJSFileToRequire",
                 jsCommand,
             });
         });
@@ -121,8 +121,6 @@ class CleanupService {
     setShouldDispose(shouldDispose) {
         this.shouldDispose = shouldDispose;
     }
-    // TODO: Consider extracting this method to a separate service
-    // as it has the same logic as the one used in analytics-service
     getCleanupProcess() {
         return new Promise((resolve, reject) => {
             const cleanupProcessArgs = this.getCleanupProcessArgs();
@@ -141,12 +139,11 @@ class CleanupService {
                 clearTimeout(timeoutId);
                 if (!isSettled) {
                     isSettled = true;
-                    // In case we throw error here, CLI will break its execution.
                     reject(err);
                 }
             });
             cleanupProcess.on("message", (data) => {
-                if (data === "ProcessReadyToReceive" /* DetachedProcessMessages.ProcessReadyToReceive */) {
+                if (data === "ProcessReadyToReceive") {
                     clearTimeout(timeoutId);
                     if (!isSettled) {
                         isSettled = true;
@@ -195,4 +192,3 @@ __decorate([
 ], CleanupService.prototype, "getCleanupProcess", null);
 exports.CleanupService = CleanupService;
 yok_1.injector.register("cleanupService", CleanupService);
-//# sourceMappingURL=cleanup-service.js.map