Merge remote-tracking branch 'origin/main' into fixReqVal

mobile/apps/photos/lib/ui/sharing/manage_links_widget.dart

@@ -53,8 +53,6 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
         widget.collection!.publicURLs.firstOrNull?.enableDownload ?? true;
     final isPasswordEnabled =
         widget.collection!.publicURLs.firstOrNull?.passwordEnabled ?? false;
-    final isJoinEnabled =
-        widget.collection!.publicURLs.firstOrNull?.enableJoin ?? false;
     final enteColorScheme = getEnteColorScheme(context);
     final PublicURL url = widget.collection!.publicURLs.firstOrNull!;
     final String urlValue =
@@ -96,31 +94,6 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
                         AppLocalizations.of(context).allowAddPhotosDescription,
                   ),
                   const SizedBox(height: 24),
-                  if (flagService.internalUser)
-                    MenuItemWidget(
-                      key: ValueKey("Allow join $isJoinEnabled"),
-                      captionedTextWidget: const CaptionedTextWidget(
-                        title: "Allow joining album (i)",
-                      ),
-                      alignCaptionedTextToLeft: true,
-                      menuItemColor: getEnteColorScheme(context).fillFaint,
-                      trailingWidget: ToggleSwitchWidget(
-                        value: () => isJoinEnabled,
-                        onChanged: () async {
-                          await _updateUrlSettings(
-                            context,
-                            {'enableJoin': !isJoinEnabled},
-                          );
-                        },
-                      ),
-                    ),
-                  if (flagService.internalUser)
-                    MenuSectionDescriptionWidget(
-                      content: isCollectEnabled
-                          ? "Allow people with link to join your album as Collaborator"
-                          : "Allow people with link to join your album as Viewer",
-                    ),
-                  if (flagService.internalUser) const SizedBox(height: 24),
                   MenuItemWidget(
                     alignCaptionedTextToLeft: true,
                     captionedTextWidget: CaptionedTextWidget(

mobile/apps/photos/scripts/internal_changes.txt

@@ -1,6 +1,5 @@
-- Neeraj: (i) Add allow joining album option in manage links
 - Neeraj: Fix lock error + improve logViewer
 - Laurens: text embedding caching for memories and discover
 - Neeraj: (i) Option to send qr for link
 - Neeraj: (i) Debug option to enable logViewer
-- Neeraj: Potential fix for ios in-app payment
+- Neeraj: Potential fix for ios in-app payment

server/ente/public_collection.go

@@ -34,7 +34,7 @@ type UpdatePublicAccessTokenRequest struct {
 
 func (ut *UpdatePublicAccessTokenRequest) Validate() error {
 	if ut.DeviceLimit == nil && ut.ValidTill == nil && ut.DisablePassword == nil &&
-		ut.Nonce == nil && ut.PassHash == nil && ut.EnableDownload == nil && ut.EnableCollect == nil {
+		ut.Nonce == nil && ut.PassHash == nil && ut.EnableDownload == nil && ut.EnableCollect == nil && ut.EnableJoin == nil {
 		return NewBadRequestWithMessage("all parameters are missing")
 	}