From 45e2d93395a59ab722f64b744c7ab9440a939dac Mon Sep 17 00:00:00 2001
From: David Dal Busco <david.dalbusco@outlook.com>
Date: Tue, 14 Nov 2023 18:46:31 +0100
Subject: [PATCH] feat: revert as on main

Signed-off-by: David Dal Busco <david.dalbusco@outlook.com>
---
 src/declarations/satellite/satellite.did.d.ts |  2 --
 .../satellite/satellite.factory.did.js        |  2 --
 .../satellite/satellite.factory.did.mjs       |  2 --
 src/frontend/src/lib/api/satellites.api.ts    |  7 ++----
 .../collections/CollectionEdit.svelte         | 22 +------------------
 src/frontend/src/lib/i18n/en.json             |  3 +--
 src/frontend/src/lib/i18n/it.json             |  3 +--
 src/frontend/src/lib/i18n/zh-cn.json          |  3 +--
 src/frontend/src/lib/types/i18n.d.ts          |  1 -
 src/satellite/satellite.did                   |  2 --
 src/satellite/src/db/store.rs                 | 19 +++-------------
 src/satellite/src/db/utils.rs                 |  8 +------
 src/satellite/src/impls.rs                    |  2 --
 src/satellite/src/rules/assert_stores.rs      | 10 ---------
 src/satellite/src/rules/constants.rs          |  2 --
 src/satellite/src/rules/store.rs              |  1 -
 src/satellite/src/rules/types.rs              |  5 +----
 src/satellite/src/storage/store.rs            | 18 +++------------
 src/satellite/src/storage/utils.rs            |  8 +------
 src/shared/src/serializers.rs                 |  4 ----
 20 files changed, 15 insertions(+), 109 deletions(-)

diff --git a/src/declarations/satellite/satellite.did.d.ts b/src/declarations/satellite/satellite.did.d.ts
index 9c1e2160b..5b6aba629 100644
--- a/src/declarations/satellite/satellite.did.d.ts
+++ b/src/declarations/satellite/satellite.did.d.ts
@@ -122,7 +122,6 @@ export interface Rule {
 	memory: [] | [Memory];
 	updated_at: bigint;
 	max_size: [] | [bigint];
-	allow_anonymous: [] | [boolean];
 	read: Permission;
 	created_at: bigint;
 	mutable_permissions: [] | [boolean];
@@ -147,7 +146,6 @@ export interface SetRule {
 	memory: [] | [Memory];
 	updated_at: [] | [bigint];
 	max_size: [] | [bigint];
-	allow_anonymous: [] | [boolean];
 	read: Permission;
 	mutable_permissions: [] | [boolean];
 	write: Permission;
diff --git a/src/declarations/satellite/satellite.factory.did.js b/src/declarations/satellite/satellite.factory.did.js
index 2729f347f..c74c5dfae 100644
--- a/src/declarations/satellite/satellite.factory.did.js
+++ b/src/declarations/satellite/satellite.factory.did.js
@@ -149,7 +149,6 @@ export const idlFactory = ({ IDL }) => {
 		memory: IDL.Opt(Memory),
 		updated_at: IDL.Nat64,
 		max_size: IDL.Opt(IDL.Nat),
-		allow_anonymous: IDL.Opt(IDL.Bool),
 		read: Permission,
 		created_at: IDL.Nat64,
 		mutable_permissions: IDL.Opt(IDL.Bool),
@@ -173,7 +172,6 @@ export const idlFactory = ({ IDL }) => {
 		memory: IDL.Opt(Memory),
 		updated_at: IDL.Opt(IDL.Nat64),
 		max_size: IDL.Opt(IDL.Nat),
-		allow_anonymous: IDL.Opt(IDL.Bool),
 		read: Permission,
 		mutable_permissions: IDL.Opt(IDL.Bool),
 		write: Permission
diff --git a/src/declarations/satellite/satellite.factory.did.mjs b/src/declarations/satellite/satellite.factory.did.mjs
index 2729f347f..c74c5dfae 100644
--- a/src/declarations/satellite/satellite.factory.did.mjs
+++ b/src/declarations/satellite/satellite.factory.did.mjs
@@ -149,7 +149,6 @@ export const idlFactory = ({ IDL }) => {
 		memory: IDL.Opt(Memory),
 		updated_at: IDL.Nat64,
 		max_size: IDL.Opt(IDL.Nat),
-		allow_anonymous: IDL.Opt(IDL.Bool),
 		read: Permission,
 		created_at: IDL.Nat64,
 		mutable_permissions: IDL.Opt(IDL.Bool),
@@ -173,7 +172,6 @@ export const idlFactory = ({ IDL }) => {
 		memory: IDL.Opt(Memory),
 		updated_at: IDL.Opt(IDL.Nat64),
 		max_size: IDL.Opt(IDL.Nat),
-		allow_anonymous: IDL.Opt(IDL.Bool),
 		read: Permission,
 		mutable_permissions: IDL.Opt(IDL.Bool),
 		write: Permission
diff --git a/src/frontend/src/lib/api/satellites.api.ts b/src/frontend/src/lib/api/satellites.api.ts
index 4f48fa0f9..087a2b73d 100644
--- a/src/frontend/src/lib/api/satellites.api.ts
+++ b/src/frontend/src/lib/api/satellites.api.ts
@@ -64,8 +64,7 @@ export const setRule = async ({
 	memory,
 	rule,
 	maxSize,
-	mutablePermissions,
-	allowAnonymous
+	mutablePermissions
 }: {
 	satelliteId: Principal;
 	collection: string;
@@ -76,7 +75,6 @@ export const setRule = async ({
 	rule: Rule | undefined;
 	maxSize: number | undefined;
 	mutablePermissions: boolean;
-	allowAnonymous: boolean;
 }) => {
 	const updateRule: SetRule = {
 		read: permissionFromText(read),
@@ -84,8 +82,7 @@ export const setRule = async ({
 		updated_at: isNullish(rule) ? [] : [rule.updated_at],
 		max_size: toNullable(nonNullish(maxSize) && maxSize > 0 ? BigInt(maxSize) : undefined),
 		memory: isNullish(rule) ? [memoryFromText(memory)] : [fromNullable(rule.memory) ?? MemoryHeap],
-		mutable_permissions: toNullable(mutablePermissions),
-		allow_anonymous: toNullable(allowAnonymous)
+		mutable_permissions: toNullable(mutablePermissions)
 	};
 
 	const actor = await getSatelliteActor(satelliteId);
diff --git a/src/frontend/src/lib/components/collections/CollectionEdit.svelte b/src/frontend/src/lib/components/collections/CollectionEdit.svelte
index ea9ae3076..f4e5ec0a3 100644
--- a/src/frontend/src/lib/components/collections/CollectionEdit.svelte
+++ b/src/frontend/src/lib/components/collections/CollectionEdit.svelte
@@ -53,14 +53,6 @@
 	};
 	$: initMutable($store.rule?.[1] ?? undefined);
 
-	let currentAllowAnonymous: boolean;
-	let allowAnonymous: boolean;
-	const initAllowAnonymous = (initialRule: Rule | undefined) => {
-		currentAllowAnonymous = fromNullable(initialRule?.allow_anonymous ?? []) ?? false;
-		allowAnonymous = currentAllowAnonymous;
-	};
-	$: initAllowAnonymous($store.rule?.[1] ?? undefined);
-
 	let maxSize: number | undefined;
 	const initMaxLength = (size: [] | [bigint]) => {
 		const tmp = fromNullable(size);
@@ -86,8 +78,7 @@
 				type,
 				rule,
 				maxSize,
-				mutablePermissions: !immutable,
-				allowAnonymous
+				mutablePermissions: !immutable
 			});
 
 			toasts.success(
@@ -190,17 +181,6 @@
 			</div>
 		{/if}
 
-		<div class="checkbox">
-			<label>
-				<input
-					type="checkbox"
-					checked={allowAnonymous}
-					on:change={() => (allowAnonymous = !allowAnonymous)}
-				/>
-				<span>{$i18n.collections.allow_anonymous}</span>
-			</label>
-		</div>
-
 		{#if !currentImmutable}
 			<div class="checkbox">
 				<label>
diff --git a/src/frontend/src/lib/i18n/en.json b/src/frontend/src/lib/i18n/en.json
index e87019d85..738f424bf 100644
--- a/src/frontend/src/lib/i18n/en.json
+++ b/src/frontend/src/lib/i18n/en.json
@@ -356,8 +356,7 @@
 		"memory": "Memory",
 		"heap": "Heap",
 		"stable": "Stable",
-		"immutable": "Make permissions immutable",
-		"allow_anonymous": "Allow anonymous calls"
+		"immutable": "Make permissions immutable"
 	},
 	"sort": {
 		"title": "Sort results",
diff --git a/src/frontend/src/lib/i18n/it.json b/src/frontend/src/lib/i18n/it.json
index d1ce71654..c7761d4ab 100644
--- a/src/frontend/src/lib/i18n/it.json
+++ b/src/frontend/src/lib/i18n/it.json
@@ -356,8 +356,7 @@
 		"memory": "Memory",
 		"heap": "Heap",
 		"stable": "Stable",
-		"immutable": "Make permissions immutable",
-		"allow_anonymous": "Allow anonymous calls"
+		"immutable": "Make permissions immutable"
 	},
 	"sort": {
 		"title": "Ordina i risultati",
diff --git a/src/frontend/src/lib/i18n/zh-cn.json b/src/frontend/src/lib/i18n/zh-cn.json
index 77bf90e95..47450f6f7 100644
--- a/src/frontend/src/lib/i18n/zh-cn.json
+++ b/src/frontend/src/lib/i18n/zh-cn.json
@@ -356,8 +356,7 @@
 		"memory": "内存",
 		"heap": "堆栈",
 		"stable": "稳定",
-		"immutable": "将权限改为只读",
-		"allow_anonymous": "Allow anonymous calls"
+		"immutable": "将权限改为只读"
 	},
 	"sort": {
 		"title": "排序结果",
diff --git a/src/frontend/src/lib/types/i18n.d.ts b/src/frontend/src/lib/types/i18n.d.ts
index b5ee43d07..bfc9ba204 100644
--- a/src/frontend/src/lib/types/i18n.d.ts
+++ b/src/frontend/src/lib/types/i18n.d.ts
@@ -378,7 +378,6 @@ interface I18nCollections {
 	heap: string;
 	stable: string;
 	immutable: string;
-	allow_anonymous: string;
 }
 
 interface I18nSort {
diff --git a/src/satellite/satellite.did b/src/satellite/satellite.did
index 7d9f5cfd9..7440b997a 100644
--- a/src/satellite/satellite.did
+++ b/src/satellite/satellite.did
@@ -98,7 +98,6 @@ type Rule = record {
   memory : opt Memory;
   updated_at : nat64;
   max_size : opt nat;
-  allow_anonymous : opt bool;
   read : Permission;
   created_at : nat64;
   mutable_permissions : opt bool;
@@ -123,7 +122,6 @@ type SetRule = record {
   memory : opt Memory;
   updated_at : opt nat64;
   max_size : opt nat;
-  allow_anonymous : opt bool;
   read : Permission;
   mutable_permissions : opt bool;
   write : Permission;
diff --git a/src/satellite/src/db/store.rs b/src/satellite/src/db/store.rs
index fe1c913cd..4146cbf9d 100644
--- a/src/satellite/src/db/store.rs
+++ b/src/satellite/src/db/store.rs
@@ -84,13 +84,7 @@ fn get_doc_impl(
     match value {
         None => Ok(None),
         Some(value) => {
-            if !assert_permission(
-                &rule.read,
-                &rule.allow_anonymous,
-                value.owner,
-                caller,
-                controllers,
-            ) {
+            if !assert_permission(&rule.read, value.owner, caller, controllers) {
                 return Ok(None);
             }
 
@@ -252,24 +246,17 @@ fn assert_write_permission(
     user_timestamp: Option<u64>,
 ) -> Result<(), String> {
     let permission = &rule.write;
-    let allow_anonymous = &rule.allow_anonymous;
 
     // For existing collection and document, check user editing is the caller
     if !public_permission(permission) {
         match current_doc {
             None => {
-                if !assert_create_permission(permission, allow_anonymous, caller, controllers) {
+                if !assert_create_permission(permission, caller, controllers) {
                     return Err(ERROR_CANNOT_WRITE.to_string());
                 }
             }
             Some(current_doc) => {
-                if !assert_permission(
-                    permission,
-                    allow_anonymous,
-                    current_doc.owner,
-                    caller,
-                    controllers,
-                ) {
+                if !assert_permission(permission, current_doc.owner, caller, controllers) {
                     return Err(ERROR_CANNOT_WRITE.to_string());
                 }
             }
diff --git a/src/satellite/src/db/utils.rs b/src/satellite/src/db/utils.rs
index 3bcfd498a..3f2a02887 100644
--- a/src/satellite/src/db/utils.rs
+++ b/src/satellite/src/db/utils.rs
@@ -27,13 +27,7 @@ pub fn filter_values(
             filter_key_matcher(&regex_key, key)
                 && filter_description_matcher(&regex_description, &doc.description)
                 && filter_owner(owner, &doc.owner)
-                && assert_permission(
-                    &rule.read,
-                    &rule.allow_anonymous,
-                    doc.owner,
-                    caller,
-                    controllers,
-                )
+                && assert_permission(&rule.read, doc.owner, caller, controllers)
         })
         .map(|(key, doc)| (key.clone(), doc.clone()))
         .collect()
diff --git a/src/satellite/src/impls.rs b/src/satellite/src/impls.rs
index 692e3d8ee..ccf3a9861 100644
--- a/src/satellite/src/impls.rs
+++ b/src/satellite/src/impls.rs
@@ -38,7 +38,6 @@ impl Default for HeapState {
                         write: rule.write,
                         memory: Some(rule.memory.unwrap_or(Memory::Heap)),
                         mutable_permissions: Some(rule.mutable_permissions.unwrap_or(false)),
-                        allow_anonymous: Some(rule.allow_anonymous.unwrap_or(false)),
                         max_size: rule.max_size,
                         created_at: now,
                         updated_at: now,
@@ -57,7 +56,6 @@ impl Default for HeapState {
                         write: rule.write,
                         memory: Some(rule.memory.unwrap_or(Memory::Heap)),
                         mutable_permissions: Some(rule.mutable_permissions.unwrap_or(false)),
-                        allow_anonymous: Some(rule.allow_anonymous.unwrap_or(false)),
                         max_size: rule.max_size,
                         created_at: now,
                         updated_at: now,
diff --git a/src/satellite/src/rules/assert_stores.rs b/src/satellite/src/rules/assert_stores.rs
index 03e08ea29..b33c1da69 100644
--- a/src/satellite/src/rules/assert_stores.rs
+++ b/src/satellite/src/rules/assert_stores.rs
@@ -8,15 +8,10 @@ use shared::utils::{principal_equal, principal_not_anonymous};
 
 pub fn assert_permission(
     permission: &Permission,
-    allow_anonymous: &Option<bool>,
     owner: Principal,
     caller: Principal,
     controllers: &Controllers,
 ) -> bool {
-    if !assert_anonymous(allow_anonymous, caller) {
-        return false;
-    }
-
     match permission {
         Permission::Public => true,
         Permission::Private => principal_equal(owner, caller),
@@ -29,14 +24,9 @@ pub fn assert_permission(
 /// This can be useful e.g. when a collection read permission is set to public but only the administrator can add content.
 pub fn assert_create_permission(
     permission: &Permission,
-    allow_anonymous: &Option<bool>,
     caller: Principal,
     controllers: &Controllers,
 ) -> bool {
-    if !assert_anonymous(allow_anonymous, caller) {
-        return false;
-    }
-
     match permission {
         Permission::Public => true,
         Permission::Private => true,
diff --git a/src/satellite/src/rules/constants.rs b/src/satellite/src/rules/constants.rs
index 913fb30bd..7e0770175 100644
--- a/src/satellite/src/rules/constants.rs
+++ b/src/satellite/src/rules/constants.rs
@@ -11,7 +11,6 @@ pub const DEFAULT_DB_COLLECTIONS: [(&str, SetRule); 1] = [(
         write: Managed,
         memory: Some(Memory::Heap),
         mutable_permissions: Some(false),
-        allow_anonymous: Some(false),
         max_size: None,
         updated_at: None,
     },
@@ -24,7 +23,6 @@ pub const DEFAULT_ASSETS_COLLECTIONS: [(&str, SetRule); 1] = [(
         write: Controllers,
         memory: Some(Memory::Heap),
         mutable_permissions: Some(false),
-        allow_anonymous: Some(false),
         max_size: None,
         updated_at: None,
     },
diff --git a/src/satellite/src/rules/store.rs b/src/satellite/src/rules/store.rs
index a651dab4c..c4945dd1d 100644
--- a/src/satellite/src/rules/store.rs
+++ b/src/satellite/src/rules/store.rs
@@ -105,7 +105,6 @@ fn set_rule_impl(
         write: user_rule.write,
         memory: Some(user_rule.memory.unwrap_or(default_memory)),
         mutable_permissions: Some(user_rule.mutable_permissions.unwrap_or(true)),
-        allow_anonymous: user_rule.allow_anonymous,
         max_size: user_rule.max_size,
     };
 
diff --git a/src/satellite/src/rules/types.rs b/src/satellite/src/rules/types.rs
index 4aa7de979..c4926a245 100644
--- a/src/satellite/src/rules/types.rs
+++ b/src/satellite/src/rules/types.rs
@@ -2,7 +2,7 @@ pub mod rules {
     use crate::types::core::CollectionKey;
     use candid::CandidType;
     use serde::{Deserialize, Serialize};
-    use shared::serializers::{deserialize_default_as_false, deserialize_default_as_true};
+    use shared::serializers::deserialize_default_as_true;
     use std::collections::HashMap;
 
     pub type Rules = HashMap<CollectionKey, Rule>;
@@ -13,8 +13,6 @@ pub mod rules {
         pub write: Permission,
         #[serde(default = "deserialize_default_as_true")]
         pub mutable_permissions: Option<bool>,
-        #[serde(default = "deserialize_default_as_false")]
-        pub allow_anonymous: Option<bool>,
         pub memory: Option<Memory>,
         pub max_size: Option<u128>,
         pub created_at: u64,
@@ -52,7 +50,6 @@ pub mod interface {
         pub read: Permission,
         pub write: Permission,
         pub mutable_permissions: Option<bool>,
-        pub allow_anonymous: Option<bool>,
         pub memory: Option<Memory>,
         pub max_size: Option<u128>,
     }
diff --git a/src/satellite/src/storage/store.rs b/src/satellite/src/storage/store.rs
index b7c9aae75..390d6ac74 100644
--- a/src/satellite/src/storage/store.rs
+++ b/src/satellite/src/storage/store.rs
@@ -193,13 +193,7 @@ fn delete_asset_impl(
     match asset {
         None => Err(ERROR_ASSET_NOT_FOUND.to_string()),
         Some(asset) => {
-            if !assert_permission(
-                &rule.write,
-                &rule.allow_anonymous,
-                asset.key.owner,
-                caller,
-                controllers,
-            ) {
+            if !assert_permission(&rule.write, asset.key.owner, caller, controllers) {
                 return Err(ERROR_ASSET_NOT_FOUND.to_string());
             }
 
@@ -451,7 +445,7 @@ fn secure_commit_chunks(
 
     match current {
         None => {
-            if !assert_create_permission(&rule.write, &rule.allow_anonymous, caller, controllers) {
+            if !assert_create_permission(&rule.write, caller, controllers) {
                 return Err(ERROR_CANNOT_COMMIT_BATCH.to_string());
             }
 
@@ -476,13 +470,7 @@ fn secure_commit_chunks_update(
         return Err("Provided collection does not match existing collection.".to_string());
     }
 
-    if !assert_permission(
-        &rule.write,
-        &rule.allow_anonymous,
-        current.key.owner,
-        caller,
-        controllers,
-    ) {
+    if !assert_permission(&rule.write, current.key.owner, caller, controllers) {
         return Err(ERROR_CANNOT_COMMIT_BATCH.to_string());
     }
 
diff --git a/src/satellite/src/storage/utils.rs b/src/satellite/src/storage/utils.rs
index 9dee2a89a..cd0d2d08e 100644
--- a/src/satellite/src/storage/utils.rs
+++ b/src/satellite/src/storage/utils.rs
@@ -61,13 +61,7 @@ pub fn filter_values(
                 && filter_full_path(&regex_key, asset)
                 && filter_description(&regex_description, asset)
                 && filter_owner(*owner, asset)
-                && assert_permission(
-                    &rule.read,
-                    &rule.allow_anonymous,
-                    asset.key.owner,
-                    caller,
-                    controllers,
-                )
+                && assert_permission(&rule.read, asset.key.owner, caller, controllers)
         })
         .collect()
 }
diff --git a/src/shared/src/serializers.rs b/src/shared/src/serializers.rs
index 1832475a1..178dca480 100644
--- a/src/shared/src/serializers.rs
+++ b/src/shared/src/serializers.rs
@@ -16,7 +16,3 @@ pub fn deserialize_from_bytes<T: for<'a> Deserialize<'a>>(bytes: Cow<'_, [u8]>)
 pub fn deserialize_default_as_true() -> Option<bool> {
     Some(true)
 }
-
-pub fn deserialize_default_as_false() -> Option<bool> {
-    Some(false)
-}