@aws-amplify/auth 4.6.14 → 4.6.15-unstable.2

package/lib/Auth.js

@@ -1,89 +1,14 @@
 "use strict";
-/*
- * Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *	 http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-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());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
 var types_1 = require("./types");
 var core_1 = require("@aws-amplify/core");
 var amazon_cognito_identity_js_1 = require("amazon-cognito-identity-js");
 var url_1 = require("url");
-var OAuth_1 = __importDefault(require("./OAuth/OAuth"));
-var urlListener_1 = __importDefault(require("./urlListener"));
+var OAuth_1 = tslib_1.__importDefault(require("./OAuth/OAuth"));
+var urlListener_1 = tslib_1.__importDefault(require("./urlListener"));
 var Errors_1 = require("./Errors");
 var Auth_1 = require("./types/Auth");
 var logger = new core_1.ConsoleLogger('AuthClass');
@@ -155,7 +80,7 @@ var AuthClass = /** @class */ (function () {
         if (!config)
             return this._config || {};
         logger.debug('configure Auth');
-        var conf = Object.assign({}, this._config, core_1.Parser.parseMobilehubConfig(config).Auth, config);
+        var conf = Object.assign({}, this._config, core_1.parseAWSExports(config).Auth, config);
         this._config = conf;
         var _a = this._config, userPoolId = _a.userPoolId, userPoolWebClientId = _a.userPoolWebClientId, cookieStorage = _a.cookieStorage, oauth = _a.oauth, region = _a.region, identityPoolId = _a.identityPoolId, mandatorySignIn = _a.mandatorySignIn, refreshHandlers = _a.refreshHandlers, identityPoolRegion = _a.identityPoolRegion, clientMetadata = _a.clientMetadata, endpoint = _a.endpoint;
         if (!this._config.storage) {
@@ -386,10 +311,10 @@ var AuthClass = /** @class */ (function () {
         }, 5000);
     };
     AuthClass.prototype.signInAfterUserConfirmed = function (authDetails, listenEvent, autoSignInPollingIntervalId) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var user, error_1;
             var _this = this;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         user = this.createCognitoUser(authDetails.getUsername());
@@ -556,9 +481,9 @@ var AuthClass = /** @class */ (function () {
         var _this = this;
         var that = this;
         return {
-            onSuccess: function (session) { return __awaiter(_this, void 0, void 0, function () {
+            onSuccess: function (session) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var cred, e_1, currentUser, e_2;
-                return __generator(this, function (_a) {
+                return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             logger.debug(session);
@@ -714,9 +639,9 @@ var AuthClass = /** @class */ (function () {
         return new Promise(function (res, rej) {
             var clientMetadata = _this._config.clientMetadata; // TODO: verify behavior if this is override during signIn
             var bypassCache = params ? params.bypassCache : false;
-            user.getUserData(function (err, data) { return __awaiter(_this, void 0, void 0, function () {
+            user.getUserData(function (err, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var cleanUpError_1, mfaType;
-                return __generator(this, function (_a) {
+                return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             if (!err) return [3 /*break*/, 5];
@@ -788,9 +713,9 @@ var AuthClass = /** @class */ (function () {
     AuthClass.prototype._getUserData = function (user, params) {
         var _this = this;
         return new Promise(function (res, rej) {
-            user.getUserData(function (err, data) { return __awaiter(_this, void 0, void 0, function () {
+            user.getUserData(function (err, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var cleanUpError_2;
-                return __generator(this, function (_a) {
+                return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             if (!err) return [3 /*break*/, 5];
@@ -826,10 +751,10 @@ var AuthClass = /** @class */ (function () {
      * @return - A promise resolve if success
      */
     AuthClass.prototype.setPreferredMFA = function (user, mfaMethod) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var clientMetadata, userData, smsMfaSettings, totpMfaSettings, _a, mfaList, currentMFAType, that;
             var _this = this;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         clientMetadata = this._config.clientMetadata;
@@ -919,9 +844,9 @@ var AuthClass = /** @class */ (function () {
                                     logger.debug('Set user mfa success', result);
                                     logger.debug('Caching the latest user data into local');
                                     // cache the latest result into user data
-                                    user.getUserData(function (err, data) { return __awaiter(_this, void 0, void 0, function () {
+                                    user.getUserData(function (err, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                         var cleanUpError_3;
-                                        return __generator(this, function (_a) {
+                                        return tslib_1.__generator(this, function (_a) {
                                             switch (_a.label) {
                                                 case 0:
                                                     if (!err) return [3 /*break*/, 5];
@@ -1051,9 +976,9 @@ var AuthClass = /** @class */ (function () {
         var that = this;
         return new Promise(function (resolve, reject) {
             user.sendMFACode(code, {
-                onSuccess: function (session) { return __awaiter(_this, void 0, void 0, function () {
+                onSuccess: function (session) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                     var cred, e_3;
-                    return __generator(this, function (_a) {
+                    return tslib_1.__generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
                                 logger.debug(session);
@@ -1098,9 +1023,9 @@ var AuthClass = /** @class */ (function () {
         var that = this;
         return new Promise(function (resolve, reject) {
             user.completeNewPasswordChallenge(password, requiredAttributes, {
-                onSuccess: function (session) { return __awaiter(_this, void 0, void 0, function () {
+                onSuccess: function (session) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                     var cred, e_4;
-                    return __generator(this, function (_a) {
+                    return tslib_1.__generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
                                 logger.debug(session);
@@ -1199,10 +1124,10 @@ var AuthClass = /** @class */ (function () {
      **/
     // TODO: Check return type void
     AuthClass.prototype.deleteUser = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e_5, isSignedInHostedUI;
             var _this = this;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
@@ -1217,10 +1142,10 @@ var AuthClass = /** @class */ (function () {
                     case 3:
                         isSignedInHostedUI = this._oAuthHandler &&
                             this._storage.getItem('amplify-signin-with-hostedUI') === 'true';
-                        return [2 /*return*/, new Promise(function (res, rej) { return __awaiter(_this, void 0, void 0, function () {
+                        return [2 /*return*/, new Promise(function (res, rej) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                 var user_1;
                                 var _this = this;
-                                return __generator(this, function (_a) {
+                                return tslib_1.__generator(this, function (_a) {
                                     if (this.userPool) {
                                         user_1 = this.userPool.getCurrentUser();
                                         if (!user_1) {
@@ -1228,10 +1153,10 @@ var AuthClass = /** @class */ (function () {
                                             return [2 /*return*/, rej(new Error('No current user.'))];
                                         }
                                         else {
-                                            user_1.getSession(function (err, session) { return __awaiter(_this, void 0, void 0, function () {
+                                            user_1.getSession(function (err, session) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                                 var cleanUpError_4;
                                                 var _this = this;
-                                                return __generator(this, function (_a) {
+                                                return tslib_1.__generator(this, function (_a) {
                                                     switch (_a.label) {
                                                         case 0:
                                                             if (!err) return [3 /*break*/, 5];
@@ -1406,10 +1331,10 @@ var AuthClass = /** @class */ (function () {
             this.isRefreshTokenExpiredError(err));
     };
     AuthClass.prototype.cleanUpInvalidSession = function (user) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e_6;
             var _this = this;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         user.signOut();
@@ -1450,10 +1375,10 @@ var AuthClass = /** @class */ (function () {
         }
         return new Promise(function (res, rej) {
             _this._storageSync
-                .then(function () { return __awaiter(_this, void 0, void 0, function () {
+                .then(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var user, clientMetadata;
                 var _this = this;
-                return __generator(this, function (_a) {
+                return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             if (!this.isOAuthInProgress()) return [3 /*break*/, 2];
@@ -1489,10 +1414,10 @@ var AuthClass = /** @class */ (function () {
                             }
                             clientMetadata = this._config.clientMetadata;
                             // refresh the session if the session expired.
-                            user.getSession(function (err, session) { return __awaiter(_this, void 0, void 0, function () {
+                            user.getSession(function (err, session) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                 var cleanUpError_5, bypassCache, clientMetadata, _a, scope;
                                 var _this = this;
-                                return __generator(this, function (_b) {
+                                return tslib_1.__generator(this, function (_b) {
                                     switch (_b.label) {
                                         case 0:
                                             if (!err) return [3 /*break*/, 5];
@@ -1523,9 +1448,9 @@ var AuthClass = /** @class */ (function () {
                                             clientMetadata = this._config.clientMetadata;
                                             _a = session.getAccessToken().decodePayload().scope, scope = _a === void 0 ? '' : _a;
                                             if (scope.split(' ').includes(USER_ADMIN_SCOPE)) {
-                                                user.getUserData(function (err, data) { return __awaiter(_this, void 0, void 0, function () {
+                                                user.getUserData(function (err, data) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                                     var cleanUpError_6, preferredMFA, attributeList, i, attribute, userAttribute, attributes;
-                                                    return __generator(this, function (_a) {
+                                                    return tslib_1.__generator(this, function (_a) {
                                                         switch (_a.label) {
                                                             case 0:
                                                                 if (!err) return [3 /*break*/, 7];
@@ -1595,9 +1520,9 @@ var AuthClass = /** @class */ (function () {
      * @return - A promise resolves to current authenticated CognitoUser if success
      */
     AuthClass.prototype.currentAuthenticatedUser = function (params) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var federatedUser, e_7, federatedInfo, user, e_8;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         logger.debug('getting current authenticated user');
@@ -1617,7 +1542,7 @@ var AuthClass = /** @class */ (function () {
                         try {
                             federatedInfo = JSON.parse(this._storage.getItem('aws-amplify-federatedInfo'));
                             if (federatedInfo) {
-                                federatedUser = __assign(__assign({}, federatedInfo.user), { token: federatedInfo.token });
+                                federatedUser = tslib_1.__assign(tslib_1.__assign({}, federatedInfo.user), { token: federatedInfo.token });
                             }
                         }
                         catch (e) {
@@ -1700,9 +1625,9 @@ var AuthClass = /** @class */ (function () {
         var clientMetadata = this._config.clientMetadata; // TODO: verify behavior if this is override during signIn
         return new Promise(function (res, rej) {
             logger.debug('Getting the session from this user:', user);
-            user.getSession(function (err, session) { return __awaiter(_this, void 0, void 0, function () {
+            user.getSession(function (err, session) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var cleanUpError_7;
-                return __generator(this, function (_a) {
+                return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             if (!err) return [3 /*break*/, 5];
@@ -1736,10 +1661,10 @@ var AuthClass = /** @class */ (function () {
      * @return - A promise resolves to be current user's credentials
      */
     AuthClass.prototype.currentUserCredentials = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e_9, federatedInfo;
             var _this = this;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         logger.debug('Getting current user credentials');
@@ -1848,10 +1773,10 @@ var AuthClass = /** @class */ (function () {
             .then(function (user) { return that.verifyUserAttributeSubmit(user, attr, code); });
     };
     AuthClass.prototype.cognitoIdentitySignOut = function (opts, user) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e_10, isSignedInHostedUI;
             var _this = this;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
@@ -1872,10 +1797,10 @@ var AuthClass = /** @class */ (function () {
                                     // in order to use global signout
                                     // we must validate the user as an authenticated user by using getSession
                                     var clientMetadata = _this._config.clientMetadata; // TODO: verify behavior if this is override during signIn
-                                    user.getSession(function (err, result) { return __awaiter(_this, void 0, void 0, function () {
+                                    user.getSession(function (err, result) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                         var cleanUpError_8;
                                         var _this = this;
-                                        return __generator(this, function (_a) {
+                                        return tslib_1.__generator(this, function (_a) {
                                             switch (_a.label) {
                                                 case 0:
                                                     if (!err) return [3 /*break*/, 5];
@@ -1954,9 +1879,9 @@ var AuthClass = /** @class */ (function () {
      * @return - A promise resolved if success
      */
     AuthClass.prototype.signOut = function (opts) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e_11, user;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
@@ -1998,8 +1923,8 @@ var AuthClass = /** @class */ (function () {
         });
     };
     AuthClass.prototype.cleanCachedItems = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: 
                     // clear cognito cached item
@@ -2113,9 +2038,9 @@ var AuthClass = /** @class */ (function () {
      * @return {Object }- current User's information
      */
     AuthClass.prototype.currentUserInfo = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var source, user, attributes, userAttrs, credentials, e_12, info, err_1, user;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         source = this.Credentials.getCredSource();
@@ -2169,9 +2094,9 @@ var AuthClass = /** @class */ (function () {
         });
     };
     AuthClass.prototype.federatedSignIn = function (providerOrOptions, response, user) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var options, provider, customState, client_id, redirect_uri, provider, loggedInUser, token, identity_id, expires_at, credentials, currentUser;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this._config.identityPoolId && !this._config.userPoolId) {
@@ -2236,9 +2161,9 @@ var AuthClass = /** @class */ (function () {
      * @param {String} URL - optional parameter for customers to pass in the response URL
      */
     AuthClass.prototype._handleAuthResponse = function (URL) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var currentUrl, hasCodeOrError, hasTokenOrError, _a, accessToken, idToken, refreshToken, state, session, credentials, isCustomStateIncluded, currentUser, customState, err_2;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (this.oAuthFlowInProgress) {
@@ -2258,7 +2183,7 @@ var AuthClass = /** @class */ (function () {
                             .split('&')
                             .map(function (entry) { return entry.split('='); })
                             .find(function (_a) {
-                            var _b = __read(_a, 1), k = _b[0];
+                            var _b = tslib_1.__read(_a, 1), k = _b[0];
                             return k === 'code' || k === 'error';
                         });
                         hasTokenOrError = !!(url_1.parse(currentUrl).hash || '#')
@@ -2266,7 +2191,7 @@ var AuthClass = /** @class */ (function () {
                             .split('&')
                             .map(function (entry) { return entry.split('='); })
                             .find(function (_a) {
-                            var _b = __read(_a, 1), k = _b[0];
+                            var _b = tslib_1.__read(_a, 1), k = _b[0];
                             return k === 'access_token' || k === 'error';
                         });
                         if (!(hasCodeOrError || hasTokenOrError)) return [3 /*break*/, 7];
@@ -2401,9 +2326,9 @@ var AuthClass = /** @class */ (function () {
         return Promise.reject(new Errors_1.NoUserPoolError(type));
     };
     AuthClass.prototype.rememberDevice = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var currUser, error_2;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
@@ -2440,9 +2365,9 @@ var AuthClass = /** @class */ (function () {
         });
     };
     AuthClass.prototype.forgetDevice = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var currUser, error_3;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
@@ -2479,9 +2404,9 @@ var AuthClass = /** @class */ (function () {
         });
     };
     AuthClass.prototype.fetchDevices = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var currUser, error_4;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);