nativescript 8.9.0-dev.1 → 8.9.0-dev.2

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

@@ -1,4 +1,13 @@
 "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");
@@ -18,231 +27,242 @@ class ApplePortalSessionService {
             authServiceKey: "e0b80c3bf78523bfe80974d320935bfa30add02e1bff88ec2166c6bd5a706c42",
         };
     }
-    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);
+    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"]);
             }
-            const sessionResponse = await this.$httpClient.httpRequest({
-                url: "https://appstoreconnect.apple.com/olympus/v1/session",
+            const userDetailsResponse = yield 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(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 = Object.assign(Object.assign(Object.assign({}, userdDetails), loginResult), { userSessionCookie: this.$applePortalCookieService.getUserSessionCookie() });
+            return result;
         });
-        this.$applePortalCookieService.updateUserSessionCookie(userDetailsResponse.headers["set-cookie"]);
-        const userdDetails = JSON.parse(userDetailsResponse.body).data;
-        const result = {
-            ...userdDetails,
-            ...loginResult,
-            userSessionCookie: this.$applePortalCookieService.getUserSessionCookie(),
-        };
-        return result;
     }
-    async createWebSession(contentProviderId) {
-        const webSessionResponse = await this.$httpClient.httpRequest({
-            url: "https://appstoreconnect.apple.com/olympus/v1/session",
-            method: "POST",
-            body: {
-                provider: {
-                    providerId: contentProviderId,
+    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,
+                    },
                 },
-            },
-            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(),
-            },
+                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;
         });
-        const webSessionCookie = this.$applePortalCookieService.getWebSessionCookie(webSessionResponse.headers["set-cookie"]);
-        return webSessionCookie;
     }
-    async login(credentials, opts) {
+    login(credentials, opts) {
         var _a, _b;
-        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);
+        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;
             }
-            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.
+            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.
 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 wrapper = new srp_wrapper_1.GSASRPAuthenticator(credentials.username);
-        const initData = await wrapper.getInit();
-        const loginConfig = await this.getLoginConfig();
-        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 initResponse = await this.$httpClient.httpRequest({
-            url: loginUrl,
-            method: "POST",
-            body: initData,
-            headers,
+    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/init`;
+            const headers = {
+                "Content-Type": "application/json",
+                "X-Requested-With": "XMLHttpRequest",
+                "X-Apple-Widget-Key": loginConfig.authServiceKey,
+                Accept: "application/json, text/javascript",
+            };
+            const initResponse = yield this.$httpClient.httpRequest({
+                url: loginUrl,
+                method: "POST",
+                body: initData,
+                headers,
+            });
+            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"]);
         });
-        const body = JSON.parse(initResponse.response.body);
-        const completeData = await wrapper.getComplete(credentials.password, body);
-        const hashcash = await 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 = await this.$httpClient.httpRequest({
-            url: completeUrl,
-            method: "POST",
-            completeHeaders,
-            body: completeData,
-            headers: completeHeaders,
+    }
+    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;
         });
-        this.$applePortalCookieService.updateUserSessionCookie(completeResponse.headers["set-cookie"]);
     }
-    async getLoginConfig() {
-        let config = null;
-        try {
-            const response = await this.$httpClient.httpRequest({
-                url: this.loginConfigEndpoint,
+    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",
             });
-            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 fetchHashcash(authServiceUrl, authServiceKey) {
-        const loginUrl = `${authServiceUrl}/auth/signin?widgetKey=${authServiceKey}`;
-        const response = await 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);
         });
-        const headers = response.headers;
-        const bits = headers["X-Apple-HC-Bits"];
-        const challenge = headers["X-Apple-HC-Challenge"];
-        return makeHashCash(bits, challenge);
     }
-    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 = {
-                securityCode: {
-                    code: token.toString(),
-                },
+    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",
             };
-            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, "Content-Type": "application/json" },
-            });
-            const authTrustResponse = await this.$httpClient.httpRequest({
-                url: "https://idmsa.apple.com/appleauth/auth/2sv/trust",
+            const authResponse = yield this.$httpClient.httpRequest({
+                url: "https://idmsa.apple.com/appleauth/auth",
                 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}`);
-        }
+            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.
+            const multiSMS = data.trustedPhoneNumbers &&
+                data.trustedPhoneNumbers.length !== 1 &&
+                data.noTrustedDevices; // Not handling more than 1 sms device and no trusted devices.
+            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) {
+                    // No trusted devices means it must be sms.
+                    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}`);
+            }
+        });
     }
 }
 exports.ApplePortalSessionService = ApplePortalSessionService;
@@ -280,8 +300,9 @@ function checkBits(bits, digest) {
     return result;
 }
 function checkBit(position, buffer) {
-    const bitOffset = position & 7;
-    const byteIndex = position >> 3;
+    const bitOffset = position & 7; // in byte
+    const byteIndex = position >> 3; // in buffer
     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

@@ -1,4 +1,13 @@
 "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");
@@ -11,51 +20,60 @@ class GSASRPAuthenticator {
         this.username = username;
         this.srpClient = undefined;
     }
-    async derivePassword(protocol, password, salt, iterations) {
-        let passHash = new Uint8Array(await js_srp_1.util.hash(srp.h, stringToU8Array(password)));
-        if (protocol == "s2k_fo") {
-            passHash = stringToU8Array(js_srp_1.util.toHex(passHash));
-        }
-        let imported = await crypto.subtle.importKey("raw", passHash, { name: "PBKDF2" }, false, ["deriveBits"]);
-        let derived = await crypto.subtle.deriveBits({
-            name: "PBKDF2",
-            hash: { name: "SHA-256" },
-            iterations,
-            salt,
-        }, imported, 256);
-        return new Uint8Array(derived);
+    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);
+        });
     }
-    async getInit() {
-        if (this.srpClient)
-            throw new Error("Already initialized");
-        this.srpClient = await 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,
-        };
+    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), 
+            // provide fake passsword because we need to get data from server
+            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,
+            };
+        });
     }
-    async getComplete(password, serverData) {
-        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 = await this.derivePassword(serverData.protocol, password, salt, iterations);
-        this.srpClient.p = derived;
-        await this.srpClient.generate(salt, serverPub);
-        let m1 = Buffer.from(this.srpClient._M).toString("base64");
-        let M2 = await this.srpClient.generateM2();
-        let m2 = Buffer.from(M2).toString("base64");
-        return {
-            accountName: this.username,
-            m1,
-            m2,
-            c: serverData.c,
-        };
+    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;
+//# sourceMappingURL=srp-wrapper.js.map