s3: fix attachments not uploading on self hosted servers

this was due to s3 endpoints requesting user's subscription
which didn't exist in case of
self hosted setups

Author: thecodrr

.env

@@ -5,7 +5,7 @@ INSTANCE_NAME=self-hosted-notesnook-instance
 
 # Description: This secret is used for generating, validating, and introspecting auth tokens. It must be a randomly generated token (preferably >32 characters).
 # Required: yes
-NOTESNOOK_API_SECRET=
+NOTESNOOK_API_SECRET=localhost-api-secret
 
 # Description: Use this flag to disable creation of new accounts on your instance (i.e. in case it is exposed to the Internet).
 # Required: yes
@@ -17,18 +17,18 @@ DISABLE_SIGNUPS=false
 
 # Description: Username for the SMTP connection (most time it is the email address of your account). Check your email provider's documentation to get the appropriate value.
 # Required: yes
-SMTP_USERNAME=
+SMTP_USERNAME=AKIARYIUZPO7PJ7PSXVL
 # Description: Password for the SMTP connection. Check your email provider's documentation to get the appropriate value.
 # Required: yes
-SMTP_PASSWORD=
+SMTP_PASSWORD=BNKYnxkV6nFrn0Tji8Bhi6eIdFclLVNGQCCJEV4fH3Pl
 # Description: Host on which the the SMTP connection is running. Check your email provider's documentation to get the appropriate value.
 # Required: yes
 # Example: smtp.gmail.com
-SMTP_HOST=
+SMTP_HOST=email-smtp.us-west-2.amazonaws.com
 # Description: Port on which the the SMTP connection is running. Check your email provider's documentation to get the appropriate value.
 # Required: yes
 # Example: 465
-SMTP_PORT=
+SMTP_PORT=587
 
 # Description: Twilio account SID is required for sending SMS with 2FA codes. Learn more here: https://help.twilio.com/articles/14726256820123-What-is-a-Twilio-Account-SID-and-where-can-I-find-it-
 # Required: no
@@ -50,7 +50,7 @@ NOTESNOOK_CORS_ORIGINS=
 # Note: the URL has no slashes at the end
 # Required: yes
 # Example: https://app.notesnook.com
-NOTESNOOK_APP_PUBLIC_URL=https://app.notesnook.com
+NOTESNOOK_APP_PUBLIC_URL=http://localhost:3000
 # Description: This is the public URL for the monograph frontend.
 # Required: yes
 # Example: https://monogr.ph

Notesnook.API/Controllers/AnnouncementController.cs

@@ -42,10 +42,10 @@ public AnnouncementController(Repository<Announcement> announcements)
 
         [HttpGet("active")]
         [AllowAnonymous]
-        public async Task<IActionResult> GetActiveAnnouncements([FromQuery] string userId)
+        public async Task<IActionResult> GetActiveAnnouncements([FromQuery] string? userId)
         {
             var totalActive = await Announcements.Collection.CountDocumentsAsync(Builders<Announcement>.Filter.Eq("IsActive", true));
-            if (totalActive <= 0) return Ok(new Announcement[] { });
+            if (totalActive <= 0) return Ok(Array.Empty<Announcement>());
 
             var announcements = (await Announcements.FindAsync((a) => a.IsActive)).Where((a) => a.UserIds == null || a.UserIds.Length == 0 || a.UserIds.Contains(userId));
             foreach (var announcement in announcements)

Notesnook.API/Controllers/S3Controller.cs

@@ -63,21 +63,24 @@ public async Task<IActionResult> Upload([FromQuery] string name)
                 return Ok(uploadUrl);
             }
 
-            var subscriptionService = await WampServers.SubscriptionServer.GetServiceAsync<IUserSubscriptionService>(SubscriptionServerTopics.UserSubscriptionServiceTopic);
-            var subscription = await subscriptionService.GetUserSubscriptionAsync(Clients.Notesnook.Id, userId);
-            if (subscription is null) return BadRequest(new { error = "User subscription not found." });
-
-            if (StorageHelper.IsFileSizeExceeded(subscription, fileSize))
+            var userSettings = await Repositories.UsersSettings.FindOneAsync((u) => u.UserId == userId);
+            if (!Constants.IS_SELF_HOSTED)
             {
-                return BadRequest(new { error = "Max file size exceeded." });
+                var subscriptionService = await WampServers.SubscriptionServer.GetServiceAsync<IUserSubscriptionService>(SubscriptionServerTopics.UserSubscriptionServiceTopic);
+                var subscription = await subscriptionService.GetUserSubscriptionAsync(Clients.Notesnook.Id, userId);
+                if (subscription is null) return BadRequest(new { error = "User subscription not found." });
+
+                if (StorageHelper.IsFileSizeExceeded(subscription, fileSize))
+                {
+                    return BadRequest(new { error = "Max file size exceeded." });
+                }
+
+                userSettings.StorageLimit ??= new Limit { Value = 0, UpdatedAt = 0 };
+                userSettings.StorageLimit.Value += fileSize;
+                if (StorageHelper.IsStorageLimitReached(subscription, userSettings.StorageLimit))
+                    return BadRequest(new { error = "Storage limit exceeded." });
             }
 
-            var userSettings = await Repositories.UsersSettings.FindOneAsync((u) => u.UserId == userId);
-            userSettings.StorageLimit ??= new Limit { Value = 0, UpdatedAt = 0 };
-            userSettings.StorageLimit.Value += fileSize;
-            if (StorageHelper.IsStorageLimitReached(subscription, userSettings.StorageLimit))
-                return BadRequest(new { error = "Storage limit exceeded." });
-
             var url = S3Service.GetUploadObjectUrl(userId, name);
             if (url == null) return BadRequest(new { error = "Could not create signed url." });
 
@@ -87,8 +90,11 @@ public async Task<IActionResult> Upload([FromQuery] string name)
             var response = await httpClient.SendRequestAsync<Response>(url, null, HttpMethod.Put, content);
             if (!response.Success) return BadRequest(await response.Content.ReadAsStringAsync());
 
-            userSettings.StorageLimit.UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-            await Repositories.UsersSettings.UpsertAsync(userSettings, (u) => u.UserId == userId);
+            if (!Constants.IS_SELF_HOSTED)
+            {
+                userSettings.StorageLimit.UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                await Repositories.UsersSettings.UpsertAsync(userSettings, (u) => u.UserId == userId);
+            }
 
             return Ok(response);
         }

Notesnook.API/Services/S3Service.cs

@@ -229,38 +229,44 @@ public async Task CompleteMultipartUploadAsync(string userId, CompleteMultipartU
             var objectName = GetFullObjectName(userId, uploadRequest.Key);
             if (userId == null || objectName == null) throw new Exception("Could not abort multipart upload.");
 
-            var subscriptionService = await WampServers.SubscriptionServer.GetServiceAsync<IUserSubscriptionService>(SubscriptionServerTopics.UserSubscriptionServiceTopic);
-            var subscription = await subscriptionService.GetUserSubscriptionAsync(Clients.Notesnook.Id, userId) ?? throw new Exception("User subscription not found.");
-
-            long fileSize = await GetMultipartUploadSizeAsync(userId, uploadRequest.Key, uploadRequest.UploadId);
-            if (StorageHelper.IsFileSizeExceeded(subscription, fileSize))
-            {
-                await this.AbortMultipartUploadAsync(userId, uploadRequest.Key, uploadRequest.UploadId);
-                throw new Exception("Max file size exceeded.");
-            }
-
             var userSettings = await Repositories.UsersSettings.FindOneAsync((u) => u.UserId == userId);
             if (userSettings == null)
             {
                 await this.AbortMultipartUploadAsync(userId, uploadRequest.Key, uploadRequest.UploadId);
                 throw new Exception("User settings not found.");
             }
 
-            userSettings.StorageLimit ??= new Limit { Value = 0, UpdatedAt = 0 };
-            userSettings.StorageLimit.Value += fileSize;
-            if (StorageHelper.IsStorageLimitReached(subscription, userSettings.StorageLimit))
+            if (!Constants.IS_SELF_HOSTED)
             {
-                await this.AbortMultipartUploadAsync(userId, uploadRequest.Key, uploadRequest.UploadId);
-                throw new Exception("Storage limit reached.");
+                var subscriptionService = await WampServers.SubscriptionServer.GetServiceAsync<IUserSubscriptionService>(SubscriptionServerTopics.UserSubscriptionServiceTopic);
+                var subscription = await subscriptionService.GetUserSubscriptionAsync(Clients.Notesnook.Id, userId) ?? throw new Exception("User subscription not found.");
+
+                long fileSize = await GetMultipartUploadSizeAsync(userId, uploadRequest.Key, uploadRequest.UploadId);
+                if (StorageHelper.IsFileSizeExceeded(subscription, fileSize))
+                {
+                    await this.AbortMultipartUploadAsync(userId, uploadRequest.Key, uploadRequest.UploadId);
+                    throw new Exception("Max file size exceeded.");
+                }
+
+                userSettings.StorageLimit ??= new Limit { Value = 0, UpdatedAt = 0 };
+                userSettings.StorageLimit.Value += fileSize;
+                if (StorageHelper.IsStorageLimitReached(subscription, userSettings.StorageLimit))
+                {
+                    await this.AbortMultipartUploadAsync(userId, uploadRequest.Key, uploadRequest.UploadId);
+                    throw new Exception("Storage limit reached.");
+                }
             }
 
             uploadRequest.Key = objectName;
             uploadRequest.BucketName = GetBucketName(S3ClientMode.INTERNAL);
             var response = await GetS3Client(S3ClientMode.INTERNAL).CompleteMultipartUploadAsync(uploadRequest);
             if (!IsSuccessStatusCode(((int)response.HttpStatusCode))) throw new Exception("Failed to complete multipart upload.");
 
-            userSettings.StorageLimit.UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-            await Repositories.UsersSettings.UpsertAsync(userSettings, (u) => u.UserId == userId);
+            if (!Constants.IS_SELF_HOSTED)
+            {
+                userSettings.StorageLimit.UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                await Repositories.UsersSettings.UpsertAsync(userSettings, (u) => u.UserId == userId);
+            }
         }
 
         private string? GetPresignedURL(string userId, string name, HttpVerb httpVerb, S3ClientMode mode = S3ClientMode.EXTERNAL)