@aws-amplify/datastore 5.0.1-api-v6-models.9351bcf.0 → 5.0.1-api-v6-models.891fe0d.0

package/lib/authModeStrategies/defaultAuthStrategy.js

@@ -4,5 +4,5 @@ exports.defaultAuthStrategy = void 0;
 // Default behavior is to use the primary auth mode for an API,
 // so we are returning an empty array so that DataStore will default
 // to using the primary auth mode.
-var defaultAuthStrategy = function () { return []; };
+const defaultAuthStrategy = () => [];
 exports.defaultAuthStrategy = defaultAuthStrategy;

package/lib/authModeStrategies/multiAuthStrategy.js

@@ -1,71 +1,10 @@
 "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());
-    });
-};
-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 (g && (g = 0, op[0] && (_ = 0)), _) 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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.multiAuthStrategy = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var core_1 = require("@aws-amplify/core");
-var types_1 = require("../types");
+const core_1 = require("@aws-amplify/core");
+const types_1 = require("../types");
 function getProviderFromRule(rule) {
     // private with no provider means userPools
     if (rule.allow === 'private' && !rule.provider) {
@@ -78,21 +17,21 @@ function getProviderFromRule(rule) {
     return rule.provider;
 }
 function sortAuthRulesWithPriority(rules) {
-    var allowSortPriority = [
+    const allowSortPriority = [
         types_1.ModelAttributeAuthAllow.CUSTOM,
         types_1.ModelAttributeAuthAllow.OWNER,
         types_1.ModelAttributeAuthAllow.GROUPS,
         types_1.ModelAttributeAuthAllow.PRIVATE,
         types_1.ModelAttributeAuthAllow.PUBLIC,
     ];
-    var providerSortPriority = [
+    const providerSortPriority = [
         types_1.ModelAttributeAuthProvider.FUNCTION,
         types_1.ModelAttributeAuthProvider.USER_POOLS,
         types_1.ModelAttributeAuthProvider.OIDC,
         types_1.ModelAttributeAuthProvider.IAM,
         types_1.ModelAttributeAuthProvider.API_KEY,
     ];
-    return __spreadArray([], __read(rules), false).sort(function (a, b) {
+    return [...rules].sort((a, b) => {
         if (a.allow === b.allow) {
             return (providerSortPriority.indexOf(getProviderFromRule(a)) -
                 providerSortPriority.indexOf(getProviderFromRule(b)));
@@ -100,11 +39,10 @@ function sortAuthRulesWithPriority(rules) {
         return (allowSortPriority.indexOf(a.allow) - allowSortPriority.indexOf(b.allow));
     });
 }
-function getAuthRules(_a) {
-    var rules = _a.rules, currentUser = _a.currentUser;
+function getAuthRules({ rules, currentUser, }) {
     // Using Set to ensure uniqueness
-    var authModes = new Set();
-    rules.forEach(function (rule) {
+    const authModes = new Set();
+    rules.forEach(rule => {
         switch (rule.allow) {
             case types_1.ModelAttributeAuthAllow.CUSTOM:
                 // custom with no provider -> function
@@ -168,40 +106,26 @@ function getAuthRules(_a) {
  * @param param0 The `{schema, modelName}` to inspect.
  * @returns A sorted array of auth modes to attempt.
  */
-var multiAuthStrategy = function (amplifyContext) {
-    return function (_a) {
-        var schema = _a.schema, modelName = _a.modelName;
-        return __awaiter(void 0, void 0, void 0, function () {
-            var currentUser, authSession, e_1, attributes, authAttribute, sortedRules;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _c.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, (0, core_1.fetchAuthSession)()];
-                    case 1:
-                        authSession = _c.sent();
-                        if (authSession.tokens.accessToken) {
-                            // the user is authenticated
-                            currentUser = authSession;
-                        }
-                        return [3 /*break*/, 3];
-                    case 2:
-                        e_1 = _c.sent();
-                        return [3 /*break*/, 3];
-                    case 3:
-                        attributes = schema.namespaces.user.models[modelName].attributes;
-                        if (attributes) {
-                            authAttribute = attributes.find(function (attr) { return attr.type === 'auth'; });
-                            if ((_b = authAttribute === null || authAttribute === void 0 ? void 0 : authAttribute.properties) === null || _b === void 0 ? void 0 : _b.rules) {
-                                sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);
-                                return [2 /*return*/, getAuthRules({ currentUser: currentUser, rules: sortedRules })];
-                            }
-                        }
-                        return [2 /*return*/, []];
-                }
-            });
-        });
-    };
+const multiAuthStrategy = (amplifyContext) => async ({ schema, modelName }) => {
+    let currentUser;
+    try {
+        const authSession = await (0, core_1.fetchAuthSession)();
+        if (authSession.tokens.accessToken) {
+            // the user is authenticated
+            currentUser = authSession;
+        }
+    }
+    catch (e) {
+        // No current user
+    }
+    const { attributes } = schema.namespaces.user.models[modelName];
+    if (attributes) {
+        const authAttribute = attributes.find(attr => attr.type === 'auth');
+        if (authAttribute?.properties?.rules) {
+            const sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);
+            return getAuthRules({ currentUser, rules: sortedRules });
+        }
+    }
+    return [];
 };
 exports.multiAuthStrategy = multiAuthStrategy;