@akylas/nativescript-cli 8.7.2 → 8.8.3

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

@@ -1,13 +1,4 @@
 "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.ApplePortalSessionService = void 0;
 const helpers_1 = require("../../common/helpers");
@@ -26,213 +17,205 @@ class ApplePortalSessionService {
             authServiceKey: "e0b80c3bf78523bfe80974d320935bfa30add02e1bff88ec2166c6bd5a706c42",
         };
     }
-    createUserSession(credentials, opts) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const loginResult = yield this.login(credentials, opts);
-            if (!opts || !opts.sessionBase64) {
-                if (loginResult.isTwoFactorAuthenticationEnabled) {
-                    const authServiceKey = (yield this.getLoginConfig()).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",
-                    method: "GET",
-                    headers: {
-                        Cookie: this.$applePortalCookieService.getUserSessionCookie(),
-                    },
-                });
-                this.$applePortalCookieService.updateUserSessionCookie(sessionResponse.headers["set-cookie"]);
+    async createUserSession(credentials, opts) {
+        const loginResult = await this.login(credentials, opts);
+        if (!opts || !opts.sessionBase64) {
+            if (loginResult.isTwoFactorAuthenticationEnabled) {
+                const authServiceKey = (await this.getLoginConfig()).authServiceKey;
+                await this.handleTwoFactorAuthentication(loginResult.scnt, loginResult.xAppleIdSessionId, authServiceKey, loginResult.hashcash);
             }
-            const userDetailsResponse = yield this.$httpClient.httpRequest({
-                url: "https://appstoreconnect.apple.com/WebObjects/iTunesConnect.woa/ra/user/detail",
+            const sessionResponse = await this.$httpClient.httpRequest({
+                url: "https://appstoreconnect.apple.com/olympus/v1/session",
                 method: "GET",
                 headers: {
-                    "Content-Type": "application/json",
                     Cookie: this.$applePortalCookieService.getUserSessionCookie(),
                 },
             });
-            this.$applePortalCookieService.updateUserSessionCookie(userDetailsResponse.headers["set-cookie"]);
-            const userdDetails = JSON.parse(userDetailsResponse.body).data;
-            const result = Object.assign(Object.assign(Object.assign({}, userdDetails), loginResult), { userSessionCookie: this.$applePortalCookieService.getUserSessionCookie() });
-            return result;
+            this.$applePortalCookieService.updateUserSessionCookie(sessionResponse.headers["set-cookie"]);
+        }
+        const userDetailsResponse = await this.$httpClient.httpRequest({
+            url: "https://appstoreconnect.apple.com/WebObjects/iTunesConnect.woa/ra/user/detail",
+            method: "GET",
+            headers: {
+                "Content-Type": "application/json",
+                Cookie: this.$applePortalCookieService.getUserSessionCookie(),
+            },
         });
+        this.$applePortalCookieService.updateUserSessionCookie(userDetailsResponse.headers["set-cookie"]);
+        const userdDetails = JSON.parse(userDetailsResponse.body).data;
+        const result = {
+            ...userdDetails,
+            ...loginResult,
+            userSessionCookie: this.$applePortalCookieService.getUserSessionCookie(),
+        };
+        return result;
     }
-    createWebSession(contentProviderId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const webSessionResponse = yield this.$httpClient.httpRequest({
-                url: "https://appstoreconnect.apple.com/olympus/v1/session",
-                method: "POST",
-                body: {
-                    provider: {
-                        providerId: contentProviderId,
-                    },
+    async createWebSession(contentProviderId) {
+        const webSessionResponse = await this.$httpClient.httpRequest({
+            url: "https://appstoreconnect.apple.com/olympus/v1/session",
+            method: "POST",
+            body: {
+                provider: {
+                    providerId: contentProviderId,
                 },
-                headers: {
-                    Accept: "application/json, text/plain, */*",
-                    "Accept-Encoding": "gzip, deflate, br",
-                    "X-Csrf-Itc": "itc",
-                    "Content-Type": "application/json;charset=UTF-8",
-                    "X-Requested-With": "olympus-ui",
-                    Cookie: this.$applePortalCookieService.getUserSessionCookie(),
-                },
-            });
-            const webSessionCookie = this.$applePortalCookieService.getWebSessionCookie(webSessionResponse.headers["set-cookie"]);
-            return webSessionCookie;
+            },
+            headers: {
+                Accept: "application/json, text/plain, */*",
+                "Accept-Encoding": "gzip, deflate, br",
+                "X-Csrf-Itc": "itc",
+                "Content-Type": "application/json;charset=UTF-8",
+                "X-Requested-With": "olympus-ui",
+                Cookie: this.$applePortalCookieService.getUserSessionCookie(),
+            },
         });
+        const webSessionCookie = this.$applePortalCookieService.getWebSessionCookie(webSessionResponse.headers["set-cookie"]);
+        return webSessionCookie;
     }
-    login(credentials, opts) {
+    async 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");
-                this.$applePortalCookieService.updateUserSessionCookie([decodedSession]);
-                result.isTwoFactorAuthenticationEnabled =
-                    decodedSession.indexOf("DES") > -1;
+        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");
+            this.$applePortalCookieService.updateUserSessionCookie([decodedSession]);
+            result.isTwoFactorAuthenticationEnabled =
+                decodedSession.indexOf("DES") > -1;
+        }
+        else {
+            try {
+                await this.loginCore(credentials);
             }
-            else {
-                try {
-                    yield this.loginCore(credentials);
-                }
-                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 &&
-                        opts &&
-                        opts.requireApplicationSpecificPassword &&
-                        !opts.applicationSpecificPassword) {
-                        this.$errors
-                            .fail(`Your account has two-factor authentication enabled but --appleApplicationSpecificPassword option is not provided.
+            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 &&
+                    opts &&
+                    opts.requireApplicationSpecificPassword &&
+                    !opts.applicationSpecificPassword) {
+                    this.$errors
+                        .fail(`Your account has two-factor authentication enabled but --appleApplicationSpecificPassword option is not provided.
 To generate an application-specific password, please go to https://appleid.apple.com/account/manage.
 This password will be used for the iTunes Transporter, which is used to upload your application.`);
-                    }
-                    if (result.isTwoFactorAuthenticationEnabled &&
-                        opts &&
-                        opts.requireInteractiveConsole &&
-                        !(0, helpers_1.isInteractive)()) {
-                        this.$errors
-                            .fail(`Your account has two-factor authentication enabled, but your console is not interactive.
+                }
+                if (result.isTwoFactorAuthenticationEnabled &&
+                    opts &&
+                    opts.requireInteractiveConsole &&
+                    !(0, helpers_1.isInteractive)()) {
+                    this.$errors
+                        .fail(`Your account has two-factor authentication enabled, but your console is not interactive.
 For more details how to set up your environment, please execute "ns publish ios --help".`);
-                    }
-                    const headers = (err && err.response && err.response.headers) || {};
-                    result.scnt = headers.scnt;
-                    result.xAppleIdSessionId = headers["x-apple-id-session-id"];
                 }
+                const headers = (err && err.response && err.response.headers) || {};
+                result.scnt = headers.scnt;
+                result.xAppleIdSessionId = headers["x-apple-id-session-id"];
             }
-            return result;
+        }
+        return result;
+    }
+    async loginCore(credentials) {
+        const loginConfig = await this.getLoginConfig();
+        const loginUrl = `${loginConfig.authServiceUrl}/auth/signin`;
+        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 = await this.$httpClient.httpRequest({
+            url: loginUrl,
+            method: "POST",
+            body,
+            headers,
         });
+        this.$applePortalCookieService.updateUserSessionCookie(loginResponse.headers["set-cookie"]);
     }
-    loginCore(credentials) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const loginConfig = yield this.getLoginConfig();
-            const loginUrl = `${loginConfig.authServiceUrl}/auth/signin`;
-            const headers = {
-                "Content-Type": "application/json",
-                "X-Requested-With": "XMLHttpRequest",
-                "X-Apple-Widget-Key": loginConfig.authServiceKey,
-                Accept: "application/json, text/javascript",
-            };
+    async getLoginConfig() {
+        let config = null;
+        try {
+            const response = await this.$httpClient.httpRequest({
+                url: this.loginConfigEndpoint,
+                method: "GET",
+            });
+            config = JSON.parse(response.body);
+        }
+        catch (err) {
+            this.$logger.trace(`Error while executing request to ${this.loginConfigEndpoint}. More info: ${err}`);
+        }
+        return config || this.defaultLoginConfig;
+    }
+    async handleTwoFactorAuthentication(scnt, xAppleIdSessionId, authServiceKey, hashcash) {
+        const headers = {
+            scnt: scnt,
+            "X-Apple-Id-Session-Id": xAppleIdSessionId,
+            "X-Apple-Widget-Key": authServiceKey,
+            "X-Apple-HC": hashcash,
+            Accept: "application/json",
+        };
+        const authResponse = await this.$httpClient.httpRequest({
+            url: "https://idmsa.apple.com/appleauth/auth",
+            method: "GET",
+            headers,
+        });
+        const data = JSON.parse(authResponse.body);
+        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);
+            token = await this.$prompter.getString(`Please enter the ${parsedAuthResponse.securityCode.length} digit code`, { allowEmpty: false });
             const body = {
-                accountName: credentials.username,
-                password: credentials.password,
-                rememberMe: true,
+                securityCode: {
+                    code: token.toString(),
+                },
             };
-            const loginResponse = yield this.$httpClient.httpRequest({
-                url: loginUrl,
+            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`;
+            }
+            await this.$httpClient.httpRequest({
+                url,
                 method: "POST",
                 body,
-                headers,
+                headers: { ...headers, "Content-Type": "application/json" },
             });
-            this.$applePortalCookieService.updateUserSessionCookie(loginResponse.headers["set-cookie"]);
-        });
-    }
-    getLoginConfig() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let config = null;
-            try {
-                const response = yield this.$httpClient.httpRequest({
-                    url: this.loginConfigEndpoint,
-                    method: "GET",
-                });
-                config = JSON.parse(response.body);
-            }
-            catch (err) {
-                this.$logger.trace(`Error while executing request to ${this.loginConfigEndpoint}. More info: ${err}`);
-            }
-            return config || this.defaultLoginConfig;
-        });
-    }
-    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({
-                url: "https://idmsa.apple.com/appleauth/auth",
+            const authTrustResponse = await this.$httpClient.httpRequest({
+                url: "https://idmsa.apple.com/appleauth/auth/2sv/trust",
                 method: "GET",
                 headers,
             });
-            const data = JSON.parse(authResponse.body);
-            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);
-                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,
-                    method: "POST",
-                    body,
-                    headers: Object.assign(Object.assign({}, headers), { "Content-Type": "application/json" }),
-                });
-                const authTrustResponse = yield this.$httpClient.httpRequest({
-                    url: "https://idmsa.apple.com/appleauth/auth/2sv/trust",
-                    method: "GET",
-                    headers,
-                });
-                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}`);
-            }
-        });
+            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}`);
+        }
     }
 }
 exports.ApplePortalSessionService = ApplePortalSessionService;