nativescript 8.5.0-dev.0 → 8.5.0-dev.0-next-03-25-2023-4519382718

package/lib/commands/appstore-upload.js

@@ -37,13 +37,12 @@ class PublishIOS {
         this.$projectData.initializeProjectData();
     }
     execute(args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.$itmsTransporterService.validate();
+            yield this.$itmsTransporterService.validate(this.$options.appleApplicationSpecificPassword);
             const username = args[0] ||
                 (yield this.$prompter.getString("Apple ID", { allowEmpty: false }));
             const password = args[1] || (yield this.$prompter.getPassword("Apple ID password"));
-            const mobileProvisionIdentifier = args[2];
-            const codeSignIdentity = args[3];
             const user = yield this.$applePortalSessionService.createUserSession({ username, password }, {
                 applicationSpecificPassword: this.$options
                     .appleApplicationSpecificPassword,
@@ -54,21 +53,21 @@ class PublishIOS {
             if (!user.areCredentialsValid) {
                 this.$errors.fail(`Invalid username and password combination. Used '${username}' as the username.`);
             }
+            const mobileProvisionIdentifier = (_a = this.$options.provision) !== null && _a !== void 0 ? _a : args[2];
             let ipaFilePath = this.$options.ipa
                 ? path.resolve(this.$options.ipa)
                 : null;
             if (!mobileProvisionIdentifier && !ipaFilePath) {
                 this.$logger.warn("No mobile provision identifier set. A default mobile provision will be used. You can set one in app/App_Resources/iOS/build.xcconfig");
             }
-            if (!codeSignIdentity && !ipaFilePath) {
-                this.$logger.warn("No code sign identity set. A default code sign identity will be used. You can set one in app/App_Resources/iOS/build.xcconfig");
-            }
             this.$options.release = true;
             if (!ipaFilePath) {
                 const platform = this.$devicePlatformsConstants.iOS.toLowerCase();
-                if (mobileProvisionIdentifier || codeSignIdentity) {
-                    this.$logger.info("Building .ipa with the selected mobile provision and/or certificate.");
+                if (mobileProvisionIdentifier) {
+                    this.$logger.info("Building .ipa with the selected mobile provision and/or certificate. " +
+                        mobileProvisionIdentifier);
                     this.$options.forDevice = true;
+                    this.$options.provision = mobileProvisionIdentifier;
                     const buildData = new build_data_1.IOSBuildData(this.$projectData.projectDir, platform, Object.assign(Object.assign({}, this.$options.argv), { watch: false }));
                     ipaFilePath = yield this.$buildController.prepareAndBuild(buildData);
                 }
@@ -87,6 +86,7 @@ class PublishIOS {
                 ipaFilePath,
                 shouldExtractIpa: !!this.$options.ipa,
                 verboseLogging: this.$logger.getLevel() === "TRACE",
+                teamId: this.$options.teamId,
             });
         });
     }

package/lib/constants.js

@@ -157,6 +157,7 @@ ITMSConstants.VerboseLoggingLevels = {
 };
 ITMSConstants.iTMSExecutableName = "iTMSTransporter";
 ITMSConstants.iTMSDirectoryName = "itms";
+ITMSConstants.altoolExecutableName = "altool";
 class ItunesConnectApplicationTypesClass {
     constructor() {
         this.iOS = "iOS App";

package/lib/declarations.d.ts

@@ -765,13 +765,18 @@ interface IITMSData {
 	 * @type {string}
 	 */
 	verboseLogging?: boolean;
+	/**
+	 * Specifies the team id
+	 * @type {string}
+	 */
+	teamId?: string;
 }
 
 /**
  * Used for communicating with Xcode iTMS Transporter tool.
  */
 interface IITMSTransporterService {
-	validate(): Promise<void>;
+	validate(appSpecificPassword?: string): Promise<void>;
 	/**
 	 * Uploads an .ipa package to iTunes Connect.
 	 * @param  {IITMSData}     data Data needed to upload the package

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

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplePortalSessionService = void 0;
 const helpers_1 = require("../../common/helpers");
 const yok_1 = require("../../common/yok");
+const crypto = require("crypto");
 class ApplePortalSessionService {
     constructor($applePortalCookieService, $errors, $httpClient, $logger, $prompter) {
         this.$applePortalCookieService = $applePortalCookieService;
@@ -31,7 +32,7 @@ class ApplePortalSessionService {
             if (!opts || !opts.sessionBase64) {
                 if (loginResult.isTwoFactorAuthenticationEnabled) {
                     const authServiceKey = (yield this.getLoginConfig()).authServiceKey;
-                    yield this.handleTwoFactorAuthentication(loginResult.scnt, loginResult.xAppleIdSessionId, authServiceKey);
+                    yield this.handleTwoFactorAuthentication(loginResult.scnt, loginResult.xAppleIdSessionId, authServiceKey, loginResult.hashcash);
                 }
                 const sessionResponse = yield this.$httpClient.httpRequest({
                     url: "https://appstoreconnect.apple.com/olympus/v1/session",
@@ -80,12 +81,14 @@ class ApplePortalSessionService {
         });
     }
     login(credentials, opts) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const result = {
                 scnt: null,
                 xAppleIdSessionId: null,
                 isTwoFactorAuthenticationEnabled: false,
                 areCredentialsValid: true,
+                hashcash: null,
             };
             if (opts && opts.sessionBase64) {
                 const decodedSession = Buffer.from(opts.sessionBase64, "base64").toString("utf8");
@@ -99,6 +102,10 @@ class ApplePortalSessionService {
                 }
                 catch (err) {
                     const statusCode = err && err.response && err.response.status;
+                    const bits = (_a = err === null || err === void 0 ? void 0 : err.response) === null || _a === void 0 ? void 0 : _a.headers["x-apple-hc-bits"];
+                    const challenge = (_b = err === null || err === void 0 ? void 0 : err.response) === null || _b === void 0 ? void 0 : _b.headers["x-apple-hc-challenge"];
+                    const hashcash = makeHashCash(bits, challenge);
+                    result.hashcash = hashcash;
                     result.areCredentialsValid = statusCode !== 401 && statusCode !== 403;
                     result.isTwoFactorAuthenticationEnabled = statusCode === 409;
                     if (result.isTwoFactorAuthenticationEnabled &&
@@ -166,12 +173,13 @@ For more details how to set up your environment, please execute "tns publish ios
             return config || this.defaultLoginConfig;
         });
     }
-    handleTwoFactorAuthentication(scnt, xAppleIdSessionId, authServiceKey) {
+    handleTwoFactorAuthentication(scnt, xAppleIdSessionId, authServiceKey, hashcash) {
         return __awaiter(this, void 0, void 0, function* () {
             const headers = {
                 scnt: scnt,
                 "X-Apple-Id-Session-Id": xAppleIdSessionId,
                 "X-Apple-Widget-Key": authServiceKey,
+                "X-Apple-HC": hashcash,
                 Accept: "application/json",
             };
             const authResponse = yield this.$httpClient.httpRequest({
@@ -180,17 +188,35 @@ For more details how to set up your environment, please execute "tns publish ios
                 headers,
             });
             const data = JSON.parse(authResponse.body);
-            if (data.trustedPhoneNumbers && data.trustedPhoneNumbers.length) {
+            const isSMS = data.trustedPhoneNumbers &&
+                data.trustedPhoneNumbers.length === 1 &&
+                data.noTrustedDevices;
+            const multiSMS = data.trustedPhoneNumbers &&
+                data.trustedPhoneNumbers.length !== 1 &&
+                data.noTrustedDevices;
+            let token;
+            if (data.trustedPhoneNumbers &&
+                data.trustedPhoneNumbers.length &&
+                !multiSMS) {
                 const parsedAuthResponse = JSON.parse(authResponse.body);
-                const token = yield this.$prompter.getString(`Please enter the ${parsedAuthResponse.securityCode.length} digit code`, { allowEmpty: false });
+                token = yield this.$prompter.getString(`Please enter the ${parsedAuthResponse.securityCode.length} digit code`, { allowEmpty: false });
+                const body = {
+                    securityCode: {
+                        code: token.toString(),
+                    },
+                };
+                let url = `https://idmsa.apple.com/appleauth/auth/verify/trusteddevice/securitycode`;
+                if (isSMS) {
+                    body.mode = "sms";
+                    body.phoneNumber = {
+                        id: data.trustedPhoneNumbers[0].id,
+                    };
+                    url = `https://idmsa.apple.com/appleauth/auth/verify/phone/securitycode`;
+                }
                 yield this.$httpClient.httpRequest({
-                    url: `https://idmsa.apple.com/appleauth/auth/verify/trusteddevice/securitycode`,
+                    url,
                     method: "POST",
-                    body: {
-                        securityCode: {
-                            code: token.toString(),
-                        },
-                    },
+                    body,
                     headers: Object.assign(Object.assign({}, headers), { "Content-Type": "application/json" }),
                 });
                 const authTrustResponse = yield this.$httpClient.httpRequest({
@@ -200,6 +226,9 @@ For more details how to set up your environment, please execute "tns publish ios
                 });
                 this.$applePortalCookieService.updateUserSessionCookie(authTrustResponse.headers["set-cookie"]);
             }
+            else if (multiSMS) {
+                this.$errors.fail(`The NativeScript CLI does not support SMS authenticaton with multiple registered phone numbers.`);
+            }
             else {
                 this.$errors.fail(`Although response from Apple indicated activated Two-step Verification or Two-factor Authentication, NativeScript CLI don't know how to handle this response: ${data}`);
             }
@@ -208,3 +237,41 @@ For more details how to set up your environment, please execute "tns publish ios
 }
 exports.ApplePortalSessionService = ApplePortalSessionService;
 yok_1.injector.register("applePortalSessionService", ApplePortalSessionService);
+function makeHashCash(bits, challenge) {
+    const version = 1;
+    const dateString = getHashCanDateString();
+    let result;
+    for (let counter = 0;; counter++) {
+        const hc = [version, bits, dateString, challenge, `:${counter}`].join(":");
+        const shasumData = crypto.createHash("sha1");
+        shasumData.update(hc);
+        const digest = shasumData.digest();
+        if (checkBits(+bits, digest)) {
+            result = hc;
+            break;
+        }
+    }
+    return result;
+}
+function getHashCanDateString() {
+    const now = new Date();
+    return `${now.getFullYear()}${padTo2Digits(now.getMonth() + 1)}${padTo2Digits(now.getDate())}${padTo2Digits(now.getHours())}${padTo2Digits(now.getMinutes())}${padTo2Digits(now.getSeconds())}`;
+}
+function padTo2Digits(num) {
+    return num.toString().padStart(2, "0");
+}
+function checkBits(bits, digest) {
+    let result = true;
+    for (let i = 0; i < bits; ++i) {
+        result = checkBit(i, digest);
+        if (!result)
+            break;
+    }
+    return result;
+}
+function checkBit(position, buffer) {
+    const bitOffset = position & 7;
+    const byteIndex = position >> 3;
+    const bit = (buffer[byteIndex] >> bitOffset) & 1;
+    return bit === 0;
+}

package/lib/services/apple-portal/definitions.d.ts

@@ -39,6 +39,7 @@ interface IAppleLoginResult {
 	xAppleIdSessionId: string;
 	isTwoFactorAuthenticationEnabled: boolean;
 	areCredentialsValid: boolean;
+	hashcash: string;
 }
 
 interface IApplePortalUserDetail extends IAppleLoginResult {

package/lib/services/ios/spm-service.js

@@ -20,7 +20,7 @@ class SPMService {
         this.$xcodebuildArgsService = $xcodebuildArgsService;
     }
     getSPMPackages(projectData) {
-        const spmPackages = this.$projectConfigService.getValue("ios.experimentalSPMPackages", []);
+        const spmPackages = this.$projectConfigService.getValue("ios.SPMPackages", []);
         return spmPackages;
     }
     hasSPMPackages(projectData) {

package/lib/services/itmstransporter-service.js

@@ -36,15 +36,38 @@ class ITMSTransporterService {
     get $projectData() {
         return this.$injector.resolve("projectData");
     }
-    validate() {
+    validate(appSpecificPassword) {
         return __awaiter(this, void 0, void 0, function* () {
             const itmsTransporterPath = yield this.getITMSTransporterPath();
-            if (!this.$fs.exists(itmsTransporterPath)) {
-                this.$errors.fail("iTMS Transporter not found on this machine - make sure your Xcode installation is not damaged.");
+            const version = yield this.$xcodeSelectService.getXcodeVersion();
+            if (+version.major < 14) {
+                if (!this.$fs.exists(itmsTransporterPath)) {
+                    this.$errors.fail("iTMS Transporter not found on this machine - make sure your Xcode installation is not damaged.");
+                }
+            }
+            else {
+                const altoolPath = yield this.getAltoolPath();
+                if (!this.$fs.exists(altoolPath)) {
+                    this.$errors.fail("altool not found on this machine - make sure your Xcode installation is not damaged.");
+                }
+                if (!appSpecificPassword) {
+                    this.$errors.fail("An app-specific password is required from xCode versions 14 and above, Use the --appleApplicationSpecificPassword to supply it.");
+                }
             }
         });
     }
     upload(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const version = yield this.$xcodeSelectService.getXcodeVersion();
+            if (+version.major < 14) {
+                yield this.upload_iTMSTransporter(data);
+            }
+            else {
+                yield this.upload_altool(data);
+            }
+        });
+    }
+    upload_iTMSTransporter(data) {
         return __awaiter(this, void 0, void 0, function* () {
             const itmsTransporterPath = yield this.getITMSTransporterPath();
             const ipaFileName = "app.ipa";
@@ -81,6 +104,40 @@ class ITMSTransporterService {
             ], "close", { stdio: "inherit" });
         });
     }
+    upload_altool(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const altoolPath = yield this.getAltoolPath();
+            const ipaFileName = "app.ipa";
+            const itmsDirectory = yield this.$tempService.mkdirSync("itms-");
+            const innerDirectory = path.join(itmsDirectory, "mybundle.itmsp");
+            const ipaFileLocation = path.join(innerDirectory, ipaFileName);
+            this.$fs.createDirectory(innerDirectory);
+            this.$fs.copyFile(data.ipaFilePath, ipaFileLocation);
+            const password = data.applicationSpecificPassword;
+            const args = [
+                "--upload-app",
+                "-t",
+                "ios",
+                "-f",
+                ipaFileLocation,
+                "-u",
+                data.credentials.username,
+                "-p",
+                password,
+                "-k 100000",
+            ];
+            if (data.teamId) {
+                args.push("--asc-provider");
+                args.push(data.teamId);
+            }
+            if (data.verboseLogging) {
+                args.push("--verbose");
+            }
+            yield this.$childProcess.spawnFromEvent(altoolPath, args, "close", {
+                stdio: "inherit",
+            });
+        });
+    }
     getBundleIdentifier(data) {
         return __awaiter(this, void 0, void 0, function* () {
             const { shouldExtractIpa, ipaFilePath } = data;
@@ -115,6 +172,13 @@ class ITMSTransporterService {
             return this.$projectData.projectIdentifiers.ios;
         });
     }
+    getAltoolPath() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const xcodePath = yield this.$xcodeSelectService.getContentsDirectoryPath();
+            let itmsTransporterPath = path.join(xcodePath, "..", "Contents", "Developer", "usr", "bin", constants_1.ITMSConstants.altoolExecutableName);
+            return itmsTransporterPath;
+        });
+    }
     getITMSTransporterPath() {
         return __awaiter(this, void 0, void 0, function* () {
             const xcodePath = yield this.$xcodeSelectService.getContentsDirectoryPath();
@@ -142,6 +206,9 @@ class ITMSTransporterService {
 </package>`;
     }
 }
+__decorate([
+    (0, decorators_1.cache)()
+], ITMSTransporterService.prototype, "getAltoolPath", null);
 __decorate([
     (0, decorators_1.cache)()
 ], ITMSTransporterService.prototype, "getITMSTransporterPath", null);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nativescript",
   "preferGlobal": true,
-  "version": "8.5.0-dev.0",
+  "version": "8.5.0-dev.0-next-03-25-2023-4519382718",
   "author": "NativeScript <support@nativescript.org>",
   "description": "Command-line interface for building NativeScript projects",
   "bin": {