identity: fix user subscription claim value incorrect for legacy pro users

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

.dockerignore

@@ -1,5 +1,5 @@
-**/Dockerfile
-**/bin
-**/obj
-**/.env
+**/Dockerfile
+**/bin
+**/obj
+**/.env
 **/.env.local

.env

@@ -9,8 +9,8 @@ NOTESNOOK_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
-# Possible values: 0 for false; 1 for true
-DISABLE_ACCOUNT_CREATION=0
+# Possible values: true/false
+DISABLE_SIGNUPS=false
 
 ### SMTP Configuration ###
 # SMTP Configuration is required for sending emails for password reset, 2FA emails etc. You can get SMTP settings from your email provider.
@@ -29,14 +29,6 @@ SMTP_HOST=
 # Required: yes
 # Example: 465
 SMTP_PORT=
-# Description: The FROM email address when sending out emails. Must be an email address under your control otherwise sending will fail. Most times it is the same email address as the SMTP_USERNAME.
-# Required: no
-# Example: support@notesnook.com
-NOTESNOOK_SENDER_EMAIL=
-# Description: The reply-to email is used whenever a user is replying to the email you sent. You can use this to set a different reply-to email address than the one you used to send the email.
-# Required: no
-# Example: support@notesnook.com
-SMTP_REPLYTO_EMAIL=
 
 # 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
@@ -49,21 +41,28 @@ TWILIO_AUTH_TOKEN=
 # Example: VAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 TWILIO_SERVICE_SID=
 
-# Description: This is the public domain for the Authentication server. It can also be the IP address if you don't own a domain name. The domain/IP must be accessible from wherever you are running the Notesnook clients. Used for generating email confirmation & password reset URLs.
-# Required: yes
-# Example: auth.streetwriters.co
-IDENTITY_SERVER_DOMAIN=localhost:8264
-
 # Description: Add the origins for which you want to allow CORS. Leave it empty to allow all origins to access your server. If you want to allow multiple origins, seperate each origin with a comma.
 # Required: no
 # Example: https://app.notesnook.com,http://localhost:3000
 NOTESNOOK_CORS_ORIGINS=
 
-# Description: This is the URL for the web app, and is used by the backend for creating redirect URLs (e.g. after email confirmation etc). 
+# Description: This is the public URL for the web app, and is used by the backend for creating redirect URLs (e.g. after email confirmation etc). 
 # Note: the URL has no slashes at the end
 # Required: yes
 # Example: https://app.notesnook.com
-NOTESNOOK_APP_HOST=https://app.notesnook.com
+NOTESNOOK_APP_PUBLIC_URL=https://app.notesnook.com
+# Description: This is the public URL for the monograph frontend.
+# Required: yes
+# Example: https://monogr.ph
+MONOGRAPH_PUBLIC_URL=http://localhost:6264
+# Description: This is the public URL for the Authentication server. Used for generating email confirmation & password reset URLs.
+# Required: yes
+# Example: https://auth.streetwriters.co
+AUTH_SERVER_PUBLIC_URL=http://localhost:8264
+# Description: This is the public URL for the S3 attachments server (minio). It'll be used by the Notesnook clients for uploading/downloading attachments.
+# Required: yes
+# Example: https://attachments.notesnook.com
+ATTACHMENTS_SERVER_PUBLIC_URL=http://localhost:9000
 
 # Description: Custom username for the root Minio account. Minio is used for storing your attachments. This must be greater than 3 characters in length.
 # Required: no
@@ -71,7 +70,3 @@ MINIO_ROOT_USER=
 # Description: Custom password for the root Minio account. Minio is used for storing your attachments. This must be greater than 8 characters in length.
 # Required: no
 MINIO_ROOT_PASSWORD=
-# Description: The URL must be accessible from wherever you are running the Notesnook clients. It'll be used by the Notesnook clients for uploading/downloading attachments.
-# Required: no
-# Example: https://attachments.notesnook.com
-S3_SERVICE_URL=

.github/workflows/publish.yml

@@ -10,8 +10,9 @@
 name: Publish Docker images
 
 on:
-  release:
-    types: [published]
+  push:
+    tags:
+      - "v*"
 
 jobs:
   push_to_registry:

.gitignore

@@ -1,267 +1,267 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-#*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-keys/
-dist/
-keystore/
-.env.local
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+#*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+keys/
+dist/
+keystore/
+.env.local
 Notesnook.API/sync/

.vscode/tasks.json

@@ -1,41 +1,41 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "label": "build-notesnook",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "build",
-        "${workspaceFolder}/Notesnook.API/Notesnook.API.csproj",
-        "/property:GenerateFullPaths=true",
-        "/consoleloggerparameters:NoSummary"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-    {
-      "label": "build-identity",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "build",
-        "${workspaceFolder}/Streetwriters.Identity/Streetwriters.Identity.csproj",
-        "/property:GenerateFullPaths=true",
-        "/consoleloggerparameters:NoSummary"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-    {
-      "label": "build-messenger",
-      "command": "dotnet",
-      "type": "process",
-      "args": [
-        "build",
-        "${workspaceFolder}/Streetwriters.Messenger/Streetwriters.Messenger.csproj",
-        "/property:GenerateFullPaths=true",
-        "/consoleloggerparameters:NoSummary"
-      ],
-      "problemMatcher": "$msCompile"
-    },
-  ]
-}
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build-notesnook",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/Notesnook.API/Notesnook.API.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "build-identity",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/Streetwriters.Identity/Streetwriters.Identity.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "build-messenger",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/Streetwriters.Messenger/Streetwriters.Messenger.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+  ]
+}

AUTHORS

@@ -1,3 +1,3 @@
-Notesnook Sync Server is written & maintained by:
-  - Abdullah Atta <abdullahatta@streetwriters.co>
-  - Ammar Ahmed <ammarahmed6506@gmail.com>
+Notesnook Sync Server is written & maintained by:
+  - Abdullah Atta <abdullahatta@streetwriters.co>
+  - Ammar Ahmed <ammarahmed6506@gmail.com>

CODE_OF_CONDUCT.md

@@ -1,128 +1,128 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-- Demonstrating empathy and kindness toward other people
-- Being respectful of differing opinions, viewpoints, and experiences
-- Giving and gracefully accepting constructive feedback
-- Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-- Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-- The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-- Trolling, insulting or derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-- Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-support@streetwriters.co.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+support@streetwriters.co.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

Notesnook.API/Accessors/SyncItemsRepositoryAccessor.cs

@@ -43,6 +43,8 @@ namespace Notesnook.API.Accessors
         public SyncItemsRepository Tags { get; }
         public Repository<UserSettings> UsersSettings { get; }
         public Repository<Monograph> Monographs { get; }
+        public Repository<InboxApiKey> InboxApiKey { get; }
+        public Repository<InboxSyncItem> InboxItems { get; }
 
         public SyncItemsRepositoryAccessor(IDbContext dbContext,
 
@@ -71,10 +73,13 @@ namespace Notesnook.API.Accessors
         [FromKeyedServices(Collections.TagsKey)]
         IMongoCollection<SyncItem> tags,
 
-        Repository<UserSettings> usersSettings, Repository<Monograph> monographs)
+        Repository<UserSettings> usersSettings, Repository<Monograph> monographs,
+        Repository<InboxApiKey> inboxApiKey, Repository<InboxSyncItem> inboxItems)
         {
             UsersSettings = usersSettings;
             Monographs = monographs;
+            InboxApiKey = inboxApiKey;
+            InboxItems = inboxItems;
             Notebooks = new SyncItemsRepository(dbContext, notebooks);
             Notes = new SyncItemsRepository(dbContext, notes);
             Contents = new SyncItemsRepository(dbContext, content);

Notesnook.API/Authorization/InboxApiKeyAuthenticationHandler.cs

@@ -0,0 +1,101 @@
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Security.Claims;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Notesnook.API.Models;
+using Streetwriters.Data.Repositories;
+
+namespace Notesnook.API.Authorization
+{
+    public static class InboxApiKeyAuthenticationDefaults
+    {
+        public const string AuthenticationScheme = "InboxApiKey";
+    }
+
+    public class InboxApiKeyAuthenticationSchemeOptions : AuthenticationSchemeOptions
+    {
+    }
+
+    public class InboxApiKeyAuthenticationHandler : AuthenticationHandler<InboxApiKeyAuthenticationSchemeOptions>
+    {
+        private readonly Repository<InboxApiKey> _inboxApiKeyRepository;
+
+        public InboxApiKeyAuthenticationHandler(
+            IOptionsMonitor<InboxApiKeyAuthenticationSchemeOptions> options,
+            ILoggerFactory logger,
+            UrlEncoder encoder,
+            Repository<InboxApiKey> inboxApiKeyRepository)
+            : base(options, logger, encoder)
+        {
+            _inboxApiKeyRepository = inboxApiKeyRepository;
+        }
+
+        protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
+        {
+            if (!Request.Headers.ContainsKey("Authorization"))
+            {
+                return AuthenticateResult.Fail("Missing Authorization header");
+            }
+
+            var apiKey = Request.Headers["Authorization"].ToString().Trim();
+            if (string.IsNullOrEmpty(apiKey))
+            {
+                return AuthenticateResult.Fail("Missing API key");
+            }
+
+            try
+            {
+                var inboxApiKey = await _inboxApiKeyRepository.FindOneAsync(k => k.Key == apiKey);
+                if (inboxApiKey == null)
+                {
+                    return AuthenticateResult.Fail("Invalid API key");
+                }
+
+                if (inboxApiKey.ExpiryDate > 0 && DateTimeOffset.UtcNow.ToUnixTimeMilliseconds() > inboxApiKey.ExpiryDate)
+                {
+                    return AuthenticateResult.Fail("API key has expired");
+                }
+
+                inboxApiKey.LastUsedAt = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+                await _inboxApiKeyRepository.UpsertAsync(inboxApiKey, k => k.Key == apiKey);
+
+                var claims = new[]
+                {
+                    new Claim("sub", inboxApiKey.UserId),
+                };
+                var identity = new ClaimsIdentity(claims, Scheme.Name);
+                var principal = new ClaimsPrincipal(identity);
+                var ticket = new AuthenticationTicket(principal, Scheme.Name);
+
+                return AuthenticateResult.Success(ticket);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex, "Error validating inbox API key");
+                return AuthenticateResult.Fail("Error validating API key");
+            }
+        }
+    }
+}

Notesnook.API/Authorization/NotesnookUserRequirement.cs

@@ -1,36 +1,36 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-
-namespace Notesnook.API.Authorization
-{
-    public class NotesnookUserRequirement : AuthorizationHandler<NotesnookUserRequirement>, IAuthorizationRequirement
-    {
-        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, NotesnookUserRequirement requirement)
-        {
-            var isInAudience = context.User.HasClaim("aud", "notesnook");
-            var hasRole = context.User.HasClaim("role", "notesnook");
-            if (isInAudience && hasRole)
-                context.Succeed(requirement);
-            return Task.CompletedTask;
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+
+namespace Notesnook.API.Authorization
+{
+    public class NotesnookUserRequirement : AuthorizationHandler<NotesnookUserRequirement>, IAuthorizationRequirement
+    {
+        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, NotesnookUserRequirement requirement)
+        {
+            var isInAudience = context.User.HasClaim("aud", "notesnook");
+            var hasRole = context.User.HasClaim("role", "notesnook");
+            if (isInAudience && hasRole)
+                context.Succeed(requirement);
+            return Task.CompletedTask;
+        }
+    }
 }

Notesnook.API/Authorization/ProUserRequirement.cs

@@ -1,63 +0,0 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Security.Claims;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-
-namespace Notesnook.API.Authorization
-{
-    public class ProUserRequirement : AuthorizationHandler<ProUserRequirement>, IAuthorizationRequirement
-    {
-        private readonly Dictionary<string, string> pathErrorPhraseMap = new()
-        {
-            ["/s3"] = "upload attachments",
-            ["/s3/multipart"] = "upload attachments",
-        };
-        private readonly string[] allowedClaims = ["trial", "premium", "premium_canceled"];
-        protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, ProUserRequirement requirement)
-        {
-            PathString path = context.Resource is DefaultHttpContext httpContext ? httpContext.Request.Path : null;
-            var isProOrTrial = context.User.Claims.Any((c) => c.Type == "notesnook:status" && allowedClaims.Contains(c.Value));
-            if (isProOrTrial) context.Succeed(requirement);
-            else
-            {
-                var phrase = "continue";
-                foreach (var item in pathErrorPhraseMap)
-                {
-                    if (path != null && path.StartsWithSegments(item.Key))
-                        phrase = item.Value;
-                }
-                var error = $"Please upgrade to Pro to {phrase}.";
-                context.Fail(new AuthorizationFailureReason(this, error));
-            }
-            return Task.CompletedTask;
-        }
-
-        public override Task HandleAsync(AuthorizationHandlerContext context)
-        {
-            return this.HandleRequirementAsync(context, this);
-        }
-    }
-}

Notesnook.API/Authorization/SyncRequirement.cs

@@ -50,9 +50,9 @@ namespace Notesnook.API.Authorization
             return Task.CompletedTask;
         }
 
-        public PolicyAuthorizationResult IsAuthorized(ClaimsPrincipal User, PathString requestPath)
+        public PolicyAuthorizationResult IsAuthorized(ClaimsPrincipal? User, PathString requestPath)
         {
-            var id = User.FindFirstValue("sub");
+            var id = User?.FindFirstValue("sub");
 
             if (string.IsNullOrEmpty(id))
             {

Notesnook.API/Constants.cs

@@ -14,5 +14,7 @@ namespace Notesnook.API
         public const string TagsKey = "tags";
         public const string ColorsKey = "colors";
         public const string VaultsKey = "vaults";
+        public const string InboxItems = "inbox_items";
+        public const string InboxApiKeysKey = "inbox_api_keys";
     }
 }

Notesnook.API/Controllers/AnnouncementController.cs

@@ -1,69 +1,69 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using MongoDB.Driver;
-using Notesnook.API.Models;
-using Streetwriters.Data.Repositories;
-
-namespace Notesnook.API.Controllers
-{
-    // TODO: this should be moved out into its own microservice
-    [ApiController]
-    [Route("announcements")]
-    public class AnnouncementController : ControllerBase
-    {
-        private Repository<Announcement> Announcements { get; set; }
-        public AnnouncementController(Repository<Announcement> announcements)
-        {
-            Announcements = announcements;
-        }
-
-        [HttpGet("active")]
-        [AllowAnonymous]
-        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[] { });
-
-            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)
-            {
-                if (announcement.UserIds != null && !announcement.UserIds.Contains(userId)) continue;
-
-                foreach (var item in announcement.Body)
-                {
-                    if (item.Type != "callToActions") continue;
-                    foreach (var action in item.Actions)
-                    {
-                        if (action.Type != "link") continue;
-
-                        action.Data = action.Data.Replace("{{UserId}}", userId ?? "0");
-                    }
-                }
-            }
-            return Ok(announcements);
-        }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using MongoDB.Driver;
+using Notesnook.API.Models;
+using Streetwriters.Data.Repositories;
+
+namespace Notesnook.API.Controllers
+{
+    // TODO: this should be moved out into its own microservice
+    [ApiController]
+    [Route("announcements")]
+    public class AnnouncementController : ControllerBase
+    {
+        private Repository<Announcement> Announcements { get; set; }
+        public AnnouncementController(Repository<Announcement> announcements)
+        {
+            Announcements = announcements;
+        }
+
+        [HttpGet("active")]
+        [AllowAnonymous]
+        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(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)
+            {
+                if (announcement.UserIds != null && !announcement.UserIds.Contains(userId)) continue;
+
+                foreach (var item in announcement.Body)
+                {
+                    if (item.Type != "callToActions") continue;
+                    foreach (var action in item.Actions)
+                    {
+                        if (action.Type != "link") continue;
+
+                        action.Data = action.Data.Replace("{{UserId}}", userId ?? "0");
+                    }
+                }
+            }
+            return Ok(announcements);
+        }
+    }
+}

Notesnook.API/Controllers/InboxController.cs

@@ -0,0 +1,214 @@
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Security.Claims;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using MongoDB.Bson;
+using Notesnook.API.Authorization;
+using Notesnook.API.Models;
+using Notesnook.API.Services;
+using Streetwriters.Common;
+using Streetwriters.Common.Messages;
+using Streetwriters.Data.Repositories;
+
+namespace Notesnook.API.Controllers
+{
+    [ApiController]
+    [Route("inbox")]
+    public class InboxController : ControllerBase
+    {
+        private readonly Repository<InboxApiKey> InboxApiKey;
+        private readonly Repository<UserSettings> UserSetting;
+        private Repository<InboxSyncItem> InboxItems;
+
+        public InboxController(
+            Repository<InboxApiKey> inboxApiKeysRepository,
+            Repository<UserSettings> userSettingsRepository,
+            Repository<InboxSyncItem> inboxItemsRepository)
+        {
+            InboxApiKey = inboxApiKeysRepository;
+            UserSetting = userSettingsRepository;
+            InboxItems = inboxItemsRepository;
+        }
+
+        [HttpGet("api-keys")]
+        [Authorize(Policy = "Notesnook")]
+        public async Task<IActionResult> GetApiKeysAsync()
+        {
+            var userId = User.FindFirstValue("sub");
+            try
+            {
+                var apiKeys = await InboxApiKey.FindAsync(t => t.UserId == userId);
+                return Ok(apiKeys);
+            }
+            catch (Exception ex)
+            {
+                await Slogger<InboxController>.Error(nameof(GetApiKeysAsync), "Couldn't get inbox api keys.", userId, ex.ToString());
+                return BadRequest(new { error = ex.Message });
+            }
+        }
+
+        [HttpPost("api-keys")]
+        [Authorize(Policy = "Notesnook")]
+        public async Task<IActionResult> CreateApiKeyAsync([FromBody] InboxApiKey request)
+        {
+            var userId = User.FindFirstValue("sub");
+            try
+            {
+                if (string.IsNullOrWhiteSpace(request.Name))
+                {
+                    return BadRequest(new { error = "Api key name is required." });
+                }
+                if (request.ExpiryDate <= -1)
+                {
+                    return BadRequest(new { error = "Valid expiry date is required." });
+                }
+
+                var count = await InboxApiKey.CountAsync(t => t.UserId == userId);
+                if (count >= 10)
+                {
+                    return BadRequest(new { error = "Maximum of 10 inbox api keys allowed." });
+                }
+
+                var inboxApiKey = new InboxApiKey
+                {
+                    UserId = userId,
+                    Name = request.Name,
+                    DateCreated = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+                    ExpiryDate = request.ExpiryDate,
+                    LastUsedAt = 0
+                };
+                await InboxApiKey.InsertAsync(inboxApiKey);
+                return Ok(inboxApiKey);
+            }
+            catch (Exception ex)
+            {
+                await Slogger<InboxController>.Error(nameof(CreateApiKeyAsync), "Couldn't create inbox api key.", userId, ex.ToString());
+                return BadRequest(new { error = ex.Message });
+            }
+        }
+
+        [HttpDelete("api-keys/{apiKey}")]
+        [Authorize(Policy = "Notesnook")]
+        public async Task<IActionResult> DeleteApiKeyAsync(string apiKey)
+        {
+            var userId = User.FindFirstValue("sub");
+            try
+            {
+                if (string.IsNullOrWhiteSpace(apiKey))
+                {
+                    return BadRequest(new { error = "Api key is required." });
+                }
+
+                await InboxApiKey.DeleteAsync(t => t.UserId == userId && t.Key == apiKey);
+                return Ok(new { message = "Api key deleted successfully." });
+            }
+            catch (Exception ex)
+            {
+                await Slogger<InboxController>.Error(nameof(DeleteApiKeyAsync), "Couldn't delete inbox api key.", userId, ex.ToString());
+                return BadRequest(new { error = ex.Message });
+            }
+        }
+
+        [HttpGet("public-encryption-key")]
+        [Authorize(Policy = InboxApiKeyAuthenticationDefaults.AuthenticationScheme)]
+        public async Task<IActionResult> GetPublicKeyAsync()
+        {
+            var userId = User.FindFirstValue("sub");
+            try
+            {
+                var userSetting = await UserSetting.FindOneAsync(u => u.UserId == userId);
+                if (string.IsNullOrWhiteSpace(userSetting?.InboxKeys?.Public))
+                {
+                    return BadRequest(new { error = "Inbox public key is not configured." });
+                }
+                return Ok(new { key = userSetting.InboxKeys.Public });
+            }
+            catch (Exception ex)
+            {
+                await Slogger<InboxController>.Error(nameof(GetPublicKeyAsync), "Couldn't get user's inbox's public key.", userId, ex.ToString());
+                return BadRequest(new { error = ex.Message });
+            }
+        }
+
+        [HttpPost("items")]
+        [Authorize(Policy = InboxApiKeyAuthenticationDefaults.AuthenticationScheme)]
+        public async Task<IActionResult> CreateInboxItemAsync([FromBody] InboxSyncItem request)
+        {
+            var userId = User.FindFirstValue("sub");
+            try
+            {
+                if (request.Key.Algorithm != Algorithms.XSAL_X25519_7)
+                {
+                    return BadRequest(new { error = $"Only {Algorithms.XSAL_X25519_7} is supported for inbox item password." });
+                }
+                if (string.IsNullOrWhiteSpace(request.Key.Cipher))
+                {
+                    return BadRequest(new { error = "Inbox item password cipher is required." });
+                }
+                if (request.Key.Length <= 0)
+                {
+                    return BadRequest(new { error = "Valid inbox item password length is required." });
+                }
+                if (request.Algorithm != Algorithms.Default)
+                {
+                    return BadRequest(new { error = $"Only {Algorithms.Default} is supported for inbox item." });
+                }
+                if (request.Version <= 0)
+                {
+                    return BadRequest(new { error = "Valid inbox item version is required." });
+                }
+                if (string.IsNullOrWhiteSpace(request.Cipher) || string.IsNullOrWhiteSpace(request.IV))
+                {
+                    return BadRequest(new { error = "Inbox item cipher and iv is required." });
+                }
+                if (request.Length <= 0)
+                {
+                    return BadRequest(new { error = "Valid inbox item length is required." });
+                }
+
+                request.UserId = userId;
+                request.ItemId = ObjectId.GenerateNewId().ToString();
+                await InboxItems.InsertAsync(request);
+                new SyncDeviceService(new SyncDevice(userId, string.Empty))
+                    .AddIdsToAllDevices([$"{request.ItemId}:inboxItems"]);
+                await WampServers.MessengerServer.PublishMessageAsync(MessengerServerTopics.SendSSETopic, new SendSSEMessage
+                {
+                    OriginTokenId = null,
+                    UserId = userId,
+                    Message = new Message
+                    {
+                        Type = "triggerSync",
+                        Data = JsonSerializer.Serialize(new { reason = "Inbox items updated." })
+                    }
+                });
+                return Ok();
+            }
+            catch (Exception ex)
+            {
+                await Slogger<InboxController>.Error(nameof(CreateInboxItemAsync), "Couldn't create inbox item.", userId, ex.ToString());
+                return BadRequest(new { error = ex.Message });
+            }
+        }
+    }
+}

Notesnook.API/Controllers/MonographsController.cs

@@ -18,14 +18,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using System.Text.RegularExpressions;
+using System.Text.Json;
 using System.Threading.Tasks;
+using AngleSharp;
+using AngleSharp.Dom;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using MongoDB.Bson;
 using MongoDB.Driver;
+using Notesnook.API.Authorization;
 using Notesnook.API.Models;
+using Notesnook.API.Services;
+using Streetwriters.Common;
+using Streetwriters.Common.Interfaces;
+using Streetwriters.Common.Messages;
 using Streetwriters.Data.Interfaces;
 using Streetwriters.Data.Repositories;
 
@@ -34,64 +43,150 @@ namespace Notesnook.API.Controllers
     [ApiController]
     [Route("monographs")]
     [Authorize("Sync")]
-    public class MonographsController : ControllerBase
+    public class MonographsController(Repository<Monograph> monographs, IURLAnalyzer analyzer) : ControllerBase
     {
-        private Repository<Monograph> Monographs { get; set; }
-        private readonly IUnitOfWork unit;
+        const string SVG_PIXEL = "<svg xmlns='http://www.w3.org/2000/svg' width='1' height='1'><circle r='9'/></svg>";
         private const int MAX_DOC_SIZE = 15 * 1024 * 1024;
-        public MonographsController(Repository<Monograph> monographs, IUnitOfWork unitOfWork)
+
+        private static FilterDefinition<Monograph> CreateMonographFilter(string userId, Monograph monograph)
         {
-            Monographs = monographs;
-            unit = unitOfWork;
+            var userIdFilter = Builders<Monograph>.Filter.Eq("UserId", userId);
+            monograph.ItemId ??= monograph.Id;
+            return ObjectId.TryParse(monograph.ItemId, out ObjectId id)
+            ? Builders<Monograph>.Filter
+                .And(userIdFilter,
+                    Builders<Monograph>.Filter.Or(
+                        Builders<Monograph>.Filter.Eq("_id", id), Builders<Monograph>.Filter.Eq("ItemId", monograph.ItemId)
+                    )
+                )
+            : Builders<Monograph>.Filter
+                .And(userIdFilter,
+                    Builders<Monograph>.Filter.Eq("ItemId", monograph.ItemId)
+                );
+        }
+
+        private static FilterDefinition<Monograph> CreateMonographFilter(string itemId)
+        {
+            return ObjectId.TryParse(itemId, out ObjectId id)
+            ? Builders<Monograph>.Filter.Or(
+                Builders<Monograph>.Filter.Eq("_id", id),
+                Builders<Monograph>.Filter.Eq("ItemId", itemId))
+            : Builders<Monograph>.Filter.Eq("ItemId", itemId);
+        }
+
+        private async Task<Monograph> FindMonographAsync(string userId, Monograph monograph)
+        {
+            var result = await monographs.Collection.FindAsync(CreateMonographFilter(userId, monograph), new FindOptions<Monograph>
+            {
+                Limit = 1
+            });
+            return await result.FirstOrDefaultAsync();
+        }
+
+        private async Task<Monograph> FindMonographAsync(string itemId)
+        {
+            var result = await monographs.Collection.FindAsync(CreateMonographFilter(itemId), new FindOptions<Monograph>
+            {
+                Limit = 1
+            });
+            return await result.FirstOrDefaultAsync();
         }
 
         [HttpPost]
-        public async Task<IActionResult> PublishAsync([FromBody] Monograph monograph)
+        public async Task<IActionResult> PublishAsync([FromQuery] string? deviceId, [FromBody] Monograph monograph)
         {
-            var userId = this.User.FindFirstValue("sub");
-            if (userId == null) return Unauthorized();
-
-            if (await Monographs.GetAsync(monograph.Id) != null) return base.Conflict("This monograph is already published.");
-
-            if (monograph.EncryptedContent == null)
-                monograph.CompressedContent = monograph.Content.CompressBrotli();
-            monograph.UserId = userId;
-            monograph.DatePublished = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-
-
-            if (monograph.EncryptedContent?.Cipher.Length > MAX_DOC_SIZE || monograph.CompressedContent?.Length > MAX_DOC_SIZE)
-                return base.BadRequest("Monograph is too big. Max allowed size is 15mb.");
-
-            Monographs.Insert(monograph);
-
-            if (!await unit.Commit()) return BadRequest();
-            return Ok(new
+            try
             {
-                id = monograph.Id
-            });
+                var userId = this.User.FindFirstValue("sub");
+                var jti = this.User.FindFirstValue("jti");
+                if (userId == null) return Unauthorized();
+
+                var existingMonograph = await FindMonographAsync(userId, monograph);
+                if (existingMonograph != null && !existingMonograph.Deleted) return await UpdateAsync(deviceId, monograph);
+
+                if (monograph.EncryptedContent == null)
+                    monograph.CompressedContent = (await CleanupContentAsync(User, monograph.Content)).CompressBrotli();
+                monograph.UserId = userId;
+                monograph.DatePublished = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+
+                if (monograph.EncryptedContent?.Cipher.Length > MAX_DOC_SIZE || monograph.CompressedContent?.Length > MAX_DOC_SIZE)
+                    return base.BadRequest("Monograph is too big. Max allowed size is 15mb.");
+
+                if (existingMonograph != null)
+                {
+                    monograph.Id = existingMonograph.Id;
+                }
+                monograph.Deleted = false;
+                await monographs.Collection.ReplaceOneAsync(
+                    CreateMonographFilter(userId, monograph),
+                    monograph,
+                    new ReplaceOptions { IsUpsert = true }
+                );
+
+                await MarkMonographForSyncAsync(userId, monograph.ItemId ?? monograph.Id, deviceId, jti);
+
+                return Ok(new
+                {
+                    id = monograph.ItemId,
+                    datePublished = monograph.DatePublished,
+                });
+            }
+            catch (Exception e)
+            {
+                await Slogger<MonographsController>.Error(nameof(PublishAsync), e.ToString());
+                return BadRequest();
+            }
         }
 
         [HttpPatch]
-        public async Task<IActionResult> UpdateAsync([FromBody] Monograph monograph)
+        public async Task<IActionResult> UpdateAsync([FromQuery] string? deviceId, [FromBody] Monograph monograph)
         {
-            if (await Monographs.GetAsync(monograph.Id) == null) return NotFound();
-
-            if (monograph.EncryptedContent?.Cipher.Length > MAX_DOC_SIZE || monograph.CompressedContent?.Length > MAX_DOC_SIZE)
-                return base.BadRequest("Monograph is too big. Max allowed size is 15mb.");
-
-            if (monograph.EncryptedContent == null)
-                monograph.CompressedContent = monograph.Content.CompressBrotli();
-            else
-                monograph.Content = null;
-
-            monograph.DatePublished = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
-            Monographs.Update(monograph.Id, monograph);
-
-            if (!await unit.Commit()) return BadRequest();
-            return Ok(new
+            try
             {
-                id = monograph.Id
-            });
+                var userId = this.User.FindFirstValue("sub");
+                var jti = this.User.FindFirstValue("jti");
+                if (userId == null) return Unauthorized();
+
+                var existingMonograph = await FindMonographAsync(userId, monograph);
+                if (existingMonograph == null || existingMonograph.Deleted)
+                {
+                    return NotFound();
+                }
+
+                if (monograph.EncryptedContent?.Cipher.Length > MAX_DOC_SIZE || monograph.CompressedContent?.Length > MAX_DOC_SIZE)
+                    return base.BadRequest("Monograph is too big. Max allowed size is 15mb.");
+
+                if (monograph.EncryptedContent == null)
+                    monograph.CompressedContent = (await CleanupContentAsync(User, monograph.Content)).CompressBrotli();
+                else
+                    monograph.Content = null;
+
+                monograph.DatePublished = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                var result = await monographs.Collection.UpdateOneAsync(
+                    CreateMonographFilter(userId, monograph),
+                    Builders<Monograph>.Update
+                    .Set(m => m.DatePublished, monograph.DatePublished)
+                    .Set(m => m.CompressedContent, monograph.CompressedContent)
+                    .Set(m => m.EncryptedContent, monograph.EncryptedContent)
+                    .Set(m => m.SelfDestruct, monograph.SelfDestruct)
+                    .Set(m => m.Title, monograph.Title)
+                    .Set(m => m.Password, monograph.Password)
+                );
+                if (!result.IsAcknowledged) return BadRequest();
+
+                await MarkMonographForSyncAsync(userId, monograph.ItemId ?? monograph.Id, deviceId, jti);
+
+                return Ok(new
+                {
+                    id = monograph.ItemId,
+                    datePublished = monograph.DatePublished,
+                });
+            }
+            catch (Exception e)
+            {
+                await Slogger<MonographsController>.Error(nameof(UpdateAsync), e.ToString());
+                return BadRequest();
+            }
         }
 
         [HttpGet]
@@ -100,20 +195,24 @@ namespace Notesnook.API.Controllers
             var userId = this.User.FindFirstValue("sub");
             if (userId == null) return Unauthorized();
 
-            var monographs = (await Monographs.Collection.FindAsync(Builders<Monograph>.Filter.Eq("UserId", userId), new FindOptions<Monograph, ObjectWithId>
-            {
-                Projection = Builders<Monograph>.Projection.Include("_id"),
-            })).ToEnumerable();
-            return Ok(monographs.Select((m) => m.Id));
+            var userMonographs = (await monographs.Collection.FindAsync(
+                    Builders<Monograph>.Filter.And(
+                        Builders<Monograph>.Filter.Eq("UserId", userId),
+                        Builders<Monograph>.Filter.Ne("Deleted", true)
+                    )
+               , new FindOptions<Monograph, ObjectWithId>
+               {
+                   Projection = Builders<Monograph>.Projection.Include("_id").Include("ItemId"),
+               })).ToEnumerable();
+            return Ok(userMonographs.Select((m) => m.ItemId ?? m.Id));
         }
 
-
         [HttpGet("{id}")]
         [AllowAnonymous]
         public async Task<IActionResult> GetMonographAsync([FromRoute] string id)
         {
-            var monograph = await Monographs.GetAsync(id);
-            if (monograph == null)
+            var monograph = await FindMonographAsync(id);
+            if (monograph == null || monograph.Deleted)
             {
                 return NotFound(new
                 {
@@ -123,36 +222,142 @@ namespace Notesnook.API.Controllers
             }
 
             if (monograph.EncryptedContent == null)
-                monograph.Content = monograph.CompressedContent.DecompressBrotli();
+                monograph.Content = monograph.CompressedContent?.DecompressBrotli();
+            monograph.ItemId ??= monograph.Id;
             return Ok(monograph);
         }
 
-        [HttpGet("{id}/destruct")]
+        [HttpGet("{id}/view")]
         [AllowAnonymous]
-        public async Task<IActionResult> DestructMonographAsync([FromRoute] string id)
+        public async Task<IActionResult> TrackView([FromRoute] string id)
         {
-            var monograph = await Monographs.GetAsync(id);
-            if (monograph == null)
-            {
-                return NotFound(new
-                {
-                    error = "invalid_id",
-                    error_description = $"No such monograph found."
-                });
-            }
+            var monograph = await FindMonographAsync(id);
+            if (monograph == null || monograph.Deleted) return Content(SVG_PIXEL, "image/svg+xml");
 
             if (monograph.SelfDestruct)
-                await Monographs.DeleteByIdAsync(monograph.Id);
+            {
+                await monographs.Collection.ReplaceOneAsync(
+                    CreateMonographFilter(monograph.UserId, monograph),
+                    new Monograph
+                    {
+                        ItemId = id,
+                        Id = monograph.Id,
+                        Deleted = true,
+                        UserId = monograph.UserId
+                    }
+                );
 
-            return Ok();
+                await MarkMonographForSyncAsync(monograph.UserId, id);
+            }
+
+            return Content(SVG_PIXEL, "image/svg+xml");
         }
 
         [HttpDelete("{id}")]
-        public async Task<IActionResult> DeleteAsync([FromRoute] string id)
+        public async Task<IActionResult> DeleteAsync([FromQuery] string? deviceId, [FromRoute] string id)
         {
-            Monographs.DeleteById(id);
-            if (!await unit.Commit()) return BadRequest();
+            var userId = this.User.FindFirstValue("sub");
+            if (userId is null) return Unauthorized();
+
+            var monograph = await FindMonographAsync(id);
+            if (monograph == null || monograph.Deleted)
+                return Ok();
+
+            var jti = this.User.FindFirstValue("jti");
+
+            await monographs.Collection.ReplaceOneAsync(
+                CreateMonographFilter(userId, monograph),
+                new Monograph
+                {
+                    ItemId = id,
+                    Id = monograph.Id,
+                    Deleted = true,
+                    UserId = monograph.UserId
+                }
+            );
+
+            await MarkMonographForSyncAsync(userId, id, deviceId, jti);
+
             return Ok();
         }
+
+        private static async Task MarkMonographForSyncAsync(string userId, string monographId, string? deviceId, string? jti)
+        {
+            if (deviceId == null) return;
+
+            new SyncDeviceService(new SyncDevice(userId, deviceId)).AddIdsToOtherDevices([$"{monographId}:monograph"]);
+            await SendTriggerSyncEventAsync(userId, jti);
+        }
+
+        private static async Task MarkMonographForSyncAsync(string userId, string monographId)
+        {
+            new SyncDeviceService(new SyncDevice(userId, string.Empty)).AddIdsToAllDevices([$"{monographId}:monograph"]);
+            await SendTriggerSyncEventAsync(userId, sendToAllDevices: true);
+        }
+
+        private static async Task SendTriggerSyncEventAsync(string userId, string? jti = null, bool sendToAllDevices = false)
+        {
+            await WampServers.MessengerServer.PublishMessageAsync(MessengerServerTopics.SendSSETopic, new SendSSEMessage
+            {
+                OriginTokenId = sendToAllDevices ? null : jti,
+                UserId = userId,
+                Message = new Message
+                {
+                    Type = "triggerSync",
+                    Data = JsonSerializer.Serialize(new { reason = "Monographs updated." })
+                }
+            });
+        }
+
+        private async Task<string> CleanupContentAsync(ClaimsPrincipal user, string content)
+        {
+            if (Constants.IS_SELF_HOSTED) return content;
+            try
+            {
+                var json = JsonSerializer.Deserialize<MonographContent>(content);
+                var html = json.Data;
+
+                if (user.IsUserSubscribed())
+                {
+                    var config = Configuration.Default.WithDefaultLoader();
+                    var context = BrowsingContext.New(config);
+                    var document = await context.OpenAsync(r => r.Content(html));
+                    foreach (var element in document.QuerySelectorAll("a"))
+                    {
+                        var href = element.GetAttribute("href");
+                        if (string.IsNullOrEmpty(href)) continue;
+                        if (!await analyzer.IsURLSafeAsync(href))
+                        {
+                            await Slogger<MonographsController>.Info("CleanupContentAsync", "Malicious URL detected: " + href);
+                            element.RemoveAttribute("href");
+                        }
+                    }
+                    html = document.ToHtml();
+                }
+                else
+                {
+                    var config = Configuration.Default.WithDefaultLoader();
+                    var context = BrowsingContext.New(config);
+                    var document = await context.OpenAsync(r => r.Content(html));
+                    foreach (var element in document.QuerySelectorAll("a,iframe,img,object,svg,button,link"))
+                    {
+                        foreach (var attr in element.Attributes)
+                            element.RemoveAttribute(attr.Name);
+                    }
+                    html = document.ToHtml();
+                }
+
+                return JsonSerializer.Serialize<MonographContent>(new MonographContent
+                {
+                    Type = json.Type,
+                    Data = html
+                });
+            }
+            catch (Exception ex)
+            {
+                await Slogger<MonographsController>.Error("CleanupContentAsync", ex.ToString());
+                return content;
+            }
+        }
     }
 }

Notesnook.API/Controllers/S3Controller.cs

@@ -24,34 +24,84 @@ using System.Threading.Tasks;
 using System.Security.Claims;
 using Notesnook.API.Interfaces;
 using System;
+using System.Net.Http;
+using Streetwriters.Common.Extensions;
+using Streetwriters.Common.Models;
+using Notesnook.API.Helpers;
+using Streetwriters.Common;
+using Streetwriters.Common.Interfaces;
+using Notesnook.API.Models;
 
 namespace Notesnook.API.Controllers
 {
     [ApiController]
     [Route("s3")]
     [ResponseCache(NoStore = true, Location = ResponseCacheLocation.None)]
+    [Authorize("Sync")]
     public class S3Controller : ControllerBase
     {
+        private ISyncItemsRepositoryAccessor Repositories { get; }
         private IS3Service S3Service { get; set; }
-        public S3Controller(IS3Service s3Service)
+        public S3Controller(IS3Service s3Service, ISyncItemsRepositoryAccessor syncItemsRepositoryAccessor)
         {
             S3Service = s3Service;
+            Repositories = syncItemsRepositoryAccessor;
         }
 
         [HttpPut]
-        [Authorize("Pro")]
-        public IActionResult Upload([FromQuery] string name)
+        public async Task<IActionResult> Upload([FromQuery] string name)
         {
             var userId = this.User.FindFirstValue("sub");
-            var url = S3Service.GetUploadObjectUrl(userId, name);
-            if (url == null) return BadRequest("Could not create signed url.");
-            return Ok(url);
+
+            if (!HttpContext.Request.Headers.ContentLength.HasValue) return BadRequest(new { error = "No Content-Length header found." });
+
+            long fileSize = HttpContext.Request.Headers.ContentLength.Value;
+            if (fileSize == 0)
+            {
+                var uploadUrl = S3Service.GetUploadObjectUrl(userId, name);
+                if (uploadUrl == null) return BadRequest(new { error = "Could not create signed url." });
+                return Ok(uploadUrl);
+            }
+
+            var userSettings = await Repositories.UsersSettings.FindOneAsync((u) => u.UserId == userId);
+            if (!Constants.IS_SELF_HOSTED)
+            {
+                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 url = S3Service.GetInternalUploadObjectUrl(userId, name);
+            if (url == null) return BadRequest(new { error = "Could not create signed url." });
+
+            var httpClient = new HttpClient();
+            var content = new StreamContent(HttpContext.Request.BodyReader.AsStream());
+            content.Headers.ContentLength = Request.ContentLength;
+            var response = await httpClient.SendRequestAsync<Response>(url, null, HttpMethod.Put, content);
+            if (!response.Success) return BadRequest(await response.Content.ReadAsStringAsync());
+
+            if (!Constants.IS_SELF_HOSTED)
+            {
+                userSettings.StorageLimit.UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+                await Repositories.UsersSettings.UpsertAsync(userSettings, (u) => u.UserId == userId);
+            }
+
+            return Ok(response);
         }
 
 
         [HttpGet("multipart")]
-        [Authorize("Pro")]
-        public async Task<IActionResult> MultipartUpload([FromQuery] string name, [FromQuery] int parts, [FromQuery] string uploadId)
+        public async Task<IActionResult> MultipartUpload([FromQuery] string name, [FromQuery] int parts, [FromQuery] string? uploadId)
         {
             var userId = this.User.FindFirstValue("sub");
             try
@@ -63,7 +113,6 @@ namespace Notesnook.API.Controllers
         }
 
         [HttpDelete("multipart")]
-        [Authorize("Pro")]
         public async Task<IActionResult> AbortMultipartUpload([FromQuery] string name, [FromQuery] string uploadId)
         {
             var userId = this.User.FindFirstValue("sub");
@@ -76,30 +125,31 @@ namespace Notesnook.API.Controllers
         }
 
         [HttpPost("multipart")]
-        [Authorize("Pro")]
-        public async Task<IActionResult> CompleteMultipartUpload([FromBody] CompleteMultipartUploadRequest uploadRequest)
+        public async Task<IActionResult> CompleteMultipartUpload([FromBody] CompleteMultipartUploadRequestWrapper uploadRequestWrapper)
         {
             var userId = this.User.FindFirstValue("sub");
             try
             {
-                await S3Service.CompleteMultipartUploadAsync(userId, uploadRequest);
+                await S3Service.CompleteMultipartUploadAsync(userId, uploadRequestWrapper.ToRequest());
                 return Ok();
             }
             catch (Exception ex) { return BadRequest(ex.Message); }
         }
 
         [HttpGet]
-        [Authorize("Sync")]
-        public IActionResult Download([FromQuery] string name)
+        public async Task<IActionResult> Download([FromQuery] string name)
         {
-            var userId = this.User.FindFirstValue("sub");
-            var url = S3Service.GetDownloadObjectUrl(userId, name);
-            if (url == null) return BadRequest("Could not create signed url.");
-            return Ok(url);
+            try
+            {
+                var userId = this.User.FindFirstValue("sub");
+                var url = await S3Service.GetDownloadObjectUrl(userId, name);
+                if (url == null) return BadRequest("Could not create signed url.");
+                return Ok(url);
+            }
+            catch (Exception ex) { return BadRequest(ex.Message); }
         }
 
         [HttpHead]
-        [Authorize("Sync")]
         public async Task<IActionResult> Info([FromQuery] string name)
         {
             var userId = this.User.FindFirstValue("sub");
@@ -109,7 +159,6 @@ namespace Notesnook.API.Controllers
         }
 
         [HttpDelete]
-        [Authorize("Sync")]
         public async Task<IActionResult> DeleteAsync([FromQuery] string name)
         {
             try

Notesnook.API/Controllers/SyncDeviceController.cs

@@ -43,8 +43,8 @@ namespace Notesnook.API.Controllers
         {
             try
             {
-                var userId = this.User.FindFirstValue("sub");
-                new SyncDeviceService(new SyncDevice(ref userId, ref deviceId)).RegisterDevice();
+                var userId = this.User.FindFirstValue("sub") ?? throw new Exception("User not found.");
+                new SyncDeviceService(new SyncDevice(userId, deviceId)).RegisterDevice();
                 return Ok();
             }
             catch (Exception ex)
@@ -60,8 +60,8 @@ namespace Notesnook.API.Controllers
         {
             try
             {
-                var userId = this.User.FindFirstValue("sub");
-                new SyncDeviceService(new SyncDevice(ref userId, ref deviceId)).UnregisterDevice();
+                var userId = this.User.FindFirstValue("sub") ?? throw new Exception("User not found.");
+                new SyncDeviceService(new SyncDevice(userId, deviceId)).UnregisterDevice();
                 return Ok();
             }
             catch (Exception ex)

Notesnook.API/Controllers/UsersController.cs

@@ -1,116 +1,115 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-using System.Security.Claims;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http.Timeouts;
-using Microsoft.AspNetCore.Mvc;
-using Notesnook.API.Interfaces;
-using Notesnook.API.Models;
-using Notesnook.API.Models.Responses;
-using Streetwriters.Common;
-
-namespace Notesnook.API.Controllers
-{
-    [ApiController]
-    [Authorize]
-    [Route("users")]
-    public class UsersController(IUserService UserService) : ControllerBase
-    {
-        [HttpPost]
-        [AllowAnonymous]
-        public async Task<IActionResult> Signup()
-        {
-            try
-            {
-                await UserService.CreateUserAsync();
-                return Ok();
-            }
-            catch (Exception ex)
-            {
-                await Slogger<UsersController>.Error(nameof(Signup), "Couldn't sign up.", ex.ToString());
-                return BadRequest(new { error = ex.Message });
-            }
-        }
-
-        [HttpGet]
-        public async Task<IActionResult> GetUser()
-        {
-            var userId = User.FindFirstValue("sub");
-            try
-            {
-                UserResponse response = await UserService.GetUserAsync(userId);
-                if (!response.Success) return BadRequest(response);
-                return Ok(response);
-            }
-            catch (Exception ex)
-            {
-                await Slogger<UsersController>.Error(nameof(GetUser), "Couldn't get user for id.", userId, ex.ToString());
-                return BadRequest(new { error = ex.Message });
-            }
-        }
-
-        [HttpPatch]
-        public async Task<IActionResult> UpdateUser([FromBody] UserResponse user)
-        {
-            var userId = User.FindFirstValue("sub");
-            try
-            {
-                if (user.AttachmentsKey != null)
-                    await UserService.SetUserAttachmentsKeyAsync(userId, user.AttachmentsKey);
-                return Ok();
-            }
-            catch (Exception ex)
-            {
-                await Slogger<UsersController>.Error(nameof(GetUser), "Couldn't update user with id.", userId, ex.ToString());
-                return BadRequest(new { error = ex.Message });
-            }
-        }
-
-        [HttpPost("reset")]
-        public async Task<IActionResult> Reset([FromForm] bool removeAttachments)
-        {
-            var userId = this.User.FindFirstValue("sub");
-
-            if (await UserService.ResetUserAsync(userId, removeAttachments))
-                return Ok();
-            return BadRequest();
-        }
-
-        [HttpPost("delete")]
-        [RequestTimeout(5 * 60 * 1000)]
-        public async Task<IActionResult> Delete([FromForm] DeleteAccountForm form)
-        {
-            var userId = this.User.FindFirstValue("sub");
-            var jti = User.FindFirstValue("jti");
-            try
-            {
-                await UserService.DeleteUserAsync(userId, jti, form.Password);
-                return Ok();
-            }
-            catch (Exception ex)
-            {
-                await Slogger<UsersController>.Error(nameof(GetUser), "Couldn't delete user with id.", userId, ex.ToString());
-                return BadRequest(new { error = ex.Message });
-            }
-        }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http.Timeouts;
+using Microsoft.AspNetCore.Mvc;
+using Notesnook.API.Interfaces;
+using Notesnook.API.Models;
+using Notesnook.API.Models.Responses;
+using Streetwriters.Common;
+
+namespace Notesnook.API.Controllers
+{
+    [ApiController]
+    [Authorize]
+    [Route("users")]
+    public class UsersController(IUserService UserService) : ControllerBase
+    {
+        [HttpPost]
+        [AllowAnonymous]
+        public async Task<IActionResult> Signup()
+        {
+            try
+            {
+                await UserService.CreateUserAsync();
+                return Ok();
+            }
+            catch (Exception ex)
+            {
+                await Slogger<UsersController>.Error(nameof(Signup), "Couldn't sign up.", ex.ToString());
+                return BadRequest(new { error = ex.Message });
+            }
+        }
+
+        [HttpGet]
+        public async Task<IActionResult> GetUser()
+        {
+            var userId = User.FindFirstValue("sub");
+            try
+            {
+                UserResponse response = await UserService.GetUserAsync(userId);
+                if (!response.Success) return BadRequest();
+                return Ok(response);
+            }
+            catch (Exception ex)
+            {
+                await Slogger<UsersController>.Error(nameof(GetUser), "Couldn't get user for id.", userId, ex.ToString());
+                return BadRequest(new { error = ex.Message });
+            }
+        }
+
+        [HttpPatch]
+        public async Task<IActionResult> UpdateUser([FromBody] UserKeys keys)
+        {
+            var userId = User.FindFirstValue("sub");
+            try
+            {
+                await UserService.SetUserKeysAsync(userId, keys);
+                return Ok();
+            }
+            catch (Exception ex)
+            {
+                await Slogger<UsersController>.Error(nameof(GetUser), "Couldn't update user with id.", userId, ex.ToString());
+                return BadRequest(new { error = ex.Message });
+            }
+        }
+
+        [HttpPost("reset")]
+        public async Task<IActionResult> Reset([FromForm] bool removeAttachments)
+        {
+            var userId = this.User.FindFirstValue("sub");
+
+            if (await UserService.ResetUserAsync(userId, removeAttachments))
+                return Ok();
+            return BadRequest();
+        }
+
+        [HttpPost("delete")]
+        [RequestTimeout(5 * 60 * 1000)]
+        public async Task<IActionResult> Delete([FromForm] DeleteAccountForm form)
+        {
+            var userId = this.User.FindFirstValue("sub");
+            var jti = User.FindFirstValue("jti");
+            try
+            {
+                await UserService.DeleteUserAsync(userId, jti, form.Password);
+                return Ok();
+            }
+            catch (Exception ex)
+            {
+                await Slogger<UsersController>.Error(nameof(GetUser), "Couldn't delete user with id.", userId, ex.ToString());
+                return BadRequest(new { error = ex.Message });
+            }
+        }
+    }
+}

Notesnook.API/Dockerfile

@@ -1,50 +1,50 @@
-FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine AS base
-WORKDIR /app
-
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
-ARG TARGETARCH
-ARG BUILDPLATFORM
-ENV DOTNET_TC_QuickJitForLoops="1" DOTNET_ReadyToRun="0" DOTNET_TieredPGO="1" DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="true"
-
-WORKDIR /src
-
-COPY Streetwriters.Data/*.csproj ./Streetwriters.Data/
-COPY Streetwriters.Common/*.csproj ./Streetwriters.Common/
-COPY Notesnook.API/*.csproj ./Notesnook.API/
-
-# restore dependencies
-RUN dotnet restore -v d /src/Notesnook.API/Notesnook.API.csproj --use-current-runtime
-
-COPY Streetwriters.Data/ ./Streetwriters.Data/
-COPY Streetwriters.Common/ ./Streetwriters.Common/
-COPY Notesnook.API/ ./Notesnook.API/
-
-WORKDIR /src/Notesnook.API/
-
-RUN dotnet build -c Release -o /app/build -a $TARGETARCH
-
-FROM build AS publish
-RUN dotnet publish -c Release -o /app/publish \
-  #--runtime alpine-x64 \
-  --self-contained true \
-  /p:TrimMode=partial \
-  /p:PublishTrimmed=true \
-  /p:PublishSingleFile=true \
-  /p:JsonSerializerIsReflectionEnabledByDefault=true \
-  -a $TARGETARCH
-
-FROM --platform=$BUILDPLATFORM base AS final
-ARG TARGETARCH
-ARG BUILDPLATFORM
-
-# create a new user and change directory ownership
-RUN adduser --disabled-password \
-  --home /app \
-  --gecos '' dotnetuser && chown -R dotnetuser /app
-
-# impersonate into the new user
-USER dotnetuser
-WORKDIR /app
-
-COPY --from=publish /app/publish .
+FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine AS base
+WORKDIR /app
+
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
+ARG TARGETARCH
+ARG BUILDPLATFORM
+ENV DOTNET_TC_QuickJitForLoops="1" DOTNET_ReadyToRun="0" DOTNET_TieredPGO="1" DOTNET_SYSTEM_GLOBALIZATION_INVARIANT="true"
+
+WORKDIR /src
+
+COPY Streetwriters.Data/*.csproj ./Streetwriters.Data/
+COPY Streetwriters.Common/*.csproj ./Streetwriters.Common/
+COPY Notesnook.API/*.csproj ./Notesnook.API/
+
+# restore dependencies
+RUN dotnet restore -v d /src/Notesnook.API/Notesnook.API.csproj --use-current-runtime
+
+COPY Streetwriters.Data/ ./Streetwriters.Data/
+COPY Streetwriters.Common/ ./Streetwriters.Common/
+COPY Notesnook.API/ ./Notesnook.API/
+
+WORKDIR /src/Notesnook.API/
+
+RUN dotnet build -c Release -o /app/build -a $TARGETARCH
+
+FROM build AS publish
+RUN dotnet publish -c Release -o /app/publish \
+  #--runtime alpine-x64 \
+  --self-contained true \
+  /p:TrimMode=partial \
+  /p:PublishTrimmed=true \
+  /p:PublishSingleFile=true \
+  /p:JsonSerializerIsReflectionEnabledByDefault=true \
+  -a $TARGETARCH
+
+FROM --platform=$BUILDPLATFORM base AS final
+ARG TARGETARCH
+ARG BUILDPLATFORM
+
+# create a new user and change directory ownership
+RUN adduser --disabled-password \
+  --home /app \
+  --gecos '' dotnetuser && chown -R dotnetuser /app
+
+# impersonate into the new user
+USER dotnetuser
+WORKDIR /app
+
+COPY --from=publish /app/publish .
 ENTRYPOINT ["./Notesnook.API"]

Notesnook.API/Extensions/AuthorizationResultTransformer.cs

@@ -1,71 +1,62 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Linq;
-using System.Net;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization.Policy;
-using Microsoft.AspNetCore.Http;
-
-namespace Notesnook.API.Extensions
-{
-    public class AuthorizationResultTransformer : IAuthorizationMiddlewareResultHandler
-    {
-        private readonly IAuthorizationMiddlewareResultHandler _handler;
-
-        public AuthorizationResultTransformer()
-        {
-            _handler = new AuthorizationMiddlewareResultHandler();
-        }
-
-        public async Task HandleAsync(
-            RequestDelegate requestDelegate,
-            HttpContext httpContext,
-            AuthorizationPolicy authorizationPolicy,
-            PolicyAuthorizationResult policyAuthorizationResult)
-        {
-            var isWebsocket = httpContext.Request.Headers.Upgrade == "websocket";
-
-            if (!isWebsocket && policyAuthorizationResult.Forbidden && policyAuthorizationResult.AuthorizationFailure != null)
-            {
-                var error = string.Join("\n", policyAuthorizationResult.AuthorizationFailure.FailureReasons.Select((r) => r.Message));
-
-                if (!string.IsNullOrEmpty(error))
-                {
-                    httpContext.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
-                    httpContext.Response.ContentType = "application/json";
-                    await httpContext.Response.WriteAsync(JsonSerializer.Serialize(new { error }));
-                    return;
-                }
-
-                await _handler.HandleAsync(requestDelegate, httpContext, authorizationPolicy, policyAuthorizationResult);
-            }
-            else if (isWebsocket)
-            {
-                await _handler.HandleAsync(requestDelegate, httpContext, authorizationPolicy, PolicyAuthorizationResult.Success());
-            }
-            else
-            {
-                await _handler.HandleAsync(requestDelegate, httpContext, authorizationPolicy, policyAuthorizationResult);
-            }
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Linq;
+using System.Net;
+using System.Net.WebSockets;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization.Policy;
+using Microsoft.AspNetCore.Http;
+
+namespace Notesnook.API.Extensions
+{
+    public class AuthorizationResultTransformer : IAuthorizationMiddlewareResultHandler
+    {
+        private readonly IAuthorizationMiddlewareResultHandler _handler;
+
+        public AuthorizationResultTransformer()
+        {
+            _handler = new AuthorizationMiddlewareResultHandler();
+        }
+
+        public async Task HandleAsync(
+            RequestDelegate requestDelegate,
+            HttpContext httpContext,
+            AuthorizationPolicy authorizationPolicy,
+            PolicyAuthorizationResult policyAuthorizationResult)
+        {
+            if (policyAuthorizationResult.Forbidden && policyAuthorizationResult.AuthorizationFailure != null)
+            {
+                var error = string.Join("\n", policyAuthorizationResult.AuthorizationFailure.FailureReasons.Select((r) => r.Message));
+                if (!string.IsNullOrEmpty(error))
+                {
+                    httpContext.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
+                    httpContext.Response.ContentType = "application/json";
+                    await httpContext.Response.WriteAsync(JsonSerializer.Serialize(new { error }));
+                    return;
+                }
+            }
+            await _handler.HandleAsync(requestDelegate, httpContext, authorizationPolicy, policyAuthorizationResult);
+        }
+    }
 }

Notesnook.API/Extensions/ClaimsPrincipalExtensions.cs

@@ -0,0 +1,14 @@
+using System.Threading;
+using System;
+using System.Threading.Tasks;
+using System.Linq;
+
+namespace System.Security.Claims
+{
+    public static class ClaimsPrincipalExtensions
+    {
+        private readonly static string[] SUBSCRIBED_CLAIMS = ["believer", "education", "essential", "pro", "legacy_pro"];
+        public static bool IsUserSubscribed(this ClaimsPrincipal user)
+         => user.Claims.Any((c) => c.Type == "notesnook:status" && SUBSCRIBED_CLAIMS.Contains(c.Value));
+    }
+}

Notesnook.API/Extensions/TransactionHelper.cs

@@ -1,44 +1,44 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Threading;
-using System;
-using System.Threading.Tasks;
-
-namespace MongoDB.Driver
-{
-    public static class TransactionHelper
-    {
-        public static async Task StartTransaction(this IMongoClient client, Action<CancellationToken> operate, CancellationToken ct)
-        {
-            using (var session = await client.StartSessionAsync())
-            {
-                var transactionOptions = new TransactionOptions(readPreference: ReadPreference.Nearest, readConcern: ReadConcern.Local, writeConcern: WriteConcern.WMajority);
-                await session.WithTransactionAsync((handle, token) =>
-                {
-                    return Task.Run(() =>
-                    {
-                        operate(token);
-                        return true;
-                    });
-                }, transactionOptions, ct);
-            }
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Threading;
+using System;
+using System.Threading.Tasks;
+
+namespace MongoDB.Driver
+{
+    public static class TransactionHelper
+    {
+        public static async Task StartTransaction(this IMongoClient client, Action<CancellationToken> operate, CancellationToken ct)
+        {
+            using (var session = await client.StartSessionAsync())
+            {
+                var transactionOptions = new TransactionOptions(readPreference: ReadPreference.Nearest, readConcern: ReadConcern.Local, writeConcern: WriteConcern.WMajority);
+                await session.WithTransactionAsync((handle, token) =>
+                {
+                    return Task.Run(() =>
+                    {
+                        operate(token);
+                        return true;
+                    });
+                }, transactionOptions, ct);
+            }
+        }
+    }
 }

Notesnook.API/Helpers/StorageHelper.cs

@@ -0,0 +1,68 @@
+using System;
+using System.Collections.Generic;
+using Notesnook.API.Models;
+using Streetwriters.Common.Enums;
+using Streetwriters.Common.Models;
+
+namespace Notesnook.API.Helpers
+{
+    class StorageHelper
+    {
+        const long MB = 1024 * 1024;
+        const long GB = 1024 * MB;
+        public readonly static Dictionary<SubscriptionPlan, long> MAX_STORAGE_PER_MONTH = new()
+            {
+                { SubscriptionPlan.FREE, 50L * MB },
+                { SubscriptionPlan.ESSENTIAL, GB },
+                { SubscriptionPlan.PRO, 10L * GB },
+                { SubscriptionPlan.EDUCATION, 10L * GB },
+                { SubscriptionPlan.BELIEVER, 25L * GB },
+                { SubscriptionPlan.LEGACY_PRO, -1 }
+            };
+        public readonly static Dictionary<SubscriptionPlan, long> MAX_FILE_SIZE = new()
+            {
+                { SubscriptionPlan.FREE, 10 * MB },
+                { SubscriptionPlan.ESSENTIAL, 100 * MB },
+                { SubscriptionPlan.PRO, 1L * GB },
+                { SubscriptionPlan.EDUCATION, 1L * GB },
+                { SubscriptionPlan.BELIEVER, 5L * GB },
+                { SubscriptionPlan.LEGACY_PRO, 512 * MB }
+            };
+
+        public static long GetStorageLimitForPlan(Subscription subscription)
+        {
+            return MAX_STORAGE_PER_MONTH[subscription.Plan];
+        }
+
+        public static long GetFileSizeLimitForPlan(Subscription subscription)
+        {
+            return MAX_FILE_SIZE[subscription.Plan];
+        }
+
+        public static bool IsStorageLimitReached(Subscription subscription, Limit limit)
+        {
+            var storageLimit = GetStorageLimitForPlan(subscription);
+            if (storageLimit == -1) return false;
+            return limit.Value > storageLimit;
+        }
+
+        public static bool IsFileSizeExceeded(Subscription subscription, long fileSize)
+        {
+            var maxFileSize = MAX_FILE_SIZE[subscription.Plan];
+            return fileSize > maxFileSize;
+        }
+
+        private static readonly string[] sizes = ["B", "KB", "MB", "GB", "TB"];
+        public static string FormatBytes(long size)
+        {
+            int order = 0;
+            while (size >= 1024 && order < sizes.Length - 1)
+            {
+                order++;
+                size = size / 1024;
+            }
+
+            return String.Format("{0:0.##} {1}", size, sizes[order]);
+        }
+    }
+}

Notesnook.API/Hubs/SyncV2Hub.cs

@@ -18,18 +18,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 using System;
+using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.Metrics;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Security.Claims;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.SignalR;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization;
 using MongoDB.Driver;
 using Notesnook.API.Authorization;
 using Notesnook.API.Interfaces;
@@ -43,15 +42,17 @@ namespace Notesnook.API.Hubs
     {
         Task<bool> SendItems(SyncTransferItemV2 transferItem);
         Task<bool> SendVaultKey(EncryptedData vaultKey);
+        Task<bool> SendMonographs(IEnumerable<MonographMetadata> monographs);
+        Task<bool> SendInboxItems(IEnumerable<InboxSyncItem> inboxItems);
         Task PushCompleted();
     }
 
-    [Authorize("Sync")]
+    [Authorize]
     public class SyncV2Hub : Hub<ISyncV2HubClient>
     {
         private ISyncItemsRepositoryAccessor Repositories { get; }
         private readonly IUnitOfWork unit;
-        private readonly string[] CollectionKeys = [
+        private static readonly string[] CollectionKeys = [
             "settingitem",
             "attachment",
             "note",
@@ -64,11 +65,40 @@ namespace Notesnook.API.Hubs
             "vault",
             "relation", // relations must sync at the end to prevent invalid state
         ];
+        private readonly FrozenDictionary<string, Action<IEnumerable<SyncItem>, string, long>> UpsertActionsMap;
+        private readonly Func<string, string[], bool, int, Task<IAsyncCursor<SyncItem>>>[] Collections;
 
         public SyncV2Hub(ISyncItemsRepositoryAccessor syncItemsRepositoryAccessor, IUnitOfWork unitOfWork)
         {
             Repositories = syncItemsRepositoryAccessor;
             unit = unitOfWork;
+
+            Collections = [
+                Repositories.Settings.FindItemsById,
+                Repositories.Attachments.FindItemsById,
+                Repositories.Notes.FindItemsById,
+                Repositories.Notebooks.FindItemsById,
+                Repositories.Contents.FindItemsById,
+                Repositories.Shortcuts.FindItemsById,
+                Repositories.Reminders.FindItemsById,
+                Repositories.Colors.FindItemsById,
+                Repositories.Tags.FindItemsById,
+                Repositories.Vaults.FindItemsById,
+                Repositories.Relations.FindItemsById,
+            ];
+            UpsertActionsMap = new Dictionary<string, Action<IEnumerable<SyncItem>, string, long>> {
+                { "settingitem", Repositories.Settings.UpsertMany },
+                { "attachment", Repositories.Attachments.UpsertMany },
+                { "note", Repositories.Notes.UpsertMany },
+                { "notebook", Repositories.Notebooks.UpsertMany },
+                { "content", Repositories.Contents.UpsertMany },
+                { "shortcut", Repositories.Shortcuts.UpsertMany },
+                { "reminder", Repositories.Reminders.UpsertMany },
+                { "relation", Repositories.Relations.UpsertMany },
+                { "color", Repositories.Colors.UpsertMany },
+                { "vault", Repositories.Vaults.UpsertMany },
+                { "tag", Repositories.Tags.UpsertMany },
+            }.ToFrozenDictionary();
         }
 
         public override async Task OnConnectedAsync()
@@ -76,97 +106,57 @@ namespace Notesnook.API.Hubs
             var result = new SyncRequirement().IsAuthorized(Context.User, new PathString("/hubs/sync/v2"));
             if (!result.Succeeded)
             {
-                var reason = result.AuthorizationFailure.FailureReasons.FirstOrDefault();
+                var reason = result.AuthorizationFailure?.FailureReasons.FirstOrDefault();
                 throw new HubException(reason?.Message ?? "Unauthorized");
             }
-            var id = Context.User.FindFirstValue("sub");
+            var id = Context.User?.FindFirstValue("sub") ?? throw new HubException("User not found.");
             await Groups.AddToGroupAsync(Context.ConnectionId, id);
             await base.OnConnectedAsync();
         }
 
-        private Action<IEnumerable<SyncItem>, string, long> MapTypeToUpsertAction(string type)
-        {
-            return type switch
-            {
-                "settingitem" => Repositories.Settings.UpsertMany,
-                "attachment" => Repositories.Attachments.UpsertMany,
-                "note" => Repositories.Notes.UpsertMany,
-                "notebook" => Repositories.Notebooks.UpsertMany,
-                "content" => Repositories.Contents.UpsertMany,
-                "shortcut" => Repositories.Shortcuts.UpsertMany,
-                "reminder" => Repositories.Reminders.UpsertMany,
-                "relation" => Repositories.Relations.UpsertMany,
-                "color" => Repositories.Colors.UpsertMany,
-                "vault" => Repositories.Vaults.UpsertMany,
-                "tag" => Repositories.Tags.UpsertMany,
-                _ => null,
-            };
-        }
-
-        private Func<string, IEnumerable<string>, bool, int, Task<IAsyncCursor<SyncItem>>> MapTypeToFindItemsAction(string type)
-        {
-            return type switch
-            {
-                "settingitem" => Repositories.Settings.FindItemsById,
-                "attachment" => Repositories.Attachments.FindItemsById,
-                "note" => Repositories.Notes.FindItemsById,
-                "notebook" => Repositories.Notebooks.FindItemsById,
-                "content" => Repositories.Contents.FindItemsById,
-                "shortcut" => Repositories.Shortcuts.FindItemsById,
-                "reminder" => Repositories.Reminders.FindItemsById,
-                "relation" => Repositories.Relations.FindItemsById,
-                "color" => Repositories.Colors.FindItemsById,
-                "vault" => Repositories.Vaults.FindItemsById,
-                "tag" => Repositories.Tags.FindItemsById,
-                _ => null,
-            };
-        }
 
         public async Task<int> PushItems(string deviceId, SyncTransferItemV2 pushItem)
         {
-            var userId = Context.User.FindFirstValue("sub");
-            if (string.IsNullOrEmpty(userId)) throw new HubException("Please login to sync.");
+            var userId = Context.User?.FindFirstValue("sub") ?? throw new HubException("Please login to sync.");
 
             SyncEventCounterSource.Log.PushV2();
 
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
+            var stopwatch = Stopwatch.StartNew();
             try
             {
 
-                var UpsertItems = MapTypeToUpsertAction(pushItem.Type) ?? throw new Exception($"Invalid item type: {pushItem.Type}.");
+                var UpsertItems = UpsertActionsMap[pushItem.Type] ?? throw new Exception($"Invalid item type: {pushItem.Type}.");
                 UpsertItems(pushItem.Items, userId, 1);
 
                 if (!await unit.Commit()) return 0;
 
-                await new SyncDeviceService(new SyncDevice(ref userId, ref deviceId)).AddIdsToOtherDevicesAsync(pushItem.Items.Select((i) => $"{i.ItemId}:{pushItem.Type}").ToList());
+                new SyncDeviceService(new SyncDevice(userId, deviceId)).AddIdsToOtherDevices(pushItem.Items.Select((i) => $"{i.ItemId}:{pushItem.Type}").ToList());
                 return 1;
             }
             finally
             {
-                stopwatch.Stop();
                 SyncEventCounterSource.Log.RecordPushDuration(stopwatch.ElapsedMilliseconds);
             }
         }
 
         public async Task<bool> PushCompleted()
         {
-            var userId = Context.User.FindFirstValue("sub");
+            var userId = Context.User?.FindFirstValue("sub") ?? throw new HubException("User not found.");
             await Clients.OthersInGroup(userId).PushCompleted();
             return true;
         }
 
-        private static async IAsyncEnumerable<SyncTransferItemV2> PrepareChunks(Func<string, string[], bool, int, Task<IAsyncCursor<SyncItem>>>[] collections, string[] types, string userId, string[] ids, int size, bool resetSync, long maxBytes)
+        private async IAsyncEnumerable<SyncTransferItemV2> PrepareChunks(string userId, string[] ids, int size, bool resetSync, long maxBytes)
         {
-            var chunksProcessed = 0;
-            for (int i = 0; i < collections.Length; i++)
+            var itemsProcessed = 0;
+            for (int i = 0; i < Collections.Length; i++)
             {
-                var type = types[i];
+                var type = CollectionKeys[i];
 
                 var filteredIds = ids.Where((id) => id.EndsWith($":{type}")).Select((id) => id.Split(":")[0]).ToArray();
                 if (!resetSync && filteredIds.Length == 0) continue;
 
-                using var cursor = await collections[i](userId, filteredIds, resetSync, size);
+                using var cursor = await Collections[i](userId, filteredIds, resetSync, size);
 
                 var chunk = new List<SyncItem>();
                 long totalBytes = 0;
@@ -180,11 +170,12 @@ namespace Notesnook.API.Hubs
                         totalBytes += item.Length + METADATA_BYTES;
                         if (totalBytes >= maxBytes)
                         {
+                            itemsProcessed += chunk.Count;
                             yield return new SyncTransferItemV2
                             {
                                 Items = chunk,
                                 Type = type,
-                                Count = chunksProcessed
+                                Count = itemsProcessed
                             };
 
                             totalBytes = 0;
@@ -194,11 +185,12 @@ namespace Notesnook.API.Hubs
                 }
                 if (chunk.Count > 0)
                 {
+                    itemsProcessed += chunk.Count;
                     yield return new SyncTransferItemV2
                     {
                         Items = chunk,
                         Type = type,
-                        Count = chunksProcessed
+                        Count = itemsProcessed
                     };
                 }
             }
@@ -206,41 +198,43 @@ namespace Notesnook.API.Hubs
 
         public async Task<SyncV2Metadata> RequestFetch(string deviceId)
         {
-            var userId = Context.User.FindFirstValue("sub");
-            if (string.IsNullOrEmpty(userId)) throw new HubException("Please login to sync.");
+            return await HandleRequestFetch(deviceId, false, false);
+        }
+
+        public async Task<SyncV2Metadata> RequestFetchV2(string deviceId)
+        {
+            return await HandleRequestFetch(deviceId, true, false);
+        }
+
+        public async Task<SyncV2Metadata> RequestFetchV3(string deviceId)
+        {
+            return await HandleRequestFetch(deviceId, true, true);
+        }
+
+        private async Task<SyncV2Metadata> HandleRequestFetch(string deviceId, bool includeMonographs, bool includeInboxItems)
+        {
+            var userId = Context.User?.FindFirstValue("sub") ?? throw new HubException("Please login to sync.");
 
             SyncEventCounterSource.Log.FetchV2();
 
-            var deviceService = new SyncDeviceService(new SyncDevice(ref userId, ref deviceId));
+            var device = new SyncDevice(userId, deviceId);
+            var deviceService = new SyncDeviceService(device);
             if (!deviceService.IsDeviceRegistered()) deviceService.RegisterDevice();
 
+            device.LastAccessTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+
             var isResetSync = deviceService.IsSyncReset();
             if (!deviceService.IsUnsynced() &&
                 !deviceService.IsSyncPending() &&
                 !isResetSync)
                 return new SyncV2Metadata { Synced = true };
 
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
+            var stopwatch = Stopwatch.StartNew();
             try
             {
-                string[] ids = await deviceService.FetchUnsyncedIdsAsync();
+                string[] ids = deviceService.FetchUnsyncedIds();
 
                 var chunks = PrepareChunks(
-                    collections: [
-                        Repositories.Settings.FindItemsById,
-                    Repositories.Attachments.FindItemsById,
-                    Repositories.Notes.FindItemsById,
-                    Repositories.Notebooks.FindItemsById,
-                    Repositories.Contents.FindItemsById,
-                    Repositories.Shortcuts.FindItemsById,
-                    Repositories.Reminders.FindItemsById,
-                    Repositories.Colors.FindItemsById,
-                    Repositories.Tags.FindItemsById,
-                    Repositories.Vaults.FindItemsById,
-                    Repositories.Relations.FindItemsById,
-                    ],
-                    types: CollectionKeys,
                     userId,
                     ids,
                     size: 1000,
@@ -254,6 +248,7 @@ namespace Notesnook.API.Hubs
                     if (!await Clients.Caller.SendVaultKey(userSettings.VaultKey).WaitAsync(TimeSpan.FromMinutes(10))) throw new HubException("Client rejected vault key.");
                 }
 
+
                 await foreach (var chunk in chunks)
                 {
                     if (!await Clients.Caller.SendItems(chunk).WaitAsync(TimeSpan.FromMinutes(10))) throw new HubException("Client rejected sent items.");
@@ -262,7 +257,50 @@ namespace Notesnook.API.Hubs
                     {
                         var syncedIds = chunk.Items.Select((i) => $"{i.ItemId}:{chunk.Type}").ToHashSet();
                         ids = ids.Where((id) => !syncedIds.Contains(id)).ToArray();
-                        await deviceService.WritePendingIdsAsync(ids);
+                        deviceService.WritePendingIds(ids);
+                    }
+                }
+
+                if (includeMonographs)
+                {
+                    var isSyncingMonographsForFirstTime = !device.HasInitialMonographsSync;
+                    var unsyncedMonographs = ids.Where((id) => id.EndsWith(":monograph")).ToHashSet();
+                    var unsyncedMonographIds = unsyncedMonographs.Select((id) => id.Split(":")[0]).ToArray();
+                    FilterDefinition<Monograph> filter = isResetSync || isSyncingMonographsForFirstTime
+                        ? Builders<Monograph>.Filter.Eq("UserId", userId)
+                        : Builders<Monograph>.Filter.And(
+                            Builders<Monograph>.Filter.Eq("UserId", userId),
+                            Builders<Monograph>.Filter.Or(
+                                Builders<Monograph>.Filter.In("ItemId", unsyncedMonographIds),
+                                Builders<Monograph>.Filter.In("_id", unsyncedMonographIds)
+                            )
+                        );
+                    var userMonographs = await Repositories.Monographs.Collection.Find(filter).Project((m) => new MonographMetadata
+                    {
+                        DatePublished = m.DatePublished,
+                        Deleted = m.Deleted,
+                        Password = m.Password,
+                        SelfDestruct = m.SelfDestruct,
+                        Title = m.Title,
+                        ItemId = m.ItemId ?? m.Id.ToString(),
+                    }).ToListAsync();
+
+                    if (userMonographs.Count > 0 && !await Clients.Caller.SendMonographs(userMonographs).WaitAsync(TimeSpan.FromMinutes(10)))
+                        throw new HubException("Client rejected monographs.");
+
+                    device.HasInitialMonographsSync = true;
+                }
+
+                if (includeInboxItems)
+                {
+                    var unsyncedInboxItems = ids.Where((id) => id.EndsWith(":inboxItems")).ToHashSet();
+                    var unsyncedInboxItemIds = unsyncedInboxItems.Select((id) => id.Split(":")[0]).ToArray();
+                    var userInboxItems = isResetSync
+                        ? await Repositories.InboxItems.FindAsync(m => m.UserId == userId)
+                        : await Repositories.InboxItems.FindAsync(m => m.UserId == userId && unsyncedInboxItemIds.Contains(m.ItemId));
+                    if (userInboxItems.Any() && !await Clients.Caller.SendInboxItems(userInboxItems).WaitAsync(TimeSpan.FromMinutes(10)))
+                    {
+                        throw new HubException("Client rejected inbox items.");
                     }
                 }
 
@@ -275,7 +313,6 @@ namespace Notesnook.API.Hubs
             }
             finally
             {
-                stopwatch.Stop();
                 SyncEventCounterSource.Log.RecordFetchDuration(stopwatch.ElapsedMilliseconds);
             }
         }
@@ -288,24 +325,4 @@ namespace Notesnook.API.Hubs
         [JsonPropertyName("synced")]
         public bool Synced { get; set; }
     }
-
-    [MessagePack.MessagePackObject]
-    public struct SyncV2TransferItem
-    {
-        [MessagePack.Key("items")]
-        [JsonPropertyName("items")]
-        public IEnumerable<SyncItem> Items { get; set; }
-
-        [MessagePack.Key("type")]
-        [JsonPropertyName("type")]
-        public string Type { get; set; }
-
-        [MessagePack.Key("final")]
-        [JsonPropertyName("final")]
-        public bool Final { get; set; }
-
-        [MessagePack.Key("vaultKey")]
-        [JsonPropertyName("vaultKey")]
-        public EncryptedData VaultKey { get; set; }
-    }
 }

Notesnook.API/Interfaces/IEncrypted.cs

@@ -1,29 +1,29 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace Notesnook.API.Interfaces
-{
-    public interface IEncrypted
-    {
-        string Cipher { get; set; }
-        string IV { get; set; }
-        long Length { get; set; }
-        string Salt { get; set; }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Notesnook.API.Interfaces
+{
+    public interface IEncrypted
+    {
+        string Cipher { get; set; }
+        string IV { get; set; }
+        long Length { get; set; }
+        string Salt { get; set; }
+    }
+}

Notesnook.API/Interfaces/IMonograph.cs

@@ -1,33 +1,33 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using Notesnook.API.Models;
-using Streetwriters.Common.Interfaces;
-
-namespace Notesnook.API.Interfaces
-{
-    public interface IMonograph : IDocument
-    {
-        string Title { get; set; }
-        string UserId { get; set; }
-        byte[] CompressedContent { get; set; }
-        EncryptedData EncryptedContent { get; set; }
-        long DatePublished { get; set; }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Notesnook.API.Models;
+using Streetwriters.Common.Interfaces;
+
+namespace Notesnook.API.Interfaces
+{
+    public interface IMonograph : IDocument
+    {
+        string Title { get; set; }
+        string UserId { get; set; }
+        byte[] CompressedContent { get; set; }
+        EncryptedData EncryptedContent { get; set; }
+        long DatePublished { get; set; }
+    }
+}

Notesnook.API/Interfaces/IS3Service.cs

@@ -31,9 +31,10 @@ namespace Notesnook.API.Interfaces
         Task DeleteObjectAsync(string userId, string name);
         Task DeleteDirectoryAsync(string userId);
         Task<long> GetObjectSizeAsync(string userId, string name);
-        string GetUploadObjectUrl(string userId, string name);
-        string GetDownloadObjectUrl(string userId, string name);
-        Task<MultipartUploadMeta> StartMultipartUploadAsync(string userId, string name, int parts, string uploadId = null);
+        string? GetUploadObjectUrl(string userId, string name);
+        string? GetInternalUploadObjectUrl(string userId, string name);
+        Task<string?> GetDownloadObjectUrl(string userId, string name);
+        Task<MultipartUploadMeta> StartMultipartUploadAsync(string userId, string name, int parts, string? uploadId = null);
         Task AbortMultipartUploadAsync(string userId, string name, string uploadId);
         Task CompleteMultipartUploadAsync(string userId, CompleteMultipartUploadRequest uploadRequest);
     }

Notesnook.API/Interfaces/ISyncItemsRepositoryAccessor.cs

@@ -40,5 +40,7 @@ namespace Notesnook.API.Interfaces
         SyncItemsRepository Tags { get; }
         Repository<UserSettings> UsersSettings { get; }
         Repository<Monograph> Monographs { get; }
+        Repository<InboxApiKey> InboxApiKey { get; }
+        Repository<InboxSyncItem> InboxItems { get; }
     }
 }

Notesnook.API/Interfaces/IUserService.cs

@@ -1,36 +1,35 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Threading;
-using System.Threading.Tasks;
-using Notesnook.API.Models.Responses;
-using Streetwriters.Common.Interfaces;
-
-namespace Notesnook.API.Interfaces
-{
-    public interface IUserService
-    {
-        Task CreateUserAsync();
-        Task DeleteUserAsync(string userId);
-        Task DeleteUserAsync(string userId, string jti, string password);
-        Task<bool> ResetUserAsync(string userId, bool removeAttachments);
-        Task<UserResponse> GetUserAsync(string userId);
-        Task SetUserAttachmentsKeyAsync(string userId, IEncrypted key);
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Threading.Tasks;
+using Notesnook.API.Models;
+using Notesnook.API.Models.Responses;
+
+namespace Notesnook.API.Interfaces
+{
+    public interface IUserService
+    {
+        Task CreateUserAsync();
+        Task DeleteUserAsync(string userId);
+        Task DeleteUserAsync(string userId, string jti, string password);
+        Task<bool> ResetUserAsync(string userId, bool removeAttachments);
+        Task<UserResponse> GetUserAsync(string userId);
+        Task SetUserKeysAsync(string userId, UserKeys keys);
+    }
 }

Notesnook.API/Interfaces/IUserSettings.cs

@@ -1,42 +1,42 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using Notesnook.API.Models;
-using Streetwriters.Common.Interfaces;
-using Streetwriters.Common.Models;
-
-namespace Notesnook.API.Interfaces
-{
-    public interface IUserSettings : IDocument
-    {
-        string UserId { get; set; }
-
-        long LastSynced
-        {
-            get; set;
-        }
-
-        EncryptedData VaultKey
-        {
-            get; set;
-        }
-
-        string Salt { get; set; }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Notesnook.API.Models;
+using Streetwriters.Common.Interfaces;
+using Streetwriters.Common.Models;
+
+namespace Notesnook.API.Interfaces
+{
+    public interface IUserSettings : IDocument
+    {
+        string UserId { get; set; }
+
+        long LastSynced
+        {
+            get; set;
+        }
+
+        EncryptedData VaultKey
+        {
+            get; set;
+        }
+
+        string Salt { get; set; }
+    }
+}

Notesnook.API/Jobs/DeviceCleanupJob.cs

@@ -0,0 +1,64 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Quartz;
+
+namespace Notesnook.API.Jobs
+{
+    public class DeviceCleanupJob : IJob
+    {
+        public async Task Execute(IJobExecutionContext context)
+        {
+            ParallelOptions parallelOptions = new()
+            {
+                MaxDegreeOfParallelism = 100,
+                CancellationToken = context.CancellationToken,
+            };
+            Parallel.ForEach(Directory.EnumerateDirectories("sync"), parallelOptions, (userDir, ct) =>
+            {
+                foreach (var device in Directory.EnumerateDirectories(userDir))
+                {
+                    string lastAccessFile = Path.Combine(device, "LastAccessTime");
+
+                    try
+                    {
+                        if (!File.Exists(lastAccessFile))
+                        {
+                            Directory.Delete(device, true);
+                            continue;
+                        }
+
+                        string content = File.ReadAllText(lastAccessFile);
+                        if (!long.TryParse(content, out long lastAccessTime) || lastAccessTime <= 0)
+                        {
+                            Directory.Delete(device, true);
+                            continue;
+                        }
+
+                        DateTimeOffset accessTime;
+                        try
+                        {
+                            accessTime = DateTimeOffset.FromUnixTimeMilliseconds(lastAccessTime);
+                        }
+                        catch (Exception)
+                        {
+                            Directory.Delete(device, true);
+                            continue;
+                        }
+
+                        // If the device hasn't been accessed for more than one month, delete it.
+                        if (accessTime.AddMonths(1) < DateTimeOffset.UtcNow)
+                        {
+                            Directory.Delete(device, true);
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        // Log the error and continue processing other directories.
+                        Console.Error.WriteLine($"Error processing device '{device}': {ex.Message}");
+                    }
+                }
+            });
+        }
+    }
+}

Notesnook.API/Models/Algorithms.cs

@@ -1,26 +1,27 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace Notesnook.API.Models
-{
-    public class Algorithms
-    {
-        public static string Default => "xcha-argon2i13-7";
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Notesnook.API.Models
+{
+    public class Algorithms
+    {
+        public static string Default => "xcha-argon2i13-7";
+        public static string XSAL_X25519_7 => "xsal-x25519-7";
+    }
 }

Notesnook.API/Models/Announcement.cs

@@ -1,159 +1,159 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-using System.Runtime.Serialization;
-using System.Text.Json.Serialization;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-
-namespace Notesnook.API.Models
-{
-    public class Announcement
-    {
-        public Announcement()
-        {
-            this.Id = ObjectId.GenerateNewId().ToString();
-        }
-
-        [BsonId]
-        [BsonRepresentation(BsonType.ObjectId)]
-        [BsonElement("id")]
-        [JsonPropertyName("id")]
-        public string Id { get; set; }
-
-        [JsonPropertyName("type")]
-        [BsonElement("type")]
-        public string Type { get; set; }
-
-        [JsonPropertyName("timestamp")]
-        [BsonElement("timestamp")]
-        public long Timestamp { get; set; }
-
-        [JsonPropertyName("platforms")]
-        [BsonElement("platforms")]
-        public string[] Platforms { get; set; }
-
-        [JsonPropertyName("isActive")]
-        [BsonElement("isActive")]
-        public bool IsActive { get; set; }
-
-        [JsonPropertyName("userTypes")]
-        [BsonElement("userTypes")]
-        public string[] UserTypes { get; set; }
-
-        [JsonPropertyName("appVersion")]
-        [BsonElement("appVersion")]
-        public int AppVersion { get; set; }
-
-        [JsonPropertyName("body")]
-        [BsonElement("body")]
-        public BodyComponent[] Body { get; set; }
-
-        [JsonIgnore]
-        [BsonElement("userIds")]
-        public string[] UserIds { get; set; }
-
-
-        [Obsolete]
-        [JsonPropertyName("title")]
-        [DataMember(Name = "title")]
-        [BsonElement("title")]
-        public string Title { get; set; }
-
-        [Obsolete]
-        [JsonPropertyName("description")]
-        [BsonElement("description")]
-        public string Description { get; set; }
-
-        [Obsolete]
-        [JsonPropertyName("callToActions")]
-        [BsonElement("callToActions")]
-        public CallToAction[] CallToActions { get; set; }
-    }
-
-    public class BodyComponent
-    {
-        [JsonPropertyName("type")]
-        [BsonElement("type")]
-        public string Type { get; set; }
-
-        [JsonPropertyName("platforms")]
-        [BsonElement("platforms")]
-        public string[] Platforms { get; set; }
-
-        [JsonPropertyName("style")]
-        [BsonElement("style")]
-        public Style Style { get; set; }
-
-        [JsonPropertyName("src")]
-        [BsonElement("src")]
-        public string Src { get; set; }
-
-        [JsonPropertyName("text")]
-        [BsonElement("text")]
-        public string Text { get; set; }
-
-        [JsonPropertyName("value")]
-        [BsonElement("value")]
-        public string Value { get; set; }
-
-        [JsonPropertyName("items")]
-        [BsonElement("items")]
-        public BodyComponent[] Items { get; set; }
-
-        [JsonPropertyName("actions")]
-        [BsonElement("actions")]
-        public CallToAction[] Actions { get; set; }
-    }
-
-    public class Style
-    {
-        [JsonPropertyName("marginTop")]
-        [BsonElement("marginTop")]
-        public int MarginTop { get; set; }
-
-        [JsonPropertyName("marginBottom")]
-        [BsonElement("marginBottom")]
-        public int MarginBottom { get; set; }
-
-        [JsonPropertyName("textAlign")]
-        [BsonElement("textAlign")]
-        public string TextAlign { get; set; }
-    }
-
-    public class CallToAction
-    {
-        [JsonPropertyName("type")]
-        [BsonElement("type")]
-        public string Type { get; set; }
-
-        [JsonPropertyName("platforms")]
-        [BsonElement("platforms")]
-        public string[] Platforms { get; set; }
-
-        [JsonPropertyName("data")]
-        [BsonElement("data")]
-        public string Data { get; set; }
-
-        [JsonPropertyName("title")]
-        [BsonElement("title")]
-        public string Title { get; set; }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+
+namespace Notesnook.API.Models
+{
+    public class Announcement
+    {
+        public Announcement()
+        {
+            this.Id = ObjectId.GenerateNewId().ToString();
+        }
+
+        [BsonId]
+        [BsonRepresentation(BsonType.ObjectId)]
+        [BsonElement("id")]
+        [JsonPropertyName("id")]
+        public string Id { get; set; }
+
+        [JsonPropertyName("type")]
+        [BsonElement("type")]
+        public string Type { get; set; }
+
+        [JsonPropertyName("timestamp")]
+        [BsonElement("timestamp")]
+        public long Timestamp { get; set; }
+
+        [JsonPropertyName("platforms")]
+        [BsonElement("platforms")]
+        public string[] Platforms { get; set; }
+
+        [JsonPropertyName("isActive")]
+        [BsonElement("isActive")]
+        public bool IsActive { get; set; }
+
+        [JsonPropertyName("userTypes")]
+        [BsonElement("userTypes")]
+        public string[] UserTypes { get; set; }
+
+        [JsonPropertyName("appVersion")]
+        [BsonElement("appVersion")]
+        public int AppVersion { get; set; }
+
+        [JsonPropertyName("body")]
+        [BsonElement("body")]
+        public BodyComponent[] Body { get; set; }
+
+        [JsonIgnore]
+        [BsonElement("userIds")]
+        public string[] UserIds { get; set; }
+
+
+        [Obsolete]
+        [JsonPropertyName("title")]
+        [DataMember(Name = "title")]
+        [BsonElement("title")]
+        public string Title { get; set; }
+
+        [Obsolete]
+        [JsonPropertyName("description")]
+        [BsonElement("description")]
+        public string Description { get; set; }
+
+        [Obsolete]
+        [JsonPropertyName("callToActions")]
+        [BsonElement("callToActions")]
+        public CallToAction[] CallToActions { get; set; }
+    }
+
+    public class BodyComponent
+    {
+        [JsonPropertyName("type")]
+        [BsonElement("type")]
+        public string Type { get; set; }
+
+        [JsonPropertyName("platforms")]
+        [BsonElement("platforms")]
+        public string[] Platforms { get; set; }
+
+        [JsonPropertyName("style")]
+        [BsonElement("style")]
+        public Style Style { get; set; }
+
+        [JsonPropertyName("src")]
+        [BsonElement("src")]
+        public string Src { get; set; }
+
+        [JsonPropertyName("text")]
+        [BsonElement("text")]
+        public string Text { get; set; }
+
+        [JsonPropertyName("value")]
+        [BsonElement("value")]
+        public string Value { get; set; }
+
+        [JsonPropertyName("items")]
+        [BsonElement("items")]
+        public BodyComponent[] Items { get; set; }
+
+        [JsonPropertyName("actions")]
+        [BsonElement("actions")]
+        public CallToAction[] Actions { get; set; }
+    }
+
+    public class Style
+    {
+        [JsonPropertyName("marginTop")]
+        [BsonElement("marginTop")]
+        public int MarginTop { get; set; }
+
+        [JsonPropertyName("marginBottom")]
+        [BsonElement("marginBottom")]
+        public int MarginBottom { get; set; }
+
+        [JsonPropertyName("textAlign")]
+        [BsonElement("textAlign")]
+        public string TextAlign { get; set; }
+    }
+
+    public class CallToAction
+    {
+        [JsonPropertyName("type")]
+        [BsonElement("type")]
+        public string Type { get; set; }
+
+        [JsonPropertyName("platforms")]
+        [BsonElement("platforms")]
+        public string[] Platforms { get; set; }
+
+        [JsonPropertyName("data")]
+        [BsonElement("data")]
+        public string Data { get; set; }
+
+        [JsonPropertyName("title")]
+        [BsonElement("title")]
+        public string Title { get; set; }
+    }
 }

Notesnook.API/Models/CompleteMultipartUploadRequestWrapper.cs

@@ -0,0 +1,30 @@
+using System.Collections.Generic;
+using Amazon.S3.Model;
+
+namespace Notesnook.API.Models;
+
+public class CompleteMultipartUploadRequestWrapper
+{
+    public string Key { get; set; }
+    public List<PartETagWrapper> PartETags { get; set; }
+    public string UploadId { get; set; }
+
+    public CompleteMultipartUploadRequest ToRequest()
+    {
+        CompleteMultipartUploadRequest completeMultipartUploadRequest = new CompleteMultipartUploadRequest();
+        completeMultipartUploadRequest.Key = Key;
+        completeMultipartUploadRequest.UploadId = UploadId;
+        completeMultipartUploadRequest.PartETags = [];
+        foreach (var partETagWrapper in PartETags)
+        {
+            var partETag = new PartETag
+            {
+                PartNumber = partETagWrapper.PartNumber,
+                ETag = partETagWrapper.ETag
+            };
+            completeMultipartUploadRequest.PartETags.Add(partETag);
+        }
+
+        return completeMultipartUploadRequest;
+    }
+}

Notesnook.API/Models/EncryptedData.cs

@@ -1,75 +1,75 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-using Notesnook.API.Interfaces;
-using System.Runtime.Serialization;
-using System.Text.Json.Serialization;
-
-namespace Notesnook.API.Models
-{
-    [MessagePack.MessagePackObject]
-    public class EncryptedData : IEncrypted
-    {
-        [MessagePack.Key("iv")]
-        [JsonPropertyName("iv")]
-        [BsonElement("iv")]
-        [DataMember(Name = "iv")]
-        public string IV
-        {
-            get; set;
-        }
-
-        [MessagePack.Key("cipher")]
-        [JsonPropertyName("cipher")]
-        [BsonElement("cipher")]
-        [DataMember(Name = "cipher")]
-        public string Cipher
-        {
-            get; set;
-        }
-
-        [MessagePack.Key("length")]
-        [JsonPropertyName("length")]
-        [BsonElement("length")]
-        [DataMember(Name = "length")]
-        public long Length { get; set; }
-
-        [MessagePack.Key("salt")]
-        [JsonPropertyName("salt")]
-        [BsonElement("salt")]
-        [DataMember(Name = "salt")]
-        public string Salt { get; set; }
-
-        public override bool Equals(object obj)
-        {
-            if (obj is EncryptedData encryptedData)
-            {
-                return IV == encryptedData.IV && Salt == encryptedData.Salt && Cipher == encryptedData.Cipher && Length == encryptedData.Length;
-            }
-            return base.Equals(obj);
-        }
-
-        public bool IsEmpty()
-        {
-            return this.Cipher == null && this.IV == null && this.Length == 0 && this.Salt == null;
-        }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using Notesnook.API.Interfaces;
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+
+namespace Notesnook.API.Models
+{
+    [MessagePack.MessagePackObject]
+    public class EncryptedData : IEncrypted
+    {
+        [MessagePack.Key("iv")]
+        [JsonPropertyName("iv")]
+        [BsonElement("iv")]
+        [DataMember(Name = "iv")]
+        public string IV
+        {
+            get; set;
+        }
+
+        [MessagePack.Key("cipher")]
+        [JsonPropertyName("cipher")]
+        [BsonElement("cipher")]
+        [DataMember(Name = "cipher")]
+        public string Cipher
+        {
+            get; set;
+        }
+
+        [MessagePack.Key("length")]
+        [JsonPropertyName("length")]
+        [BsonElement("length")]
+        [DataMember(Name = "length")]
+        public long Length { get; set; }
+
+        [MessagePack.Key("salt")]
+        [JsonPropertyName("salt")]
+        [BsonElement("salt")]
+        [DataMember(Name = "salt")]
+        public string Salt { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is EncryptedData encryptedData)
+            {
+                return IV == encryptedData.IV && Salt == encryptedData.Salt && Cipher == encryptedData.Cipher && Length == encryptedData.Length;
+            }
+            return base.Equals(obj);
+        }
+
+        public bool IsEmpty()
+        {
+            return this.Cipher == null && this.IV == null && this.Length == 0 && this.Salt == null;
+        }
+    }
+}

Notesnook.API/Models/InboxApiKey.cs

@@ -0,0 +1,60 @@
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Text.Json.Serialization;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using NanoidDotNet;
+
+namespace Notesnook.API.Models
+{
+    public class InboxApiKey
+    {
+        public InboxApiKey()
+        {
+            var random = Nanoid.Generate(size: 64);
+            Key = "nn__" + random;
+        }
+
+        [BsonId]
+        [BsonIgnoreIfDefault]
+        [BsonRepresentation(BsonType.ObjectId)]
+        [JsonIgnore]
+        [MessagePack.IgnoreMember]
+        public string Id { get; set; }
+
+        [JsonPropertyName("userId")]
+        public string UserId { get; set; }
+
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        [JsonPropertyName("key")]
+        public string Key { get; set; }
+
+        [JsonPropertyName("dateCreated")]
+        public long DateCreated { get; set; }
+
+        [JsonPropertyName("expiryDate")]
+        public long ExpiryDate { get; set; }
+
+        [JsonPropertyName("lastUsedAt")]
+        public long LastUsedAt { get; set; }
+    }
+}

Notesnook.API/Models/InboxSyncItem.cs

@@ -0,0 +1,70 @@
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.ComponentModel.DataAnnotations;
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+
+namespace Notesnook.API.Models
+{
+
+    [MessagePack.MessagePackObject]
+    public class InboxSyncItem : SyncItem
+    {
+        [DataMember(Name = "key")]
+        [JsonPropertyName("key")]
+        [MessagePack.Key("key")]
+        [Required]
+        public EncryptedKey Key
+        {
+            get; set;
+        }
+    }
+
+    [MessagePack.MessagePackObject]
+    public class EncryptedKey
+    {
+        [DataMember(Name = "alg")]
+        [JsonPropertyName("alg")]
+        [MessagePack.Key("alg")]
+        [Required]
+        public string Algorithm
+        {
+            get; set;
+        }
+
+        [DataMember(Name = "cipher")]
+        [JsonPropertyName("cipher")]
+        [MessagePack.Key("cipher")]
+        [Required]
+        public string Cipher
+        {
+            get; set;
+        }
+
+        [JsonPropertyName("length")]
+        [DataMember(Name = "length")]
+        [MessagePack.Key("length")]
+        [Required]
+        public long Length
+        {
+            get; set;
+        }
+    }
+}

Notesnook.API/Models/Monograph.cs

@@ -1,67 +1,96 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Text.Json.Serialization;
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-using Notesnook.API.Interfaces;
-
-namespace Notesnook.API.Models
-{
-    public class ObjectWithId
-    {
-        [BsonId]
-        [BsonRepresentation(BsonType.ObjectId)]
-        public string Id { get; set; }
-    }
-
-    public class Monograph : IMonograph
-    {
-        public Monograph()
-        {
-            Id = ObjectId.GenerateNewId().ToString();
-        }
-
-        [BsonId]
-        [BsonRepresentation(BsonType.ObjectId)]
-        public string Id { get; set; }
-
-        [JsonPropertyName("title")]
-        public string Title { get; set; }
-
-        [JsonPropertyName("userId")]
-        public string UserId { get; set; }
-
-        [JsonPropertyName("selfDestruct")]
-        public bool SelfDestruct { get; set; }
-
-        [JsonPropertyName("encryptedContent")]
-        public EncryptedData EncryptedContent { get; set; }
-
-        [JsonPropertyName("datePublished")]
-        public long DatePublished { get; set; }
-
-        [JsonPropertyName("content")]
-        [BsonIgnore]
-        public string Content { get; set; }
-
-        [JsonIgnore]
-        public byte[] CompressedContent { get; set; }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Text.Json.Serialization;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using System.Runtime.Serialization;
+
+namespace Notesnook.API.Models
+{
+    public class ObjectWithId
+    {
+        [BsonId]
+        [BsonIgnoreIfDefault]
+        [BsonRepresentation(BsonType.ObjectId)]
+        public string Id
+        {
+            get; set;
+        }
+
+        public string ItemId
+        {
+            get; set;
+        }
+    }
+
+    public class Monograph
+    {
+        public Monograph()
+        {
+            Id = ObjectId.GenerateNewId().ToString();
+        }
+
+        [DataMember(Name = "id")]
+        [JsonPropertyName("id")]
+        [MessagePack.Key("id")]
+        public string ItemId
+        {
+            get; set;
+        }
+
+        [BsonId]
+        [BsonIgnoreIfDefault]
+        [BsonRepresentation(BsonType.ObjectId)]
+        [JsonIgnore]
+        [MessagePack.IgnoreMember]
+        public string Id
+        {
+            get; set;
+        }
+
+        [JsonPropertyName("title")]
+        public string Title { get; set; }
+
+        [JsonPropertyName("userId")]
+        public string? UserId { get; set; }
+
+        [JsonPropertyName("selfDestruct")]
+        public bool SelfDestruct { get; set; }
+
+        [JsonPropertyName("encryptedContent")]
+        public EncryptedData? EncryptedContent { get; set; }
+
+        [JsonPropertyName("datePublished")]
+        public long DatePublished { get; set; }
+
+        [JsonPropertyName("content")]
+        [BsonIgnore]
+        public string? Content { get; set; }
+
+        [JsonIgnore]
+        public byte[]? CompressedContent { get; set; }
+
+        [JsonPropertyName("password")]
+        public EncryptedData? Password { get; set; }
+
+        [JsonPropertyName("deleted")]
+        public bool Deleted { get; set; }
+    }
 }

Notesnook.API/Models/MonographContent.cs

@@ -1,41 +1,35 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.ComponentModel.DataAnnotations;
-using System.Runtime.Serialization;
-using Streetwriters.Common.Attributes;
-using Streetwriters.Common.Converters;
-using Streetwriters.Common.Enums;
-using Streetwriters.Common.Models;
-
-namespace Streetwriters.Common.Interfaces
-{
-    [JsonInterfaceConverter(typeof(InterfaceConverter<ISubscription, Subscription>))]
-    public interface ISubscription : IDocument
-    {
-        string UserId { get; set; }
-        ApplicationType AppId { get; set; }
-        SubscriptionProvider Provider { get; set; }
-        long StartDate { get; set; }
-        long ExpiryDate { get; set; }
-        SubscriptionType Type { get; set; }
-        string OrderId { get; set; }
-        string SubscriptionId { get; set; }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Text.Json.Serialization;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using System.Runtime.Serialization;
+
+namespace Notesnook.API.Models
+{
+
+    public class MonographContent
+    {
+        [JsonPropertyName("data")]
+        public string Data { get; set; }
+        [JsonPropertyName("type")]
+        public string Type { get; set; }
+    }
+}

Notesnook.API/Models/MonographMetadata.cs

@@ -0,0 +1,52 @@
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Text.Json.Serialization;
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using System.Runtime.Serialization;
+
+namespace Notesnook.API.Models
+{
+    public class MonographMetadata
+    {
+        [DataMember(Name = "id")]
+        [JsonPropertyName("id")]
+        [MessagePack.Key("id")]
+        public required string ItemId
+        {
+            get; set;
+        }
+
+        [JsonPropertyName("title")]
+        public required string Title { get; set; }
+
+        [JsonPropertyName("selfDestruct")]
+        public bool SelfDestruct { get; set; }
+
+        [JsonPropertyName("datePublished")]
+        public long DatePublished { get; set; }
+
+        [JsonPropertyName("password")]
+        public EncryptedData? Password { get; set; }
+
+        [JsonPropertyName("deleted")]
+        public bool Deleted { get; set; }
+    }
+}

Notesnook.API/Models/MultipartUploadMeta.cs

@@ -1,27 +1,27 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace Notesnook.API.Models
-{
-    public class MultipartUploadMeta
-    {
-        public string UploadId { get; set; }
-        public string[] Parts { get; set; }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Notesnook.API.Models
+{
+    public class MultipartUploadMeta
+    {
+        public string UploadId { get; set; }
+        public string[] Parts { get; set; }
+    }
 }

Notesnook.API/Models/PartETagWrapper.cs

@@ -0,0 +1,7 @@
+namespace Notesnook.API.Models;
+
+public class PartETagWrapper
+{
+    public int PartNumber { get; set; }
+    public string ETag { get; set; }
+}

Notesnook.API/Models/Responses/SignupResponse.cs

@@ -1,14 +1,14 @@
-using System.Text.Json.Serialization;
-using Streetwriters.Common.Models;
-
-namespace Notesnook.API.Models.Responses
-{
-    public class SignupResponse : Response
-    {
-        [JsonPropertyName("userId")]
-        public string UserId { get; set; }
-
-        [JsonPropertyName("errors")]
-        public string[] Errors { get; set; }
-    }
-}
+using System.Text.Json.Serialization;
+using Streetwriters.Common.Models;
+
+namespace Notesnook.API.Models.Responses
+{
+    public class SignupResponse : Response
+    {
+        [JsonPropertyName("userId")]
+        public string UserId { get; set; }
+
+        [JsonPropertyName("errors")]
+        public string[] Errors { get; set; }
+    }
+}

Notesnook.API/Models/Responses/UserResponse.cs

@@ -1,25 +1,37 @@
-using System.Text.Json.Serialization;
-using Streetwriters.Common.Interfaces;
-using Streetwriters.Common.Models;
-
-namespace Notesnook.API.Models.Responses
-{
-    public class UserResponse : UserModel, IResponse
-    {
-        [JsonPropertyName("salt")]
-        public string Salt { get; set; }
-
-        [JsonPropertyName("attachmentsKey")]
-        public EncryptedData AttachmentsKey { get; set; }
-
-        [JsonPropertyName("subscription")]
-        public ISubscription Subscription { get; set; }
-
-        [JsonPropertyName("profile")]
-        public EncryptedData Profile { get; set; }
-
-        [JsonIgnore]
-        public bool Success { get; set; }
-        public int StatusCode { get; set; }
-    }
-}
+using System.Net.Http;
+using System.Text.Json.Serialization;
+using Streetwriters.Common.Interfaces;
+using Streetwriters.Common.Models;
+
+namespace Notesnook.API.Models.Responses
+{
+    public class UserResponse : UserModel, IResponse
+    {
+        [JsonPropertyName("salt")]
+        public string? Salt { get; set; }
+
+        [JsonPropertyName("attachmentsKey")]
+        public EncryptedData? AttachmentsKey { get; set; }
+
+        [JsonPropertyName("monographPasswordsKey")]
+        public EncryptedData? MonographPasswordsKey { get; set; }
+
+        [JsonPropertyName("inboxKeys")]
+        public InboxKeys? InboxKeys { get; set; }
+
+        [JsonPropertyName("subscription")]
+        public Subscription? Subscription { get; set; }
+
+        [JsonPropertyName("storageUsed")]
+        public long StorageUsed { get; set; }
+
+        [JsonPropertyName("totalStorage")]
+        public long TotalStorage { get; set; }
+
+        [JsonIgnore]
+        public bool Success { get; set; }
+        public int StatusCode { get; set; }
+        [JsonIgnore]
+        public HttpContent? Content { get; set; }
+    }
+}

Notesnook.API/Models/S3Options.cs

@@ -1,29 +1,29 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace Notesnook.API.Models
-{
-    public class S3Options
-    {
-        public string ServiceUrl { get; set; }
-        public string Region { get; set; }
-        public string AccessKeyId { get; set; }
-        public string SecretAccessKey { get; set; }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Notesnook.API.Models
+{
+    public class S3Options
+    {
+        public string ServiceUrl { get; set; }
+        public string Region { get; set; }
+        public string AccessKeyId { get; set; }
+        public string SecretAccessKey { get; set; }
+    }
 }

Notesnook.API/Models/SyncItem.cs

@@ -44,7 +44,7 @@ namespace Notesnook.API.Models
         [DataMember(Name = "userId")]
         [JsonPropertyName("userId")]
         [MessagePack.Key("userId")]
-        public string UserId
+        public string? UserId
         {
             get; set;
         }
@@ -71,7 +71,7 @@ namespace Notesnook.API.Models
         [DataMember(Name = "id")]
         [JsonPropertyName("id")]
         [MessagePack.Key("id")]
-        public string ItemId
+        public string? ItemId
         {
             get; set;
         }
@@ -111,7 +111,7 @@ namespace Notesnook.API.Models
         public string Algorithm
         {
             get; set;
-        } = Algorithms.Default;
+        }
     }
 
     public class SyncItemBsonSerializer : SerializerBase<SyncItem>

Notesnook.API/Models/UserKeys.cs

@@ -0,0 +1,34 @@
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Notesnook.API.Models
+{
+    public class UserKeys
+    {
+        public EncryptedData? AttachmentsKey { get; set; }
+        public EncryptedData? MonographPasswordsKey { get; set; }
+        public InboxKeys? InboxKeys { get; set; }
+    }
+
+    public class InboxKeys
+    {
+        public string? Public { get; set; }
+        public EncryptedData? Private { get; set; }
+    }
+}

Notesnook.API/Models/UserSettings.cs

@@ -1,42 +1,51 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using MongoDB.Bson;
-using MongoDB.Bson.Serialization.Attributes;
-using Notesnook.API.Interfaces;
-
-namespace Notesnook.API.Models
-{
-    public class UserSettings : IUserSettings
-    {
-        public UserSettings()
-        {
-            this.Id = ObjectId.GenerateNewId().ToString();
-        }
-        public string UserId { get; set; }
-        public long LastSynced { get; set; }
-        public string Salt { get; set; }
-        public EncryptedData VaultKey { get; set; }
-        public EncryptedData AttachmentsKey { get; set; }
-
-        [BsonId]
-        [BsonRepresentation(BsonType.ObjectId)]
-        public string Id { get; set; }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using MongoDB.Bson;
+using MongoDB.Bson.Serialization.Attributes;
+using Notesnook.API.Interfaces;
+
+namespace Notesnook.API.Models
+{
+    public class Limit
+    {
+        public long Value { get; set; }
+        public long UpdatedAt { get; set; }
+    }
+
+    public class UserSettings : IUserSettings
+    {
+        public UserSettings()
+        {
+            this.Id = ObjectId.GenerateNewId().ToString();
+        }
+        public string UserId { get; set; }
+        public long LastSynced { get; set; }
+        public string Salt { get; set; }
+        public EncryptedData? VaultKey { get; set; }
+        public EncryptedData? AttachmentsKey { get; set; }
+        public EncryptedData? MonographPasswordsKey { get; set; }
+        public InboxKeys? InboxKeys { get; set; }
+        public Limit StorageLimit { get; set; }
+
+        [BsonId]
+        [BsonRepresentation(BsonType.ObjectId)]
+        public string Id { get; set; }
+    }
+}

Notesnook.API/Notesnook.API.csproj

@@ -3,9 +3,11 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <StartupObject>Notesnook.API.Program</StartupObject>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AngleSharp" Version="1.3.0" />
     <PackageReference Include="AWSSDK.Core" Version="3.7.304.31" />
     <PackageReference Include="DotNetEnv" Version="2.3.0" />
     <PackageReference Include="IdentityModel.AspNetCore.OAuth2Introspection" Version="6.2.0" />
@@ -15,8 +17,11 @@
     <PackageReference Include="AWSSDK.S3" Version="3.7.310.8" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
+    <PackageReference Include="Nanoid" Version="3.1.0" />
     <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-alpha.2" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
+    <PackageReference Include="Quartz" Version="3.5.0" />
+    <PackageReference Include="Quartz.AspNetCore" Version="3.5.0" />
   </ItemGroup>
 
   <ItemGroup>

Notesnook.API/Program.cs

@@ -1,68 +1,64 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#if !DEBUG
-using System.Net;
-#endif
-using System;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
-using Streetwriters.Common;
-using System.Linq;
-using Microsoft.Extensions.Logging;
-using System.Net;
-
-namespace Notesnook.API
-{
-    public class Program
-    {
-        public static async Task Main(string[] args)
-        {
-#if DEBUG
-            DotNetEnv.Env.TraversePath().Load(".env.local");
-#else
-            DotNetEnv.Env.TraversePath().Load(".env");
-#endif
-            IHost host = CreateHostBuilder(args).Build();
-            await host.RunAsync();
-        }
-
-        public static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
-                {
-                    webBuilder
-                    .UseStartup<Startup>()
-                    .UseKestrel((options) =>
-                    {
-                        options.Limits.MaxRequestBodySize = long.MaxValue;
-                        options.ListenAnyIP(Servers.NotesnookAPI.Port);
-                        if (Servers.NotesnookAPI.IsSecure)
-                        {
-                            options.ListenAnyIP(443, listenerOptions =>
-                            {
-                                listenerOptions.UseHttps(Servers.NotesnookAPI.SSLCertificate);
-                            });
-                        }
-                        options.Listen(IPAddress.Parse("127.0.0.1"), 5067);
-                    });
-                });
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using Streetwriters.Common;
+using System.Net;
+
+namespace Notesnook.API
+{
+    public class Program
+    {
+        public static async Task Main(string[] args)
+        {
+#if (DEBUG || STAGING)
+            DotNetEnv.Env.TraversePath().Load(".env.local");
+#else
+            DotNetEnv.Env.TraversePath().Load(".env");
+#endif
+            IHost host = CreateHostBuilder(args).Build();
+            await host.RunAsync();
+        }
+
+        public static IHostBuilder CreateHostBuilder(string[] args) =>
+            Host.CreateDefaultBuilder(args)
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder
+                    .UseStartup<Startup>()
+                    .UseKestrel((options) =>
+                    {
+                        options.Limits.MaxRequestBodySize = long.MaxValue;
+                        options.ListenAnyIP(Servers.NotesnookAPI.Port);
+                        if (Servers.NotesnookAPI.IsSecure)
+                        {
+                            options.ListenAnyIP(443, listenerOptions =>
+                            {
+                                listenerOptions.UseHttps(Servers.NotesnookAPI.SSLCertificate);
+                            });
+                        }
+                        options.Listen(IPAddress.Parse("127.0.0.1"), 5067);
+                    });
+                });
+    }
+}

Notesnook.API/Repositories/SyncItemsRepository.cs

@@ -44,16 +44,9 @@ namespace Notesnook.API.Repositories
         public SyncItemsRepository(IDbContext dbContext, IMongoCollection<SyncItem> collection) : base(dbContext, collection)
         {
             this.collectionName = collection.CollectionNamespace.CollectionName;
-#if DEBUG
-            Collection.Indexes.CreateMany([
-                new CreateIndexModel<SyncItem>(Builders<SyncItem>.IndexKeys.Ascending("UserId").Descending("DateSynced")),
-                new CreateIndexModel<SyncItem>(Builders<SyncItem>.IndexKeys.Ascending("UserId").Ascending("ItemId")),
-                new CreateIndexModel<SyncItem>(Builders<SyncItem>.IndexKeys.Ascending("UserId"))
-            ]);
-#endif
         }
 
-        private readonly List<string> ALGORITHMS = [Algorithms.Default];
+        private readonly List<string> ALGORITHMS = [Algorithms.Default, Algorithms.XSAL_X25519_7];
         private bool IsValidAlgorithm(string algorithm)
         {
             return ALGORITHMS.Contains(algorithm);
@@ -121,6 +114,9 @@ namespace Notesnook.API.Repositories
                 throw new Exception($"Corrupted item \"{item.ItemId}\" in collection \"{this.collectionName}\". Please report this error to support@streetwriters.co.");
             }
 
+            if (item.ItemId == null)
+                throw new Exception($"Item does not have an ItemId.");
+
             item.DateSynced = dateSynced;
             item.UserId = userId;
 
@@ -155,6 +151,9 @@ namespace Notesnook.API.Repositories
                     throw new Exception($"Corrupted item \"{item.ItemId}\" in collection \"{this.collectionName}\". Please report this error to support@streetwriters.co.");
                 }
 
+                if (item.ItemId == null)
+                    throw new Exception($"Item does not have an ItemId.");
+
                 var filter = Builders<SyncItem>.Filter.And(
                     userIdFilter,
                     Builders<SyncItem>.Filter.Eq("ItemId", item.ItemId)

Notesnook.API/Services/S3Service.cs

@@ -28,9 +28,13 @@ using Amazon.Runtime;
 using Amazon.S3;
 using Amazon.S3.Model;
 using Microsoft.Extensions.Options;
+using Notesnook.API.Helpers;
 using Notesnook.API.Interfaces;
 using Notesnook.API.Models;
 using Streetwriters.Common;
+using Streetwriters.Common.Enums;
+using Streetwriters.Common.Interfaces;
+using Streetwriters.Common.Models;
 
 namespace Notesnook.API.Services
 {
@@ -45,6 +49,7 @@ namespace Notesnook.API.Services
         private readonly string BUCKET_NAME = Constants.S3_BUCKET_NAME ?? "";
         private readonly string INTERNAL_BUCKET_NAME = Constants.S3_INTERNAL_BUCKET_NAME ?? "";
         private AmazonS3Client S3Client { get; }
+        private ISyncItemsRepositoryAccessor Repositories { get; }
 
         // When running in a dockerized environment the sync server doesn't have access
         // to the host's S3 Service URL. It can only talk to S3 server via its own internal
@@ -57,11 +62,12 @@ namespace Notesnook.API.Services
         private AmazonS3Client S3InternalClient { get; }
         private HttpClient httpClient = new HttpClient();
 
-        public S3Service()
+        public S3Service(ISyncItemsRepositoryAccessor syncItemsRepositoryAccessor)
         {
+            Repositories = syncItemsRepositoryAccessor;
             var config = new AmazonS3Config
             {
-#if DEBUG
+#if (DEBUG || STAGING)
                 ServiceURL = Servers.S3Server.ToString(),
 #else
                 ServiceURL = Constants.S3_SERVICE_URL,
@@ -71,7 +77,7 @@ namespace Notesnook.API.Services
                 SignatureMethod = SigningAlgorithm.HmacSHA256,
                 SignatureVersion = "4"
             };
-#if DEBUG
+#if (DEBUG || STAGING)
             S3Client = new AmazonS3Client("S3RVER", "S3RVER", config);
 #else
             S3Client = new AmazonS3Client(Constants.S3_ACCESS_KEY_ID, Constants.S3_ACCESS_KEY, config);
@@ -145,31 +151,38 @@ namespace Notesnook.API.Services
 
             var request = new HttpRequestMessage(HttpMethod.Head, url);
             var response = await httpClient.SendAsync(request);
-            const long MAX_SIZE = 513 * 1024 * 1024; // 512 MB
-            if (!Constants.IS_SELF_HOSTED && response.Content.Headers.ContentLength >= MAX_SIZE)
-            {
-                await this.DeleteObjectAsync(userId, name);
-                throw new Exception("File size exceeds the maximum allowed size.");
-            }
             return response.Content.Headers.ContentLength ?? 0;
         }
 
 
-        public string GetUploadObjectUrl(string userId, string name)
+        public string? GetUploadObjectUrl(string userId, string name)
         {
-            var url = this.GetPresignedURL(userId, name, HttpVerb.PUT);
-            if (url == null) return null;
-            return url;
+            return this.GetPresignedURL(userId, name, HttpVerb.PUT);
         }
 
-        public string GetDownloadObjectUrl(string userId, string name)
+        public string? GetInternalUploadObjectUrl(string userId, string name)
         {
+            return this.GetPresignedURL(userId, name, HttpVerb.PUT, S3ClientMode.INTERNAL);
+        }
+
+        public async Task<string?> GetDownloadObjectUrl(string userId, string name)
+        {
+            // var subscriptionService = await WampServers.SubscriptionServer.GetServiceAsync<IUserSubscriptionService>(SubscriptionServerTopics.UserSubscriptionServiceTopic);
+            // var subscription = await subscriptionService.GetUserSubscriptionAsync(Clients.Notesnook.Id, userId);
+
+            // var size = await GetObjectSizeAsync(userId, name);
+            // if (StorageHelper.IsFileSizeExceeded(subscription, size))
+            // {
+            //     var fileSizeLimit = StorageHelper.GetFileSizeLimitForPlan(subscription);
+            //     throw new Exception($"You cannot download files larger than {StorageHelper.FormatBytes(fileSizeLimit)} on this plan.");
+            // }
+
             var url = this.GetPresignedURL(userId, name, HttpVerb.GET);
             if (url == null) return null;
             return url;
         }
 
-        public async Task<MultipartUploadMeta> StartMultipartUploadAsync(string userId, string name, int parts, string uploadId = null)
+        public async Task<MultipartUploadMeta> StartMultipartUploadAsync(string userId, string name, int parts, string? uploadId = null)
         {
             var objectName = GetFullObjectName(userId, name);
             if (userId == null || objectName == null) throw new Exception("Could not initiate multipart upload.");
@@ -204,18 +217,64 @@ namespace Notesnook.API.Services
             if (!IsSuccessStatusCode(((int)response.HttpStatusCode))) throw new Exception("Failed to abort multipart upload.");
         }
 
+        private async Task<long> GetMultipartUploadSizeAsync(string userId, string key, string uploadId)
+        {
+            var objectName = GetFullObjectName(userId, key);
+            var parts = await GetS3Client(S3ClientMode.INTERNAL).ListPartsAsync(GetBucketName(S3ClientMode.INTERNAL), objectName, uploadId);
+            long totalSize = 0;
+            foreach (var part in parts.Parts)
+            {
+                totalSize += part.Size;
+            }
+            return totalSize;
+        }
+
         public async Task CompleteMultipartUploadAsync(string userId, CompleteMultipartUploadRequest uploadRequest)
         {
             var objectName = GetFullObjectName(userId, uploadRequest.Key);
             if (userId == null || objectName == null) throw new Exception("Could not abort multipart upload.");
 
+            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.");
+            }
+
+            if (!Constants.IS_SELF_HOSTED)
+            {
+                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.");
+
+            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)
+        private string? GetPresignedURL(string userId, string name, HttpVerb httpVerb, S3ClientMode mode = S3ClientMode.EXTERNAL)
         {
             var objectName = GetFullObjectName(userId, name);
             if (userId == null || objectName == null) return null;
@@ -227,7 +286,7 @@ namespace Notesnook.API.Services
                 Expires = System.DateTime.Now.AddHours(1),
                 Verb = httpVerb,
                 Key = objectName,
-#if DEBUG
+#if (DEBUG || STAGING)
                 Protocol = Protocol.HTTP,
 #else
                 Protocol = client.Config.ServiceURL.StartsWith("http://") ? Protocol.HTTP : Protocol.HTTPS,
@@ -236,19 +295,19 @@ namespace Notesnook.API.Services
             return client.GetPreSignedURL(request);
         }
 
-        private string GetPresignedURLForUploadPart(string objectName, string uploadId, int partNumber)
+        private string GetPresignedURLForUploadPart(string objectName, string uploadId, int partNumber, S3ClientMode mode = S3ClientMode.EXTERNAL)
         {
 
-            var client = GetS3Client(S3ClientMode.INTERNAL);
+            var client = GetS3Client(mode);
             return client.GetPreSignedURL(new GetPreSignedUrlRequest
             {
-                BucketName = GetBucketName(S3ClientMode.INTERNAL),
+                BucketName = GetBucketName(mode),
                 Expires = System.DateTime.Now.AddHours(1),
                 Verb = HttpVerb.PUT,
                 Key = objectName,
                 PartNumber = partNumber,
                 UploadId = uploadId,
-#if DEBUG
+#if (DEBUG || STAGING)
                 Protocol = Protocol.HTTP,
 #else
                 Protocol = client.Config.ServiceURL.StartsWith("http://") ? Protocol.HTTP : Protocol.HTTPS,

Notesnook.API/Services/SyncDeviceService.cs

@@ -27,111 +27,108 @@ using System.Threading.Tasks;
 
 namespace Notesnook.API.Services
 {
-    public struct SyncDevice(ref string userId, ref string deviceId)
+    public struct SyncDevice(string userId, string deviceId)
     {
-        public readonly string DeviceId = deviceId;
-        public readonly string UserId = userId;
+        public readonly string DeviceId => deviceId;
+        public readonly string UserId => userId;
 
-        private string userSyncDirectoryPath = null;
-        public string UserSyncDirectoryPath
+        public string UserSyncDirectoryPath = CreateFilePath(userId);
+        public string UserDeviceDirectoryPath = CreateFilePath(userId, deviceId);
+        public string PendingIdsFilePath = CreateFilePath(userId, deviceId, "pending");
+        public string UnsyncedIdsFilePath = CreateFilePath(userId, deviceId, "unsynced");
+        public string ResetSyncFilePath = CreateFilePath(userId, deviceId, "reset-sync");
+
+        public readonly long LastAccessTime
         {
-            get
-            {
-                userSyncDirectoryPath ??= Path.Join("sync", UserId);
-                return userSyncDirectoryPath;
-            }
+            get => long.Parse(GetMetadata("LastAccessTime") ?? "0");
+            set => SetMetadata("LastAccessTime", value.ToString());
         }
-        private string userDeviceDirectoryPath = null;
-        public string UserDeviceDirectoryPath
+
+        /// <summary>
+        /// Indicates if the monographs have been synced for the first time
+        /// ever on a device.
+        /// </summary>
+        public readonly bool HasInitialMonographsSync
         {
-            get
-            {
-                userDeviceDirectoryPath ??= Path.Join(UserSyncDirectoryPath, DeviceId);
-                return userDeviceDirectoryPath;
-            }
+            get => !string.IsNullOrEmpty(GetMetadata("HasInitialMonographsSync"));
+            set => SetMetadata("HasInitialMonographsSync", value.ToString());
         }
-        private string pendingIdsFilePath = null;
-        public string PendingIdsFilePath
+
+        private static string CreateFilePath(string userId, string? deviceId = null, string? metadataKey = null)
         {
-            get
-            {
-                pendingIdsFilePath ??= Path.Join(UserDeviceDirectoryPath, "pending");
-                return pendingIdsFilePath;
-            }
+            return Path.Join("sync", userId, deviceId, metadataKey);
         }
-        private string unsyncedIdsFilePath = null;
-        public string UnsyncedIdsFilePath
+
+        private readonly string? GetMetadata(string metadataKey)
         {
-            get
-            {
-                unsyncedIdsFilePath ??= Path.Join(UserDeviceDirectoryPath, "unsynced");
-                return unsyncedIdsFilePath;
-            }
+            var path = CreateFilePath(userId, deviceId, metadataKey);
+            if (!File.Exists(path)) return null;
+            return File.ReadAllText(path);
         }
-        private string resetSyncFilePath = null;
-        public string ResetSyncFilePath
+
+        private readonly void SetMetadata(string metadataKey, string value)
         {
-            get
+            try
             {
-                resetSyncFilePath ??= Path.Join(UserDeviceDirectoryPath, "reset-sync");
-                return resetSyncFilePath;
+                var path = CreateFilePath(userId, deviceId, metadataKey);
+                File.WriteAllText(path, value);
             }
+            catch (DirectoryNotFoundException) { }
         }
     }
+
     public class SyncDeviceService(SyncDevice device)
     {
-        public async Task<string[]> GetUnsyncedIdsAsync()
+        public string[] GetUnsyncedIds()
         {
             try
             {
-                return await File.ReadAllLinesAsync(device.UnsyncedIdsFilePath);
+                return File.ReadAllLines(device.UnsyncedIdsFilePath);
             }
             catch { return []; }
         }
 
-        public async Task<string[]> GetUnsyncedIdsAsync(string deviceId)
+        public string[] GetUnsyncedIds(string deviceId)
         {
             try
             {
-                return await File.ReadAllLinesAsync(Path.Join(device.UserSyncDirectoryPath, deviceId, "unsynced"));
+                return File.ReadAllLines(Path.Join(device.UserSyncDirectoryPath, deviceId, "unsynced"));
             }
             catch { return []; }
         }
 
-        public async Task<string[]> FetchUnsyncedIdsAsync()
+        public string[] FetchUnsyncedIds()
         {
-            if (IsSyncReset()) return Array.Empty<string>();
-            if (UnsyncedIdsFileLocks.TryGetValue(device.DeviceId, out SemaphoreSlim fileLock) && fileLock.CurrentCount == 0)
-                await fileLock.WaitAsync();
+            if (IsSyncReset()) return [];
             try
             {
-                var unsyncedIds = await GetUnsyncedIdsAsync();
-                if (IsSyncPending())
+                var unsyncedIds = GetUnsyncedIds();
+                lock (device.DeviceId)
                 {
-                    unsyncedIds = unsyncedIds.Union(await File.ReadAllLinesAsync(device.PendingIdsFilePath)).ToArray();
+                    if (IsSyncPending())
+                    {
+                        unsyncedIds = unsyncedIds.Union(File.ReadAllLines(device.PendingIdsFilePath)).ToArray();
+                    }
+
+                    if (unsyncedIds.Length == 0) return [];
+
+                    File.Delete(device.UnsyncedIdsFilePath);
+                    File.WriteAllLines(device.PendingIdsFilePath, unsyncedIds);
                 }
-
-                if (unsyncedIds.Length == 0) return [];
-
-                File.Delete(device.UnsyncedIdsFilePath);
-                await File.WriteAllLinesAsync(device.PendingIdsFilePath, unsyncedIds);
-
                 return unsyncedIds;
             }
             catch
             {
-                return Array.Empty<string>();
-            }
-            finally
-            {
-                if (fileLock != null && fileLock.CurrentCount == 0) fileLock.Release();
+                return [];
             }
         }
 
-
-        public async Task WritePendingIdsAsync(IEnumerable<string> ids)
+        public void WritePendingIds(IEnumerable<string> ids)
         {
-            await File.WriteAllLinesAsync(device.PendingIdsFilePath, ids);
+            lock (device.DeviceId)
+            {
+                File.WriteAllLines(device.PendingIdsFilePath, ids);
+            }
         }
 
         public bool IsSyncReset()
@@ -155,8 +152,16 @@ namespace Notesnook.API.Services
 
         public void Reset()
         {
-            File.Delete(device.ResetSyncFilePath);
-            File.Delete(device.PendingIdsFilePath);
+            try
+            {
+                lock (device.UserId)
+                {
+                    File.Delete(device.ResetSyncFilePath);
+                    File.Delete(device.PendingIdsFilePath);
+                }
+            }
+            catch (FileNotFoundException) { }
+            catch (DirectoryNotFoundException) { }
         }
 
         public bool IsDeviceRegistered()
@@ -175,49 +180,64 @@ namespace Notesnook.API.Services
 
         public void ResetDevices()
         {
-            if (File.Exists(device.UserSyncDirectoryPath)) File.Delete(device.UserSyncDirectoryPath);
-            Directory.CreateDirectory(device.UserSyncDirectoryPath);
+            lock (device.UserId)
+            {
+                if (File.Exists(device.UserSyncDirectoryPath)) File.Delete(device.UserSyncDirectoryPath);
+                Directory.CreateDirectory(device.UserSyncDirectoryPath);
+            }
         }
 
-        private readonly ConcurrentDictionary<string, SemaphoreSlim> UnsyncedIdsFileLocks = [];
-        public async Task AddIdsToOtherDevicesAsync(List<string> ids)
+        public void AddIdsToOtherDevices(List<string> ids)
         {
-            await Parallel.ForEachAsync(ListDevices(), async (id, ct) =>
+            device.LastAccessTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+            foreach (string id in ListDevices())
             {
-                if (id == device.DeviceId || IsSyncReset(id)) return;
-                if (!UnsyncedIdsFileLocks.TryGetValue(id, out SemaphoreSlim fileLock))
-                {
-                    fileLock = UnsyncedIdsFileLocks.AddOrUpdate(id, (id) => new SemaphoreSlim(1, 1), (id, old) => new SemaphoreSlim(1, 1));
-                }
+                if (id == device.DeviceId || IsSyncReset(id)) continue;
 
-                await fileLock.WaitAsync(ct);
-                try
+                lock (id)
                 {
                     if (!IsDeviceRegistered(id)) Directory.CreateDirectory(Path.Join(device.UserSyncDirectoryPath, id));
 
-                    var oldIds = await GetUnsyncedIdsAsync(id);
-                    await File.WriteAllLinesAsync(Path.Join(device.UserSyncDirectoryPath, id, "unsynced"), ids.Union(oldIds), ct);
+                    var oldIds = GetUnsyncedIds(id);
+                    File.WriteAllLines(Path.Join(device.UserSyncDirectoryPath, id, "unsynced"), ids.Union(oldIds));
                 }
-                finally
+            }
+        }
+
+        public void AddIdsToAllDevices(List<string> ids)
+        {
+            foreach (var id in ListDevices())
+            {
+                if (IsSyncReset(id)) return;
+                lock (id)
                 {
-                    fileLock.Release();
+                    if (!IsDeviceRegistered(id)) Directory.CreateDirectory(Path.Join(device.UserSyncDirectoryPath, id));
+
+                    var oldIds = GetUnsyncedIds(id);
+                    File.WriteAllLinesAsync(Path.Join(device.UserSyncDirectoryPath, id, "unsynced"), ids.Union(oldIds));
                 }
-            });
+            }
         }
 
         public void RegisterDevice()
         {
-            Directory.CreateDirectory(device.UserDeviceDirectoryPath);
-            File.Create(device.ResetSyncFilePath).Close();
+            lock (device.UserId)
+            {
+                if (Directory.Exists(device.UserDeviceDirectoryPath))
+                    Directory.Delete(device.UserDeviceDirectoryPath, true);
+                Directory.CreateDirectory(device.UserDeviceDirectoryPath);
+                File.Create(device.ResetSyncFilePath).Close();
+                device.LastAccessTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
+            }
         }
 
         public void UnregisterDevice()
         {
-            try
+            lock (device.UserId)
             {
+                if (!Path.Exists(device.UserDeviceDirectoryPath)) return;
                 Directory.Delete(device.UserDeviceDirectoryPath, true);
             }
-            catch { }
         }
     }
 }

Notesnook.API/Services/UserService.cs

@@ -18,13 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 using System;
-using System.IO;
 using System.Net.Http;
-using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Notesnook.API.Helpers;
 using Notesnook.API.Interfaces;
 using Notesnook.API.Models;
 using Notesnook.API.Models.Responses;
@@ -73,19 +72,22 @@ namespace Notesnook.API.Services
             await Repositories.UsersSettings.InsertAsync(new UserSettings
             {
                 UserId = response.UserId,
+                StorageLimit = new Limit { UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), Value = 0 },
                 LastSynced = 0,
                 Salt = GetSalt()
             });
 
             if (!Constants.IS_SELF_HOSTED)
             {
-                await WampServers.SubscriptionServer.PublishMessageAsync(SubscriptionServerTopics.CreateSubscriptionTopic, new CreateSubscriptionMessage
+                await WampServers.SubscriptionServer.PublishMessageAsync(SubscriptionServerTopics.CreateSubscriptionV2Topic, new CreateSubscriptionMessageV2
                 {
                     AppId = ApplicationType.NOTESNOOK,
                     Provider = SubscriptionProvider.STREETWRITERS,
-                    Type = SubscriptionType.BASIC,
+                    Status = SubscriptionStatus.ACTIVE,
+                    Plan = SubscriptionPlan.FREE,
                     UserId = response.UserId,
                     StartTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+                    Timestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
                 });
             }
 
@@ -98,14 +100,15 @@ namespace Notesnook.API.Services
 
             var user = await userService.GetUserAsync(Clients.Notesnook.Id, userId) ?? throw new Exception("User not found.");
 
-            ISubscription subscription = null;
+            Subscription? subscription = null;
             if (Constants.IS_SELF_HOSTED)
             {
                 subscription = new Subscription
                 {
                     AppId = ApplicationType.NOTESNOOK,
                     Provider = SubscriptionProvider.STREETWRITERS,
-                    Type = SubscriptionType.PREMIUM,
+                    Plan = SubscriptionPlan.BELIEVER,
+                    Status = SubscriptionStatus.ACTIVE,
                     UserId = user.UserId,
                     StartDate = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
                     // this date doesn't matter as the subscription is static.
@@ -115,10 +118,18 @@ namespace Notesnook.API.Services
             else
             {
                 var subscriptionService = await WampServers.SubscriptionServer.GetServiceAsync<IUserSubscriptionService>(SubscriptionServerTopics.UserSubscriptionServiceTopic);
-                subscription = await subscriptionService.GetUserSubscriptionAsync(Clients.Notesnook.Id, userId);
+                subscription = await subscriptionService.GetUserSubscriptionAsync(Clients.Notesnook.Id, userId) ?? throw new Exception("User subscription not found.");
             }
 
             var userSettings = await Repositories.UsersSettings.FindOneAsync((u) => u.UserId == user.UserId) ?? throw new Exception("User settings not found.");
+
+            // reset user's attachment limit every month
+            if (userSettings.StorageLimit == null || DateTimeOffset.UtcNow.Month > DateTimeOffset.FromUnixTimeMilliseconds(userSettings.StorageLimit.UpdatedAt).Month)
+            {
+                userSettings.StorageLimit ??= new Limit { UpdatedAt = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(), Value = 0 };
+                await Repositories.UsersSettings.UpsertAsync(userSettings, (u) => u.UserId == user.UserId);
+            }
+
             return new UserResponse
             {
                 UserId = user.UserId,
@@ -128,23 +139,57 @@ namespace Notesnook.API.Services
                 MFA = user.MFA,
                 PhoneNumber = user.PhoneNumber,
                 AttachmentsKey = userSettings.AttachmentsKey,
+                MonographPasswordsKey = userSettings.MonographPasswordsKey,
+                InboxKeys = userSettings.InboxKeys,
                 Salt = userSettings.Salt,
                 Subscription = subscription,
+                StorageUsed = userSettings.StorageLimit.Value,
+                TotalStorage = StorageHelper.GetStorageLimitForPlan(subscription),
                 Success = true,
                 StatusCode = 200
             };
         }
 
-        public async Task SetUserAttachmentsKeyAsync(string userId, IEncrypted key)
+        public async Task SetUserKeysAsync(string userId, UserKeys keys)
         {
             var userSettings = await Repositories.UsersSettings.FindOneAsync((u) => u.UserId == userId) ?? throw new Exception("User not found.");
-            userSettings.AttachmentsKey = (EncryptedData)key;
+
+            if (keys.AttachmentsKey != null)
+            {
+                userSettings.AttachmentsKey = keys.AttachmentsKey;
+            }
+            if (keys.MonographPasswordsKey != null)
+            {
+                userSettings.MonographPasswordsKey = keys.MonographPasswordsKey;
+            }
+            if (keys.InboxKeys != null)
+            {
+                if (keys.InboxKeys.Public == null || keys.InboxKeys.Private == null)
+                {
+                    userSettings.InboxKeys = null;
+                    await Repositories.InboxApiKey.DeleteManyAsync(t => t.UserId == userId);
+                }
+                else
+                {
+                    userSettings.InboxKeys = keys.InboxKeys;
+                    var defaultInboxKey = new InboxApiKey
+                    {
+                        UserId = userId,
+                        Name = "Default",
+                        DateCreated = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+                        ExpiryDate = DateTimeOffset.UtcNow.AddYears(1).ToUnixTimeMilliseconds(),
+                        LastUsedAt = 0
+                    };
+                    await Repositories.InboxApiKey.InsertAsync(defaultInboxKey);
+                }
+            }
+
             await Repositories.UsersSettings.UpdateAsync(userSettings.Id, userSettings);
         }
 
         public async Task DeleteUserAsync(string userId)
         {
-            new SyncDeviceService(new SyncDevice(ref userId, ref userId)).ResetDevices();
+            new SyncDeviceService(new SyncDevice(userId, userId)).ResetDevices();
 
             var cc = new CancellationTokenSource();
 
@@ -162,6 +207,7 @@ namespace Notesnook.API.Services
             Repositories.Vaults.DeleteByUserId(userId);
             Repositories.UsersSettings.Delete((u) => u.UserId == userId);
             Repositories.Monographs.DeleteMany((m) => m.UserId == userId);
+            Repositories.InboxApiKey.DeleteMany((t) => t.UserId == userId);
 
             var result = await unit.Commit();
             await Slogger<UserService>.Info(nameof(DeleteUserAsync), "User data deleted", userId, result.ToString());
@@ -204,7 +250,7 @@ namespace Notesnook.API.Services
 
         public async Task<bool> ResetUserAsync(string userId, bool removeAttachments)
         {
-            new SyncDeviceService(new SyncDevice(ref userId, ref userId)).ResetDevices();
+            new SyncDeviceService(new SyncDevice(userId, userId)).ResetDevices();
 
             var cc = new CancellationTokenSource();
 
@@ -221,12 +267,15 @@ namespace Notesnook.API.Services
             Repositories.Tags.DeleteByUserId(userId);
             Repositories.Vaults.DeleteByUserId(userId);
             Repositories.Monographs.DeleteMany((m) => m.UserId == userId);
+            Repositories.InboxApiKey.DeleteMany((t) => t.UserId == userId);
             if (!await unit.Commit()) return false;
 
             var userSettings = await Repositories.UsersSettings.FindOneAsync((s) => s.UserId == userId);
 
             userSettings.AttachmentsKey = null;
+            userSettings.MonographPasswordsKey = null;
             userSettings.VaultKey = null;
+            userSettings.InboxKeys = null;
             userSettings.LastSynced = 0;
 
             await Repositories.UsersSettings.UpsertAsync(userSettings, (s) => s.UserId == userId);

Notesnook.API/Startup.cs

@@ -48,15 +48,19 @@ using Notesnook.API.Authorization;
 using Notesnook.API.Extensions;
 using Notesnook.API.Hubs;
 using Notesnook.API.Interfaces;
+using Notesnook.API.Jobs;
 using Notesnook.API.Models;
 using Notesnook.API.Repositories;
 using Notesnook.API.Services;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Resources;
+using Quartz;
 using Streetwriters.Common;
 using Streetwriters.Common.Extensions;
+using Streetwriters.Common.Interfaces;
 using Streetwriters.Common.Messages;
 using Streetwriters.Common.Models;
+using Streetwriters.Common.Services;
 using Streetwriters.Data;
 using Streetwriters.Data.DbContexts;
 using Streetwriters.Data.Interfaces;
@@ -108,12 +112,11 @@ namespace Notesnook.API
                     policy.RequireAuthenticatedUser();
                     policy.Requirements.Add(new SyncRequirement());
                 });
-                options.AddPolicy("Pro", policy =>
+
+                options.AddPolicy(InboxApiKeyAuthenticationDefaults.AuthenticationScheme, policy =>
                 {
-                    policy.AuthenticationSchemes.Add("introspection");
+                    policy.AuthenticationSchemes.Add(InboxApiKeyAuthenticationDefaults.AuthenticationScheme);
                     policy.RequireAuthenticatedUser();
-                    policy.Requirements.Add(new SyncRequirement());
-                    policy.Requirements.Add(new ProUserRequirement());
                 });
 
                 options.DefaultPolicy = options.GetPolicy("Notesnook");
@@ -148,9 +151,13 @@ namespace Notesnook.API
                 options.SaveToken = true;
                 options.EnableCaching = true;
                 options.CacheDuration = TimeSpan.FromMinutes(30);
-            });
+            })
+            .AddScheme<InboxApiKeyAuthenticationSchemeOptions, InboxApiKeyAuthenticationHandler>(
+                InboxApiKeyAuthenticationDefaults.AuthenticationScheme,
+                options => { }
+            );
 
-            BsonSerializer.RegisterSerializer(new SyncItemBsonSerializer());
+            // Serializer.RegisterSerializer(new SyncItemBsonSerializer());
             if (!BsonClassMap.IsClassMapRegistered(typeof(UserSettings)))
                 BsonClassMap.RegisterClassMap<UserSettings>();
 
@@ -165,7 +172,9 @@ namespace Notesnook.API
 
             services.AddRepository<UserSettings>("user_settings", "notesnook")
                     .AddRepository<Monograph>("monographs", "notesnook")
-                    .AddRepository<Announcement>("announcements", "notesnook");
+                    .AddRepository<Announcement>("announcements", "notesnook")
+                    .AddRepository<InboxApiKey>(Collections.InboxApiKeysKey, "notesnook")
+                    .AddRepository<InboxSyncItem>(Collections.InboxItems, "notesnook");
 
             services.AddMongoCollection(Collections.SettingsKey)
                     .AddMongoCollection(Collections.AttachmentsKey)
@@ -178,11 +187,14 @@ namespace Notesnook.API
                     .AddMongoCollection(Collections.ShortcutsKey)
                     .AddMongoCollection(Collections.TagsKey)
                     .AddMongoCollection(Collections.ColorsKey)
-                    .AddMongoCollection(Collections.VaultsKey);
+                    .AddMongoCollection(Collections.VaultsKey)
+                    .AddMongoCollection(Collections.InboxItems)
+                    .AddMongoCollection(Collections.InboxApiKeysKey);
 
             services.AddScoped<ISyncItemsRepositoryAccessor, SyncItemsRepositoryAccessor>();
             services.AddScoped<IUserService, UserService>();
             services.AddScoped<IS3Service, S3Service>();
+            services.AddScoped<IURLAnalyzer, URLAnalyzer>();
 
             services.AddControllers();
 
@@ -216,6 +228,24 @@ namespace Notesnook.API
                     .WithMetrics((builder) => builder
                             .AddMeter("Notesnook.API.Metrics.Sync")
                             .AddPrometheusExporter());
+
+            services.AddQuartzHostedService(q =>
+            {
+                q.WaitForJobsToComplete = false;
+                q.AwaitApplicationStarted = true;
+                q.StartDelay = TimeSpan.FromMinutes(1);
+            }).AddQuartz(q =>
+            {
+                q.UseMicrosoftDependencyInjectionJobFactory();
+
+                var jobKey = new JobKey("DeviceCleanupJob");
+                q.AddJob<DeviceCleanupJob>(opts => opts.WithIdentity(jobKey));
+                q.AddTrigger(opts => opts
+                    .ForJob(jobKey)
+                    .WithIdentity("DeviceCleanup-trigger")
+                    // first of every month
+                    .WithCronSchedule("0 0 0 1 * ? *"));
+            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -257,7 +287,6 @@ namespace Notesnook.API
 
             app.UseEndpoints(endpoints =>
             {
-                endpoints.MapPrometheusScrapingEndpoint();
                 endpoints.MapControllers();
                 endpoints.MapHealthChecks("/health");
                 endpoints.MapHub<SyncHub>("/hubs/sync", options =>

Notesnook.API/appsettings.Development.json

@@ -1,15 +1,15 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft": "Warning",
-      "Microsoft.Hosting.Lifetime": "Information",
-      "Microsoft.AspNetCore.SignalR": "Trace",
-      "Microsoft.AspNetCore.Http.Connections": "Trace"
-    }
-  },
-  "MongoDbSettings": {
-    "ConnectionString": "mongodb://localhost:27017/notesnook",
-    "DatabaseName": "notesnook"
-  }
-}
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information",
+      "Microsoft.AspNetCore.SignalR": "Trace",
+      "Microsoft.AspNetCore.Http.Connections": "Trace"
+    }
+  },
+  "MongoDbSettings": {
+    "ConnectionString": "mongodb://localhost:27017/notesnook",
+    "DatabaseName": "notesnook"
+  }
+}

Notesnook.API/appsettings.json

@@ -1,7 +1,7 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Warning"
-    }
-  }
-}
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Warning"
+    }
+  }
+}

Notesnook.Inbox.API/.env.example

@@ -0,0 +1,2 @@
+PORT=5181
+NOTESNOOK_API_SERVER_URL=http://localhost:5264/

Notesnook.Inbox.API/.gitignore

@@ -0,0 +1,3 @@
+node_modules/
+dist/
+.env

Notesnook.Inbox.API/Dockerfile

@@ -0,0 +1,19 @@
+FROM oven/bun:1.2.21-slim
+
+RUN mkdir -p /home/bun/app && chown -R bun:bun /home/bun/app
+
+WORKDIR /home/bun/app
+
+USER bun
+
+COPY --chown=bun:bun package.json bun.lock .
+
+RUN bun install --frozen-lockfile
+
+COPY --chown=bun:bun . .
+
+RUN bun run build
+
+EXPOSE 5181
+
+CMD ["bun", "run", "start"]

Notesnook.Inbox.API/bun.lock

@@ -0,0 +1,192 @@
+{
+  "lockfileVersion": 1,
+  "workspaces": {
+    "": {
+      "name": "notesnook-inbox-api",
+      "dependencies": {
+        "express": "^5.1.0",
+        "libsodium-wrappers-sumo": "^0.7.15",
+        "zod": "^4.1.9",
+      },
+      "devDependencies": {
+        "@types/express": "^5.0.3",
+        "@types/libsodium-wrappers-sumo": "^0.7.8",
+        "@types/node": "^24.5.2",
+        "typescript": "^5.9.2",
+      },
+    },
+  },
+  "packages": {
+    "@types/body-parser": ["@types/body-parser@1.19.6", "", { "dependencies": { "@types/connect": "*", "@types/node": "*" } }, "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g=="],
+
+    "@types/connect": ["@types/connect@3.4.38", "", { "dependencies": { "@types/node": "*" } }, "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="],
+
+    "@types/express": ["@types/express@5.0.3", "", { "dependencies": { "@types/body-parser": "*", "@types/express-serve-static-core": "^5.0.0", "@types/serve-static": "*" } }, "sha512-wGA0NX93b19/dZC1J18tKWVIYWyyF2ZjT9vin/NRu0qzzvfVzWjs04iq2rQ3H65vCTQYlRqs3YHfY7zjdV+9Kw=="],
+
+    "@types/express-serve-static-core": ["@types/express-serve-static-core@5.0.7", "", { "dependencies": { "@types/node": "*", "@types/qs": "*", "@types/range-parser": "*", "@types/send": "*" } }, "sha512-R+33OsgWw7rOhD1emjU7dzCDHucJrgJXMA5PYCzJxVil0dsyx5iBEPHqpPfiKNJQb7lZ1vxwoLR4Z87bBUpeGQ=="],
+
+    "@types/http-errors": ["@types/http-errors@2.0.5", "", {}, "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg=="],
+
+    "@types/libsodium-wrappers": ["@types/libsodium-wrappers@0.7.14", "", {}, "sha512-5Kv68fXuXK0iDuUir1WPGw2R9fOZUlYlSAa0ztMcL0s0BfIDTqg9GXz8K30VJpPP3sxWhbolnQma2x+/TfkzDQ=="],
+
+    "@types/libsodium-wrappers-sumo": ["@types/libsodium-wrappers-sumo@0.7.8", "", { "dependencies": { "@types/libsodium-wrappers": "*" } }, "sha512-N2+df4MB/A+W0RAcTw7A5oxKgzD+Vh6Ye7lfjWIi5SdTzVLfHPzxUjhwPqHLO5Ev9fv/+VHl+sUaUuTg4fUPqw=="],
+
+    "@types/mime": ["@types/mime@1.3.5", "", {}, "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="],
+
+    "@types/node": ["@types/node@24.5.2", "", { "dependencies": { "undici-types": "~7.12.0" } }, "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ=="],
+
+    "@types/qs": ["@types/qs@6.14.0", "", {}, "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ=="],
+
+    "@types/range-parser": ["@types/range-parser@1.2.7", "", {}, "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="],
+
+    "@types/send": ["@types/send@0.17.5", "", { "dependencies": { "@types/mime": "^1", "@types/node": "*" } }, "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w=="],
+
+    "@types/serve-static": ["@types/serve-static@1.15.8", "", { "dependencies": { "@types/http-errors": "*", "@types/node": "*", "@types/send": "*" } }, "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg=="],
+
+    "accepts": ["accepts@2.0.0", "", { "dependencies": { "mime-types": "^3.0.0", "negotiator": "^1.0.0" } }, "sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng=="],
+
+    "body-parser": ["body-parser@2.2.0", "", { "dependencies": { "bytes": "^3.1.2", "content-type": "^1.0.5", "debug": "^4.4.0", "http-errors": "^2.0.0", "iconv-lite": "^0.6.3", "on-finished": "^2.4.1", "qs": "^6.14.0", "raw-body": "^3.0.0", "type-is": "^2.0.0" } }, "sha512-02qvAaxv8tp7fBa/mw1ga98OGm+eCbqzJOKoRt70sLmfEEi+jyBYVTDGfCL/k06/4EMk/z01gCe7HoCH/f2LTg=="],
+
+    "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="],
+
+    "call-bind-apply-helpers": ["call-bind-apply-helpers@1.0.2", "", { "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" } }, "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ=="],
+
+    "call-bound": ["call-bound@1.0.4", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "get-intrinsic": "^1.3.0" } }, "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg=="],
+
+    "content-disposition": ["content-disposition@1.0.0", "", { "dependencies": { "safe-buffer": "5.2.1" } }, "sha512-Au9nRL8VNUut/XSzbQA38+M78dzP4D+eqg3gfJHMIHHYa3bg067xj1KxMUWj+VULbiZMowKngFFbKczUrNJ1mg=="],
+
+    "content-type": ["content-type@1.0.5", "", {}, "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="],
+
+    "cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],
+
+    "cookie-signature": ["cookie-signature@1.2.2", "", {}, "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg=="],
+
+    "debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="],
+
+    "depd": ["depd@2.0.0", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="],
+
+    "dunder-proto": ["dunder-proto@1.0.1", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", "gopd": "^1.2.0" } }, "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A=="],
+
+    "ee-first": ["ee-first@1.1.1", "", {}, "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="],
+
+    "encodeurl": ["encodeurl@2.0.0", "", {}, "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg=="],
+
+    "es-define-property": ["es-define-property@1.0.1", "", {}, "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g=="],
+
+    "es-errors": ["es-errors@1.3.0", "", {}, "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="],
+
+    "es-object-atoms": ["es-object-atoms@1.1.1", "", { "dependencies": { "es-errors": "^1.3.0" } }, "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA=="],
+
+    "escape-html": ["escape-html@1.0.3", "", {}, "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="],
+
+    "etag": ["etag@1.8.1", "", {}, "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="],
+
+    "express": ["express@5.1.0", "", { "dependencies": { "accepts": "^2.0.0", "body-parser": "^2.2.0", "content-disposition": "^1.0.0", "content-type": "^1.0.5", "cookie": "^0.7.1", "cookie-signature": "^1.2.1", "debug": "^4.4.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "finalhandler": "^2.1.0", "fresh": "^2.0.0", "http-errors": "^2.0.0", "merge-descriptors": "^2.0.0", "mime-types": "^3.0.0", "on-finished": "^2.4.1", "once": "^1.4.0", "parseurl": "^1.3.3", "proxy-addr": "^2.0.7", "qs": "^6.14.0", "range-parser": "^1.2.1", "router": "^2.2.0", "send": "^1.1.0", "serve-static": "^2.2.0", "statuses": "^2.0.1", "type-is": "^2.0.1", "vary": "^1.1.2" } }, "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA=="],
+
+    "finalhandler": ["finalhandler@2.1.0", "", { "dependencies": { "debug": "^4.4.0", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "on-finished": "^2.4.1", "parseurl": "^1.3.3", "statuses": "^2.0.1" } }, "sha512-/t88Ty3d5JWQbWYgaOGCCYfXRwV1+be02WqYYlL6h0lEiUAMPM8o8qKGO01YIkOHzka2up08wvgYD0mDiI+q3Q=="],
+
+    "forwarded": ["forwarded@0.2.0", "", {}, "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="],
+
+    "fresh": ["fresh@2.0.0", "", {}, "sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A=="],
+
+    "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="],
+
+    "get-intrinsic": ["get-intrinsic@1.3.0", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", "es-errors": "^1.3.0", "es-object-atoms": "^1.1.1", "function-bind": "^1.1.2", "get-proto": "^1.0.1", "gopd": "^1.2.0", "has-symbols": "^1.1.0", "hasown": "^2.0.2", "math-intrinsics": "^1.1.0" } }, "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ=="],
+
+    "get-proto": ["get-proto@1.0.1", "", { "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" } }, "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g=="],
+
+    "gopd": ["gopd@1.2.0", "", {}, "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg=="],
+
+    "has-symbols": ["has-symbols@1.1.0", "", {}, "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="],
+
+    "hasown": ["hasown@2.0.2", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="],
+
+    "http-errors": ["http-errors@2.0.0", "", { "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", "setprototypeof": "1.2.0", "statuses": "2.0.1", "toidentifier": "1.0.1" } }, "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="],
+
+    "iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="],
+
+    "inherits": ["inherits@2.0.4", "", {}, "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="],
+
+    "ipaddr.js": ["ipaddr.js@1.9.1", "", {}, "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="],
+
+    "is-promise": ["is-promise@4.0.0", "", {}, "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="],
+
+    "libsodium-sumo": ["libsodium-sumo@0.7.15", "", {}, "sha512-5tPmqPmq8T8Nikpm1Nqj0hBHvsLFCXvdhBFV7SGOitQPZAA6jso8XoL0r4L7vmfKXr486fiQInvErHtEvizFMw=="],
+
+    "libsodium-wrappers-sumo": ["libsodium-wrappers-sumo@0.7.15", "", { "dependencies": { "libsodium-sumo": "^0.7.15" } }, "sha512-aSWY8wKDZh5TC7rMvEdTHoyppVq/1dTSAeAR7H6pzd6QRT3vQWcT5pGwCotLcpPEOLXX6VvqihSPkpEhYAjANA=="],
+
+    "math-intrinsics": ["math-intrinsics@1.1.0", "", {}, "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g=="],
+
+    "media-typer": ["media-typer@1.1.0", "", {}, "sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="],
+
+    "merge-descriptors": ["merge-descriptors@2.0.0", "", {}, "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g=="],
+
+    "mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="],
+
+    "mime-types": ["mime-types@3.0.1", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-xRc4oEhT6eaBpU1XF7AjpOFD+xQmXNB5OVKwp4tqCuBpHLS/ZbBDrc07mYTDqVMg6PfxUjjNp85O6Cd2Z/5HWA=="],
+
+    "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="],
+
+    "negotiator": ["negotiator@1.0.0", "", {}, "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg=="],
+
+    "object-inspect": ["object-inspect@1.13.4", "", {}, "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew=="],
+
+    "on-finished": ["on-finished@2.4.1", "", { "dependencies": { "ee-first": "1.1.1" } }, "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="],
+
+    "once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="],
+
+    "parseurl": ["parseurl@1.3.3", "", {}, "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="],
+
+    "path-to-regexp": ["path-to-regexp@8.3.0", "", {}, "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA=="],
+
+    "proxy-addr": ["proxy-addr@2.0.7", "", { "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" } }, "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="],
+
+    "qs": ["qs@6.14.0", "", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w=="],
+
+    "range-parser": ["range-parser@1.2.1", "", {}, "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="],
+
+    "raw-body": ["raw-body@3.0.1", "", { "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", "iconv-lite": "0.7.0", "unpipe": "1.0.0" } }, "sha512-9G8cA+tuMS75+6G/TzW8OtLzmBDMo8p1JRxN5AZ+LAp8uxGA8V8GZm4GQ4/N5QNQEnLmg6SS7wyuSmbKepiKqA=="],
+
+    "router": ["router@2.2.0", "", { "dependencies": { "debug": "^4.4.0", "depd": "^2.0.0", "is-promise": "^4.0.0", "parseurl": "^1.3.3", "path-to-regexp": "^8.0.0" } }, "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ=="],
+
+    "safe-buffer": ["safe-buffer@5.2.1", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="],
+
+    "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="],
+
+    "send": ["send@1.2.0", "", { "dependencies": { "debug": "^4.3.5", "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "etag": "^1.8.1", "fresh": "^2.0.0", "http-errors": "^2.0.0", "mime-types": "^3.0.1", "ms": "^2.1.3", "on-finished": "^2.4.1", "range-parser": "^1.2.1", "statuses": "^2.0.1" } }, "sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw=="],
+
+    "serve-static": ["serve-static@2.2.0", "", { "dependencies": { "encodeurl": "^2.0.0", "escape-html": "^1.0.3", "parseurl": "^1.3.3", "send": "^1.2.0" } }, "sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ=="],
+
+    "setprototypeof": ["setprototypeof@1.2.0", "", {}, "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="],
+
+    "side-channel": ["side-channel@1.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", "side-channel-list": "^1.0.0", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" } }, "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw=="],
+
+    "side-channel-list": ["side-channel-list@1.0.0", "", { "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3" } }, "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA=="],
+
+    "side-channel-map": ["side-channel-map@1.0.1", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3" } }, "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA=="],
+
+    "side-channel-weakmap": ["side-channel-weakmap@1.0.2", "", { "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.5", "object-inspect": "^1.13.3", "side-channel-map": "^1.0.1" } }, "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A=="],
+
+    "statuses": ["statuses@2.0.2", "", {}, "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw=="],
+
+    "toidentifier": ["toidentifier@1.0.1", "", {}, "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="],
+
+    "type-is": ["type-is@2.0.1", "", { "dependencies": { "content-type": "^1.0.5", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw=="],
+
+    "typescript": ["typescript@5.9.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A=="],
+
+    "undici-types": ["undici-types@7.12.0", "", {}, "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ=="],
+
+    "unpipe": ["unpipe@1.0.0", "", {}, "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="],
+
+    "vary": ["vary@1.1.2", "", {}, "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="],
+
+    "wrappy": ["wrappy@1.0.2", "", {}, "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="],
+
+    "zod": ["zod@4.1.9", "", {}, "sha512-HI32jTq0AUAC125z30E8bQNz0RQ+9Uc+4J7V97gLYjZVKRjeydPgGt6dvQzFrav7MYOUGFqqOGiHpA/fdbd0cQ=="],
+
+    "http-errors/statuses": ["statuses@2.0.1", "", {}, "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="],
+
+    "raw-body/iconv-lite": ["iconv-lite@0.7.0", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ=="],
+  }
+}

Notesnook.Inbox.API/package.json

@@ -0,0 +1,33 @@
+{
+  "name": "notesnook-inbox-api",
+  "version": "1.0.0",
+  "description": "Notesnook Inbox API server",
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "bun build src/index.ts --outdir dist --target bun",
+    "start": "bun run dist/index.js",
+    "dev": "bun --watch src/index.ts"
+  },
+  "keywords": [
+    "notesnook",
+    "inbox",
+    "api"
+  ],
+  "license": "GPL-3.0-or-later",
+  "author": {
+    "name": "Streetwriters (Private) Limited",
+    "email": "support@streetwriters.co",
+    "url": "https://streetwriters.co"
+  },
+  "dependencies": {
+    "express": "^5.1.0",
+    "libsodium-wrappers-sumo": "^0.7.15",
+    "zod": "^4.1.9"
+  },
+  "devDependencies": {
+    "@types/libsodium-wrappers-sumo": "^0.7.8",
+    "@types/express": "^5.0.3",
+    "@types/node": "^24.5.2",
+    "typescript": "^5.9.2"
+  }
+}

Notesnook.Inbox.API/src/index.ts

@@ -0,0 +1,173 @@
+import express from "express";
+import _sodium, { base64_variants } from "libsodium-wrappers-sumo";
+import { z } from "zod";
+
+const NOTESNOOK_API_SERVER_URL = process.env.NOTESNOOK_API_SERVER_URL;
+if (!NOTESNOOK_API_SERVER_URL) {
+  throw new Error("NOTESNOOK_API_SERVER_URL is not defined");
+}
+
+let sodium: typeof _sodium;
+
+const RawInboxItemSchema = z.object({
+  title: z.string().min(1, "Title is required"),
+  pinned: z.boolean().optional(),
+  favorite: z.boolean().optional(),
+  readonly: z.boolean().optional(),
+  archived: z.boolean().optional(),
+  notebookIds: z.array(z.string()).optional(),
+  tagIds: z.array(z.string()).optional(),
+  type: z.enum(["note"]),
+  source: z.string(),
+  version: z.literal(1),
+  content: z
+    .object({
+      type: z.enum(["html"]),
+      data: z.string(),
+    })
+    .optional(),
+});
+
+interface EncryptedInboxItem {
+  v: 1;
+  key: Omit<EncryptedInboxItem, "key" | "iv" | "v">;
+  iv: string;
+  alg: string;
+  cipher: string;
+  length: number;
+}
+
+function encrypt(rawData: string, publicKey: string): EncryptedInboxItem {
+  try {
+    const password = sodium.crypto_aead_xchacha20poly1305_ietf_keygen();
+    const nonce = sodium.randombytes_buf(
+      sodium.crypto_aead_xchacha20poly1305_ietf_NPUBBYTES
+    );
+    const data = sodium.from_string(rawData);
+    const cipher = sodium.crypto_aead_xchacha20poly1305_ietf_encrypt(
+      data,
+      null,
+      null,
+      nonce,
+      password
+    );
+    const inboxPublicKey = sodium.from_base64(
+      publicKey,
+      base64_variants.URLSAFE_NO_PADDING
+    );
+    const encryptedPassword = sodium.crypto_box_seal(password, inboxPublicKey);
+
+    return {
+      v: 1,
+      key: {
+        cipher: sodium.to_base64(
+          encryptedPassword,
+          base64_variants.URLSAFE_NO_PADDING
+        ),
+        alg: `xsal-x25519-${base64_variants.URLSAFE_NO_PADDING}`,
+        length: password.length,
+      },
+      iv: sodium.to_base64(nonce, base64_variants.URLSAFE_NO_PADDING),
+      alg: `xcha-argon2i13-${base64_variants.URLSAFE_NO_PADDING}`,
+      cipher: sodium.to_base64(cipher, base64_variants.URLSAFE_NO_PADDING),
+      length: data.length,
+    };
+  } catch (error) {
+    throw new Error(`encryption failed: ${error}`);
+  }
+}
+
+async function getInboxPublicEncryptionKey(apiKey: string) {
+  const response = await fetch(
+    `${NOTESNOOK_API_SERVER_URL}inbox/public-encryption-key`,
+    {
+      headers: {
+        Authorization: apiKey,
+      },
+    }
+  );
+  if (!response.ok) {
+    throw new Error(
+      `failed to fetch inbox public encryption key: ${await response.text()}`
+    );
+  }
+
+  const data = (await response.json()) as unknown as any;
+  return (data?.key as string) || null;
+}
+
+async function postEncryptedInboxItem(
+  apiKey: string,
+  item: EncryptedInboxItem
+) {
+  const response = await fetch(`${NOTESNOOK_API_SERVER_URL}inbox/items`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: apiKey,
+    },
+    body: JSON.stringify({ ...item }),
+  });
+  if (!response.ok) {
+    throw new Error(`failed to post inbox item: ${await response.text()}`);
+  }
+}
+
+const app = express();
+app.use(express.json({ limit: "10mb" }));
+app.post("/inbox", async (req, res) => {
+  try {
+    const apiKey = req.headers["authorization"];
+    if (!apiKey) {
+      return res.status(401).json({ error: "unauthorized" });
+    }
+    if (!req.body.item) {
+      return res.status(400).json({ error: "item is required" });
+    }
+
+    const validationResult = RawInboxItemSchema.safeParse(req.body.item);
+    if (!validationResult.success) {
+      return res.status(400).json({
+        error: "invalid item",
+        details: validationResult.error.issues,
+      });
+    }
+
+    const inboxPublicKey = await getInboxPublicEncryptionKey(apiKey);
+    if (!inboxPublicKey) {
+      return res.status(403).json({ error: "inbox public key not found" });
+    }
+    console.log("[info] fetched inbox public key:", inboxPublicKey);
+
+    const item = validationResult.data;
+    const encryptedItem = encrypt(JSON.stringify(item), inboxPublicKey);
+    console.log("[info] encrypted item:", encryptedItem);
+    await postEncryptedInboxItem(apiKey, encryptedItem);
+    return res.status(200).json({ message: "inbox item posted" });
+  } catch (error) {
+    if (error instanceof Error) {
+      console.log("[error]", error.message);
+      return res
+        .status(500)
+        .json({ error: "internal server error", description: error.message });
+    } else {
+      console.log("[error] unknown error occured:", error);
+      return res.status(500).json({
+        error: "internal server error",
+        description: `unknown error occured: ${error}`,
+      });
+    }
+  }
+});
+
+(async () => {
+  await _sodium.ready;
+  sodium = _sodium;
+
+  const PORT = Number(process.env.PORT || "5181");
+  app.listen(PORT, () => {
+    console.log(`📫 notesnook inbox api server running on port ${PORT}`);
+  });
+})();
+
+export default app;

Notesnook.Inbox.API/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ESNext",
+    "lib": ["ES2020"],
+    "outDir": "./dist",
+    "strict": true,
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}

README.md

@@ -69,7 +69,7 @@ This takes care of setting up everything including MongoDB, Minio etc.
 
 ## TODO Self-hosting
 
-**Note: Self-hosting the Notesnook Sync Server is not yet possible. We are working to enable full on-premise self hosting so stay tuned!**
+**Note: Self-hosting the Notesnook Sync Server is now possible, but without support. Documentation will be provided at a later date. We are working to enable full on-premise self-hosting, so stay tuned!**
 
 - [x] Open source the Sync server
 - [x] Open source the Identity server
@@ -77,8 +77,8 @@ This takes care of setting up everything including MongoDB, Minio etc.
 - [x] Fully Dockerize all services
 - [x] Use self-hosted Minio for S3 storage
 - [x] Publish on DockerHub
+- [x] Add settings to change server URLs in Notesnook client apps (starting from v3.0.18)
 - [ ] Write self hosting docs
-- [ ] Add settings to change server URLs in Notesnook client apps
 
 ## License
 

Streetwriters.Common/Attributes/JsonInterfaceConverterAttribute.cs

@@ -1,33 +1,33 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-using System.Text.Json.Serialization;
-
-namespace Streetwriters.Common.Attributes
-{
-    [AttributeUsage(AttributeTargets.Interface, AllowMultiple = false)]
-    public class JsonInterfaceConverterAttribute : JsonConverterAttribute
-    {
-        public JsonInterfaceConverterAttribute(Type converterType)
-            : base(converterType)
-        {
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Text.Json.Serialization;
+
+namespace Streetwriters.Common.Attributes
+{
+    [AttributeUsage(AttributeTargets.Interface, AllowMultiple = false)]
+    public class JsonInterfaceConverterAttribute : JsonConverterAttribute
+    {
+        public JsonInterfaceConverterAttribute(Type converterType)
+            : base(converterType)
+        {
+        }
+    }
 }

Streetwriters.Common/Clients.cs

@@ -1,82 +1,82 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Streetwriters.Common.Enums;
-using Streetwriters.Common.Interfaces;
-using Streetwriters.Common.Messages;
-using Streetwriters.Common.Models;
-
-namespace Streetwriters.Common
-{
-    public class Clients
-    {
-        public static readonly Client Notesnook = new()
-        {
-            Id = "notesnook",
-            Name = "Notesnook",
-            SenderEmail = Constants.NOTESNOOK_SENDER_EMAIL,
-            SenderName = "Notesnook",
-            Type = ApplicationType.NOTESNOOK,
-            AppId = ApplicationType.NOTESNOOK,
-            AccountRecoveryRedirectURL = $"{Constants.NOTESNOOK_APP_HOST}/account/recovery",
-            EmailConfirmedRedirectURL = $"{Constants.NOTESNOOK_APP_HOST}/account/verified",
-            OnEmailConfirmed = async (userId) =>
-            {
-                await WampServers.MessengerServer.PublishMessageAsync(MessengerServerTopics.SendSSETopic, new SendSSEMessage
-                {
-                    UserId = userId,
-                    Message = new Message
-                    {
-                        Type = "emailConfirmed",
-                        Data = null
-                    }
-                });
-            }
-        };
-
-        public static Dictionary<string, Client> ClientsMap = new()
-        {
-            { "notesnook", Notesnook }
-        };
-
-        public static Client FindClientById(string id)
-        {
-            if (!IsValidClient(id)) return null;
-            return ClientsMap[id];
-        }
-
-        public static Client FindClientByAppId(ApplicationType appId)
-        {
-            switch (appId)
-            {
-                case ApplicationType.NOTESNOOK:
-                    return ClientsMap["notesnook"];
-            }
-            return null;
-        }
-
-        public static bool IsValidClient(string id)
-        {
-            return ClientsMap.ContainsKey(id);
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Streetwriters.Common.Enums;
+using Streetwriters.Common.Interfaces;
+using Streetwriters.Common.Messages;
+using Streetwriters.Common.Models;
+
+namespace Streetwriters.Common
+{
+    public class Clients
+    {
+        public static readonly Client Notesnook = new()
+        {
+            Id = "notesnook",
+            Name = "Notesnook",
+            SenderEmail = Constants.NOTESNOOK_SENDER_EMAIL,
+            SenderName = "Notesnook",
+            Type = ApplicationType.NOTESNOOK,
+            AppId = ApplicationType.NOTESNOOK,
+            AccountRecoveryRedirectURL = $"{Constants.NOTESNOOK_APP_HOST}/account/recovery",
+            EmailConfirmedRedirectURL = $"{Constants.NOTESNOOK_APP_HOST}/account/verified",
+            OnEmailConfirmed = async (userId) =>
+            {
+                await WampServers.MessengerServer.PublishMessageAsync(MessengerServerTopics.SendSSETopic, new SendSSEMessage
+                {
+                    UserId = userId,
+                    Message = new Message
+                    {
+                        Type = "emailConfirmed",
+                        Data = null
+                    }
+                });
+            }
+        };
+
+        public static Dictionary<string, Client> ClientsMap = new()
+        {
+            { "notesnook", Notesnook }
+        };
+
+        public static Client FindClientById(string id)
+        {
+            if (!IsValidClient(id)) return null;
+            return ClientsMap[id];
+        }
+
+        public static Client FindClientByAppId(ApplicationType appId)
+        {
+            switch (appId)
+            {
+                case ApplicationType.NOTESNOOK:
+                    return ClientsMap["notesnook"];
+            }
+            return null;
+        }
+
+        public static bool IsValidClient(string id)
+        {
+            return ClientsMap.ContainsKey(id);
+        }
+    }
 }

Streetwriters.Common/Constants.cs

@@ -1,81 +1,82 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-
-namespace Streetwriters.Common
-{
-    public class Constants
-    {
-        public static int COMPATIBILITY_VERSION = 1;
-        public static bool IS_SELF_HOSTED => Environment.GetEnvironmentVariable("SELF_HOSTED") == "1";
-        public static bool DISABLE_ACCOUNT_CREATION => Environment.GetEnvironmentVariable("DISABLE_ACCOUNT_CREATION") == "1";
-        public static string INSTANCE_NAME => Environment.GetEnvironmentVariable("INSTANCE_NAME") ?? "default";
-
-        // S3 related
-        public static string S3_ACCESS_KEY => Environment.GetEnvironmentVariable("S3_ACCESS_KEY");
-        public static string S3_ACCESS_KEY_ID => Environment.GetEnvironmentVariable("S3_ACCESS_KEY_ID");
-        public static string S3_SERVICE_URL => Environment.GetEnvironmentVariable("S3_SERVICE_URL");
-        public static string S3_REGION => Environment.GetEnvironmentVariable("S3_REGION");
-        public static string S3_BUCKET_NAME => Environment.GetEnvironmentVariable("S3_BUCKET_NAME");
-        public static string S3_INTERNAL_BUCKET_NAME => Environment.GetEnvironmentVariable("S3_INTERNAL_BUCKET_NAME");
-        public static string S3_INTERNAL_SERVICE_URL => Environment.GetEnvironmentVariable("S3_INTERNAL_SERVICE_URL");
-
-        // SMTP settings
-        public static string SMTP_USERNAME => Environment.GetEnvironmentVariable("SMTP_USERNAME");
-        public static string SMTP_PASSWORD => Environment.GetEnvironmentVariable("SMTP_PASSWORD");
-        public static string SMTP_HOST => Environment.GetEnvironmentVariable("SMTP_HOST");
-        public static string SMTP_PORT => Environment.GetEnvironmentVariable("SMTP_PORT");
-        public static string SMTP_REPLYTO_EMAIL => Environment.GetEnvironmentVariable("SMTP_REPLYTO_EMAIL");
-        public static string NOTESNOOK_SENDER_EMAIL => Environment.GetEnvironmentVariable("NOTESNOOK_SENDER_EMAIL") ?? Environment.GetEnvironmentVariable("SMTP_USERNAME");
-
-        public static string NOTESNOOK_APP_HOST => Environment.GetEnvironmentVariable("NOTESNOOK_APP_HOST");
-        public static string NOTESNOOK_API_SECRET => Environment.GetEnvironmentVariable("NOTESNOOK_API_SECRET");
-
-        // MessageBird is used for SMS sending
-        public static string TWILIO_ACCOUNT_SID => Environment.GetEnvironmentVariable("TWILIO_ACCOUNT_SID");
-        public static string TWILIO_AUTH_TOKEN => Environment.GetEnvironmentVariable("TWILIO_AUTH_TOKEN");
-        public static string TWILIO_SERVICE_SID => Environment.GetEnvironmentVariable("TWILIO_SERVICE_SID");
-        // Server discovery
-        public static int NOTESNOOK_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("NOTESNOOK_SERVER_PORT") ?? "80");
-        public static string NOTESNOOK_SERVER_HOST => Environment.GetEnvironmentVariable("NOTESNOOK_SERVER_HOST");
-        public static string NOTESNOOK_CERT_PATH => Environment.GetEnvironmentVariable("NOTESNOOK_CERT_PATH");
-        public static string NOTESNOOK_CERT_KEY_PATH => Environment.GetEnvironmentVariable("NOTESNOOK_CERT_KEY_PATH");
-
-        public static int IDENTITY_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("IDENTITY_SERVER_PORT") ?? "80");
-        public static string IDENTITY_SERVER_HOST => Environment.GetEnvironmentVariable("IDENTITY_SERVER_HOST");
-        public static string IDENTITY_SERVER_DOMAIN => Environment.GetEnvironmentVariable("IDENTITY_SERVER_DOMAIN");
-        public static string IDENTITY_CERT_PATH => Environment.GetEnvironmentVariable("IDENTITY_CERT_PATH");
-        public static string IDENTITY_CERT_KEY_PATH => Environment.GetEnvironmentVariable("IDENTITY_CERT_KEY_PATH");
-
-        public static int SSE_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("SSE_SERVER_PORT") ?? "80");
-        public static string SSE_SERVER_HOST => Environment.GetEnvironmentVariable("SSE_SERVER_HOST");
-        public static string SSE_CERT_PATH => Environment.GetEnvironmentVariable("SSE_CERT_PATH");
-        public static string SSE_CERT_KEY_PATH => Environment.GetEnvironmentVariable("SSE_CERT_KEY_PATH");
-
-        // internal
-        public static string MONGODB_CONNECTION_STRING => Environment.GetEnvironmentVariable("MONGODB_CONNECTION_STRING");
-        public static string MONGODB_DATABASE_NAME => Environment.GetEnvironmentVariable("MONGODB_DATABASE_NAME");
-        public static int SUBSCRIPTIONS_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("SUBSCRIPTIONS_SERVER_PORT") ?? "80");
-        public static string SUBSCRIPTIONS_SERVER_HOST => Environment.GetEnvironmentVariable("SUBSCRIPTIONS_SERVER_HOST");
-        public static string SUBSCRIPTIONS_CERT_PATH => Environment.GetEnvironmentVariable("SUBSCRIPTIONS_CERT_PATH");
-        public static string SUBSCRIPTIONS_CERT_KEY_PATH => Environment.GetEnvironmentVariable("SUBSCRIPTIONS_CERT_KEY_PATH");
-        public static string[] NOTESNOOK_CORS_ORIGINS => Environment.GetEnvironmentVariable("NOTESNOOK_CORS")?.Split(",") ?? new string[] { };
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+
+namespace Streetwriters.Common
+{
+    public class Constants
+    {
+        public static int COMPATIBILITY_VERSION = 1;
+        public static bool IS_SELF_HOSTED => Environment.GetEnvironmentVariable("SELF_HOSTED") == "1";
+        public static bool DISABLE_SIGNUPS => Environment.GetEnvironmentVariable("DISABLE_SIGNUPS") == "true";
+        public static string INSTANCE_NAME => Environment.GetEnvironmentVariable("INSTANCE_NAME") ?? "default";
+
+        // S3 related
+        public static string S3_ACCESS_KEY => Environment.GetEnvironmentVariable("S3_ACCESS_KEY");
+        public static string S3_ACCESS_KEY_ID => Environment.GetEnvironmentVariable("S3_ACCESS_KEY_ID");
+        public static string S3_SERVICE_URL => Environment.GetEnvironmentVariable("S3_SERVICE_URL");
+        public static string S3_REGION => Environment.GetEnvironmentVariable("S3_REGION");
+        public static string S3_BUCKET_NAME => Environment.GetEnvironmentVariable("S3_BUCKET_NAME");
+        public static string S3_INTERNAL_BUCKET_NAME => Environment.GetEnvironmentVariable("S3_INTERNAL_BUCKET_NAME");
+        public static string S3_INTERNAL_SERVICE_URL => Environment.GetEnvironmentVariable("S3_INTERNAL_SERVICE_URL");
+
+        // SMTP settings
+        public static string SMTP_USERNAME => Environment.GetEnvironmentVariable("SMTP_USERNAME");
+        public static string SMTP_PASSWORD => Environment.GetEnvironmentVariable("SMTP_PASSWORD");
+        public static string SMTP_HOST => Environment.GetEnvironmentVariable("SMTP_HOST");
+        public static string SMTP_PORT => Environment.GetEnvironmentVariable("SMTP_PORT");
+        public static string SMTP_REPLYTO_EMAIL => Environment.GetEnvironmentVariable("SMTP_REPLYTO_EMAIL");
+        public static string NOTESNOOK_SENDER_EMAIL => Environment.GetEnvironmentVariable("NOTESNOOK_SENDER_EMAIL") ?? Environment.GetEnvironmentVariable("SMTP_USERNAME");
+
+        public static string NOTESNOOK_APP_HOST => Environment.GetEnvironmentVariable("NOTESNOOK_APP_HOST");
+        public static string NOTESNOOK_API_SECRET => Environment.GetEnvironmentVariable("NOTESNOOK_API_SECRET");
+
+        // MessageBird is used for SMS sending
+        public static string TWILIO_ACCOUNT_SID => Environment.GetEnvironmentVariable("TWILIO_ACCOUNT_SID");
+        public static string TWILIO_AUTH_TOKEN => Environment.GetEnvironmentVariable("TWILIO_AUTH_TOKEN");
+        public static string TWILIO_SERVICE_SID => Environment.GetEnvironmentVariable("TWILIO_SERVICE_SID");
+        // Server discovery
+        public static int NOTESNOOK_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("NOTESNOOK_SERVER_PORT") ?? "80");
+        public static string NOTESNOOK_SERVER_HOST => Environment.GetEnvironmentVariable("NOTESNOOK_SERVER_HOST");
+        public static string NOTESNOOK_CERT_PATH => Environment.GetEnvironmentVariable("NOTESNOOK_CERT_PATH");
+        public static string NOTESNOOK_CERT_KEY_PATH => Environment.GetEnvironmentVariable("NOTESNOOK_CERT_KEY_PATH");
+
+        public static int IDENTITY_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("IDENTITY_SERVER_PORT") ?? "80");
+        public static string IDENTITY_SERVER_HOST => Environment.GetEnvironmentVariable("IDENTITY_SERVER_HOST");
+        public static Uri IDENTITY_SERVER_URL => new(Environment.GetEnvironmentVariable("IDENTITY_SERVER_URL"));
+        public static string IDENTITY_CERT_PATH => Environment.GetEnvironmentVariable("IDENTITY_CERT_PATH");
+        public static string IDENTITY_CERT_KEY_PATH => Environment.GetEnvironmentVariable("IDENTITY_CERT_KEY_PATH");
+
+        public static int SSE_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("SSE_SERVER_PORT") ?? "80");
+        public static string SSE_SERVER_HOST => Environment.GetEnvironmentVariable("SSE_SERVER_HOST");
+        public static string SSE_CERT_PATH => Environment.GetEnvironmentVariable("SSE_CERT_PATH");
+        public static string SSE_CERT_KEY_PATH => Environment.GetEnvironmentVariable("SSE_CERT_KEY_PATH");
+
+        // internal
+        public static string WEBRISK_API_URI => Environment.GetEnvironmentVariable("WEBRISK_API_URI");
+        public static string MONGODB_CONNECTION_STRING => Environment.GetEnvironmentVariable("MONGODB_CONNECTION_STRING");
+        public static string MONGODB_DATABASE_NAME => Environment.GetEnvironmentVariable("MONGODB_DATABASE_NAME");
+        public static int SUBSCRIPTIONS_SERVER_PORT => int.Parse(Environment.GetEnvironmentVariable("SUBSCRIPTIONS_SERVER_PORT") ?? "80");
+        public static string SUBSCRIPTIONS_SERVER_HOST => Environment.GetEnvironmentVariable("SUBSCRIPTIONS_SERVER_HOST");
+        public static string SUBSCRIPTIONS_CERT_PATH => Environment.GetEnvironmentVariable("SUBSCRIPTIONS_CERT_PATH");
+        public static string SUBSCRIPTIONS_CERT_KEY_PATH => Environment.GetEnvironmentVariable("SUBSCRIPTIONS_CERT_KEY_PATH");
+        public static string[] NOTESNOOK_CORS_ORIGINS => Environment.GetEnvironmentVariable("NOTESNOOK_CORS")?.Split(",") ?? new string[] { };
+    }
 }

Streetwriters.Common/Converters/InterfaceConverter.cs

@@ -1,54 +1,54 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace Streetwriters.Common.Converters
-{
-    /// <summary>
-    /// Converts simple interface into an object (assumes that there is only one class of TInterface)
-    /// </summary>
-    /// <typeparam name="TInterface">Interface type</typeparam>
-    /// <typeparam name="TClass">Class type</typeparam>
-    public class InterfaceConverter<TInterface, TClass> : JsonConverter<TInterface> where TClass : TInterface
-    {
-        public override TInterface Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            return JsonSerializer.Deserialize<TClass>(ref reader, options);
-        }
-
-        public override void Write(Utf8JsonWriter writer, TInterface value, JsonSerializerOptions options)
-        {
-            switch (value)
-            {
-                case null:
-                    JsonSerializer.Serialize(writer, null, options);
-                    break;
-                default:
-                    {
-                        var type = value.GetType();
-                        JsonSerializer.Serialize(writer, value, type, options);
-                        break;
-                    }
-            }
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Streetwriters.Common.Converters
+{
+    /// <summary>
+    /// Converts simple interface into an object (assumes that there is only one class of TInterface)
+    /// </summary>
+    /// <typeparam name="TInterface">Interface type</typeparam>
+    /// <typeparam name="TClass">Class type</typeparam>
+    public class InterfaceConverter<TInterface, TClass> : JsonConverter<TInterface> where TClass : TInterface
+    {
+        public override TInterface Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return JsonSerializer.Deserialize<TClass>(ref reader, options);
+        }
+
+        public override void Write(Utf8JsonWriter writer, TInterface value, JsonSerializerOptions options)
+        {
+            switch (value)
+            {
+                case null:
+                    JsonSerializer.Serialize(writer, null, options);
+                    break;
+                default:
+                    {
+                        var type = value.GetType();
+                        JsonSerializer.Serialize(writer, value, type, options);
+                        break;
+                    }
+            }
+        }
+    }
 }

Streetwriters.Common/Enums/ApplicationType.cs

@@ -1,26 +1,26 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace Streetwriters.Common.Enums
-{
-    public enum ApplicationType
-    {
-        NOTESNOOK = 0
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Streetwriters.Common.Enums
+{
+    public enum ApplicationType
+    {
+        NOTESNOOK = 0
+    }
 }

Streetwriters.Common/Enums/MFAMethods.cs

@@ -1,29 +1,29 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace Streetwriters.Common.Enums
-{
-    public class MFAMethods
-    {
-        public static string Email => "email";
-        public static string SMS => "sms";
-        public static string App => "app";
-        public static string RecoveryCode => "recoveryCode";
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Streetwriters.Common.Enums
+{
+    public class MFAMethods
+    {
+        public static string Email => "email";
+        public static string SMS => "sms";
+        public static string App => "app";
+        public static string RecoveryCode => "recoveryCode";
+    }
 }

Streetwriters.Common/Enums/SubscriptionPlan.cs

@@ -17,17 +17,17 @@ You should have received a copy of the Affero GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using Streetwriters.Identity.Interfaces;
+using System;
 
-namespace Streetwriters.Identity.Models
+namespace Streetwriters.Common.Enums
 {
-    public class EmailTemplate : IEmailTemplate
+    public enum SubscriptionPlan
     {
-        public int? Id { get; set; }
-        public object Data { get; set; }
-        public long? SendAt { get; set; }
-        public string Subject { get; set; }
-        public string Html { get; set; }
-        public string Text { get; set; }
+        FREE = 0,
+        ESSENTIAL = 1,
+        PRO = 2,
+        BELIEVER = 3,
+        EDUCATION = 4,
+        LEGACY_PRO = 5
     }
 }

Streetwriters.Common/Enums/SubscriptionProvider.cs

@@ -1,29 +1,30 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace Streetwriters.Common.Enums
-{
-    public enum SubscriptionProvider
-    {
-        STREETWRITERS = 0,
-        APPLE = 1,
-        GOOGLE = 2,
-        PADDLE = 3
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Streetwriters.Common.Enums
+{
+    public enum SubscriptionProvider
+    {
+        STREETWRITERS = 0,
+        APPLE = 1,
+        GOOGLE = 2,
+        PADDLE = 3,
+        GIFT_CARD = 4,
+    }
+}

Streetwriters.Common/Enums/SubscriptionStatus.cs

@@ -0,0 +1,30 @@
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Streetwriters.Common.Enums
+{
+    public enum SubscriptionStatus
+    {
+        ACTIVE,
+        TRIAL,
+        CANCELED,
+        PAUSED,
+        EXPIRED
+    }
+}

Streetwriters.Common/Enums/SubscriptionType.cs

@@ -27,6 +27,6 @@ namespace Streetwriters.Common.Enums
         PREMIUM = 5,
         PREMIUM_EXPIRED = 6,
         PREMIUM_CANCELED = 7,
-        PREMIUM_PAUSED = 8
+        PREMIUM_PAUSED = 8,
     }
 }

Streetwriters.Common/Extensions/AppBuilderExtensions.cs

@@ -1,86 +1,86 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-using System.Collections.Generic;
-using System.Text.Json;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
-using WampSharp.AspNetCore.WebSockets.Server;
-using WampSharp.Binding;
-using WampSharp.V2;
-using WampSharp.V2.Realm;
-
-namespace Streetwriters.Common.Extensions
-{
-    public static class AppBuilderExtensions
-    {
-        public static IApplicationBuilder UseVersion(this IApplicationBuilder app, Server server)
-        {
-            app.Map("/version", (app) =>
-            {
-                app.Run(async context =>
-                {
-                    context.Response.ContentType = "application/json";
-                    var data = new Dictionary<string, object>
-                    {
-                        { "version", Constants.COMPATIBILITY_VERSION },
-                        { "id", server.Id },
-                        { "instance", Constants.INSTANCE_NAME }
-                    };
-                    await context.Response.WriteAsync(JsonSerializer.Serialize(data));
-                });
-            });
-            return app;
-        }
-
-        public static IApplicationBuilder UseWamp<T>(this IApplicationBuilder app, WampServer<T> server, Action<IWampHostedRealm, WampServer<T>> action) where T : new()
-        {
-            WampHost host = new WampHost();
-
-            app.Map(server.Endpoint, builder =>
-            {
-                builder.UseWebSockets();
-                host.RegisterTransport(new AspNetCoreWebSocketTransport(builder),
-                                       new JTokenJsonBinding(),
-                                       new JTokenMsgpackBinding());
-            });
-
-            host.Open();
-
-            action.Invoke(host.RealmContainer.GetRealmByName(server.Realm), server);
-
-            return app;
-        }
-
-        public static T GetService<T>(this IApplicationBuilder app)
-        {
-            return app.ApplicationServices.GetRequiredService<T>();
-        }
-
-        public static T GetScopedService<T>(this IApplicationBuilder app)
-        {
-            using (var scope = app.ApplicationServices.CreateScope())
-            {
-                return scope.ServiceProvider.GetRequiredService<T>();
-            }
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using WampSharp.AspNetCore.WebSockets.Server;
+using WampSharp.Binding;
+using WampSharp.V2;
+using WampSharp.V2.Realm;
+
+namespace Streetwriters.Common.Extensions
+{
+    public static class AppBuilderExtensions
+    {
+        public static IApplicationBuilder UseVersion(this IApplicationBuilder app, Server server)
+        {
+            app.Map("/version", (app) =>
+            {
+                app.Run(async context =>
+                {
+                    context.Response.ContentType = "application/json";
+                    var data = new Dictionary<string, object>
+                    {
+                        { "version", Constants.COMPATIBILITY_VERSION },
+                        { "id", server.Id },
+                        { "instance", Constants.INSTANCE_NAME }
+                    };
+                    await context.Response.WriteAsync(JsonSerializer.Serialize(data));
+                });
+            });
+            return app;
+        }
+
+        public static IApplicationBuilder UseWamp<T>(this IApplicationBuilder app, WampServer<T> server, Action<IWampHostedRealm, WampServer<T>> action) where T : new()
+        {
+            WampHost host = new WampHost();
+
+            app.Map(server.Endpoint, builder =>
+            {
+                builder.UseWebSockets();
+                host.RegisterTransport(new AspNetCoreWebSocketTransport(builder),
+                                       new JTokenJsonBinding(),
+                                       new JTokenMsgpackBinding());
+            });
+
+            host.Open();
+
+            action.Invoke(host.RealmContainer.GetRealmByName(server.Realm), server);
+
+            return app;
+        }
+
+        public static T GetService<T>(this IApplicationBuilder app)
+        {
+            return app.ApplicationServices.GetRequiredService<T>();
+        }
+
+        public static T GetScopedService<T>(this IApplicationBuilder app)
+        {
+            using (var scope = app.ApplicationServices.CreateScope())
+            {
+                return scope.ServiceProvider.GetRequiredService<T>();
+            }
+        }
+    }
 }

Streetwriters.Common/Extensions/HttpClientExtensions.cs

@@ -1,72 +1,74 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Json;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Streetwriters.Common.Interfaces;
-
-namespace Streetwriters.Common.Extensions
-{
-    public static class HttpClientExtensions
-    {
-        public static async Task<T> SendRequestAsync<T>(this HttpClient httpClient, string url, IHeaderDictionary headers, HttpMethod method, HttpContent content = null) where T : IResponse, new()
-        {
-            var request = new HttpRequestMessage(method, url);
-
-            if (method != HttpMethod.Get && method != HttpMethod.Delete)
-            {
-                request.Content = content;
-            }
-
-            foreach (var header in headers)
-            {
-                if (header.Key == "Content-Type" || header.Key == "Content-Length")
-                {
-                    if (request.Content != null)
-                        request.Content.Headers.TryAddWithoutValidation(header.Key, header.Value.AsEnumerable());
-                    continue;
-                }
-                request.Headers.TryAddWithoutValidation(header.Key, header.Value.AsEnumerable());
-            }
-
-            var response = await httpClient.SendAsync(request);
-            if (response.Content.Headers.ContentLength > 0)
-            {
-                var res = await response.Content.ReadFromJsonAsync<T>();
-                res.Success = response.IsSuccessStatusCode;
-                res.StatusCode = (int)response.StatusCode;
-                return res;
-            }
-            else
-            {
-                return new T { Success = response.IsSuccessStatusCode, StatusCode = (int)response.StatusCode };
-            }
-        }
-
-        public static Task<T> ForwardAsync<T>(this HttpClient httpClient, IHttpContextAccessor accessor, string url, HttpMethod method) where T : IResponse, new()
-        {
-            var httpContext = accessor.HttpContext;
-            var content = new StreamContent(httpContext.Request.BodyReader.AsStream());
-            return httpClient.SendRequestAsync<T>(url, httpContext.Request.Headers, method, content);
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Linq;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Streetwriters.Common.Interfaces;
+
+namespace Streetwriters.Common.Extensions
+{
+    public static class HttpClientExtensions
+    {
+        public static async Task<T> SendRequestAsync<T>(this HttpClient httpClient, string url, IHeaderDictionary headers, HttpMethod method, HttpContent content = null) where T : IResponse, new()
+        {
+            var request = new HttpRequestMessage(method, url);
+
+            if (method != HttpMethod.Get && method != HttpMethod.Delete)
+            {
+                request.Content = content;
+            }
+
+            if (headers != null)
+            {
+                foreach (var header in headers)
+                {
+                    if (header.Key == "Content-Type" || header.Key == "Content-Length")
+                    {
+                        request.Content?.Headers.TryAddWithoutValidation(header.Key, header.Value.AsEnumerable());
+                        continue;
+                    }
+                    request.Headers.TryAddWithoutValidation(header.Key, header.Value.AsEnumerable());
+                }
+            }
+
+            var response = await httpClient.SendAsync(request);
+            if (response.Content.Headers.ContentLength > 0 && response.Content.Headers.ContentType.ToString().Contains("application/json"))
+            {
+                var res = await response.Content.ReadFromJsonAsync<T>();
+                res.Success = response.IsSuccessStatusCode;
+                res.StatusCode = (int)response.StatusCode;
+                return res;
+            }
+            else
+            {
+                return new T { Success = response.IsSuccessStatusCode, StatusCode = (int)response.StatusCode, Content = response.Content };
+            }
+        }
+
+        public static Task<T> ForwardAsync<T>(this HttpClient httpClient, IHttpContextAccessor accessor, string url, HttpMethod method) where T : IResponse, new()
+        {
+            var httpContext = accessor.HttpContext;
+            var content = new StreamContent(httpContext.Request.BodyReader.AsStream());
+            return httpClient.SendRequestAsync<T>(url, httpContext.Request.Headers, method, content);
+        }
+    }
 }

Streetwriters.Common/Extensions/ServiceCollectionServiceExtensions.cs

@@ -1,53 +1,53 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using Microsoft.Extensions.DependencyInjection;
-using Streetwriters.Data.DbContexts;
-using Streetwriters.Data.Repositories;
-
-namespace Streetwriters.Common.Extensions
-{
-    public static class ServiceCollectionServiceExtensions
-    {
-        public static IServiceCollection AddRepository<T>(this IServiceCollection services, string collectionName, string database) where T : class
-        {
-            services.AddSingleton((provider) => MongoDbContext.GetMongoCollection<T>(provider.GetService<MongoDB.Driver.IMongoClient>(), database, collectionName));
-            services.AddScoped<Repository<T>>();
-            return services;
-        }
-
-        public static IServiceCollection AddDefaultCors(this IServiceCollection services)
-        {
-            services.AddCors(options =>
-            {
-                options.AddPolicy("notesnook", (b) =>
-                {
-                    if (Constants.NOTESNOOK_CORS_ORIGINS.Length <= 0)
-                        b.AllowAnyOrigin();
-                    else
-                        b.WithOrigins(Constants.NOTESNOOK_CORS_ORIGINS);
-
-                    b.AllowAnyMethod()
-                    .AllowAnyHeader();
-                });
-            });
-            return services;
-        }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using Microsoft.Extensions.DependencyInjection;
+using Streetwriters.Data.DbContexts;
+using Streetwriters.Data.Repositories;
+
+namespace Streetwriters.Common.Extensions
+{
+    public static class ServiceCollectionServiceExtensions
+    {
+        public static IServiceCollection AddRepository<T>(this IServiceCollection services, string collectionName, string database) where T : class
+        {
+            services.AddSingleton((provider) => MongoDbContext.GetMongoCollection<T>(provider.GetService<MongoDB.Driver.IMongoClient>(), database, collectionName));
+            services.AddScoped<Repository<T>>();
+            return services;
+        }
+
+        public static IServiceCollection AddDefaultCors(this IServiceCollection services)
+        {
+            services.AddCors(options =>
+            {
+                options.AddPolicy("notesnook", (b) =>
+                {
+                    if (Constants.NOTESNOOK_CORS_ORIGINS.Length <= 0)
+                        b.AllowAnyOrigin();
+                    else
+                        b.WithOrigins(Constants.NOTESNOOK_CORS_ORIGINS);
+
+                    b.AllowAnyMethod()
+                    .AllowAnyHeader();
+                });
+            });
+            return services;
+        }
+    }
+}

Streetwriters.Common/Extensions/StringExtensions.cs

@@ -1,87 +1,87 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.IO;
-using System.IO.Compression;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace System
-{
-    public static class StringExtensions
-    {
-        public static string Sha256(this string input)
-        {
-            var bytes = Encoding.UTF8.GetBytes(input);
-            var hash = SHA256.HashData(bytes);
-            return Convert.ToBase64String(hash);
-        }
-
-        public static byte[] CompressBrotli(this string input)
-        {
-            var raw = Encoding.Default.GetBytes(input);
-            using (MemoryStream memory = new MemoryStream())
-            {
-                using (BrotliStream brotli = new BrotliStream(memory, CompressionLevel.Optimal))
-                {
-                    brotli.Write(raw, 0, raw.Length);
-                }
-                return memory.ToArray();
-            }
-        }
-
-        public static string DecompressBrotli(this byte[] compressed)
-        {
-            using (BrotliStream stream = new BrotliStream(new MemoryStream(compressed), CompressionMode.Decompress))
-            {
-                const int size = 4096;
-                byte[] buffer = new byte[size];
-                using (MemoryStream memory = new MemoryStream())
-                {
-                    int count = 0;
-                    do
-                    {
-                        count = stream.Read(buffer, 0, size);
-                        if (count > 0)
-                        {
-                            memory.Write(buffer, 0, count);
-                        }
-                    }
-                    while (count > 0);
-                    return Encoding.Default.GetString(memory.ToArray());
-                }
-            }
-        }
-
-        private static string ToHex(byte[] bytes, int startIndex, int length)
-        {
-            char[] c = new char[length * 2];
-            byte b;
-            for (int bx = startIndex, cx = startIndex; bx < length; ++bx, ++cx)
-            {
-                b = ((byte)(bytes[bx] >> 4));
-                c[cx] = (char)(b > 9 ? b + 0x37 + 0x20 : b + 0x30);
-
-                b = ((byte)(bytes[bx] & 0x0F));
-                c[++cx] = (char)(b > 9 ? b + 0x37 + 0x20 : b + 0x30);
-            }
-            return new string(c);
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.IO;
+using System.IO.Compression;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace System
+{
+    public static class StringExtensions
+    {
+        public static string Sha256(this string input)
+        {
+            var bytes = Encoding.UTF8.GetBytes(input);
+            var hash = SHA256.HashData(bytes);
+            return Convert.ToBase64String(hash);
+        }
+
+        public static byte[] CompressBrotli(this string input)
+        {
+            var raw = Encoding.Default.GetBytes(input);
+            using (MemoryStream memory = new MemoryStream())
+            {
+                using (BrotliStream brotli = new BrotliStream(memory, CompressionLevel.Optimal))
+                {
+                    brotli.Write(raw, 0, raw.Length);
+                }
+                return memory.ToArray();
+            }
+        }
+
+        public static string DecompressBrotli(this byte[] compressed)
+        {
+            using (BrotliStream stream = new BrotliStream(new MemoryStream(compressed), CompressionMode.Decompress))
+            {
+                const int size = 4096;
+                byte[] buffer = new byte[size];
+                using (MemoryStream memory = new MemoryStream())
+                {
+                    int count = 0;
+                    do
+                    {
+                        count = stream.Read(buffer, 0, size);
+                        if (count > 0)
+                        {
+                            memory.Write(buffer, 0, count);
+                        }
+                    }
+                    while (count > 0);
+                    return Encoding.Default.GetString(memory.ToArray());
+                }
+            }
+        }
+
+        private static string ToHex(byte[] bytes, int startIndex, int length)
+        {
+            char[] c = new char[length * 2];
+            byte b;
+            for (int bx = startIndex, cx = startIndex; bx < length; ++bx, ++cx)
+            {
+                b = ((byte)(bytes[bx] >> 4));
+                c[cx] = (char)(b > 9 ? b + 0x37 + 0x20 : b + 0x30);
+
+                b = ((byte)(bytes[bx] & 0x0F));
+                c[++cx] = (char)(b > 9 ? b + 0x37 + 0x20 : b + 0x30);
+            }
+            return new string(c);
+        }
+    }
 }

Streetwriters.Common/Extensions/WampRealmExtensions.cs

@@ -1,42 +1,66 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-using Microsoft.AspNetCore.Builder;
-using Streetwriters.Common.Interfaces;
-using WampSharp.AspNetCore.WebSockets.Server;
-using WampSharp.Binding;
-using WampSharp.V2;
-using WampSharp.V2.Realm;
-
-namespace Streetwriters.Common.Extensions
-{
-    public static class WampRealmExtensions
-    {
-        public static IDisposable Subscribe<T>(this IWampHostedRealm realm, string topicName, Action<T> onNext)
-        {
-            return realm.Services.GetSubject<T>(topicName).Subscribe<T>(onNext);
-        }
-
-        public static IDisposable Subscribe<T>(this IWampHostedRealm realm, string topicName, IMessageHandler<T> handler)
-        {
-            return realm.Services.GetSubject<T>(topicName).Subscribe<T>(async (message) => await handler.Process(message));
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Reactive.Disposables;
+using System.Threading;
+using Microsoft.AspNetCore.Builder;
+using Streetwriters.Common.Interfaces;
+using WampSharp.AspNetCore.WebSockets.Server;
+using WampSharp.Binding;
+using WampSharp.V2;
+using WampSharp.V2.Realm;
+
+namespace Streetwriters.Common.Extensions
+{
+    public static class WampRealmExtensions
+    {
+        public static IDisposable Subscribe<T>(this IWampHostedRealm realm, string topicName, Action<T> onNext)
+        {
+            return realm.Services.GetSubject<T>(topicName).Subscribe<T>(onNext);
+        }
+
+        public static IDisposable Subscribe<T>(this IWampHostedRealm realm, string topicName, IMessageHandler<T> handler)
+        {
+            return realm.Services.GetSubject<T>(topicName).Subscribe<T>(async (message) => await handler.Process(message));
+        }
+
+        public static IDisposable SubscribeWithSemaphore<T>(this IWampHostedRealm realm, string topicName, IMessageHandler<T> handler)
+        {
+            var semaphore = new SemaphoreSlim(1, 1);
+            var subscriber = realm.Services.GetSubject<T>(topicName).Subscribe<T>(async (message) =>
+            {
+                await semaphore.WaitAsync();
+                try
+                {
+                    await handler.Process(message);
+                }
+                finally
+                {
+                    semaphore.Release();
+                }
+            });
+            return Disposable.Create(() =>
+            {
+                subscriber.Dispose();
+                semaphore.Dispose();
+            });
+        }
+    }
 }

Streetwriters.Common/Helpers/HtmlHelper.cs

@@ -0,0 +1,23 @@
+using System.IO;
+using WebMarkupMin.Core;
+using WebMarkupMin.Core.Loggers;
+
+namespace Streetwriters.Common.Helpers
+{
+    public static class HtmlHelper
+    {
+        public static string ReadMinifiedHtmlFile(string path)
+        {
+            var settings = new HtmlMinificationSettings()
+            {
+                WhitespaceMinificationMode = WhitespaceMinificationMode.Medium,
+            };
+            var cssMinifier = new KristensenCssMinifier();
+            var jsMinifier = new CrockfordJsMinifier();
+
+            var minifier = new HtmlMinifier(settings, cssMinifier, jsMinifier, new NullLogger());
+
+            return minifier.Minify(File.ReadAllText(path), false).MinifiedContent;
+        }
+    }
+}

Streetwriters.Common/Helpers/WampHelper.cs

@@ -17,6 +17,7 @@ You should have received a copy of the Affero GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+using System.Collections.Generic;
 using System.Reactive.Subjects;
 using System.Threading.Tasks;
 using Streetwriters.Common.Messages;
@@ -43,5 +44,12 @@ namespace Streetwriters.Common.Helpers
             var subject = realm.Services.GetSubject<T>(topicName);
             subject.OnNext(message);
         }
+
+        public static void PublishMessages<T>(IWampRealmProxy realm, string topicName, IEnumerable<T> messages)
+        {
+            var subject = realm.Services.GetSubject<T>(topicName);
+            foreach (var message in messages)
+                subject.OnNext(message);
+        }
     }
 }

Streetwriters.Common/Interfaces/IClient.cs

@@ -1,38 +1,38 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-using System.Threading.Tasks;
-using Streetwriters.Common.Enums;
-
-namespace Streetwriters.Common.Interfaces
-{
-    public interface IClient
-    {
-        string Id { get; set; }
-        string Name { get; set; }
-        ApplicationType Type { get; set; }
-        ApplicationType AppId { get; set; }
-        string SenderEmail { get; set; }
-        string SenderName { get; set; }
-        string EmailConfirmedRedirectURL { get; }
-        string AccountRecoveryRedirectURL { get; }
-        Func<string, Task> OnEmailConfirmed { get; set; }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Threading.Tasks;
+using Streetwriters.Common.Enums;
+
+namespace Streetwriters.Common.Interfaces
+{
+    public interface IClient
+    {
+        string Id { get; set; }
+        string Name { get; set; }
+        ApplicationType Type { get; set; }
+        ApplicationType AppId { get; set; }
+        string SenderEmail { get; set; }
+        string SenderName { get; set; }
+        string EmailConfirmedRedirectURL { get; }
+        string AccountRecoveryRedirectURL { get; }
+        Func<string, Task> OnEmailConfirmed { get; set; }
+    }
+}

Streetwriters.Common/Interfaces/IDocument.cs

@@ -1,29 +1,29 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace Streetwriters.Common.Interfaces
-{
-    public interface IDocument
-    {
-        string Id
-        {
-            get; set;
-        }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace Streetwriters.Common.Interfaces
+{
+    public interface IDocument
+    {
+        string Id
+        {
+            get; set;
+        }
+    }
+}

Streetwriters.Common/Interfaces/IEmailSender.cs

@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MimeKit;
+using MimeKit.Cryptography;
+using Streetwriters.Common.Models;
+
+namespace Streetwriters.Common.Interfaces
+{
+    public interface IEmailSender
+    {
+        Task SendEmailAsync(
+            string email,
+            EmailTemplate template,
+            IClient client,
+            GnuPGContext gpgContext = null,
+            Dictionary<string, byte[]> attachments = null
+        );
+    }
+}

Streetwriters.Common/Interfaces/IMessageHandler.cs

@@ -1,29 +1,29 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Threading.Tasks;
-using Streetwriters.Common.Interfaces;
-
-namespace Streetwriters.Common.Interfaces
-{
-    public interface IMessageHandler<T>
-    {
-        Task Process(T message);
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Threading.Tasks;
+using Streetwriters.Common.Interfaces;
+
+namespace Streetwriters.Common.Interfaces
+{
+    public interface IMessageHandler<T>
+    {
+        Task Process(T message);
+    }
 }

Streetwriters.Common/Interfaces/IOffer.cs

@@ -1,32 +1,32 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Collections.Generic;
-using Streetwriters.Common.Enums;
-using Streetwriters.Common.Models;
-
-namespace Streetwriters.Common.Interfaces
-{
-    public interface IOffer : IDocument
-    {
-        ApplicationType AppId { get; set; }
-        string PromoCode { get; set; }
-        PromoCode[] Codes { get; set; }
-    }
-}
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Collections.Generic;
+using Streetwriters.Common.Enums;
+using Streetwriters.Common.Models;
+
+namespace Streetwriters.Common.Interfaces
+{
+    public interface IOffer : IDocument
+    {
+        ApplicationType AppId { get; set; }
+        string PromoCode { get; set; }
+        PromoCode[] Codes { get; set; }
+    }
+}

Streetwriters.Common/Interfaces/IResponse.cs

@@ -1,27 +1,30 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace Streetwriters.Common.Interfaces
-{
-    public interface IResponse
-    {
-        bool Success { get; set; }
-        int StatusCode { get; set; }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Net.Http;
+
+namespace Streetwriters.Common.Interfaces
+{
+    public interface IResponse
+    {
+        bool Success { get; set; }
+        int StatusCode { get; set; }
+        HttpContent Content { get; set; }
+    }
 }

Streetwriters.Common/Interfaces/IURLAnalyzer.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using MimeKit;
+using MimeKit.Cryptography;
+using Streetwriters.Common.Models;
+
+namespace Streetwriters.Common.Interfaces
+{
+    public interface IURLAnalyzer
+    {
+        Task<bool> IsURLSafeAsync(string uri);
+    }
+}

Streetwriters.Common/Interfaces/IUserAccountService.cs

@@ -7,7 +7,7 @@ namespace Streetwriters.Common.Interfaces
     public interface IUserAccountService
     {
         [WampProcedure("co.streetwriters.identity.users.get_user")]
-        Task<UserModel> GetUserAsync(string clientId, string userId);
+        Task<UserModel?> GetUserAsync(string clientId, string userId);
         [WampProcedure("co.streetwriters.identity.users.delete_user")]
         Task DeleteUserAsync(string clientId, string userId, string password);
         // [WampProcedure("co.streetwriters.identity.users.create_user")]

Streetwriters.Common/Interfaces/IUserSubscriptionService.cs

@@ -9,5 +9,6 @@ namespace Streetwriters.Common.Interfaces
     {
         [WampProcedure("co.streetwriters.subscriptions.subscriptions.get_user_subscription")]
         Task<Subscription> GetUserSubscriptionAsync(string clientId, string userId);
+        Subscription TransformUserSubscription(Subscription subscription);
     }
 }

Streetwriters.Common/Logger.cs

@@ -1,52 +1,52 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace Streetwriters.Common
-{
-    public class Slogger<T>
-    {
-        public static Task Info(string scope, params string[] messages)
-        {
-            return Write(Format("info", scope, messages));
-        }
-
-        public static Task Error(string scope, params string[] messages)
-        {
-            return Write(Format("error", scope, messages));
-        }
-        private static string Format(string level, string scope, params string[] messages)
-        {
-            var date = DateTime.UtcNow.ToString("MM-dd-yyyy HH:mm:ss");
-            var messageText = string.Join(" ", messages);
-            return $"[{date}] | {level} | <{scope}> {messageText}";
-        }
-        private static Task Write(string line)
-        {
-            var logDirectory = Path.GetFullPath("./logs");
-            if (!Directory.Exists(logDirectory))
-                Directory.CreateDirectory(logDirectory);
-            var path = Path.Join(logDirectory, typeof(T).FullName + "-" + DateTime.UtcNow.ToString("MM-dd-yyyy") + ".log");
-            return File.AppendAllLinesAsync(path, new string[1] { line });
-        }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Streetwriters.Common
+{
+    public class Slogger<T>
+    {
+        public static Task Info(string scope, params string[] messages)
+        {
+            return Write(Format("info", scope, messages));
+        }
+
+        public static Task Error(string scope, params string[] messages)
+        {
+            return Write(Format("error", scope, messages));
+        }
+        private static string Format(string level, string scope, params string[] messages)
+        {
+            var date = DateTime.UtcNow.ToString("MM-dd-yyyy HH:mm:ss");
+            var messageText = string.Join(" ", messages);
+            return $"[{date}] | {level} | <{scope}> {messageText}";
+        }
+        private static Task Write(string line)
+        {
+            var logDirectory = Path.GetFullPath("./logs");
+            if (!Directory.Exists(logDirectory))
+                Directory.CreateDirectory(logDirectory);
+            var path = Path.Join(logDirectory, typeof(T).FullName + "-" + DateTime.UtcNow.ToString("MM-dd-yyyy") + ".log");
+            return File.AppendAllLinesAsync(path, new string[1] { line });
+        }
+    }
 }

Streetwriters.Common/Messages/ClearCacheMessage.cs

@@ -1,38 +1,38 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using System.Text.Json.Serialization;
-using Streetwriters.Common.Enums;
-using Streetwriters.Common.Interfaces;
-
-namespace Streetwriters.Common.Messages
-{
-    public class ClearCacheMessage
-    {
-        public ClearCacheMessage(List<string> keys)
-        {
-            this.Keys = keys;
-        }
-
-        [JsonPropertyName("keys")]
-        public List<string> Keys { get; set; }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using Streetwriters.Common.Enums;
+using Streetwriters.Common.Interfaces;
+
+namespace Streetwriters.Common.Messages
+{
+    public class ClearCacheMessage
+    {
+        public ClearCacheMessage(List<string> keys)
+        {
+            this.Keys = keys;
+        }
+
+        [JsonPropertyName("keys")]
+        public List<string> Keys { get; set; }
+    }
 }

Streetwriters.Common/Messages/CreateSubscriptionMessage.cs

@@ -17,6 +17,7 @@ You should have received a copy of the Affero GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+using System;
 using System.Runtime.Serialization;
 using System.Text.Json.Serialization;
 using Streetwriters.Common.Enums;
@@ -58,6 +59,8 @@ namespace Streetwriters.Common.Messages
 
         [JsonPropertyName("productId")]
         public string ProductId { get; set; }
+
+        [JsonPropertyName("extend")]
         public bool Extend { get; set; }
     }
 }

Streetwriters.Common/Messages/CreateSubscriptionMessageV2.cs

@@ -0,0 +1,69 @@
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using Streetwriters.Common.Enums;
+using Streetwriters.Common.Interfaces;
+
+namespace Streetwriters.Common.Messages
+{
+    public class CreateSubscriptionMessageV2
+    {
+        [JsonPropertyName("userId")]
+        public string UserId { get; set; }
+
+        [JsonPropertyName("provider")]
+        public SubscriptionProvider Provider { get; set; }
+
+        [JsonPropertyName("appId")]
+        public ApplicationType AppId { get; set; }
+
+        [JsonPropertyName("plan")]
+        public SubscriptionPlan Plan { get; set; }
+
+        [JsonPropertyName("status")]
+        public SubscriptionStatus Status { get; set; }
+
+        [JsonPropertyName("start")]
+        public long StartTime { get; set; }
+
+        [JsonPropertyName("expiry")]
+        public long ExpiryTime { get; set; }
+
+        [JsonPropertyName("orderId")]
+        public string OrderId { get; set; }
+
+        [JsonPropertyName("subscriptionId")]
+        public string SubscriptionId { get; set; }
+
+        [JsonPropertyName("productId")]
+        public string ProductId { get; set; }
+
+        [JsonPropertyName("timestamp")]
+        public long Timestamp { get; set; }
+
+        [JsonPropertyName("trialExpiry")]
+        public long TrialExpiryTime { get; set; }
+
+        [JsonPropertyName("googlePurchaseToken")]
+        public string? GooglePurchaseToken { get; set; }
+    }
+}

Streetwriters.Common/Messages/DeleteSubscriptionMessage.cs

@@ -1,35 +1,35 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Runtime.Serialization;
-using System.Text.Json.Serialization;
-using Streetwriters.Common.Enums;
-using Streetwriters.Common.Interfaces;
-
-namespace Streetwriters.Common.Messages
-{
-    public class DeleteSubscriptionMessage
-    {
-        [JsonPropertyName("userId")]
-        public string UserId { get; set; }
-
-        [JsonPropertyName("appId")]
-        public ApplicationType AppId { get; set; }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using Streetwriters.Common.Enums;
+using Streetwriters.Common.Interfaces;
+
+namespace Streetwriters.Common.Messages
+{
+    public class DeleteSubscriptionMessage
+    {
+        [JsonPropertyName("userId")]
+        public string UserId { get; set; }
+
+        [JsonPropertyName("appId")]
+        public ApplicationType AppId { get; set; }
+    }
 }

Streetwriters.Common/Messages/DeleteUserMessage.cs

@@ -1,32 +1,32 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Runtime.Serialization;
-using System.Text.Json.Serialization;
-using Streetwriters.Common.Enums;
-using Streetwriters.Common.Interfaces;
-
-namespace Streetwriters.Common.Messages
-{
-    public class DeleteUserMessage
-    {
-        [JsonPropertyName("userId")]
-        public string UserId { get; set; }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using Streetwriters.Common.Enums;
+using Streetwriters.Common.Interfaces;
+
+namespace Streetwriters.Common.Messages
+{
+    public class DeleteUserMessage
+    {
+        [JsonPropertyName("userId")]
+        public string UserId { get; set; }
+    }
 }

Streetwriters.Common/Messages/SendSSEMessage.cs

@@ -1,48 +1,48 @@
-/*
-This file is part of the Notesnook Sync Server project (https://notesnook.com/)
-
-Copyright (C) 2023 Streetwriters (Private) Limited
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the Affero GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-Affero GNU General Public License for more details.
-
-You should have received a copy of the Affero GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-using System.Runtime.Serialization;
-using System.Text.Json.Serialization;
-using Streetwriters.Common.Interfaces;
-
-namespace Streetwriters.Common.Messages
-{
-    public class Message
-    {
-        [JsonPropertyName("type")]
-        public string Type { get; set; }
-
-        [JsonPropertyName("data")]
-        public string Data { get; set; }
-    }
-    public class SendSSEMessage
-    {
-        [JsonPropertyName("sendToAll")]
-        public bool SendToAll { get; set; }
-
-        [JsonPropertyName("userId")]
-        public string UserId { get; set; }
-
-        [JsonPropertyName("message")]
-        public Message Message { get; set; }
-
-        [JsonPropertyName("originTokenId")]
-        public string OriginTokenId { get; set; }
-    }
+/*
+This file is part of the Notesnook Sync Server project (https://notesnook.com/)
+
+Copyright (C) 2023 Streetwriters (Private) Limited
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the Affero GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+Affero GNU General Public License for more details.
+
+You should have received a copy of the Affero GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
+using Streetwriters.Common.Interfaces;
+
+namespace Streetwriters.Common.Messages
+{
+    public class Message
+    {
+        [JsonPropertyName("type")]
+        public string Type { get; set; }
+
+        [JsonPropertyName("data")]
+        public string Data { get; set; }
+    }
+    public class SendSSEMessage
+    {
+        [JsonPropertyName("sendToAll")]
+        public bool SendToAll { get; set; }
+
+        [JsonPropertyName("userId")]
+        public string UserId { get; set; }
+
+        [JsonPropertyName("message")]
+        public Message Message { get; set; }
+
+        [JsonPropertyName("originTokenId")]
+        public string? OriginTokenId { get; set; }
+    }
 }