@authup/access 1.0.0-beta.63 → 1.0.0-beta.65

package/dist/index.mjs

@@ -199,13 +199,10 @@ function aggregatePermissionPolicyBindings(input) {
 		return previous;
 	}, {});
 	const output = [];
-	for (const key of Object.keys(grouped)) {
-		const group = grouped[key];
-		output.push({
-			permission: group[0].permission,
-			grants: group.map(buildGrant)
-		});
-	}
+	for (const group of Object.values(grouped)) output.push({
+		permission: group[0].permission,
+		grants: group.map(buildGrant)
+	});
 	return output;
 }
 //#endregion
@@ -252,9 +249,8 @@ const NON_SEMANTIC_POLICY_KEYS = /* @__PURE__ */ new Set([
 */
 function normalizePolicyForEquality(policy) {
 	const result = {};
-	for (const key of Object.keys(policy)) {
+	for (const [key, value] of Object.entries(policy)) {
 		if (NON_SEMANTIC_POLICY_KEYS.has(key)) continue;
-		const value = policy[key];
 		if (key === "children" && Array.isArray(value)) {
 			result[key] = value.map((child) => normalizePolicyForEquality(child));
 			continue;
@@ -847,7 +843,7 @@ var CompositePolicyEvaluator = class {
 		}
 		if (settled === null) {
 			let condition = null;
-			if (ctx.withConditions && pendingWithoutCondition === 0 && pendingConditions.length > 0 && decisionStrategy !== DecisionStrategy.CONSENSUS) {
+			if (pendingWithoutCondition === 0 && ctx.withConditions && pendingConditions.length > 0 && decisionStrategy !== DecisionStrategy.CONSENSUS) {
 				if (pendingConditions.length === 1) {
 					const [first] = pendingConditions;
 					condition = first ?? null;
@@ -907,13 +903,14 @@ var DatePolicyEvaluator = class {
 	async evaluate(value, ctx) {
 		const policy = await this.validator.run(value);
 		let now;
-		if (ctx.data.has("date")) if (ctx.data.isValidated("date")) now = ctx.data.get("date");
-		else {
-			now = normalizeDate$1(toDate$1(ctx.data.get("date")));
-			ctx.data.set("date", now);
-			ctx.data.setValidated("date");
-		}
-		else now = normalizeDate$1(/* @__PURE__ */ new Date());
+		if (ctx.data.has("date")) {
+			if (ctx.data.isValidated("date")) now = ctx.data.get("date");
+			else {
+				now = normalizeDate$1(toDate$1(ctx.data.get("date")));
+				ctx.data.set("date", now);
+				ctx.data.setValidated("date");
+			}
+		} else now = normalizeDate$1(/* @__PURE__ */ new Date());
 		if (policy.start) {
 			const start = normalizeDate$1(toDate$1(policy.start));
 			if (now < start) return { success: maybeInvertPolicyOutcome(false, policy.invert) };
@@ -1064,7 +1061,7 @@ var RealmMatchPolicyEvaluator = class {
 			if (scope === "any") condition = nin(field, []);
 			else {
 				const terms = [];
-				if (scope !== "none" && realmId !== null) terms.push(eq(field, realmId));
+				if (realmId !== null && scope !== "none") terms.push(eq(field, realmId));
 				if (scope === "ownOrNull") terms.push(eq(field, null));
 				if (terms.length === 0) condition = inArray(field, []);
 				else if (terms.length === 1) condition = terms[0];
@@ -1118,9 +1115,10 @@ var RealmMatchPolicyEvaluator = class {
 			})]
 		};
 		let keys;
-		if (policy.attributeName) if (Array.isArray(policy.attributeName)) keys = policy.attributeName;
-		else keys = [policy.attributeName];
-		else {
+		if (policy.attributeName) {
+			if (Array.isArray(policy.attributeName)) keys = policy.attributeName;
+			else keys = [policy.attributeName];
+		} else {
 			keys = [
 				"realm_id",
 				"realm_name",
@@ -1149,8 +1147,7 @@ var RealmMatchPolicyEvaluator = class {
 			evaluated = true;
 			let outcome = false;
 			const attributeValue = attributes[key];
-			if (attributeValue === null && policy.attributeNullMatchAll) outcome = true;
-			else if (attributeValue === identity.realmId || attributeValue === identity.realmName) outcome = true;
+			if (attributeValue === null && policy.attributeNullMatchAll || attributeValue === identity.realmId || attributeValue === identity.realmName) outcome = true;
 			if (outcome) {
 				if (policy.decisionStrategy === DecisionStrategy.AFFIRMATIVE) return { success: maybeInvertPolicyOutcome(true, policy.invert) };
 				count++;
@@ -1231,13 +1228,14 @@ var TimePolicyEvaluator = class {
 	async evaluate(value, ctx) {
 		const policy = await this.validator.run(value);
 		let now;
-		if (ctx.data.has("time")) if (ctx.data.isValidated("time")) now = ctx.data.get("time");
-		else {
-			now = toDate(ctx.data.get("time"));
-			ctx.data.set("time", now);
-			ctx.data.setValidated("time");
-		}
-		else now = /* @__PURE__ */ new Date();
+		if (ctx.data.has("time")) {
+			if (ctx.data.isValidated("time")) now = ctx.data.get("time");
+			else {
+				now = toDate(ctx.data.get("time"));
+				ctx.data.set("time", now);
+				ctx.data.setValidated("time");
+			}
+		} else now = /* @__PURE__ */ new Date();
 		if (policy.start) {
 			const start = normalizeDate(toDate(policy.start, now), now);
 			if (now < start) return { success: maybeInvertPolicyOutcome(false, policy.invert) };
@@ -1440,8 +1438,10 @@ var PermissionEvaluator = class {
 				withConditions: true
 			}));
 			if (evaluationResult.success) return { verdict: "allow" };
-			if (evaluationResult.pending) if (evaluationResult.condition) conditions.push(evaluationResult.condition);
-			else post = true;
+			if (evaluationResult.pending) {
+				if (evaluationResult.condition) conditions.push(evaluationResult.condition);
+				else post = true;
+			}
 		}
 		if (post) return { verdict: "post" };
 		if (conditions.length === 0) return { verdict: "deny" };