From 5df3e7af703b459644bb3d3e2fc41d958d7216bd Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 5 Oct 2025 17:59:19 -0700 Subject: [PATCH 01/33] Document change (#683) --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 069f2dd0..1ef92b2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,9 @@ The following log documents the history of the server project. ### Unreleased -None +### 3.0.0-rc1 2025-10-05 + +- Use SQLite instead of Postgres. Please use https://github.com/dnote/pg2sqlite to migrate. ### 2.1.1 2023-03-04 From a62c7f9e93bfe9d21d05c42aff0f4ad499b45f68 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 5 Oct 2025 21:26:12 -0700 Subject: [PATCH 02/33] Build cli v0.15.2 (#684) --- .github/workflows/release-cli.yml | 58 +++++++++++++++++++++++++++++++ CHANGELOG.md | 5 +++ Makefile | 6 ++-- install.sh | 17 +++++++-- pkg/cli/cmd/login/login.go | 4 --- pkg/cli/cmd/login/login_test.go | 4 --- pkg/dirs/dirs_unix.go | 2 +- pkg/dirs/dirs_unix_test.go | 2 +- scripts/cli/build.sh | 16 +++++++-- scripts/cli/release-homebrew.sh | 19 ++++++---- 10 files changed, 108 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/release-cli.yml diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml new file mode 100644 index 00000000..65b2fd0b --- /dev/null +++ b/.github/workflows/release-cli.yml @@ -0,0 +1,58 @@ +name: Release CLI + +on: + push: + tags: + - 'cli-v*' + +jobs: + release: + runs-on: ubuntu-22.04 + permissions: + contents: write + + steps: + - uses: actions/checkout@v5 + - uses: actions/setup-go@v6 + with: + go-version: '>=1.25.0' + + - name: Extract version from tag + id: version + run: | + TAG=${GITHUB_REF#refs/tags/cli-v} + echo "version=$TAG" >> $GITHUB_OUTPUT + echo "Releasing version: $TAG" + + - name: Install dependencies + run: make install + + - name: Run CLI tests + run: make test-cli + + - name: Run E2E tests + run: make test-e2e + + - name: Build CLI + run: make version=${{ steps.version.outputs.version }} build-cli + + - name: Create GitHub release + env: + GH_TOKEN: ${{ github.token }} + run: | + VERSION="${{ steps.version.outputs.version }}" + TAG="cli-v${VERSION}" + + # Determine if prerelease (version not matching major.minor.patch) + FLAGS="" + if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + FLAGS="--prerelease" + fi + + gh release create "$TAG" \ + build/cli/*.tar.gz \ + build/cli/*_checksums.txt \ + $FLAGS \ + --title="$TAG" \ + --notes="Please see the [CHANGELOG](https://github.com/dnote/dnote/blob/master/CHANGELOG.md)" \ + --draft diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ef92b2e..431232b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -213,6 +213,11 @@ The following log documentes the history of the CLI project None +### 0.15.2 - 2025-10-05 + +* Support for 32bit linux, freebsd amd64, mac arm64. +* Remove Pro. + ### 0.15.1 - 2024-02-03 * Upgrade `color` dependency (#660). diff --git a/Makefile b/Makefile index 3b91d6ae..12cf32cf 100644 --- a/Makefile +++ b/Makefile @@ -95,13 +95,13 @@ endif @${currentDir}/scripts/release.sh cli $(version) ${cliOutputDir} .PHONY: release-cli -release-cli-homebrew: clean build-cli +release-cli-homebrew: ifndef version - $(error version is required. Usage: make version=0.1.0 release-cli) + $(error version is required. Usage: make version=0.1.0 release-cli-homebrew) endif @echo "==> releasing cli on Homebrew" - @${currentDir}/scripts/cli/release-homebrew.sh $(version) ${cliOutputDir} + @${currentDir}/scripts/cli/release-homebrew.sh $(version) .PHONY: release-cli release-server: diff --git a/install.sh b/install.sh index 6537232e..bb09bd8f 100755 --- a/install.sh +++ b/install.sh @@ -68,9 +68,14 @@ uname_os() { uname_arch() { arch=$(uname -m) - case $arch in + case $arch in x86_64) arch="amd64" ;; aarch64) arch="arm64" ;; + arm64) arch="arm64" ;; + armv7l) arch="arm" ;; + armv6l) arch="arm" ;; + armv5l) arch="arm" ;; + arm) arch="arm" ;; x86) arch="386" ;; i686) arch="386" ;; i386) arch="386" ;; @@ -86,9 +91,17 @@ check_platform() { found=1 case "$platform" in - darwin/amd64) found=0;; + # Linux linux/amd64) found=0 ;; linux/arm64) found=0 ;; + linux/arm) found=0 ;; + # macOS + darwin/amd64) found=0 ;; + darwin/arm64) found=0 ;; + # Windows + windows/amd64) found=0 ;; + # FreeBSD + freebsd/amd64) found=0 ;; esac return $found diff --git a/pkg/cli/cmd/login/login.go b/pkg/cli/cmd/login/login.go index 42df6c77..1e667382 100644 --- a/pkg/cli/cmd/login/login.go +++ b/pkg/cli/cmd/login/login.go @@ -126,10 +126,6 @@ func getBaseURL(rawURL string) (string, error) { } func getServerDisplayURL(ctx context.DnoteCtx) string { - if ctx.APIEndpoint == "https://api.getdnote.com" { - return "https://www.getdnote.com" - } - baseURL, err := getBaseURL(ctx.APIEndpoint) if err != nil { return "" diff --git a/pkg/cli/cmd/login/login_test.go b/pkg/cli/cmd/login/login_test.go index 47807c1f..c208fa5d 100644 --- a/pkg/cli/cmd/login/login_test.go +++ b/pkg/cli/cmd/login/login_test.go @@ -31,10 +31,6 @@ func TestGetServerDisplayURL(t *testing.T) { apiEndpoint string expected string }{ - { - apiEndpoint: "https://api.getdnote.com", - expected: "https://www.getdnote.com", - }, { apiEndpoint: "https://dnote.mydomain.com/api", expected: "https://dnote.mydomain.com", diff --git a/pkg/dirs/dirs_unix.go b/pkg/dirs/dirs_unix.go index c6d525e5..59420c0e 100644 --- a/pkg/dirs/dirs_unix.go +++ b/pkg/dirs/dirs_unix.go @@ -16,7 +16,7 @@ * along with Dnote. If not, see . */ -//go:build linux || darwin +//go:build linux || darwin || freebsd package dirs diff --git a/pkg/dirs/dirs_unix_test.go b/pkg/dirs/dirs_unix_test.go index 3d821155..0ab63ad8 100644 --- a/pkg/dirs/dirs_unix_test.go +++ b/pkg/dirs/dirs_unix_test.go @@ -16,7 +16,7 @@ * along with Dnote. If not, see . */ -//go:build linux || darwin +//go:build linux || darwin || freebsd package dirs diff --git a/scripts/cli/build.sh b/scripts/cli/build.sh index 467f1282..c805ba90 100755 --- a/scripts/cli/build.sh +++ b/scripts/cli/build.sh @@ -36,7 +36,7 @@ if [[ $1 == v* ]]; then exit 1 fi -goVersion=go-1.21.x +goVersion=go-1.25.x get_binary_name() { platform=$1 @@ -57,7 +57,7 @@ build() { # build binary destDir="$outputDir/$platform-$arch" - ldflags="-X main.apiEndpoint=https://api.getdnote.com -X main.versionTag=$version" + ldflags="-X main.apiEndpoint=https://localhost:3000/api -X main.versionTag=$version" tags="fts5" pushd "$projectDir" @@ -92,7 +92,7 @@ build() { popd binaryName=$(get_binary_name "$platform") - mv "$destDir/cli-${platform}-"* "$destDir/$binaryName" + mv "$destDir/cli-"* "$destDir/$binaryName" # build tarball tarballName="dnote_${version}_${platform}_${arch}.tar.gz" @@ -113,10 +113,20 @@ if [ -z "$GOOS" ] && [ -z "$GOARCH" ]; then # install the tool go install src.techknowlogick.com/xgo@latest + # Linux build linux amd64 build linux arm64 + build linux arm + + # macOS build darwin amd64 + build darwin arm64 + + # Windows build windows amd64 + + # FreeBSD + build freebsd amd64 else build "$GOOS" "$GOARCH" true fi diff --git a/scripts/cli/release-homebrew.sh b/scripts/cli/release-homebrew.sh index 7e9a7bd5..f48f16dc 100755 --- a/scripts/cli/release-homebrew.sh +++ b/scripts/cli/release-homebrew.sh @@ -10,12 +10,13 @@ if [ ! -d "$cliHomebrewDir" ]; then fi version=$1 -tarball=$2 echo "version: $version" -echo "tarball: $tarball" -sha=$(shasum -a 256 "$tarball" | cut -d ' ' -f 1) +# Download source tarball and calculate SHA256 +source_url="https://github.com/dnote/dnote/archive/refs/tags/cli-v${version}.tar.gz" +echo "Calculating SHA256 for: $source_url" +sha=$(curl -L "$source_url" | shasum -a 256 | cut -d ' ' -f 1) pushd "$cliHomebrewDir" @@ -25,14 +26,18 @@ git pull origin master cat > ./Formula/dnote.rb << EOF class Dnote < Formula - desc "A simple command line notebook for programmers" + desc "Simple command line notebook for programmers" homepage "https://www.getdnote.com" - url "https://github.com/dnote/dnote/releases/download/cli-v${version}/dnote_${version}_darwin_amd64.tar.gz" - version "${version}" + url "https://github.com/dnote/dnote/archive/refs/tags/cli-v${version}.tar.gz" sha256 "${sha}" + license "GPL-3.0" + head "https://github.com/dnote/dnote.git", branch: "master" + + depends_on "go" => :build def install - bin.install "dnote" + ldflags = "-s -w -X main.apiEndpoint=https://api.getdnote.com -X main.versionTag=#{version}" + system "go", "build", *std_go_args(ldflags: ldflags), "-tags", "fts5", "./pkg/cli" end test do From 637d4c686163142891a811917f896bd83c1967c4 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 5 Oct 2025 22:26:48 -0700 Subject: [PATCH 03/33] Simplify contribution (#685) --- CONTRIBUTING.md | 90 ++++++++------------- README.md | 32 +++++--- SELF_HOSTING.md | 116 ++++++++-------------------- Vagrantfile | 20 ----- scripts/vagrant/bootstrap.sh | 19 ----- scripts/vagrant/install_go.sh | 26 ------- scripts/vagrant/install_node.sh | 19 ----- scripts/vagrant/install_postgres.sh | 9 --- scripts/vagrant/install_utils.sh | 18 ----- 9 files changed, 86 insertions(+), 263 deletions(-) delete mode 100644 Vagrantfile delete mode 100755 scripts/vagrant/bootstrap.sh delete mode 100755 scripts/vagrant/install_go.sh delete mode 100755 scripts/vagrant/install_node.sh delete mode 100755 scripts/vagrant/install_postgres.sh delete mode 100755 scripts/vagrant/install_utils.sh diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fb41959d..ffb31385 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,89 +8,61 @@ Dnote is an open source project. ## Setting up -Dnote uses [Vagrant](https://github.com/hashicorp/vagrant) to provision a consistent development environment. +The CLI and server are single single binary files with SQLite embedded - no databases to install, no containers to run, no VMs required. -*Prerequisites* +**Prerequisites** -* Vagrant ([Download](https://www.vagrantup.com/downloads.html)) -* VirtualBox ([Download](https://www.virtualbox.org/)) +* Go 1.25+ ([Download](https://go.dev/dl/)) +* Node.js 18+ ([Download](https://nodejs.org/) - only needed for building frontend assets) -Run the following command from the project root. It starts the virtual machine and bootstraps the project. +**Quick Start** -``` -vagrant up -``` +1. Clone the repository +2. Install dependencies: + ```bash + make install + ``` +3. Start developing! Run tests: + ```bash + make test + ``` + Or start the dev server: + ```bash + make dev-server + ``` -*Workflow* - -* You can make changes to the source code from the host machine. -* Any commands need to be run inside the virtual machine. You can connect to it by running `vagrant ssh`. -* If you want to run tests in a WATCH mode, please do so from the host machine. We cannot watch file changes due to the limitation of file system used in a virtual machine. +That's it. You're ready to contribute. ## Server -The server consists of the frontend web application and a web server. - -### Development - -* Run `make dev-server` to start a local server. -* You can access the server on `localhost:3000` on your machine. - -### Test - ```bash -# Run tests for app +# Start dev server (runs on localhost:3000) +make dev-server + +# Run tests make test-api -# Run in watch mode +# Run tests in watch mode WATCH=true make test-api ``` - ## Command Line Interface -### Build +```bash +# Run tests +make test-cli -You can build either a development version or a production version: - -``` -# Build a development version for your platform and place it in your `PATH`. +# Build dev version (places in your PATH) make debug=true build-cli -# Build a production version for all platforms +# Build production version for all platforms make version=v0.1.0 build-cli -# Build a production version for a specific platform +# Build for a specific platform # Note: You cannot cross-compile using this method because Dnote uses CGO # and requires the OS specific headers. GOOS=[insert OS] GOARCH=[insert arch] make version=v0.1.0 build-cli -``` -### Test - -* Run all tests for the command line interface: - -``` -make test-cli -``` - -### Debug - -Run Dnote with `DNOTE_DEBUG=1` to print debugging statements. For instance: - -``` +# Debug mode DNOTE_DEBUG=1 dnote sync ``` - -### Release - -* Run `make version=v0.1.0 release-cli` to achieve the following: - * Build for all target platforms, create a git tag, push all tags to the repository - * Create a release on GitHub and [Dnote Homebrew tap](https://github.com/dnote/homebrew-dnote). - -**Note** - -- If a release is not stable, - - disable the homebrew release by commenting out relevant code in the release script. - - mark release as pre-release on GitHub release - diff --git a/README.md b/README.md index e23eb426..51579b5a 100644 --- a/README.md +++ b/README.md @@ -3,30 +3,42 @@ ![Build Status](https://github.com/dnote/dnote/actions/workflows/ci.yml/badge.svg) -Dnote is a simple command line notebook for programmers. +Dnote is a simple command line notebook. Single binary, no dependencies. Since 2017. -It **keeps you focused** by providing a way of effortlessly capturing and retrieving information **without leaving your terminal**. It also offers a seamless **multi-device sync**. +Your notes are stored in **one SQLite file** - portable, searchable, and completely under your control. Optional sync between devices via a self-hosted server with REST API access. -![A demo of Dnote command line interface](assets/cli.gif "Dnote command line interface") +```sh +# Add a note (or omit -c to launch your editor) +dnote add linux -c "Check disk usage with df -h" + +# View notes in a book +dnote view linux + +# Full-text search +dnote find "disk usage" + +# Sync notes +dnote sync +``` ## Installation -On macOS, you can install using Homebrew: +On Unix-like systems (Linux, FreeBSD, macOS), you can use the installation script: + + curl -s https://www.getdnote.com/install | sh + +Or on macOS with Homebrew: ```sh brew tap dnote/dnote brew install dnote ``` -On Linux or macOS, you can use the installation script: - - curl -s https://www.getdnote.com/install | sh - -Otherwise, you can download the binary for your platform manually from the [releases page](https://github.com/dnote/dnote/releases). +You can also download the binary for your platform from the [releases page](https://github.com/dnote/dnote/releases). ## Server -You can install it [using Docker](https://github.com/dnote/dnote/blob/master/host/docker/README.md), or [using a binary](https://github.com/dnote/dnote/blob/master/SELF_HOSTING.md). +Self-host your own Dnote server - just run a binary, no database required. [Download](https://github.com/dnote/dnote/blob/master/SELF_HOSTING.md) or run [with Docker](https://github.com/dnote/dnote/blob/master/host/docker/README.md). ## Documentation diff --git a/SELF_HOSTING.md b/SELF_HOSTING.md index 0c52733c..52bc7cfd 100644 --- a/SELF_HOSTING.md +++ b/SELF_HOSTING.md @@ -1,47 +1,26 @@ -# Installing Dnote Server +# Self-Hosting Dnote Server -This guide documents the steps for installing the Dnote server on your own machine. If you prefer Docker, please see [the Docker guide](https://github.com/dnote/dnote/blob/master/host/docker/README.md). +For Docker installation, see [the Docker guide](https://github.com/dnote/dnote/blob/master/host/docker/README.md). -## Overview +## Quick Start -Dnote server comes as a single binary file that you can simply download and run. It uses SQLite as the database. - -## Installation - -1. Download the official Dnote server release from the [release page](https://github.com/dnote/dnote/releases). -2. Extract the archive and move the `dnote-server` executable to `/usr/local/bin`. +Download from [releases](https://github.com/dnote/dnote/releases), extract, and run: ```bash tar -xzf dnote-server-$version-$os.tar.gz mv ./dnote-server /usr/local/bin +dnote-server start --webUrl=https://your.server ``` -3. Run Dnote +You're up and running. Database: `~/.local/share/dnote/server.db` (customize with `--dbPath`). Run `dnote-server start --help` for options. -```bash -dnote-server start --webUrl=$webURL -``` +Set `apiEndpoint: https://your.server/api` in `~/.config/dnote/dnoterc` to connect your CLI to the server. -Replace `$webURL` with the full URL to your server, without a trailing slash (e.g. `https://your.server`). +## Optional guide -Additional flags: -- `--port`: Server port (default: `3000`) -- `--disableRegistration`: Disable user registration (default: `false`) -- `--logLevel`: Log level: `debug`, `info`, `warn`, or `error` (default: `info`) -- `--appEnv`: environment (default: `PRODUCTION`) +### Nginx -You can also use environment variables: `PORT`, `WebURL`, `DisableRegistration`, `LOG_LEVEL`, `APP_ENV`. - -## Configuration - -By now, Dnote is fully functional in your machine. The API, frontend app, and the background tasks are all in the single binary. Let's take a few more steps to configure Dnote. - -### Configure Nginx - -To make it accessible from the Internet, you need to configure Nginx. - -1. Install nginx. -2. Create a new file in `/etc/nginx/sites-enabled/dnote` with the following contents: +Create `/etc/nginx/sites-enabled/dnote`: ``` server { @@ -55,17 +34,16 @@ server { } } ``` -3. Replace `my-dnote-server.com` with the URL for your server. -4. Reload the nginx configuration by running the following: -``` +Replace `my-dnote-server.com` with your domain, then reload: + +```bash sudo service nginx reload ``` -### Configure Apache2 +### Apache2 -1. Install Apache2 and install/enable mod_proxy. -2. Create a new file in `/etc/apache2/sites-available/dnote.conf` with the following contents: +Enable `mod_proxy`, then create `/etc/apache2/sites-available/dnote.conf`: ``` @@ -79,26 +57,20 @@ sudo service nginx reload ``` -3. Enable the dnote site and restart the Apache2 service by running the following: +Enable and restart: -``` +```bash a2ensite dnote sudo service apache2 restart ``` -Now you can access the Dnote frontend application on `/`, and the API on `/api`. +### TLS -### Configure TLS by using LetsEncrypt +Use LetsEncrypt to obtain a certificate and configure HTTPS in your reverse proxy. -It is recommended to use HTTPS. Obtain a certificate using LetsEncrypt and configure TLS in Nginx. +### systemd Daemon -In the future versions of the Dnote Server, HTTPS will be required at all times. - -### Run Dnote As a Daemon - -We can use `systemd` to run Dnote in the background as a Daemon, and automatically start it on system reboot. - -1. Create a new file at `/etc/systemd/system/dnote.service` with the following content: +Create `/etc/systemd/system/dnote.service`: ``` [Unit] @@ -118,45 +90,23 @@ ExecStart=/usr/local/bin/dnote-server start --webUrl=$WebURL WantedBy=multi-user.target ``` -Replace `$user` and `$WebURL` with the actual values. +Replace `$user` and `$WebURL`. Add `--dbPath` to `ExecStart` if you want a custom database location. -By default, the database will be stored at `$XDG_DATA_HOME/dnote/server.db` (typically `~/.local/share/dnote/server.db`). To use a custom location, add `--dbPath=/path/to/database.db` to the `ExecStart` command. +Enable and start: -2. Reload the change by running `sudo systemctl daemon-reload`. -3. Enable the Daemon by running `sudo systemctl enable dnote`.` -4. Start the Daemon by running `sudo systemctl start dnote` +```bash +sudo systemctl daemon-reload +sudo systemctl enable dnote +sudo systemctl start dnote +``` -### Optional: Email Support +### Email Support -To enable sending emails, add the following environment variables to your configuration. But they are not required. +If you want emails, add these environment variables: -- `SmtpHost` - SMTP server hostname -- `SmtpPort` - SMTP server port +- `SmtpHost` - SMTP hostname +- `SmtpPort` - SMTP port - `SmtpUsername` - SMTP username - `SmtpPassword` - SMTP password -For systemd, add these as additional `Environment=` lines in `/etc/systemd/system/dnote.service`. - -### Configure clients - -Let's configure Dnote clients to connect to the self-hosted web API endpoint. - -#### CLI - -We need to modify the configuration file for the CLI. It should have been generated at `~/.config/dnote/dnoterc` upon running the CLI for the first time. - -The following is an example configuration: - -```yaml -editor: nvim -apiEndpoint: https://localhost:3000/api -``` - -Simply change the value for `apiEndpoint` to a full URL to the self-hosted instance, followed by '/api', and save the configuration file. - -e.g. - -```yaml -editor: nvim -apiEndpoint: my-dnote-server.com/api -``` +For systemd, add as `Environment=` lines in the service file. diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index 65dd3db1..00000000 --- a/Vagrantfile +++ /dev/null @@ -1,20 +0,0 @@ -# -*- mode: ruby -*- - -Vagrant.configure("2") do |config| - config.vm.box = "ubuntu/bionic64" - config.vm.synced_folder '.', '/go/src/github.com/dnote/dnote' - config.vm.network "forwarded_port", guest: 3000, host: 3000 - config.vm.network "forwarded_port", guest: 8080, host: 8080 - config.vm.network "forwarded_port", guest: 5432, host: 5433 - - config.vm.provision 'shell', path: './scripts/vagrant/install_utils.sh' - config.vm.provision 'shell', path: './scripts/vagrant/install_go.sh', privileged: false - config.vm.provision 'shell', path: './scripts/vagrant/install_node.sh', privileged: false - config.vm.provision 'shell', path: './scripts/vagrant/install_postgres.sh', privileged: false - config.vm.provision 'shell', path: './scripts/vagrant/bootstrap.sh', privileged: false - - config.vm.provider "virtualbox" do |v| - v.memory = 4000 - v.cpus = 2 - end -end diff --git a/scripts/vagrant/bootstrap.sh b/scripts/vagrant/bootstrap.sh deleted file mode 100755 index b8299676..00000000 --- a/scripts/vagrant/bootstrap.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -set -ex - -echo "export DNOTE=/go/src/github.com/dnote/dnote" >> /home/vagrant/.bash_profile -echo "cd /go/src/github.com/dnote/dnote" >> /home/vagrant/.bash_profile - -# install dependencies -(cd /go/src/github.com/dnote/dnote && make install) - -# set up database -sudo -u postgres createdb dnote -sudo -u postgres createdb dnote_test -sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';" - -# allow connection from host and allow to connect without password -sudo sed -i "/port*/a listen_addresses = '*'" /etc/postgresql/14/main/postgresql.conf -sudo sed -i 's/host.*all.*.all.*md5/# &/' /etc/postgresql/14/main/pg_hba.conf -sudo sed -i "$ a host all all all trust" /etc/postgresql/14/main/pg_hba.conf -sudo service postgresql restart diff --git a/scripts/vagrant/install_go.sh b/scripts/vagrant/install_go.sh deleted file mode 100755 index 4dc0c1b0..00000000 --- a/scripts/vagrant/install_go.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -# shellcheck disable=SC1091 -set -eux - -VERSION=1.21 -OS=linux -ARCH=amd64 - -tarball=go$VERSION.$OS-$ARCH.tar.gz - -wget -q https://dl.google.com/go/"$tarball" -sudo tar -C /usr/local -xzf "$tarball" -sudo tar -xf "$tarball" - -sudo mkdir -p /go/src -sudo mkdir -p /go/bin -sudo mkdir -p /go/pkg -sudo chown -R vagrant:vagrant /go - -GOPATH=/go -echo "export GOPATH=$GOPATH" >> /home/vagrant/.bash_profile -echo "export PATH=$PATH:/usr/local/go/bin:$GOPATH/bin" >> /home/vagrant/.bash_profile -source /home/vagrant/.bash_profile - -go version -go env diff --git a/scripts/vagrant/install_node.sh b/scripts/vagrant/install_node.sh deleted file mode 100755 index 1233d449..00000000 --- a/scripts/vagrant/install_node.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -# shellcheck disable=SC1090,SC1091 -set -eux - -VERSION=12.16.2 -NVM_VERSION=v0.35.0 - -# Install nvm -wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/"$NVM_VERSION"/install.sh | bash -cat >> /home/vagrant/.bash_profile<< EOF -export NVM_DIR="\$([ -z "\${XDG_CONFIG_HOME-}" ] && printf %s "\${HOME}/.nvm" || printf %s "\${XDG_CONFIG_HOME}/nvm")" -[ -s "\$NVM_DIR/nvm.sh" ] && \. "\$NVM_DIR/nvm.sh" # This loads nvm -EOF -source /home/vagrant/.bash_profile - -# Install a node and alias -nvm install --no-progress "$VERSION" 1>/dev/null -nvm alias default "$VERSION" -nvm use default diff --git a/scripts/vagrant/install_postgres.sh b/scripts/vagrant/install_postgres.sh deleted file mode 100755 index f2738021..00000000 --- a/scripts/vagrant/install_postgres.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -set -ex - -sudo apt-get -y install wget ca-certificates -wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - -sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" >> /etc/apt/sources.list.d/pgdg.list' - -sudo apt-get update -sudo apt-get install -y postgresql-14 diff --git a/scripts/vagrant/install_utils.sh b/scripts/vagrant/install_utils.sh deleted file mode 100755 index 46322005..00000000 --- a/scripts/vagrant/install_utils.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -set -eux - -sudo apt-get update -sudo apt-get install -y htop git wget build-essential inotify-tools - -# Install Chrome -wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list -sudo apt-get -y update -sudo apt-get install -y google-chrome-stable - -# Install dart-sass -dart_version=1.34.1 -dart_tarball="dart-sass-$dart_version-linux-x64.tar.gz" -wget -q "https://github.com/sass/dart-sass/releases/download/$dart_version/$dart_tarball" -tar -xvzf "$dart_tarball" -C /tmp/ -sudo install /tmp/dart-sass/sass /usr/bin From 162ceb4ad1cd60f7db2b9f007b857e85df35154b Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Fri, 10 Oct 2025 21:20:33 -0700 Subject: [PATCH 04/33] Simplify installation (#686) --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 51579b5a..12fd8675 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,6 @@ On Unix-like systems (Linux, FreeBSD, macOS), you can use the installation scrip Or on macOS with Homebrew: ```sh -brew tap dnote/dnote brew install dnote ``` From ca5af5e34a95eeb239505a57dbc2d22c2eaaced1 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sat, 11 Oct 2025 12:41:51 -0700 Subject: [PATCH 05/33] Run server on port 3001 (#687) * Simplify docker compose file * Run on port 3001 --- CONTRIBUTING.md | 2 +- README.md | 34 ++++++++++++++++++++++++---------- SELF_HOSTING.md | 6 +++--- assets/cli.gif | Bin 251236 -> 0 bytes assets/devices.png | Bin 37561 -> 0 bytes host/docker/Dockerfile | 2 +- host/docker/README.md | 2 +- host/docker/compose.yml | 11 +++-------- pkg/e2e/server_test.go | 4 ++-- pkg/server/.env.dev | 2 +- pkg/server/.env.test | 2 +- pkg/server/config/config.go | 4 ++-- pkg/server/main.go | 4 ++-- scripts/cli/build.sh | 2 +- scripts/cli/dev.sh | 2 +- scripts/e2e/test.sh | 2 +- scripts/server/dev.sh | 2 +- 17 files changed, 45 insertions(+), 36 deletions(-) delete mode 100644 assets/cli.gif delete mode 100644 assets/devices.png diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ffb31385..b0fa33eb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,7 +36,7 @@ That's it. You're ready to contribute. ## Server ```bash -# Start dev server (runs on localhost:3000) +# Start dev server (runs on localhost:3001) make dev-server # Run tests diff --git a/README.md b/README.md index 12fd8675..e9469d83 100644 --- a/README.md +++ b/README.md @@ -23,22 +23,36 @@ dnote sync ## Installation -On Unix-like systems (Linux, FreeBSD, macOS), you can use the installation script: +```bash +# Linux, macOS, FreeBSD, Windows +curl -s https://www.getdnote.com/install | sh - curl -s https://www.getdnote.com/install | sh - -Or on macOS with Homebrew: - -```sh +# macOS with Homebrew brew install dnote ``` -You can also download the binary for your platform from the [releases page](https://github.com/dnote/dnote/releases). +Or [download binary](https://github.com/dnote/dnote/releases). -## Server +## Server (Optional) -Self-host your own Dnote server - just run a binary, no database required. [Download](https://github.com/dnote/dnote/blob/master/SELF_HOSTING.md) or run [with Docker](https://github.com/dnote/dnote/blob/master/host/docker/README.md). +Just run a binary. No database setup required. + +Run with Docker Compose using [compose.yml](./host/docker/compose.yml): + +```yaml +services: + dnote: + image: dnote/dnote:latest + container_name: dnote + ports: + - 3001:3001 + volumes: + - ./dnote_data:/data + restart: unless-stopped +``` + +Or see the [guide](https://github.com/dnote/dnote/blob/master/SELF_HOSTING.md) for binary installation and configuration options. ## Documentation -Please see [Dnote wiki](https://github.com/dnote/dnote/wiki) for the documentation. +See the [Dnote wiki](https://github.com/dnote/dnote/wiki) for full documentation. diff --git a/SELF_HOSTING.md b/SELF_HOSTING.md index 52bc7cfd..d033b45e 100644 --- a/SELF_HOSTING.md +++ b/SELF_HOSTING.md @@ -30,7 +30,7 @@ server { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header Host $host; - proxy_pass http://127.0.0.1:3000; + proxy_pass http://127.0.0.1:3001; } } ``` @@ -51,8 +51,8 @@ Enable `mod_proxy`, then create `/etc/apache2/sites-available/dnote.conf`: ProxyRequests Off ProxyPreserveHost On - ProxyPass / http://127.0.0.1:3000/ keepalive=On - ProxyPassReverse / http://127.0.0.1:3000/ + ProxyPass / http://127.0.0.1:3001/ keepalive=On + ProxyPassReverse / http://127.0.0.1:3001/ RequestHeader set X-Forwarded-HTTPS "0" ``` diff --git a/assets/cli.gif b/assets/cli.gif deleted file mode 100644 index 8925e1312d7819c4c8306ae1c0af4a716f058b97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251236 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%0Dj2&6J!{|12@Vo0L$q=qZ%|SSwJH``C%1?QlG_Xh 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 OpP7jjq|WH>v;P6V4EA3D diff --git a/host/docker/Dockerfile b/host/docker/Dockerfile index 81beabee..cd93f6ca 100644 --- a/host/docker/Dockerfile +++ b/host/docker/Dockerfile @@ -13,4 +13,4 @@ ENTRYPOINT ["./entrypoint.sh"] CMD ./dnote-server start -EXPOSE 3000 +EXPOSE 3001 diff --git a/host/docker/README.md b/host/docker/README.md index 69926481..179492b6 100644 --- a/host/docker/README.md +++ b/host/docker/README.md @@ -19,7 +19,7 @@ docker compose pull docker compose up -d ``` -Visit http://localhost:3000 in your browser to see Dnote running. +Visit http://localhost:3001 in your browser to see Dnote running. Please see [the installation guide](https://github.com/dnote/dnote/blob/master/SELF_HOSTING.md) for further configuration. diff --git a/host/docker/compose.yml b/host/docker/compose.yml index d2c2e5ed..2869033a 100644 --- a/host/docker/compose.yml +++ b/host/docker/compose.yml @@ -1,14 +1,9 @@ -version: "3" - services: dnote: image: dnote/dnote:latest - environment: - APP_ENV: PRODUCTION - WebURL: localhost:3000 - DisableRegistration: "false" + container_name: dnote ports: - - 3000:3000 + - 3001:3001 volumes: - ./dnote_data:/data - restart: always + restart: unless-stopped diff --git a/pkg/e2e/server_test.go b/pkg/e2e/server_test.go index 52a2d311..c37b7320 100644 --- a/pkg/e2e/server_test.go +++ b/pkg/e2e/server_test.go @@ -151,8 +151,8 @@ func TestServerStartHelp(t *testing.T) { func TestServerStartInvalidConfig(t *testing.T) { cmd := exec.Command(testServerBinary, "start") - // Clear WebURL env var so validation fails - cmd.Env = []string{} + // Set invalid WebURL to trigger validation failure + cmd.Env = []string{"WebURL=not-a-valid-url"} output, err := cmd.CombinedOutput() diff --git a/pkg/server/.env.dev b/pkg/server/.env.dev index 334b1196..fe5dca07 100644 --- a/pkg/server/.env.dev +++ b/pkg/server/.env.dev @@ -5,5 +5,5 @@ SmtpPassword=mock-SmtpPassword SmtpHost=mock-SmtpHost SmtpPort=465 -WebURL=http://localhost:3000 +WebURL=http://localhost:3001 DisableRegistration=false diff --git a/pkg/server/.env.test b/pkg/server/.env.test index d633f83c..8c0befed 100644 --- a/pkg/server/.env.test +++ b/pkg/server/.env.test @@ -5,5 +5,5 @@ SmtpPassword=mock-SmtpPassword SmtpHost=mock-SmtpHost SmtpPort=465 -WebURL=http://localhost:3000 +WebURL=http://localhost:3001 DisableRegistration=false diff --git a/pkg/server/config/config.go b/pkg/server/config/config.go index 916bae4e..e941a9a5 100644 --- a/pkg/server/config/config.go +++ b/pkg/server/config/config.go @@ -93,8 +93,8 @@ type Params struct { func New(p Params) (Config, error) { c := Config{ AppEnv: getOrEnv(p.AppEnv, "APP_ENV", AppEnvProduction), - Port: getOrEnv(p.Port, "PORT", "3000"), - WebURL: getOrEnv(p.WebURL, "WebURL", ""), + Port: getOrEnv(p.Port, "PORT", "3001"), + WebURL: getOrEnv(p.WebURL, "WebURL", "http://localhost:3001"), DBPath: getOrEnv(p.DBPath, "DBPath", DefaultDBPath), DisableRegistration: p.DisableRegistration || readBoolEnv("DisableRegistration"), LogLevel: getOrEnv(p.LogLevel, "LOG_LEVEL", "info"), diff --git a/pkg/server/main.go b/pkg/server/main.go index 4e36b96d..e8fa1aa8 100644 --- a/pkg/server/main.go +++ b/pkg/server/main.go @@ -81,8 +81,8 @@ Flags: } appEnv := startFlags.String("appEnv", "", "Application environment (env: APP_ENV, default: PRODUCTION)") - port := startFlags.String("port", "", "Server port (env: PORT, default: 3000)") - webURL := startFlags.String("webUrl", "", "Full URL to server without trailing slash (env: WebURL, example: https://example.com)") + port := startFlags.String("port", "", "Server port (env: PORT, default: 3001)") + webURL := startFlags.String("webUrl", "", "Full URL to server without trailing slash (env: WebURL, default: http://localhost:3001)") dbPath := startFlags.String("dbPath", "", "Path to SQLite database file (env: DBPath, default: $XDG_DATA_HOME/dnote/server.db)") disableRegistration := startFlags.Bool("disableRegistration", false, "Disable user registration (env: DisableRegistration, default: false)") logLevel := startFlags.String("logLevel", "", "Log level: debug, info, warn, or error (env: LOG_LEVEL, default: info)") diff --git a/scripts/cli/build.sh b/scripts/cli/build.sh index c805ba90..c5c6043c 100755 --- a/scripts/cli/build.sh +++ b/scripts/cli/build.sh @@ -57,7 +57,7 @@ build() { # build binary destDir="$outputDir/$platform-$arch" - ldflags="-X main.apiEndpoint=https://localhost:3000/api -X main.versionTag=$version" + ldflags="-X main.apiEndpoint=https://localhost:3001/api -X main.versionTag=$version" tags="fts5" pushd "$projectDir" diff --git a/scripts/cli/dev.sh b/scripts/cli/dev.sh index ce173496..d4a23e76 100755 --- a/scripts/cli/dev.sh +++ b/scripts/cli/dev.sh @@ -6,6 +6,6 @@ dir=$(dirname "${BASH_SOURCE[0]}") sudo rm -rf "$(which dnote)" "$GOPATH/bin/cli" # change tags to darwin if on macos -go install -ldflags "-X main.apiEndpoint=http://127.0.0.1:3000/api" --tags "linux fts5" "$dir/../../pkg/cli" +go install -ldflags "-X main.apiEndpoint=http://127.0.0.1:3001/api" --tags "linux fts5" "$dir/../../pkg/cli" sudo ln -s "$GOPATH/bin/cli" /usr/local/bin/dnote diff --git a/scripts/e2e/test.sh b/scripts/e2e/test.sh index 240d5c97..8ff94364 100755 --- a/scripts/e2e/test.sh +++ b/scripts/e2e/test.sh @@ -9,5 +9,5 @@ source "$basePath/pkg/server/.env.test" set +a pushd "$basePath"/pkg/e2e -go test --tags "fts5" ./... -p 1 +go test --tags "fts5" ./... -p 1 -v -timeout 5m popd diff --git a/scripts/server/dev.sh b/scripts/server/dev.sh index 5eb93328..7e1fe80e 100755 --- a/scripts/server/dev.sh +++ b/scripts/server/dev.sh @@ -23,7 +23,7 @@ cp "$basePath"/pkg/server/assets/static/* "$basePath/pkg/server/static" # run server moduleName="github.com/dnote/dnote" ldflags="-X '$moduleName/pkg/server/buildinfo.CSSFiles=main.css' -X '$moduleName/pkg/server/buildinfo.JSFiles=main.js' -X '$moduleName/pkg/server/buildinfo.Version=dev' -X '$moduleName/pkg/server/buildinfo.Standalone=true'" -task="go run -ldflags \"$ldflags\" --tags fts5 main.go start -port 3000" +task="go run -ldflags \"$ldflags\" --tags fts5 main.go start -port 3001" ( cd "$basePath/pkg/watcher" && \ From fd7b2a78b27fc48dde5cbfb0c0b4b94d0ade51d6 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sat, 11 Oct 2025 13:35:39 -0700 Subject: [PATCH 06/33] Remove email verification (#688) * Remove email verified flag * Fix sass deprecation warnings --- pkg/server/app/email.go | 22 - pkg/server/app/email_test.go | 16 - pkg/server/app/errors.go | 3 - pkg/server/assets/package-lock.json | 529 ++++++++++++++---- pkg/server/assets/styles/src/_books.scss | 11 +- pkg/server/assets/styles/src/_buttons.scss | 56 +- pkg/server/assets/styles/src/_font.scss | 6 +- pkg/server/assets/styles/src/_global.scss | 36 +- pkg/server/assets/styles/src/_header.scss | 56 +- pkg/server/assets/styles/src/_home.scss | 66 +-- pkg/server/assets/styles/src/_login.scss | 25 +- pkg/server/assets/styles/src/_note.scss | 43 +- pkg/server/assets/styles/src/_rem.scss | 39 +- pkg/server/assets/styles/src/_responsive.scss | 18 +- pkg/server/assets/styles/src/_settings.scss | 68 +-- pkg/server/assets/styles/src/_shared.scss | 60 +- pkg/server/assets/styles/src/_theme.scss | 5 +- pkg/server/assets/styles/src/main.scss | 42 +- pkg/server/controllers/helpers.go | 2 - pkg/server/controllers/routes.go | 2 - pkg/server/controllers/users.go | 126 ----- pkg/server/controllers/users_test.go | 291 +--------- pkg/server/database/consts.go | 2 - pkg/server/database/models.go | 7 +- pkg/server/mailer/mailer.go | 7 - pkg/server/mailer/mailer_test.go | 39 -- pkg/server/mailer/templates/verify_email.txt | 5 - pkg/server/mailer/types.go | 6 - pkg/server/middleware/auth_test.go | 4 +- pkg/server/session/session.go | 10 +- pkg/server/session/session_test.go | 9 +- pkg/server/token/token_test.go | 2 +- .../templates/users/email_verification.gohtml | 2 - .../views/templates/users/settings.gohtml | 28 - pkg/server/views/view.go | 2 - 35 files changed, 731 insertions(+), 914 deletions(-) delete mode 100644 pkg/server/mailer/templates/verify_email.txt delete mode 100644 pkg/server/views/templates/users/email_verification.gohtml diff --git a/pkg/server/app/email.go b/pkg/server/app/email.go index 0897e415..2f721a6f 100644 --- a/pkg/server/app/email.go +++ b/pkg/server/app/email.go @@ -65,28 +65,6 @@ func getNoreplySender(webURL string) (string, error) { return addr, nil } -// SendVerificationEmail sends verification email -func (a *App) SendVerificationEmail(email, tokenValue string) error { - body, err := a.EmailTemplates.Execute(mailer.EmailTypeEmailVerification, mailer.EmailKindText, mailer.EmailVerificationTmplData{ - Token: tokenValue, - WebURL: a.WebURL, - }) - if err != nil { - return errors.Wrapf(err, "executing reset verification template for %s", email) - } - - from, err := GetSenderEmail(a.WebURL, defaultSender) - if err != nil { - return errors.Wrap(err, "getting the sender email") - } - - if err := a.EmailBackend.Queue("Verify your Dnote email address", from, []string{email}, mailer.EmailKindText, body); err != nil { - return errors.Wrapf(err, "queueing email for %s", email) - } - - return nil -} - // SendWelcomeEmail sends welcome email func (a *App) SendWelcomeEmail(email string) error { body, err := a.EmailTemplates.Execute(mailer.EmailTypeWelcome, mailer.EmailKindText, mailer.WelcomeTmplData{ diff --git a/pkg/server/app/email_test.go b/pkg/server/app/email_test.go index 1c68a96f..56270604 100644 --- a/pkg/server/app/email_test.go +++ b/pkg/server/app/email_test.go @@ -26,22 +26,6 @@ import ( "github.com/dnote/dnote/pkg/server/testutils" ) -func TestSendVerificationEmail(t *testing.T) { - emailBackend := testutils.MockEmailbackendImplementation{} - a := NewTest() - a.EmailBackend = &emailBackend - a.WebURL = "http://example.com" - - if err := a.SendVerificationEmail("alice@example.com", "mockTokenValue"); err != nil { - t.Fatal(err, "failed to perform") - } - - assert.Equalf(t, len(emailBackend.Emails), 1, "email queue count mismatch") - assert.Equal(t, emailBackend.Emails[0].From, "noreply@example.com", "email sender mismatch") - assert.DeepEqual(t, emailBackend.Emails[0].To, []string{"alice@example.com"}, "email sender mismatch") - -} - func TestSendWelcomeEmail(t *testing.T) { emailBackend := testutils.MockEmailbackendImplementation{} a := NewTest() diff --git a/pkg/server/app/errors.go b/pkg/server/app/errors.go index 250de5d1..895fc40f 100644 --- a/pkg/server/app/errors.go +++ b/pkg/server/app/errors.go @@ -79,7 +79,4 @@ var ( ErrInvalidPassword appError = "Invalid currnet password." // ErrEmailTooLong is an error for email length exceeding the limit ErrEmailTooLong appError = "Email is too long." - - // ErrEmailAlreadyVerified is an error for trying to verify email that is already verified - ErrEmailAlreadyVerified appError = "Email is already verified." ) diff --git a/pkg/server/assets/package-lock.json b/pkg/server/assets/package-lock.json index a37c4305..ec63082c 100644 --- a/pkg/server/assets/package-lock.json +++ b/pkg/server/assets/package-lock.json @@ -1,158 +1,493 @@ { "name": "assets", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 3, "requires": true, - "dependencies": { - "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" + "packages": { + "": { + "name": "assets", + "version": "1.0.0", + "license": "AGPL-3.0-or-later", + "devDependencies": { + "sass": "^1.50.1" } }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true + "node_modules/@parcel/watcher": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz", + "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.5.1", + "@parcel/watcher-darwin-arm64": "2.5.1", + "@parcel/watcher-darwin-x64": "2.5.1", + "@parcel/watcher-freebsd-x64": "2.5.1", + "@parcel/watcher-linux-arm-glibc": "2.5.1", + "@parcel/watcher-linux-arm-musl": "2.5.1", + "@parcel/watcher-linux-arm64-glibc": "2.5.1", + "@parcel/watcher-linux-arm64-musl": "2.5.1", + "@parcel/watcher-linux-x64-glibc": "2.5.1", + "@parcel/watcher-linux-x64-musl": "2.5.1", + "@parcel/watcher-win32-arm64": "2.5.1", + "@parcel/watcher-win32-ia32": "2.5.1", + "@parcel/watcher-win32-x64": "2.5.1" + } }, - "braces": { + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz", + "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz", + "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz", + "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz", + "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz", + "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz", + "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz", + "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz", + "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz", + "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz", + "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz", + "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz", + "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz", + "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/braces": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, - "requires": { + "optional": true, + "dependencies": { "fill-range": "^7.1.1" }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz", + "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==", + "dev": true, "dependencies": { - "fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - } + "readdirp": "^4.0.1" + }, + "engines": { + "node": ">= 14.16.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" } }, - "chokidar": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", + "node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" + "optional": true, + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" } }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, - "optional": true - }, - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" + "optional": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" } }, - "immutable": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz", - "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==", + "node_modules/immutable": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz", + "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==", "dev": true }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-extglob": { + "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } }, - "is-glob": { + "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, - "requires": { + "optional": true, + "dependencies": { "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" } }, - "is-number": { + "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true + "dev": true, + "optional": true, + "engines": { + "node": ">=0.12.0" + } }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true + "node_modules/micromatch": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, + "optional": true, + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } }, - "picomatch": { + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "dev": true, + "optional": true + }, + "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, - "requires": { - "picomatch": "^2.2.1" + "optional": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, - "sass": { - "version": "1.50.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.50.1.tgz", - "integrity": "sha512-noTnY41KnlW2A9P8sdwESpDmo+KBNkukI1i8+hOK3footBUcohNHtdOJbckp46XO95nuvcHDDZ+4tmOnpK3hjw==", + "node_modules/readdirp": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", + "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==", "dev": true, - "requires": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", + "engines": { + "node": ">= 14.18.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/sass": { + "version": "1.93.2", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz", + "integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==", + "dev": true, + "dependencies": { + "chokidar": "^4.0.0", + "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" + }, + "optionalDependencies": { + "@parcel/watcher": "^2.4.1" } }, - "source-map-js": { + "node_modules/source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true + "dev": true, + "engines": { + "node": ">=0.10.0" + } }, - "to-regex-range": { + "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "requires": { + "optional": true, + "dependencies": { "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" } } } diff --git a/pkg/server/assets/styles/src/_books.scss b/pkg/server/assets/styles/src/_books.scss index 6f58ef94..c94c4347 100644 --- a/pkg/server/assets/styles/src/_books.scss +++ b/pkg/server/assets/styles/src/_books.scss @@ -1,3 +1,6 @@ +@use "rem"; +@use "theme"; + /* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * * This file is part of Dnote. @@ -18,12 +21,12 @@ .books-page { .books-content { - padding: rem(16px) rem(24px); - margin-top: rem(16px); + padding: rem.rem(16px) rem.rem(24px); + margin-top: rem.rem(16px); h1 { - border-bottom: 1px solid $lighter-gray; - margin-bottom: rem(12px); + border-bottom: 1px solid theme.$lighter-gray; + margin-bottom: rem.rem(12px); } } } diff --git a/pkg/server/assets/styles/src/_buttons.scss b/pkg/server/assets/styles/src/_buttons.scss index ef1095d5..16059864 100644 --- a/pkg/server/assets/styles/src/_buttons.scss +++ b/pkg/server/assets/styles/src/_buttons.scss @@ -16,9 +16,11 @@ * along with Dnote. If not, see . */ -@import './theme'; -@import './rem'; -@import './font'; +@use "sass:color"; +@use 'theme'; +@use 'rem'; +@use 'font'; +@use "responsive"; @mixin button($text-color, $background-color) { color: $text-color; @@ -26,7 +28,7 @@ &:not(:disabled):hover { color: $text-color; - background-color: darken($background-color, 5%); + background-color: color.adjust($background-color, $lightness: -5%); box-shadow: 0px 0px 4px 2px #cacaca; } } @@ -87,40 +89,40 @@ button:disabled { } .button-small { - @include font-size('small'); - padding: rem(4px) rem(12px); + @include font.font-size('small'); + padding: rem.rem(4px) rem.rem(12px); } .button-normal { // @include font-size('small'); - padding: rem(8px) rem(16px); + padding: rem.rem(8px) rem.rem(16px); } .button-large { - @include font-size('medium'); + @include font.font-size('medium'); - padding: rem(8px) rem(24px); + padding: rem.rem(8px) rem.rem(24px); - @include breakpoint(md) { - padding: rem(12px) rem(36px); + @include responsive.breakpoint(md) { + padding: rem.rem(12px) rem.rem(36px); } - @include breakpoint(lg) { - padding: rem(12px) rem(48px); + @include responsive.breakpoint(lg) { + padding: rem.rem(12px) rem.rem(48px); } } .button-xlarge { - @include font-size('x-large'); + @include font.font-size('x-large'); - padding: rem(16px) rem(24px); + padding: rem.rem(16px) rem.rem(24px); - @include breakpoint(md) { - padding: rem(12px) rem(36px); + @include responsive.breakpoint(md) { + padding: rem.rem(12px) rem.rem(36px); } - @include breakpoint(lg) { - padding: rem(16px) rem(48px); + @include responsive.breakpoint(lg) { + padding: rem.rem(16px) rem.rem(48px); } } @@ -133,23 +135,23 @@ button:disabled { } .button-second { - @include button($black, $second); + @include button(theme.$black, theme.$second); } .button-second-outline { - @include button-outline($black, $second); + @include button-outline(theme.$black, theme.$second); } .button-third { - @include button(#ffffff, $third); + @include button(#ffffff, theme.$third); } .button-third-outline { - @include button-outline($third, $third); + @include button-outline(theme.$third, theme.$third); } .button-danger { - @include button-outline($danger-text, $danger-text); + @include button-outline(theme.$danger-text, theme.$danger-text); font-weight: 600; } @@ -158,7 +160,7 @@ button:disabled { } .button ~ .button { - margin-left: rem(12px); + margin-left: rem.rem(12px); } .button-no-ui { @@ -173,10 +175,10 @@ button:disabled { } .button-link { - color: $link; + color: theme.$link; &:hover { - color: $link-hover; + color: theme.$link-hover; text-decoration: underline; } } diff --git a/pkg/server/assets/styles/src/_font.scss b/pkg/server/assets/styles/src/_font.scss index f64b7236..37bc3163 100644 --- a/pkg/server/assets/styles/src/_font.scss +++ b/pkg/server/assets/styles/src/_font.scss @@ -16,7 +16,7 @@ * along with Dnote. If not, see . */ -@import './responsive'; +@use 'responsive'; $lowDecay: 0.1; $medDecay: 0.15; @@ -95,12 +95,12 @@ $highDecay: 0.2; font-size: $smSizeValue * 1px; font-size: $smSizeValue * 0.1rem; - @include breakpoint(md) { + @include responsive.breakpoint(md) { font-size: $mdSizeValue * 1px; font-size: $mdSizeValue * 0.1rem; } - @include breakpoint(lg) { + @include responsive.breakpoint(lg) { font-size: $lgSizeValue * 1px; font-size: $lgSizeValue * 0.1rem; } diff --git a/pkg/server/assets/styles/src/_global.scss b/pkg/server/assets/styles/src/_global.scss index a91a9a95..8c497658 100644 --- a/pkg/server/assets/styles/src/_global.scss +++ b/pkg/server/assets/styles/src/_global.scss @@ -1,3 +1,9 @@ +@use "font"; +@use "rem"; +@use "responsive"; +@use "theme"; +@use "variables"; + /* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * * This file is part of Dnote. @@ -20,8 +26,8 @@ position: relative; display: flex; flex-direction: column; - background: $lighter-gray; - min-height: calc(100vh - #{$header-height}); + background: theme.$lighter-gray; + min-height: calc(100vh - #{variables.$header-height}); // margin-bottom: $footer-height; &.nofooter { @@ -29,49 +35,49 @@ } &.noheader:not(.nofooter) { - min-height: calc(100vh - #{$footer-height}); + min-height: calc(100vh - #{variables.$footer-height}); } &.nofooter:not(.noheader) { - min-height: calc(100vh - #{$header-height}); + min-height: calc(100vh - #{variables.$header-height}); } &.nofooter.noheader { min-height: 100vh; } - @include breakpoint(lg) { + @include responsive.breakpoint(lg) { margin-bottom: 0; - min-height: calc(100vh - #{$header-height}); + min-height: calc(100vh - #{variables.$header-height}); } } /* partials */ .partial--time { - color: $gray; - @include font-size('small'); + color: theme.$gray; + @include font.font-size('small'); .mobile-text { - @include breakpoint(md) { + @include responsive.breakpoint(md) { display: none; } } .text { display: none; - @include breakpoint(md) { + @include responsive.breakpoint(md) { display: inherit; } } } .partial--page-toolbar { - @include breakpoint(lg) { - height: rem(48px); - border-radius: rem(4px); - background: $light; + @include responsive.breakpoint(lg) { + height: rem.rem(48px); + border-radius: rem.rem(4px); + background: theme.$light; box-shadow: 0 0 8px rgba(0, 0, 0, 0.14); &.bottom { - margin-top: rem(12px); + margin-top: rem.rem(12px); } } } diff --git a/pkg/server/assets/styles/src/_header.scss b/pkg/server/assets/styles/src/_header.scss index 61c7b5bf..c952599e 100644 --- a/pkg/server/assets/styles/src/_header.scss +++ b/pkg/server/assets/styles/src/_header.scss @@ -16,8 +16,12 @@ * along with Dnote. If not, see . */ -@import './theme'; -@import './variables'; +@use "sass:color"; +@use 'theme'; +@use 'variables'; +@use "font"; +@use "rem"; +@use "responsive"; .header-wrapper { padding: 0; @@ -25,7 +29,7 @@ position: relative; display: flex; box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2); - background: $first; + background: theme.$first; align-items: stretch; justify-content: space-between; flex: 1; @@ -33,13 +37,13 @@ position: sticky; top: 0; z-index: 4; - height: $header-height; + height: variables.$header-height; .container { height: 100%; } - @include breakpoint(md) { + @include responsive.breakpoint(md) { flex-direction: row; } @@ -60,15 +64,15 @@ .search-wrapper { align-items: center; display: flex; - margin-left: rem(32px); + margin-left: rem.rem(32px); } .search-input { - width: rem(356px); + width: rem.rem(356px); border: 0; padding: 4px 12px; - border-radius: rem(4px); - @include font-size('small'); + border-radius: rem.rem(4px); + @include font.font-size('small'); } .brand { @@ -81,7 +85,7 @@ } .main-nav { - margin-left: rem(32px); + margin-left: rem.rem(32px); display: flex; .list { @@ -94,22 +98,22 @@ } .nav-link { - @include font-size('small'); + @include font.font-size('small'); display: flex; font-weight: 600; align-items: center; - padding: 0 rem(16px); - color: $white; + padding: 0 rem.rem(16px); + color: theme.$white; &:hover { - color: $white; + color: theme.$white; text-decoration: none; - background: lighten($first, 10%); + background: color.adjust(theme.$first, $lightness: 10%); } } .nav-item { - @include font-size('small'); + @include font.font-size('small'); font-weight: 600; } } @@ -131,7 +135,7 @@ display: none; position: absolute; background-color: #f1f1f1; - width: rem(240px); + width: rem.rem(240px); background: #fff; border: 1px solid #d8d8d8; border-radius: 4px; @@ -154,15 +158,15 @@ } .account-dropdown-header { - @include font-size('small'); - color: $light-gray; - padding: rem(8px) rem(12px); + @include font.font-size('small'); + color: theme.$light-gray; + padding: rem.rem(8px) rem.rem(12px); display: block; margin-bottom: 0; white-space: nowrap; svg { - fill: $light-gray; + fill: theme.$light-gray; } .email { @@ -173,15 +177,15 @@ } .dropdown-link { - @include font-size('small'); + @include font.font-size('small'); white-space: pre; - padding: rem(8px) rem(14px); + padding: rem.rem(8px) rem.rem(14px); width: 100%; display: block; color: black; &:hover { - background: $lighter-gray; + background: theme.$lighter-gray; text-decoration: none; color: #0056b3; } @@ -192,7 +196,7 @@ } &:not(.disabled):focus { - background: $lighter-gray; + background: theme.$lighter-gray; color: #0056b3; outline: 1px dotted gray; } @@ -204,7 +208,7 @@ } .session-notice { - margin-left: rem(4px); + margin-left: rem.rem(4px); } } } diff --git a/pkg/server/assets/styles/src/_home.scss b/pkg/server/assets/styles/src/_home.scss index b1eac511..ce72a9f3 100644 --- a/pkg/server/assets/styles/src/_home.scss +++ b/pkg/server/assets/styles/src/_home.scss @@ -16,21 +16,23 @@ * along with Dnote. If not, see . */ -@import './theme'; -@import './font'; +@use 'theme'; +@use 'font'; +@use "rem"; +@use "responsive"; .home-page { .note-group-list { flex-grow: 1; - @include breakpoint(lg) { - margin-top: rem(16px); + @include responsive.breakpoint(lg) { + margin-top: rem.rem(16px); } .note-group-list-empty { - padding: rem(40px) rem(16px); + padding: rem.rem(40px) rem.rem(16px); text-align: center; - color: $gray; + color: theme.$gray; } } @@ -40,29 +42,29 @@ box-shadow: 0 0 8px rgba(0, 0, 0, 0.14); &:not(:first-of-type) { - margin-top: rem(20px); + margin-top: rem.rem(20px); - @include breakpoint(md) { - margin-top: rem(24px); + @include responsive.breakpoint(md) { + margin-top: rem.rem(24px); } } .note-group-header { - @include font-size('small'); + @include font.font-size('small'); display: flex; justify-content: space-between; color: white; - padding: rem(12px) rem(16px); - background: $light; - color: $black; - border-bottom: 1px solid $border-color; + padding: rem.rem(12px) rem.rem(16px); + background: theme.$light; + color: theme.$black; + border-bottom: 1px solid theme.$border-color; border-top-left-radius: 4px; border-top-right-radius: 4px; } .date { font-weight: 600; - @include font-size('small'); + @include font.font-size('small'); } .mask { @@ -78,7 +80,7 @@ .header-date { font-weight: 600; - @include font-size('regular'); + @include font.font-size('regular'); } .header-count { font-weight: 300; @@ -101,23 +103,23 @@ background: white; position: relative; - border-bottom: 1px solid $border-color; + border-bottom: 1px solid theme.$border-color; .link { - color: $black; + color: theme.$black; display: block; - padding: rem(12px) rem(16px); + padding: rem.rem(12px) rem.rem(16px); border: 2px solid transparent; &:hover { text-decoration: none; - background: $light-blue; + background: theme.$light-blue; color: inherit; } } .meta { - line-height: rem(16px); + line-height: rem.rem(16px); } .body { @@ -131,11 +133,11 @@ } .note-content { - margin-top: rem(12px); + margin-top: rem.rem(12px); line-height: 1.6rem; overflow: hidden; text-overflow: ellipsis; - color: $gray; + color: theme.$gray; } .book-label { @@ -143,11 +145,11 @@ text-overflow: ellipsis; white-space: nowrap; font-weight: 700; - @include font-size('small'); + @include font.font-size('small'); width: 212px; - @include breakpoint('md') { + @include responsive.breakpoint('md') { width: 320px; } } @@ -155,7 +157,7 @@ .match { display: inline-block; background: #f7f77d; - padding: rem(4px) rem(4px); + padding: rem.rem(4px) rem.rem(4px); } } @@ -168,12 +170,12 @@ align-items: center; .paginator-info { - @include font-size('small'); - color: $gray; + @include font.font-size('small'); + color: theme.$gray; } .paginator-link { - padding: rem(12px) rem(12px); + padding: rem.rem(12px) rem.rem(12px); &.disabled { cursor: not-allowed; @@ -181,10 +183,10 @@ } .paginator-link-prev { - margin-left: rem(8px); + margin-left: rem.rem(8px); - @include breakpoint(md) { - margin-left: rem(20px); + @include responsive.breakpoint(md) { + margin-left: rem.rem(20px); } } diff --git a/pkg/server/assets/styles/src/_login.scss b/pkg/server/assets/styles/src/_login.scss index 49d5c42c..9200a911 100644 --- a/pkg/server/assets/styles/src/_login.scss +++ b/pkg/server/assets/styles/src/_login.scss @@ -16,11 +16,12 @@ * along with Dnote. If not, see . */ -@import './theme'; -@import './font'; +@use 'theme'; +@use 'font'; +@use "rem"; .auth-page { - background: $lighter-gray; + background: theme.$lighter-gray; text-align: center; min-height: 100vh; padding: 50px 0; @@ -30,8 +31,8 @@ } .heading { - color: $black; - @include font-size('2x-large'); + color: theme.$black; + @include font.font-size('2x-large'); font-weight: 300; margin-top: 12px; margin-bottom: 0; @@ -58,15 +59,15 @@ .callout { color: #7c7c7c; - @include font-size('small'); + @include font.font-size('small'); } .cta { - @include font-size('small'); + @include font.font-size('small'); } .panel { - border: 1px solid $border-color; - background: $white; + border: 1px solid theme.$border-color; + background: theme.$white; border-radius: 2px; padding: 20px; text-align: left; @@ -82,21 +83,21 @@ } } .label { - @include font-size('small'); + @include font.font-size('small'); font-weight: 600; width: 100%; margin-bottom: 0; } .forgot { - @include font-size('small'); + @include font.font-size('small'); float: right; font-weight: 400; } &.password-reset-page { .email-input { - margin-top: rem(16px); + margin-top: rem.rem(16px); } } diff --git a/pkg/server/assets/styles/src/_note.scss b/pkg/server/assets/styles/src/_note.scss index 623d7969..edc83a34 100644 --- a/pkg/server/assets/styles/src/_note.scss +++ b/pkg/server/assets/styles/src/_note.scss @@ -1,3 +1,8 @@ +@use "font"; +@use "rem"; +@use "responsive"; +@use "theme"; + /* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * * This file is part of Dnote. @@ -18,7 +23,7 @@ .note-page { // min-height: calc(100vh - 57px); - background: $lighter-gray; + background: theme.$lighter-gray; flex-grow: 1; flex-basis: 0; @@ -38,8 +43,8 @@ display: flex; align-items: center; justify-content: space-between; - padding: rem(12px) rem(16px); - border-bottom: 1px solid $border-color; + padding: rem.rem(12px) rem.rem(16px); + border-bottom: 1px solid theme.$border-color; } .header-left, .header-right { @@ -52,27 +57,27 @@ } .content-wrapper { - padding: rem(12px) rem(16px); + padding: rem.rem(12px) rem.rem(16px); } .collapsed-content { - color: $light-gray; + color: theme.$light-gray; } .footer { display: flex; justify-content: space-between; align-items: center; - @include font-size('small'); - padding: rem(12px) rem(16px); + @include font.font-size('small'); + padding: rem.rem(12px) rem.rem(16px); } .ts { - color: $light-gray; + color: theme.$light-gray; } .ts-lead { display: none; - @include breakpoint(md) { + @include responsive.breakpoint(md) { display: inline; } } @@ -83,13 +88,13 @@ } .book-label { - @include font-size('medium'); + @include font.font-size('medium'); font-weight: 600; display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - color: $black; + color: theme.$black; a { color: inherit; @@ -103,17 +108,17 @@ // header .header { .book-label { - max-width: rem(200px); - margin-left: rem(12px); + max-width: rem.rem(200px); + margin-left: rem.rem(12px); - @include breakpoint(sm) { - max-width: rem(200px); + @include responsive.breakpoint(sm) { + max-width: rem.rem(200px); } - @include breakpoint(md) { - max-width: rem(420px); + @include responsive.breakpoint(md) { + max-width: rem.rem(420px); } - @include breakpoint(lg) { - max-width: rem(600px); + @include responsive.breakpoint(lg) { + max-width: rem.rem(600px); } } } diff --git a/pkg/server/assets/styles/src/_rem.scss b/pkg/server/assets/styles/src/_rem.scss index e875d0cd..cd736925 100644 --- a/pkg/server/assets/styles/src/_rem.scss +++ b/pkg/server/assets/styles/src/_rem.scss @@ -1,3 +1,6 @@ +@use "sass:list"; +@use "sass:map"; +@use "sass:meta"; /* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * * This file is part of Dnote. @@ -24,6 +27,8 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +@use "sass:math"; + // assume 1 rem = 10 px // achieved by body { font-size: 62.5%; ) $rem-baseline: 10px !default; @@ -32,24 +37,24 @@ $rem-px-only: false !default; @function rem-separator($list, $separator: false) { @if $separator == "comma" or $separator == "space" { - @return append($list, null, $separator); + @return list.append($list, null, $separator); } - @if function-exists("list-separator") == true { - @return list-separator($list); + @if meta.function-exists("list-separator") == true { + @return list.separator($list); } // list-separator polyfill by Hugo Giraudel (https://sass-compatibility.github.io/#list_separator_function) $test-list: (); @each $item in $list { - $test-list: append($test-list, $item, space); + $test-list: list.append($test-list, $item, space); } @return if($test-list == $list, space, comma); } @mixin rem-baseline($zoom: 100%) { - font-size: $zoom / 16px * $rem-baseline; + font-size: math.div($zoom, 16px) * $rem-baseline; } @function rem-convert($to, $values...) { @@ -57,28 +62,28 @@ $rem-px-only: false !default; $separator: rem-separator($values); @each $value in $values { - @if type-of($value) == "number" and unit($value) == "rem" and $to == "px" { - $result: append($result, $value / 1rem * $rem-baseline, $separator); + @if meta.type-of($value) == "number" and math.unit($value) == "rem" and $to == "px" { + $result: list.append($result, math.div($value, 1rem) * $rem-baseline, $separator); } @else if - type-of($value) == + meta.type-of($value) == "number" and - unit($value) == + math.unit($value) == "px" and $to == "rem" { - $result: append($result, $value / $rem-baseline * 1rem, $separator); - } @else if type-of($value) == "list" { + $result: list.append($result, math.div($value, $rem-baseline) * 1rem, $separator); + } @else if meta.type-of($value) == "list" { $value-separator: rem-separator($value); $value: rem-convert($to, $value...); $value: rem-separator($value, $value-separator); - $result: append($result, $value, $separator); + $result: list.append($result, $value, $separator); } @else { - $result: append($result, $value, $separator); + $result: list.append($result, $value, $separator); } } - @return if(length($result) == 1, nth($result, 1), $result); + @return if(list.length($result) == 1, list.nth($result, 1), $result); } @function rem($values...) { @@ -90,9 +95,9 @@ $rem-px-only: false !default; } @mixin rem($properties, $values...) { - @if type-of($properties) == "map" { - @each $property in map-keys($properties) { - @include rem($property, map-get($properties, $property)); + @if meta.type-of($properties) == "map" { + @each $property in map.keys($properties) { + @include rem($property, map.get($properties, $property)); } } @else { @each $property in $properties { diff --git a/pkg/server/assets/styles/src/_responsive.scss b/pkg/server/assets/styles/src/_responsive.scss index 05188e4c..9aaf9a7f 100644 --- a/pkg/server/assets/styles/src/_responsive.scss +++ b/pkg/server/assets/styles/src/_responsive.scss @@ -16,39 +16,39 @@ * along with Dnote. If not, see . */ -@import './variables'; +@use 'variables'; @mixin breakpoint($point) { @if $point == xl { - @media (min-width: $xl-breakpoint) { + @media (min-width: variables.$xl-breakpoint) { @content; } } @else if $point == lg { - @media (min-width: $lg-breakpoint) { + @media (min-width: variables.$lg-breakpoint) { @content; } } @else if $point == md { - @media (min-width: $md-breakpoint) { + @media (min-width: variables.$md-breakpoint) { @content; } } @else if $point == sm { - @media (min-width: $sm-breakpoint) { + @media (min-width: variables.$sm-breakpoint) { @content; } } @else if $point == smonly { - @media (min-width: $sm-breakpoint) and (max-width: $md-breakpoint - 1px) { + @media (min-width: variables.$sm-breakpoint) and (max-width: variables.$md-breakpoint - 1px) { @content; } } @else if $point == smdown { - @media (max-width: $md-breakpoint - 1px) { + @media (max-width: variables.$md-breakpoint - 1px) { @content; } } @else if $point == mdonly { - @media (min-width: $md-breakpoint) and (max-width: $lg-breakpoint - 1px) { + @media (min-width: variables.$md-breakpoint) and (max-width: variables.$lg-breakpoint - 1px) { @content; } } @else if $point == mddown { - @media (max-width: $lg-breakpoint - 1px) { + @media (max-width: variables.$lg-breakpoint - 1px) { @content; } } diff --git a/pkg/server/assets/styles/src/_settings.scss b/pkg/server/assets/styles/src/_settings.scss index 6b89ed7a..2f5d439d 100644 --- a/pkg/server/assets/styles/src/_settings.scss +++ b/pkg/server/assets/styles/src/_settings.scss @@ -16,17 +16,19 @@ * along with Dnote. If not, see . */ -@import './theme'; -@import './font'; +@use 'theme'; +@use 'font'; +@use "rem"; +@use "responsive"; .settings-page { .sidebar { box-shadow: 0 1px 5px rgba(0, 0, 0, 0.2); background: white; - margin-bottom: rem(20px); - margin-top: rem(20px); + margin-bottom: rem.rem(20px); + margin-top: rem.rem(20px); - @include breakpoint(lg) { + @include responsive.breakpoint(lg) { margin-bottom: 0; margin-top: 0; } @@ -34,30 +36,30 @@ .sidebar-item { display: block; - padding: rem(12px) rem(16px); + padding: rem.rem(12px) rem.rem(16px); border-left: 4px solid transparent; - @include font-size('regular'); + @include font.font-size('regular'); &:hover { text-decoration: none; - background: $light; + background: theme.$light; } &.active { font-weight: 600; - border-left-color: $first; + border-left-color: theme.$first; } } .setting-section-wrapper { .header { - @include breakpoint(lg) { + @include responsive.breakpoint(lg) { display: none; } } .setting-section { - margin-top: rem(24px); + margin-top: rem.rem(24px); background: white; box-shadow: 0 0 8px rgba(0, 0, 0, 0.14); @@ -67,27 +69,27 @@ } .section-heading { - @include font-size('regular'); + @include font.font-size('regular'); font-weight: 600; - padding-bottom: rem(4px); - background: $light; - padding: rem(16px) rem(20px); + padding-bottom: rem.rem(4px); + background: theme.$light; + padding: rem.rem(16px) rem.rem(20px); } .section-content { - margin-top: rem(20px); + margin-top: rem.rem(20px); } .actions { - margin-top: rem(18px); + margin-top: rem.rem(18px); text-align: right; } } .setting-row { - padding: rem(16px) rem(20px); + padding: rem.rem(16px) rem.rem(20px); &:not(:last-child) { - border-bottom: 1px solid $border-color; + border-bottom: 1px solid theme.$border-color; } .setting-row-summary { @@ -95,7 +97,7 @@ flex-direction: column; // align-items: flex-start; - @include breakpoint(md) { + @include responsive.breakpoint(md) { flex-direction: row; justify-content: space-between; align-items: center; @@ -103,24 +105,24 @@ } .setting-row-main { - padding-top: rem(24px); + padding-top: rem.rem(24px); } .setting-name { font-weight: 400; - @include font-size('regular'); + @include font.font-size('regular'); margin-bottom: 0; } .setting-desc { margin-bottom: 0; - @include font-size('small'); - color: $gray; + @include font.font-size('small'); + color: theme.$gray; } .setting-action { display: flex; flex-direction: column; - @include breakpoint(md) { + @include responsive.breakpoint(md) { flex-direction: row; } } @@ -130,9 +132,9 @@ word-break: break-all; justify-content: space-between; align-items: center; - margin-top: rem(4px); + margin-top: rem.rem(4px); - @include breakpoint(md) { + @include responsive.breakpoint(md) { flex-direction: row; align-items: center; margin-top: 0; @@ -140,26 +142,26 @@ } .setting-edit { - color: $link; + color: theme.$link; padding: 0; &:hover { - color: $link-hover; + color: theme.$link-hover; } - @include breakpoint(md) { - margin-left: rem(16px); + @include responsive.breakpoint(md) { + margin-left: rem.rem(16px); } } .input-row { & ~ .input-row, .input-row { - margin-top: rem(12px); + margin-top: rem.rem(12px); } } } .email-verification-form { - margin-left: rem(12px); + margin-left: rem.rem(12px); } } diff --git a/pkg/server/assets/styles/src/_shared.scss b/pkg/server/assets/styles/src/_shared.scss index 78d35e03..1b7697c1 100644 --- a/pkg/server/assets/styles/src/_shared.scss +++ b/pkg/server/assets/styles/src/_shared.scss @@ -16,8 +16,10 @@ * along with Dnote. If not, see . */ -@import './font'; -@import './responsive'; +@use 'font'; +@use 'responsive'; +@use "rem"; +@use "theme"; @keyframes holderPulse { 0% { @@ -46,7 +48,7 @@ input[type='email']:disabled, input[type='number']:disabled, input[type='password']:disabled, textarea:disabled { - background-color: $lighter-gray; + background-color: theme.$lighter-gray; cursor: not-allowed; } @@ -76,17 +78,17 @@ button { } .text-input { - border: 1px solid $border-color; - padding: rem(8px) rem(12px); + border: 1px solid theme.$border-color; + padding: rem.rem(8px) rem.rem(12px); position: relative; - border-radius: rem(4px); + border-radius: rem.rem(4px); display: block; &::placeholder { - color: $gray; + color: theme.$gray; } &:focus { - border-color: $light-blue; + border-color: theme.$light-blue; box-shadow: inset 0 1px 2px rgba(24, 31, 35, 0.075), 0 0 0 0.2em rgba(4, 100, 210, 0.3); outline: none; @@ -94,11 +96,11 @@ button { } .text-input-small { - padding: rem(4px) rem(12px); + padding: rem.rem(4px) rem.rem(12px); } .text-input-medium { - padding: rem(8px) rem(12px); + padding: rem.rem(8px) rem.rem(12px); } .text-input-stretch { @@ -110,10 +112,10 @@ button { } a { - color: $link; + color: theme.$link; &:hover { - color: $link-hover; + color: theme.$link-hover; } } @@ -129,12 +131,12 @@ h6 { // grid .container.mobile-fw { - @include breakpoint(mddown) { + @include responsive.breakpoint(mddown) { max-width: 100%; } } .container.mobile-nopadding { - @include breakpoint(mddown) { + @include responsive.breakpoint(mddown) { padding-left: 0; padding-right: 0; @@ -154,30 +156,30 @@ html body { } .page { - padding-top: rem(20px); - padding-bottom: rem(20px); + padding-top: rem.rem(20px); + padding-bottom: rem.rem(20px); &.page-mobile-full { padding-top: 0; padding-bottom: 0; - @include breakpoint(lg) { - padding-top: rem(32px); - padding-bottom: rem(32px); + @include responsive.breakpoint(lg) { + padding-top: rem.rem(32px); + padding-bottom: rem.rem(32px); } } } .page-header { - margin-top: rem(20px); + margin-top: rem.rem(20px); &.page-header-full { - margin-bottom: rem(20px); + margin-bottom: rem.rem(20px); } - @include breakpoint(lg) { + @include responsive.breakpoint(lg) { // padding: 0; - margin-bottom: rem(20px); + margin-bottom: rem.rem(20px); margin-top: 0; } } @@ -189,7 +191,7 @@ html body { background-repeat: no-repeat; background-position: right 8px center; background-size: 8px 10px; - border: 1px solid $border-color; + border: 1px solid theme.$border-color; min-height: 34px; padding: 6px 8px; padding-right: 24px; @@ -207,7 +209,7 @@ html body { &:disabled, &.form-select-disabled { background-image: url('data:image/png;base64, iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAYAAACEYr13AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAEKSURBVHgBzVTNDYIwFC4NB46OwAi4gY7gETgoE6gTGCcwTgAJ4efGCLCBjMAIXrmA3yOhQazQhJj4JQ0v7fte3/e1hbFfIk3TYxzHp6kc7dtCFEUW5/xBcdM0a9d1S1kel00mSWKCnIkkxDSnXADIMYYEU9O0zPf91WwB6L6NyB3atrUMw7hNFkCbFyROmXYYmypMDMNwo+t6ztSwtW27oEAXrXBuwu2rCht+WPgU7C8gPCBzYOBKhQS5FTwIKBYeQFeJoWyiKNYH5Co6OCuQr/0JdBuPVyElQCd7GRMb3B3HebsHHzexrmvyQvZwqjFZWsDzvCc62BFhSGYD3UMsfs6ToKOd+6EsxgtrtWLW4gUN3AAAAABJRU5ErkJggg=='); - background-color: $lighter-gray; + background-color: theme.$lighter-gray; } } @@ -215,12 +217,12 @@ html body { // width: 100%; width: auto; font-weight: 600; - margin-bottom: rem(4px); - @include font-size('small'); + margin-bottom: rem.rem(4px); + @include font.font-size('small'); } .page-heading { - @include font-size('x-large'); + @include font.font-size('x-large'); } .dropdown-caret { @@ -231,7 +233,7 @@ html body { border-right: 4px solid transparent; border-bottom: 0 solid transparent; border-left: 4px solid transparent; - margin-left: rem(8px); + margin-left: rem.rem(8px); } .divider { diff --git a/pkg/server/assets/styles/src/_theme.scss b/pkg/server/assets/styles/src/_theme.scss index e17497a6..f37d81a5 100644 --- a/pkg/server/assets/styles/src/_theme.scss +++ b/pkg/server/assets/styles/src/_theme.scss @@ -1,3 +1,4 @@ +@use "sass:color"; /* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * * This file is part of Dnote. @@ -26,7 +27,7 @@ $lighter-gray: #f3f3f3; $dark-gray: #637283; // primary colors -$first: #072a40; +$first: #333745; $second: #e7e7e7; $third: #0a4b73; @@ -35,7 +36,7 @@ $border-color: #d8d8d8; $border-color-light: $lighter-gray; $link: #6f53c0; -$link-hover: darken($link, 5%); +$link-hover: color.adjust($link, $lightness: -5%); $danger-text: #cb2431; $danger-background: #f8d7da; diff --git a/pkg/server/assets/styles/src/main.scss b/pkg/server/assets/styles/src/main.scss index df45971a..4a5a7379 100644 --- a/pkg/server/assets/styles/src/main.scss +++ b/pkg/server/assets/styles/src/main.scss @@ -16,25 +16,25 @@ * along with Dnote. If not, see . */ -@import './reboot'; -@import './grid'; -@import './bootstrap'; -@import './buttons'; -@import './responsive'; -@import './select'; -@import './shared'; -@import './marker'; -@import './rem'; -@import './markdown'; -@import './hljs'; +@use 'reboot'; +@use 'grid'; +@use 'bootstrap'; +@use 'buttons'; +@use 'responsive'; +@use 'select'; +@use 'shared'; +@use 'marker'; +@use 'rem'; +@use 'markdown'; +@use 'hljs'; -@import './login'; -@import './home'; -@import './note'; -@import './books'; -@import './settings'; -@import './header'; -@import './global'; +@use 'login'; +@use 'home'; +@use 'note'; +@use 'books'; +@use 'settings'; +@use 'header'; +@use 'global'; html { font-size: 62.5%; /* 1.0 rem = 10px */ @@ -74,11 +74,11 @@ img { } .container.mobile-nopadding { - @include breakpoint(mdonly) { + @include responsive.breakpoint(mdonly) { max-width: 100%; } - @include breakpoint(mddown) { + @include responsive.breakpoint(mddown) { padding-left: 0; padding-right: 0; @@ -137,7 +137,7 @@ img { } .input { - border-radius: rem(4px); + border-radius: rem.rem(4px); background-clip: padding-box; border: 1px solid #ced4da; transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; diff --git a/pkg/server/controllers/helpers.go b/pkg/server/controllers/helpers.go index 0e88034b..72100c8b 100644 --- a/pkg/server/controllers/helpers.go +++ b/pkg/server/controllers/helpers.go @@ -232,8 +232,6 @@ func getStatusCode(err error) int { return http.StatusUnauthorized case app.ErrEmailTooLong: return http.StatusBadRequest - case app.ErrEmailAlreadyVerified: - return http.StatusConflict case app.ErrMissingToken: return http.StatusBadRequest case app.ErrExpiredToken: diff --git a/pkg/server/controllers/routes.go b/pkg/server/controllers/routes.go index 0c873fa3..db8b706d 100644 --- a/pkg/server/controllers/routes.go +++ b/pkg/server/controllers/routes.go @@ -58,8 +58,6 @@ func NewWebRoutes(a *app.App, c *Controllers) []Route { {"PATCH", "/password-reset", c.Users.PasswordReset, true}, {"GET", "/password-reset/{token}", c.Users.PasswordResetConfirm, true}, {"POST", "/reset-token", c.Users.CreateResetToken, true}, - {"POST", "/verification-token", mw.Auth(a.DB, c.Users.CreateEmailVerificationToken, redirectGuest), true}, - {"GET", "/verify-email/{token}", mw.Auth(a.DB, c.Users.VerifyEmail, redirectGuest), true}, {"PATCH", "/account/profile", mw.Auth(a.DB, c.Users.ProfileUpdate, nil), true}, {"PATCH", "/account/password", mw.Auth(a.DB, c.Users.PasswordUpdate, nil), true}, diff --git a/pkg/server/controllers/users.go b/pkg/server/controllers/users.go index 4643f599..67baca6a 100644 --- a/pkg/server/controllers/users.go +++ b/pkg/server/controllers/users.go @@ -30,7 +30,6 @@ import ( "github.com/dnote/dnote/pkg/server/database" "github.com/dnote/dnote/pkg/server/helpers" "github.com/dnote/dnote/pkg/server/log" - "github.com/dnote/dnote/pkg/server/mailer" "github.com/dnote/dnote/pkg/server/token" "github.com/dnote/dnote/pkg/server/views" "github.com/gorilla/mux" @@ -80,10 +79,6 @@ func NewUsers(app *app.App, viewEngine *views.Engine) *Users { views.Config{Title: "About", Layout: "base", HelperFuncs: commonHelpers, HeaderTemplate: "navbar"}, "users/settings_about", ), - EmailVerificationView: viewEngine.NewView(app, - views.Config{Layout: "base", HelperFuncs: commonHelpers, HeaderTemplate: "navbar"}, - "users/email_verification", - ), app: app, } } @@ -96,7 +91,6 @@ type Users struct { AboutView *views.View PasswordResetView *views.View PasswordResetConfirmView *views.View - EmailVerificationView *views.View app *app.App } @@ -599,10 +593,6 @@ func (u *Users) ProfileUpdate(w http.ResponseWriter, r *http.Request) { return } - // check if email was changed - if form.Email != account.Email.String { - account.EmailVerified = false - } account.Email.String = form.Email if err := tx.Save(&account).Error; err != nil { @@ -620,119 +610,3 @@ func (u *Users) ProfileUpdate(w http.ResponseWriter, r *http.Request) { views.RedirectAlert(w, r, "/", http.StatusFound, alert) } -func (u *Users) VerifyEmail(w http.ResponseWriter, r *http.Request) { - vd := views.Data{} - - vars := mux.Vars(r) - tokenValue := vars["token"] - - if tokenValue == "" { - handleHTMLError(w, r, app.ErrMissingToken, "Missing email verification token", u.EmailVerificationView, vd) - return - } - - var token database.Token - if err := u.app.DB. - Where("value = ? AND type = ?", tokenValue, database.TokenTypeEmailVerification). - First(&token).Error; err != nil { - handleHTMLError(w, r, app.ErrInvalidToken, "Finding token", u.EmailVerificationView, vd) - return - } - - if token.UsedAt != nil { - handleHTMLError(w, r, app.ErrInvalidToken, "Token has already been used.", u.EmailVerificationView, vd) - return - } - - // Expire after ttl - if time.Since(token.CreatedAt).Minutes() > 30 { - handleHTMLError(w, r, app.ErrExpiredToken, "Token has expired.", u.EmailVerificationView, vd) - return - } - - var account database.Account - if err := u.app.DB.Where("user_id = ?", token.UserID).First(&account).Error; err != nil { - handleHTMLError(w, r, err, "finding account", u.EmailVerificationView, vd) - return - } - if account.EmailVerified { - handleHTMLError(w, r, app.ErrEmailAlreadyVerified, "Already verified", u.EmailVerificationView, vd) - return - } - - tx := u.app.DB.Begin() - account.EmailVerified = true - if err := tx.Save(&account).Error; err != nil { - tx.Rollback() - handleHTMLError(w, r, err, "updating email_verified", u.EmailVerificationView, vd) - return - } - if err := tx.Model(&token).Update("used_at", time.Now()).Error; err != nil { - tx.Rollback() - handleHTMLError(w, r, err, "updating reset token", u.EmailVerificationView, vd) - return - } - tx.Commit() - - var user database.User - if err := u.app.DB.Where("id = ?", token.UserID).First(&user).Error; err != nil { - handleHTMLError(w, r, err, "finding user", u.EmailVerificationView, vd) - return - } - - session, err := u.app.SignIn(&user) - if err != nil { - handleHTMLError(w, r, err, "Creating session", u.EmailVerificationView, vd) - } - - setSessionCookie(w, session.Key, session.ExpiresAt) - http.Redirect(w, r, "/", http.StatusFound) -} - -func (u *Users) CreateEmailVerificationToken(w http.ResponseWriter, r *http.Request) { - vd := views.Data{} - - user := context.User(r.Context()) - if user == nil { - handleHTMLError(w, r, app.ErrLoginRequired, "No authenticated user found", u.SettingView, vd) - return - } - - var account database.Account - err := u.app.DB.Where("user_id = ?", user.ID).First(&account).Error - if err != nil { - handleHTMLError(w, r, err, "finding account", u.SettingView, vd) - return - } - - if account.EmailVerified { - handleHTMLError(w, r, app.ErrEmailAlreadyVerified, "email is already verified.", u.SettingView, vd) - return - } - if account.Email.String == "" { - handleHTMLError(w, r, app.ErrEmailRequired, "email is empty.", u.SettingView, vd) - return - } - - tok, err := token.Create(u.app.DB, account.UserID, database.TokenTypeEmailVerification) - if err != nil { - handleHTMLError(w, r, err, "saving token", u.SettingView, vd) - return - } - - if err := u.app.SendVerificationEmail(account.Email.String, tok.Value); err != nil { - if pkgErrors.Cause(err) == mailer.ErrSMTPNotConfigured { - handleHTMLError(w, r, app.ErrInvalidSMTPConfig, "SMTP config is not configured correctly.", u.SettingView, vd) - } else { - handleHTMLError(w, r, err, "sending verification email", u.SettingView, vd) - } - - return - } - - alert := views.Alert{ - Level: views.AlertLvlSuccess, - Message: "Please check your email for the verification", - } - views.RedirectAlert(w, r, "/", http.StatusFound, alert) -} diff --git a/pkg/server/controllers/users_test.go b/pkg/server/controllers/users_test.go index e4c9ff2d..643cb016 100644 --- a/pkg/server/controllers/users_test.go +++ b/pkg/server/controllers/users_test.go @@ -578,12 +578,6 @@ func TestResetPassword(t *testing.T) { Type: database.TokenTypeResetPassword, } testutils.MustExec(t, db.Save(&tok), "preparing token") - otherTok := database.Token{ - UserID: u.ID, - Value: "somerandomvalue", - Type: database.TokenTypeEmailVerification, - } - testutils.MustExec(t, db.Save(&otherTok), "preparing another token") s1 := database.Session{ Key: "some-session-key-1", @@ -618,16 +612,14 @@ func TestResetPassword(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusFound, "Status code mismatch") - var resetToken, verificationToken database.Token + var resetToken database.Token var account database.Account testutils.MustExec(t, db.Where("value = ?", "MivFxYiSMMA4An9dP24DNQ==").First(&resetToken), "finding reset token") - testutils.MustExec(t, db.Where("value = ?", "somerandomvalue").First(&verificationToken), "finding reset token") testutils.MustExec(t, db.Where("id = ?", acc.ID).First(&account), "finding account") assert.NotEqual(t, resetToken.UsedAt, nil, "reset_token UsedAt mismatch") passwordErr := bcrypt.CompareHashAndPassword([]byte(account.Password.String), []byte("newpassword")) assert.Equal(t, passwordErr, nil, "Password mismatch") - assert.Equal(t, verificationToken.UsedAt, (*time.Time)(nil), "verificationToken UsedAt mismatch") var s1Count, s2Count int64 testutils.MustExec(t, db.Model(&database.Session{}).Where("id = ?", s1.ID).Count(&s1Count), "counting s1") @@ -777,46 +769,6 @@ func TestResetPassword(t *testing.T) { } }) - t.Run("using wrong type token: email_verification", func(t *testing.T) { - db := testutils.InitMemoryDB(t) - - // Setup - a := app.NewTest() - a.Clock = clock.NewMock() - a.DB = db - server := MustNewServer(t, &a) - defer server.Close() - - u := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") - tok := database.Token{ - UserID: u.ID, - Value: "MivFxYiSMMA4An9dP24DNQ==", - Type: database.TokenTypeEmailVerification, - } - testutils.MustExec(t, db.Save(&tok), "Failed to prepare reset_token") - testutils.MustExec(t, db.Model(&tok).Update("created_at", time.Now().Add(time.Minute*-11)), "Failed to prepare reset_token created_at") - - dat := url.Values{} - dat.Set("token", "MivFxYiSMMA4An9dP24DNQ==") - dat.Set("password", "oldpassword") - dat.Set("password_confirmation", "oldpassword") - req := testutils.MakeFormReq(server.URL, "PATCH", "/password-reset", dat) - - // Execute - res := testutils.HTTPDo(t, req) - - // Test - assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status code mismatch") - - var resetToken database.Token - var account database.Account - testutils.MustExec(t, db.Where("value = ?", "MivFxYiSMMA4An9dP24DNQ==").First(&resetToken), "failed to find reset_token") - testutils.MustExec(t, db.Where("id = ?", acc.ID).First(&account), "failed to find account") - - assert.Equal(t, acc.Password, account.Password, "password should not have been updated") - assert.Equal(t, resetToken.UsedAt, (*time.Time)(nil), "used_at should be nil") - }) } func TestCreateResetToken(t *testing.T) { @@ -1018,9 +970,7 @@ func TestUpdateEmail(t *testing.T) { defer server.Close() u := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") - acc.EmailVerified = true - testutils.MustExec(t, db.Save(&acc), "updating email_verified") + testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") // Execute dat := url.Values{} @@ -1039,7 +989,6 @@ func TestUpdateEmail(t *testing.T) { testutils.MustExec(t, db.Where("user_id = ?", u.ID).First(&account), "finding account") assert.Equal(t, account.Email.String, "alice-new@example.com", "email mismatch") - assert.Equal(t, account.EmailVerified, false, "EmailVerified mismatch") }) t.Run("password mismatch", func(t *testing.T) { @@ -1053,9 +1002,7 @@ func TestUpdateEmail(t *testing.T) { defer server.Close() u := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") - acc.EmailVerified = true - testutils.MustExec(t, db.Save(&acc), "updating email_verified") + testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") // Execute dat := url.Values{} @@ -1074,238 +1021,6 @@ func TestUpdateEmail(t *testing.T) { testutils.MustExec(t, db.Where("user_id = ?", u.ID).First(&account), "finding account") assert.Equal(t, account.Email.String, "alice@example.com", "email mismatch") - assert.Equal(t, account.EmailVerified, true, "EmailVerified mismatch") }) } -func TestVerifyEmail(t *testing.T) { - t.Run("success", func(t *testing.T) { - db := testutils.InitMemoryDB(t) - - // Setup - a := app.NewTest() - a.Clock = clock.NewMock() - a.DB = db - server := MustNewServer(t, &a) - defer server.Close() - - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@example.com", "pass1234") - tok := database.Token{ - UserID: user.ID, - Type: database.TokenTypeEmailVerification, - Value: "someTokenValue", - } - testutils.MustExec(t, db.Save(&tok), "preparing token") - - // Execute - req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email/%s", "someTokenValue"), "") - res := testutils.HTTPAuthDo(t, db, req, user) - - // Test - assert.StatusCodeEquals(t, res, http.StatusFound, "Status code mismatch") - - var account database.Account - var token database.Token - var tokenCount int64 - testutils.MustExec(t, db.Where("user_id = ?", user.ID).First(&account), "finding account") - testutils.MustExec(t, db.Where("user_id = ? AND type = ?", user.ID, database.TokenTypeEmailVerification).First(&token), "finding token") - testutils.MustExec(t, db.Model(&database.Token{}).Count(&tokenCount), "counting token") - - assert.Equal(t, account.EmailVerified, true, "email_verified mismatch") - assert.NotEqual(t, token.Value, "", "token value should not have been updated") - assert.Equal(t, tokenCount, int64(1), "token count mismatch") - assert.NotEqual(t, token.UsedAt, (*time.Time)(nil), "token should have been used") - }) - - t.Run("used token", func(t *testing.T) { - db := testutils.InitMemoryDB(t) - - // Setup - a := app.NewTest() - a.Clock = clock.NewMock() - a.DB = db - server := MustNewServer(t, &a) - defer server.Close() - - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@example.com", "pass1234") - - usedAt := time.Now().Add(time.Hour * -11).UTC() - tok := database.Token{ - UserID: user.ID, - Type: database.TokenTypeEmailVerification, - Value: "someTokenValue", - UsedAt: &usedAt, - } - testutils.MustExec(t, db.Save(&tok), "preparing token") - - // Execute - req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email/%s", "someTokenValue"), "") - res := testutils.HTTPAuthDo(t, db, req, user) - - // Test - assert.StatusCodeEquals(t, res, http.StatusBadRequest, "") - - var account database.Account - var token database.Token - var tokenCount int64 - testutils.MustExec(t, db.Where("user_id = ?", user.ID).First(&account), "finding account") - testutils.MustExec(t, db.Where("user_id = ? AND type = ?", user.ID, database.TokenTypeEmailVerification).First(&token), "finding token") - testutils.MustExec(t, db.Model(&database.Token{}).Count(&tokenCount), "counting token") - - assert.Equal(t, account.EmailVerified, false, "email_verified mismatch") - assert.NotEqual(t, token.UsedAt, nil, "token used_at mismatch") - assert.Equal(t, tokenCount, int64(1), "token count mismatch") - assert.NotEqual(t, token.UsedAt, (*time.Time)(nil), "token should have been used") - }) - - t.Run("expired token", func(t *testing.T) { - db := testutils.InitMemoryDB(t) - - // Setup - a := app.NewTest() - a.Clock = clock.NewMock() - a.DB = db - server := MustNewServer(t, &a) - defer server.Close() - - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@example.com", "pass1234") - - tok := database.Token{ - UserID: user.ID, - Type: database.TokenTypeEmailVerification, - Value: "someTokenValue", - } - testutils.MustExec(t, db.Save(&tok), "preparing token") - testutils.MustExec(t, db.Model(&tok).Update("created_at", time.Now().Add(time.Minute*-31)), "Failed to prepare token created_at") - - // Execute - req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email/%s", "someTokenValue"), "") - res := testutils.HTTPAuthDo(t, db, req, user) - - // Test - assert.StatusCodeEquals(t, res, http.StatusGone, "") - - var account database.Account - var token database.Token - var tokenCount int64 - testutils.MustExec(t, db.Where("user_id = ?", user.ID).First(&account), "finding account") - testutils.MustExec(t, db.Where("user_id = ? AND type = ?", user.ID, database.TokenTypeEmailVerification).First(&token), "finding token") - testutils.MustExec(t, db.Model(&database.Token{}).Count(&tokenCount), "counting token") - - assert.Equal(t, account.EmailVerified, false, "email_verified mismatch") - assert.Equal(t, tokenCount, int64(1), "token count mismatch") - assert.Equal(t, token.UsedAt, (*time.Time)(nil), "token should have not been used") - }) - - t.Run("already verified", func(t *testing.T) { - db := testutils.InitMemoryDB(t) - - // Setup - a := app.NewTest() - a.Clock = clock.NewMock() - a.DB = db - server := MustNewServer(t, &a) - defer server.Close() - - user := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, user, "alice@example.com", "oldpass1234") - acc.EmailVerified = true - testutils.MustExec(t, db.Save(&acc), "preparing account") - - tok := database.Token{ - UserID: user.ID, - Type: database.TokenTypeEmailVerification, - Value: "someTokenValue", - } - testutils.MustExec(t, db.Save(&tok), "preparing token") - - // Execute - req := testutils.MakeReq(server.URL, "GET", fmt.Sprintf("/verify-email/%s", "someTokenValue"), "") - res := testutils.HTTPAuthDo(t, db, req, user) - - // Test - assert.StatusCodeEquals(t, res, http.StatusConflict, "") - - var account database.Account - var token database.Token - var tokenCount int64 - testutils.MustExec(t, db.Where("user_id = ?", user.ID).First(&account), "finding account") - testutils.MustExec(t, db.Where("user_id = ? AND type = ?", user.ID, database.TokenTypeEmailVerification).First(&token), "finding token") - testutils.MustExec(t, db.Model(&database.Token{}).Count(&tokenCount), "counting token") - - assert.Equal(t, account.EmailVerified, true, "email_verified mismatch") - assert.Equal(t, tokenCount, int64(1), "token count mismatch") - assert.Equal(t, token.UsedAt, (*time.Time)(nil), "token should have not been used") - }) -} - -func TestCreateVerificationToken(t *testing.T) { - t.Run("success", func(t *testing.T) { - db := testutils.InitMemoryDB(t) - - // Setup - emailBackend := testutils.MockEmailbackendImplementation{} - a := app.NewTest() - a.Clock = clock.NewMock() - a.DB = db - a.EmailBackend = &emailBackend - server := MustNewServer(t, &a) - defer server.Close() - - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@example.com", "pass1234") - - // Execute - req := testutils.MakeReq(server.URL, "POST", "/verification-token", "") - res := testutils.HTTPAuthDo(t, db, req, user) - - // Test - assert.StatusCodeEquals(t, res, http.StatusFound, "status code mismatch") - - var account database.Account - var token database.Token - var tokenCount int64 - testutils.MustExec(t, db.Where("user_id = ?", user.ID).First(&account), "finding account") - testutils.MustExec(t, db.Where("user_id = ? AND type = ?", user.ID, database.TokenTypeEmailVerification).First(&token), "finding token") - testutils.MustExec(t, db.Model(&database.Token{}).Count(&tokenCount), "counting token") - - assert.Equal(t, account.EmailVerified, false, "email_verified should not have been updated") - assert.NotEqual(t, token.Value, "", "token Value mismatch") - assert.Equal(t, tokenCount, int64(1), "token count mismatch") - assert.Equal(t, token.UsedAt, (*time.Time)(nil), "token UsedAt mismatch") - assert.Equal(t, len(emailBackend.Emails), 1, "email queue count mismatch") - }) - - t.Run("already verified", func(t *testing.T) { - db := testutils.InitMemoryDB(t) - // Setup - a := app.NewTest() - a.Clock = clock.NewMock() - a.DB = db - server := MustNewServer(t, &a) - defer server.Close() - - user := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, user, "alice@example.com", "pass1234") - acc.EmailVerified = true - testutils.MustExec(t, db.Save(&acc), "preparing account") - - // Execute - req := testutils.MakeReq(server.URL, "POST", "/verification-token", "") - res := testutils.HTTPAuthDo(t, db, req, user) - - // Test - assert.StatusCodeEquals(t, res, http.StatusConflict, "Status code mismatch") - - var account database.Account - var tokenCount int64 - testutils.MustExec(t, db.Where("user_id = ?", user.ID).First(&account), "finding account") - testutils.MustExec(t, db.Model(&database.Token{}).Count(&tokenCount), "counting token") - - assert.Equal(t, account.EmailVerified, true, "email_verified should not have been updated") - assert.Equal(t, tokenCount, int64(0), "token count mismatch") - }) -} diff --git a/pkg/server/database/consts.go b/pkg/server/database/consts.go index b4a1db03..6a9abc0c 100644 --- a/pkg/server/database/consts.go +++ b/pkg/server/database/consts.go @@ -21,8 +21,6 @@ package database const ( // TokenTypeResetPassword is a type of a token for reseting password TokenTypeResetPassword = "reset_password" - // TokenTypeEmailVerification is a type of a token for verifying email - TokenTypeEmailVerification = "email_verification" ) const ( diff --git a/pkg/server/database/models.go b/pkg/server/database/models.go index ac3e4e56..98571e10 100644 --- a/pkg/server/database/models.go +++ b/pkg/server/database/models.go @@ -73,10 +73,9 @@ type User struct { // Account is a model for an account type Account struct { Model - UserID int `gorm:"index"` - Email NullString - EmailVerified bool `gorm:"default:false"` - Password NullString + UserID int `gorm:"index"` + Email NullString + Password NullString } // Token is a model for a token diff --git a/pkg/server/mailer/mailer.go b/pkg/server/mailer/mailer.go index d02d8911..1cf786a7 100644 --- a/pkg/server/mailer/mailer.go +++ b/pkg/server/mailer/mailer.go @@ -34,8 +34,6 @@ var ( EmailTypeResetPassword = "reset_password" // EmailTypeResetPasswordAlert represents a password change notification email EmailTypeResetPasswordAlert = "reset_password_alert" - // EmailTypeEmailVerification represents an email verification email - EmailTypeEmailVerification = "verify_email" // EmailTypeWelcome represents an welcome email EmailTypeWelcome = "welcome" ) @@ -79,10 +77,6 @@ func NewTemplates() Templates { if err != nil { panic(errors.Wrap(err, "initializing welcome template")) } - verifyEmailText, err := initTextTmpl(EmailTypeEmailVerification) - if err != nil { - panic(errors.Wrap(err, "initializing email verification template")) - } passwordResetText, err := initTextTmpl(EmailTypeResetPassword) if err != nil { panic(errors.Wrap(err, "initializing password reset template")) @@ -95,7 +89,6 @@ func NewTemplates() Templates { T := Templates{} T.set(EmailTypeResetPassword, EmailKindText, passwordResetText) T.set(EmailTypeResetPasswordAlert, EmailKindText, passwordResetAlertText) - T.set(EmailTypeEmailVerification, EmailKindText, verifyEmailText) T.set(EmailTypeWelcome, EmailKindText, welcomeText) return T diff --git a/pkg/server/mailer/mailer_test.go b/pkg/server/mailer/mailer_test.go index df95b1f9..5837192a 100644 --- a/pkg/server/mailer/mailer_test.go +++ b/pkg/server/mailer/mailer_test.go @@ -32,7 +32,6 @@ func TestAllTemplatesInitialized(t *testing.T) { emailTypes := []string{ EmailTypeResetPassword, EmailTypeResetPasswordAlert, - EmailTypeEmailVerification, EmailTypeWelcome, } @@ -46,44 +45,6 @@ func TestAllTemplatesInitialized(t *testing.T) { } } -func TestEmailVerificationEmail(t *testing.T) { - testCases := []struct { - token string - webURL string - }{ - { - token: "someRandomToken1", - webURL: "http://localhost:3000", - }, - { - token: "someRandomToken2", - webURL: "http://localhost:3001", - }, - } - - tmpl := NewTemplates() - - for _, tc := range testCases { - t.Run(fmt.Sprintf("with WebURL %s", tc.webURL), func(t *testing.T) { - dat := EmailVerificationTmplData{ - Token: tc.token, - WebURL: tc.webURL, - } - body, err := tmpl.Execute(EmailTypeEmailVerification, EmailKindText, dat) - if err != nil { - t.Fatal(errors.Wrap(err, "executing")) - } - - if ok := strings.Contains(body, tc.webURL); !ok { - t.Errorf("email body did not contain %s", tc.webURL) - } - if ok := strings.Contains(body, tc.token); !ok { - t.Errorf("email body did not contain %s", tc.token) - } - }) - } -} - func TestResetPasswordEmail(t *testing.T) { testCases := []struct { token string diff --git a/pkg/server/mailer/templates/verify_email.txt b/pkg/server/mailer/templates/verify_email.txt deleted file mode 100644 index c21af88d..00000000 --- a/pkg/server/mailer/templates/verify_email.txt +++ /dev/null @@ -1,5 +0,0 @@ -Hi, - -Welcome to Dnote! To verify your email, visit the following link: - - {{ .WebURL }}/verify-email/{{ .Token }} diff --git a/pkg/server/mailer/types.go b/pkg/server/mailer/types.go index 3a371911..6ad862de 100644 --- a/pkg/server/mailer/types.go +++ b/pkg/server/mailer/types.go @@ -18,12 +18,6 @@ package mailer -// EmailVerificationTmplData is a template data for email verification emails -type EmailVerificationTmplData struct { - Token string - WebURL string -} - // EmailResetPasswordTmplData is a template data for reset password emails type EmailResetPasswordTmplData struct { AccountEmail string diff --git a/pkg/server/middleware/auth_test.go b/pkg/server/middleware/auth_test.go index 8451ae5d..1485befa 100644 --- a/pkg/server/middleware/auth_test.go +++ b/pkg/server/middleware/auth_test.go @@ -178,7 +178,7 @@ func TestTokenAuth(t *testing.T) { user := testutils.SetupUserData(db) tok := database.Token{ UserID: user.ID, - Type: database.TokenTypeEmailVerification, + Type: database.TokenTypeResetPassword, Value: "xpwFnc0MdllFUePDq9DLeQ==", } testutils.MustExec(t, db.Save(&tok), "preparing token") @@ -193,7 +193,7 @@ func TestTokenAuth(t *testing.T) { w.WriteHeader(http.StatusOK) } - server := httptest.NewServer(TokenAuth(db, handler, database.TokenTypeEmailVerification, nil)) + server := httptest.NewServer(TokenAuth(db, handler, database.TokenTypeResetPassword, nil)) defer server.Close() t.Run("with token", func(t *testing.T) { diff --git a/pkg/server/session/session.go b/pkg/server/session/session.go index 8c55549c..a9494c58 100644 --- a/pkg/server/session/session.go +++ b/pkg/server/session/session.go @@ -24,16 +24,14 @@ import ( // Session represents user session type Session struct { - UUID string `json:"uuid"` - Email string `json:"email"` - EmailVerified bool `json:"email_verified"` + UUID string `json:"uuid"` + Email string `json:"email"` } // New returns a new session for the given user func New(user database.User, account database.Account) Session { return Session{ - UUID: user.UUID, - Email: account.Email.String, - EmailVerified: account.EmailVerified, + UUID: user.UUID, + Email: account.Email.String, } } diff --git a/pkg/server/session/session_test.go b/pkg/server/session/session_test.go index 107dacfe..dec674b7 100644 --- a/pkg/server/session/session_test.go +++ b/pkg/server/session/session_test.go @@ -28,10 +28,10 @@ import ( func TestNew(t *testing.T) { u1 := database.User{UUID: "0f5f0054-d23f-4be1-b5fb-57673109e9cb"} - a1 := database.Account{Email: database.ToNullString("alice@example.com"), EmailVerified: false} + a1 := database.Account{Email: database.ToNullString("alice@example.com")} u2 := database.User{UUID: "718a1041-bbe6-496e-bbe4-ea7e572c295e"} - a2 := database.Account{Email: database.ToNullString("bob@example.com"), EmailVerified: false} + a2 := database.Account{Email: database.ToNullString("bob@example.com")} testCases := []struct { user database.User @@ -52,9 +52,8 @@ func TestNew(t *testing.T) { // Execute got := New(tc.user, tc.account) expected := Session{ - UUID: tc.user.UUID, - Email: tc.account.Email.String, - EmailVerified: tc.account.EmailVerified, + UUID: tc.user.UUID, + Email: tc.account.Email.String, } assert.DeepEqual(t, got, expected, "result mismatch") diff --git a/pkg/server/token/token_test.go b/pkg/server/token/token_test.go index 922cc93d..426ff3d1 100644 --- a/pkg/server/token/token_test.go +++ b/pkg/server/token/token_test.go @@ -33,7 +33,7 @@ func TestCreate(t *testing.T) { kind string }{ { - kind: database.TokenTypeEmailVerification, + kind: database.TokenTypeResetPassword, }, } diff --git a/pkg/server/views/templates/users/email_verification.gohtml b/pkg/server/views/templates/users/email_verification.gohtml deleted file mode 100644 index 969688a4..00000000 --- a/pkg/server/views/templates/users/email_verification.gohtml +++ /dev/null @@ -1,2 +0,0 @@ -{{define "yield"}} -{{end}} diff --git a/pkg/server/views/templates/users/settings.gohtml b/pkg/server/views/templates/users/settings.gohtml index a9639468..9f747b3e 100644 --- a/pkg/server/views/templates/users/settings.gohtml +++ b/pkg/server/views/templates/users/settings.gohtml @@ -144,34 +144,6 @@ -

-
-
-

Email Verified

-
- -
- {{ if eq true false }} b{{end}} - - {{if .EmailVerified}} - Yes - {{else}} - No - - - {{end}} -
-
-
-
diff --git a/pkg/server/views/view.go b/pkg/server/views/view.go index 2b0e57a9..3484dca8 100644 --- a/pkg/server/views/view.go +++ b/pkg/server/views/view.go @@ -116,8 +116,6 @@ func (v *View) Render(w http.ResponseWriter, r *http.Request, data *Data, status } if vd.Account != nil { vd.Yield["Email"] = vd.Account.Email.String - vd.Yield["EmailVerified"] = vd.Account.EmailVerified - vd.Yield["EmailVerified"] = vd.Account.EmailVerified } vd.Yield["CurrentPath"] = r.URL.Path vd.Yield["Standalone"] = buildinfo.Standalone From e0f68fc8d87fcb467387494c5f4e0f1fe05020e3 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sat, 11 Oct 2025 16:14:20 -0700 Subject: [PATCH 07/33] Rate limit client (#689) --- pkg/cli/client/client.go | 100 ++++++++++++++++++++-------- pkg/cli/client/client_test.go | 64 +++++++++++++++--- pkg/cli/context/ctx.go | 3 + pkg/cli/infra/init.go | 2 + pkg/e2e/sync_test.go | 1 - pkg/server/.env.dev | 9 +-- pkg/server/.env.test | 8 --- pkg/server/middleware/limit.go | 72 ++++++++++++-------- pkg/server/middleware/limit_test.go | 82 +++++++++++++++++++++++ 9 files changed, 263 insertions(+), 78 deletions(-) create mode 100644 pkg/server/middleware/limit_test.go diff --git a/pkg/cli/client/client.go b/pkg/cli/client/client.go index b90ddaca..b24c432e 100644 --- a/pkg/cli/client/client.go +++ b/pkg/cli/client/client.go @@ -33,6 +33,7 @@ import ( "github.com/dnote/dnote/pkg/cli/context" "github.com/dnote/dnote/pkg/cli/log" "github.com/pkg/errors" + "golang.org/x/time/rate" ) // ErrInvalidLogin is an error for invalid credentials for login @@ -44,15 +45,66 @@ var ErrContentTypeMismatch = errors.New("content type mismatch") var contentTypeApplicationJSON = "application/json" var contentTypeNone = "" -// requestOptions contians options for requests +// requestOptions contains options for requests type requestOptions struct { HTTPClient *http.Client // ExpectedContentType is the Content-Type that the client is expecting from the server ExpectedContentType *string } -var defaultRequestOptions = requestOptions{ - ExpectedContentType: &contentTypeApplicationJSON, +const ( + // clientRateLimitPerSecond is the max requests per second the client will make + clientRateLimitPerSecond = 50 + // clientRateLimitBurst is the burst capacity for rate limiting + clientRateLimitBurst = 100 +) + +// rateLimitedTransport wraps an http.RoundTripper with rate limiting +type rateLimitedTransport struct { + transport http.RoundTripper + limiter *rate.Limiter +} + +func (t *rateLimitedTransport) RoundTrip(req *http.Request) (*http.Response, error) { + // Wait for rate limiter to allow the request + if err := t.limiter.Wait(req.Context()); err != nil { + return nil, err + } + return t.transport.RoundTrip(req) +} + +// NewRateLimitedHTTPClient creates an HTTP client with rate limiting +func NewRateLimitedHTTPClient() *http.Client { + // Calculate interval from rate: 1 second / requests per second + interval := time.Second / time.Duration(clientRateLimitPerSecond) + + transport := &rateLimitedTransport{ + transport: http.DefaultTransport, + limiter: rate.NewLimiter(rate.Every(interval), clientRateLimitBurst), + } + return &http.Client{ + Transport: transport, + } +} + +func getHTTPClient(ctx context.DnoteCtx, options *requestOptions) *http.Client { + if options != nil && options.HTTPClient != nil { + return options.HTTPClient + } + + if ctx.HTTPClient != nil { + return ctx.HTTPClient + } + + return &http.Client{} +} + +func getExpectedContentType(options *requestOptions) string { + if options != nil && options.ExpectedContentType != nil { + return *options.ExpectedContentType + } + + return contentTypeApplicationJSON } func getReq(ctx context.DnoteCtx, path, method, body string) (*http.Request, error) { @@ -72,22 +124,6 @@ func getReq(ctx context.DnoteCtx, path, method, body string) (*http.Request, err return req, nil } -func getHTTPClient(options *requestOptions) http.Client { - if options != nil && options.HTTPClient != nil { - return *options.HTTPClient - } - - return http.Client{} -} - -func getExpectedContentType(options *requestOptions) string { - if options != nil && options.ExpectedContentType != nil { - return *options.ExpectedContentType - } - - return contentTypeApplicationJSON -} - // checkRespErr checks if the given http response indicates an error. It returns a boolean indicating // if the response is an error, and a decoded error message. func checkRespErr(res *http.Response) error { @@ -124,7 +160,7 @@ func doReq(ctx context.DnoteCtx, method, path, body string, options *requestOpti log.Debug("HTTP request: %+v\n", req) - hc := getHTTPClient(options) + hc := getHTTPClient(ctx, options) res, err := hc.Do(req) if err != nil { return res, errors.Wrap(err, "making http request") @@ -542,15 +578,27 @@ func Signin(ctx context.DnoteCtx, email, password string) (SigninResponse, error // Signout deletes a user session on the server side func Signout(ctx context.DnoteCtx, sessionKey string) error { - hc := http.Client{ - // No need to follow redirect - CheckRedirect: func(req *http.Request, via []*http.Request) error { - return http.ErrUseLastResponse - }, + // Create a client that shares the transport (and thus rate limiter) from ctx.HTTPClient + // but doesn't follow redirects + var hc *http.Client + if ctx.HTTPClient != nil { + hc = &http.Client{ + Transport: ctx.HTTPClient.Transport, + CheckRedirect: func(req *http.Request, via []*http.Request) error { + return http.ErrUseLastResponse + }, + } + } else { + log.Warnf("No HTTP client configured for signout - falling back\n") + hc = &http.Client{ + CheckRedirect: func(req *http.Request, via []*http.Request) error { + return http.ErrUseLastResponse + }, + } } opts := requestOptions{ - HTTPClient: &hc, + HTTPClient: hc, ExpectedContentType: &contentTypeNone, } _, err := doAuthorizedReq(ctx, "POST", "/v3/signout", "", &opts) diff --git a/pkg/cli/client/client_test.go b/pkg/cli/client/client_test.go index 59bdf4b0..c5467ad6 100644 --- a/pkg/cli/client/client_test.go +++ b/pkg/cli/client/client_test.go @@ -23,12 +23,15 @@ import ( "fmt" "net/http" "net/http/httptest" + "sync/atomic" "testing" + "time" "github.com/dnote/dnote/pkg/assert" "github.com/dnote/dnote/pkg/cli/context" "github.com/dnote/dnote/pkg/cli/testutils" "github.com/pkg/errors" + "golang.org/x/time/rate" ) // startCommonTestServer starts a test HTTP server that simulates a common set of senarios @@ -82,9 +85,10 @@ func TestSignIn(t *testing.T) { defer commonTs.Close() correctEndpoint := fmt.Sprintf("%s/api", ts.URL) + testClient := NewRateLimitedHTTPClient() t.Run("success", func(t *testing.T) { - result, err := Signin(context.DnoteCtx{APIEndpoint: correctEndpoint}, "alice@example.com", "pass1234") + result, err := Signin(context.DnoteCtx{APIEndpoint: correctEndpoint, HTTPClient: testClient}, "alice@example.com", "pass1234") if err != nil { t.Errorf("got signin request error: %+v", err.Error()) } @@ -94,7 +98,7 @@ func TestSignIn(t *testing.T) { }) t.Run("failure", func(t *testing.T) { - result, err := Signin(context.DnoteCtx{APIEndpoint: correctEndpoint}, "alice@example.com", "incorrectpassword") + result, err := Signin(context.DnoteCtx{APIEndpoint: correctEndpoint, HTTPClient: testClient}, "alice@example.com", "incorrectpassword") assert.Equal(t, err, ErrInvalidLogin, "err mismatch") assert.Equal(t, result.Key, "", "Key mismatch") @@ -103,7 +107,7 @@ func TestSignIn(t *testing.T) { t.Run("server error", func(t *testing.T) { endpoint := fmt.Sprintf("%s/bad-api", ts.URL) - result, err := Signin(context.DnoteCtx{APIEndpoint: endpoint}, "alice@example.com", "pass1234") + result, err := Signin(context.DnoteCtx{APIEndpoint: endpoint, HTTPClient: testClient}, "alice@example.com", "pass1234") if err == nil { t.Error("error should have been returned") } @@ -114,7 +118,7 @@ func TestSignIn(t *testing.T) { t.Run("accidentally pointing to a catch-all handler", func(t *testing.T) { endpoint := fmt.Sprintf("%s", ts.URL) - result, err := Signin(context.DnoteCtx{APIEndpoint: endpoint}, "alice@example.com", "pass1234") + result, err := Signin(context.DnoteCtx{APIEndpoint: endpoint, HTTPClient: testClient}, "alice@example.com", "pass1234") assert.Equal(t, errors.Cause(err), ErrContentTypeMismatch, "error cause mismatch") assert.Equal(t, result.Key, "", "Key mismatch") @@ -134,17 +138,18 @@ func TestSignOut(t *testing.T) { defer commonTs.Close() correctEndpoint := fmt.Sprintf("%s/api", ts.URL) + testClient := NewRateLimitedHTTPClient() t.Run("success", func(t *testing.T) { - err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: correctEndpoint}, "alice@example.com") + err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: correctEndpoint, HTTPClient: testClient}, "alice@example.com") if err != nil { - t.Errorf("got signin request error: %+v", err.Error()) + t.Errorf("got signout request error: %+v", err.Error()) } }) t.Run("server error", func(t *testing.T) { endpoint := fmt.Sprintf("%s/bad-api", commonTs.URL) - err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: endpoint}, "alice@example.com") + err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: endpoint, HTTPClient: testClient}, "alice@example.com") if err == nil { t.Error("error should have been returned") } @@ -152,8 +157,51 @@ func TestSignOut(t *testing.T) { t.Run("accidentally pointing to a catch-all handler", func(t *testing.T) { endpoint := fmt.Sprintf("%s", commonTs.URL) - err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: endpoint}, "alice@example.com") + err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: endpoint, HTTPClient: testClient}, "alice@example.com") assert.Equal(t, errors.Cause(err), ErrContentTypeMismatch, "error cause mismatch") }) + + // Gracefully handle a case where http client was not initialized in the context. + t.Run("nil HTTPClient", func(t *testing.T) { + err := Signout(context.DnoteCtx{SessionKey: "somekey", APIEndpoint: correctEndpoint}, "alice@example.com") + if err != nil { + t.Errorf("got signout request error: %+v", err.Error()) + } + }) +} + +func TestRateLimitedTransport(t *testing.T) { + var requestCount atomic.Int32 + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + requestCount.Add(1) + w.WriteHeader(http.StatusOK) + })) + defer ts.Close() + + transport := &rateLimitedTransport{ + transport: http.DefaultTransport, + limiter: rate.NewLimiter(10, 5), + } + client := &http.Client{Transport: transport} + + // Make 10 requests + start := time.Now() + numRequests := 10 + for i := range numRequests { + req, _ := http.NewRequest("GET", ts.URL, nil) + resp, err := client.Do(req) + if err != nil { + t.Fatalf("Request %d failed: %v", i, err) + } + resp.Body.Close() + } + elapsed := time.Since(start) + + // Burst of 5, then 5 more at 10 req/s = 500ms minimum + if elapsed < 500*time.Millisecond { + t.Errorf("Rate limit not enforced: 10 requests took %v, expected >= 500ms", elapsed) + } + + assert.Equal(t, int(requestCount.Load()), 10, "request count mismatch") } diff --git a/pkg/cli/context/ctx.go b/pkg/cli/context/ctx.go index a5f62340..61cd5be8 100644 --- a/pkg/cli/context/ctx.go +++ b/pkg/cli/context/ctx.go @@ -20,6 +20,8 @@ package context import ( + "net/http" + "github.com/dnote/dnote/pkg/cli/database" "github.com/dnote/dnote/pkg/clock" ) @@ -44,6 +46,7 @@ type DnoteCtx struct { Editor string Clock clock.Clock EnableUpgradeCheck bool + HTTPClient *http.Client } // Redact replaces private information from the context with a set of diff --git a/pkg/cli/infra/init.go b/pkg/cli/infra/init.go index 72286cad..2b6c9618 100644 --- a/pkg/cli/infra/init.go +++ b/pkg/cli/infra/init.go @@ -28,6 +28,7 @@ import ( "strconv" "time" + "github.com/dnote/dnote/pkg/cli/client" "github.com/dnote/dnote/pkg/cli/config" "github.com/dnote/dnote/pkg/cli/consts" "github.com/dnote/dnote/pkg/cli/context" @@ -159,6 +160,7 @@ func SetupCtx(ctx context.DnoteCtx) (context.DnoteCtx, error) { Editor: cf.Editor, Clock: clock.New(), EnableUpgradeCheck: cf.EnableUpgradeCheck, + HTTPClient: client.NewRateLimitedHTTPClient(), } return ret, nil diff --git a/pkg/e2e/sync_test.go b/pkg/e2e/sync_test.go index 2f3234f2..2ddf373e 100644 --- a/pkg/e2e/sync_test.go +++ b/pkg/e2e/sync_test.go @@ -95,7 +95,6 @@ func TestMain(m *testing.M) { a.EmailTemplates = mailer.Templates{} a.EmailBackend = &apitest.MockEmailbackendImplementation{} a.DB = serverDb - a.WebURL = os.Getenv("WebURL") var err error server, err = controllers.NewServer(&a) diff --git a/pkg/server/.env.dev b/pkg/server/.env.dev index fe5dca07..c78a6704 100644 --- a/pkg/server/.env.dev +++ b/pkg/server/.env.dev @@ -1,9 +1,2 @@ APP_ENV=DEVELOPMENT - -SmtpUsername=mock-SmtpUsername -SmtpPassword=mock-SmtpPassword -SmtpHost=mock-SmtpHost -SmtpPort=465 - -WebURL=http://localhost:3001 -DisableRegistration=false +DBPath=../../dev-server.db diff --git a/pkg/server/.env.test b/pkg/server/.env.test index 8c0befed..b9cf3101 100644 --- a/pkg/server/.env.test +++ b/pkg/server/.env.test @@ -1,9 +1 @@ APP_ENV=TEST - -SmtpUsername=mock-SmtpUsername -SmtpPassword=mock-SmtpPassword -SmtpHost=mock-SmtpHost -SmtpPort=465 - -WebURL=http://localhost:3001 -DisableRegistration=false diff --git a/pkg/server/middleware/limit.go b/pkg/server/middleware/limit.go index 3b3c3987..2f737613 100644 --- a/pkg/server/middleware/limit.go +++ b/pkg/server/middleware/limit.go @@ -29,63 +29,81 @@ import ( "golang.org/x/time/rate" ) +const ( + // serverRateLimitPerSecond is the max requests per second the server will accept per IP + serverRateLimitPerSecond = 50 + // serverRateLimitBurst is the burst capacity for rate limiting + serverRateLimitBurst = 100 +) + type visitor struct { limiter *rate.Limiter lastSeen time.Time } -var visitors = make(map[string]*visitor) -var mtx sync.RWMutex - -func init() { - go cleanupVisitors() +// RateLimiter holds the rate limiting state for visitors +type RateLimiter struct { + visitors map[string]*visitor + mtx sync.RWMutex } -// addVisitor adds a new visitor to the map and returns a limiter for the visitor -func addVisitor(identifier string) *rate.Limiter { - // initialize a token bucket - limiter := rate.NewLimiter(rate.Every(1*time.Second), 60) +// NewRateLimiter creates a new rate limiter instance +func NewRateLimiter() *RateLimiter { + rl := &RateLimiter{ + visitors: make(map[string]*visitor), + } + go rl.cleanupVisitors() + return rl +} - mtx.Lock() - visitors[identifier] = &visitor{ +var defaultLimiter = NewRateLimiter() + +// addVisitor adds a new visitor to the map and returns a limiter for the visitor +func (rl *RateLimiter) addVisitor(identifier string) *rate.Limiter { + // Calculate interval from rate: 1 second / requests per second + interval := time.Second / time.Duration(serverRateLimitPerSecond) + limiter := rate.NewLimiter(rate.Every(interval), serverRateLimitBurst) + + rl.mtx.Lock() + rl.visitors[identifier] = &visitor{ limiter: limiter, lastSeen: time.Now()} - mtx.Unlock() + rl.mtx.Unlock() return limiter } // getVisitor returns a limiter for a visitor with the given identifier. It // adds the visitor to the map if not seen before. -func getVisitor(identifier string) *rate.Limiter { - mtx.RLock() - v, exists := visitors[identifier] +func (rl *RateLimiter) getVisitor(identifier string) *rate.Limiter { + rl.mtx.RLock() + v, exists := rl.visitors[identifier] if !exists { - mtx.RUnlock() - return addVisitor(identifier) + rl.mtx.RUnlock() + return rl.addVisitor(identifier) } v.lastSeen = time.Now() - mtx.RUnlock() + rl.mtx.RUnlock() return v.limiter } // cleanupVisitors deletes visitors that has not been seen in a while from the // map of visitors -func cleanupVisitors() { +func (rl *RateLimiter) cleanupVisitors() { for { time.Sleep(time.Minute) - mtx.Lock() + rl.mtx.Lock() - for identifier, v := range visitors { + for identifier, v := range rl.visitors { if time.Since(v.lastSeen) > 3*time.Minute { - delete(visitors, identifier) + delete(rl.visitors, identifier) } } - mtx.Unlock() + rl.mtx.Unlock() } } @@ -107,10 +125,10 @@ func lookupIP(r *http.Request) string { } // Limit is a middleware to rate limit the handler -func Limit(next http.Handler) http.HandlerFunc { +func (rl *RateLimiter) Limit(next http.Handler) http.HandlerFunc { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { identifier := lookupIP(r) - limiter := getVisitor(identifier) + limiter := rl.getVisitor(identifier) if !limiter.Allow() { http.Error(w, "Too many requests", http.StatusTooManyRequests) @@ -124,12 +142,12 @@ func Limit(next http.Handler) http.HandlerFunc { }) } -// ApplyLimit applies rate limit conditionally +// ApplyLimit applies rate limit conditionally using the global limiter func ApplyLimit(h http.HandlerFunc, rateLimit bool) http.Handler { ret := h if rateLimit && os.Getenv("APP_ENV") != "TEST" { - ret = Limit(ret) + ret = defaultLimiter.Limit(ret) } return ret diff --git a/pkg/server/middleware/limit_test.go b/pkg/server/middleware/limit_test.go new file mode 100644 index 00000000..1d5743ee --- /dev/null +++ b/pkg/server/middleware/limit_test.go @@ -0,0 +1,82 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Dnote. If not, see . + */ + +package middleware + +import ( + "net/http" + "net/http/httptest" + "testing" +) + +func TestLimit(t *testing.T) { + handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusOK) + }) + + limiter := NewRateLimiter() + middleware := limiter.Limit(handler) + + // Make burst + 5 requests from same IP + numRequests := serverRateLimitBurst + 5 + blockedCount := 0 + + for range numRequests { + req := httptest.NewRequest("GET", "/test", nil) + req.RemoteAddr = "192.168.1.1:1234" + w := httptest.NewRecorder() + + middleware.ServeHTTP(w, req) + + if w.Code == http.StatusTooManyRequests { + blockedCount++ + } + } + + // At least some requests after burst should be blocked + if blockedCount == 0 { + t.Error("Expected some requests to be rate limited after burst") + } +} + +func TestLimit_DifferentIPs(t *testing.T) { + handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusOK) + }) + + limiter := NewRateLimiter() + middleware := limiter.Limit(handler) + + // Exhaust rate limit for first IP + for range serverRateLimitBurst + 5 { + req := httptest.NewRequest("GET", "/test", nil) + req.RemoteAddr = "192.168.1.1:1234" + w := httptest.NewRecorder() + middleware.ServeHTTP(w, req) + } + + // Request from different IP should still succeed + req := httptest.NewRequest("GET", "/test", nil) + req.RemoteAddr = "192.168.1.2:5678" + w := httptest.NewRecorder() + middleware.ServeHTTP(w, req) + + if w.Code != http.StatusOK { + t.Errorf("Request from different IP should succeed, got status %d", w.Code) + } +} From 24491bc68a561a70b61d934958d627db32af711b Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 12 Oct 2025 12:03:20 -0700 Subject: [PATCH 08/33] Allow to upload all data to an empty server (#690) * Handle server switch * Avoid losing data in case of race * Simplify --- pkg/cli/client/client.go | 20 +- pkg/cli/client/client_test.go | 18 + pkg/cli/cmd/root/root.go | 16 + pkg/cli/cmd/sync/sync.go | 100 +++++- pkg/cli/cmd/sync/sync_test.go | 67 ++++ pkg/cli/infra/init.go | 25 +- pkg/cli/infra/init_test.go | 49 +++ pkg/cli/main.go | 11 +- pkg/cli/main_test.go | 6 +- pkg/cli/migrate/migrations.go | 5 +- pkg/cli/testutils/main.go | 176 ++++++++-- pkg/e2e/sync_test.go | 621 ++++++++++++++++++++++++++++++++-- 12 files changed, 1050 insertions(+), 64 deletions(-) diff --git a/pkg/cli/client/client.go b/pkg/cli/client/client.go index b24c432e..021afe7d 100644 --- a/pkg/cli/client/client.go +++ b/pkg/cli/client/client.go @@ -42,6 +42,21 @@ var ErrInvalidLogin = errors.New("wrong credentials") // ErrContentTypeMismatch is an error for invalid credentials for login var ErrContentTypeMismatch = errors.New("content type mismatch") +// HTTPError represents an HTTP error response from the server +type HTTPError struct { + StatusCode int + Message string +} + +func (e *HTTPError) Error() string { + return fmt.Sprintf(`response %d "%s"`, e.StatusCode, e.Message) +} + +// IsConflict returns true if the error is a 409 Conflict error +func (e *HTTPError) IsConflict() bool { + return e.StatusCode == 409 +} + var contentTypeApplicationJSON = "application/json" var contentTypeNone = "" @@ -137,7 +152,10 @@ func checkRespErr(res *http.Response) error { } bodyStr := string(body) - return errors.Errorf(`response %d "%s"`, res.StatusCode, strings.TrimRight(bodyStr, "\n")) + return &HTTPError{ + StatusCode: res.StatusCode, + Message: strings.TrimRight(bodyStr, "\n"), + } } func checkContentType(res *http.Response, options *requestOptions) error { diff --git a/pkg/cli/client/client_test.go b/pkg/cli/client/client_test.go index c5467ad6..31b6d6c8 100644 --- a/pkg/cli/client/client_test.go +++ b/pkg/cli/client/client_test.go @@ -205,3 +205,21 @@ func TestRateLimitedTransport(t *testing.T) { assert.Equal(t, int(requestCount.Load()), 10, "request count mismatch") } + +func TestHTTPError(t *testing.T) { + t.Run("IsConflict returns true for 409", func(t *testing.T) { + conflictErr := &HTTPError{ + StatusCode: 409, + Message: "Conflict", + } + + assert.Equal(t, conflictErr.IsConflict(), true, "IsConflict() should return true for 409") + + notFoundErr := &HTTPError{ + StatusCode: 404, + Message: "Not Found", + } + + assert.Equal(t, notFoundErr.IsConflict(), false, "IsConflict() should return false for 404") + }) +} diff --git a/pkg/cli/cmd/root/root.go b/pkg/cli/cmd/root/root.go index 81e0c58a..750629e4 100644 --- a/pkg/cli/cmd/root/root.go +++ b/pkg/cli/cmd/root/root.go @@ -22,6 +22,8 @@ import ( "github.com/spf13/cobra" ) +var apiEndpointFlag string + var root = &cobra.Command{ Use: "dnote", Short: "Dnote - a simple command line notebook", @@ -32,6 +34,20 @@ var root = &cobra.Command{ }, } +func init() { + root.PersistentFlags().StringVar(&apiEndpointFlag, "api-endpoint", "", "the API endpoint to connect to (defaults to value in config)") +} + +// GetRoot returns the root command +func GetRoot() *cobra.Command { + return root +} + +// GetAPIEndpointFlag returns the value of the --api-endpoint flag +func GetAPIEndpointFlag() string { + return apiEndpointFlag +} + // Register adds a new command func Register(cmd *cobra.Command) { root.AddCommand(cmd) diff --git a/pkg/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go index 1d511d98..ff8e8a5f 100644 --- a/pkg/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -29,6 +29,7 @@ import ( "github.com/dnote/dnote/pkg/cli/infra" "github.com/dnote/dnote/pkg/cli/log" "github.com/dnote/dnote/pkg/cli/migrate" + "github.com/dnote/dnote/pkg/cli/ui" "github.com/dnote/dnote/pkg/cli/upgrade" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -629,6 +630,20 @@ func stepSync(ctx context.DnoteCtx, tx *database.DB, afterUSN int) error { return nil } +// isConflictError checks if an error is a 409 Conflict error from the server +func isConflictError(err error) bool { + if err == nil { + return false + } + + var httpErr *client.HTTPError + if errors.As(err, &httpErr) { + return httpErr.IsConflict() + } + + return false +} + func sendBooks(ctx context.DnoteCtx, tx *database.DB) (bool, error) { isBehind := false @@ -661,6 +676,12 @@ func sendBooks(ctx context.DnoteCtx, tx *database.DB) (bool, error) { } else { resp, err := client.CreateBook(ctx, book.Label) if err != nil { + // If we get a 409 conflict, it means another client uploaded data. + if isConflictError(err) { + log.Debug("409 conflict creating book %s, will retry after sync\n", book.Label) + isBehind = true + continue + } return isBehind, errors.Wrap(err, "creating a book") } @@ -766,7 +787,10 @@ func sendNotes(ctx context.DnoteCtx, tx *database.DB) (bool, error) { } else { resp, err := client.CreateNote(ctx, note.BookUUID, note.Body) if err != nil { - return isBehind, errors.Wrap(err, "creating a note") + // If we get a 409 conflict, it means another client uploaded data. + log.Debug("error creating note (will retry after sync): %v\n", err) + isBehind = true + continue } note.Dirty = false @@ -885,6 +909,26 @@ func saveSyncState(tx *database.DB, serverTime int64, serverMaxUSN int) error { return nil } +// prepareEmptyServerSync marks all local books and notes as dirty when syncing to an empty server. +// This is typically used when switching to a new empty server but wanting to upload existing local data. +// Returns true if preparation was done, false otherwise. +func prepareEmptyServerSync(tx *database.DB) error { + // Mark all books and notes as dirty and reset USN to 0 + if _, err := tx.Exec("UPDATE books SET usn = 0, dirty = 1 WHERE deleted = 0"); err != nil { + return errors.Wrap(err, "marking books as dirty") + } + if _, err := tx.Exec("UPDATE notes SET usn = 0, dirty = 1 WHERE deleted = 0"); err != nil { + return errors.Wrap(err, "marking notes as dirty") + } + + // Reset lastMaxUSN to 0 to match the server + if err := updateLastMaxUSN(tx, 0); err != nil { + return errors.Wrap(err, "resetting last max usn") + } + + return nil +} + func newRun(ctx context.DnoteCtx) infra.RunEFunc { return func(cmd *cobra.Command, args []string) error { if ctx.SessionKey == "" { @@ -915,6 +959,52 @@ func newRun(ctx context.DnoteCtx) infra.RunEFunc { log.Debug("lastSyncAt: %d, lastMaxUSN: %d, syncState: %+v\n", lastSyncAt, lastMaxUSN, syncState) + // Handle a case where server has MaxUSN=0 but local has data (server switch) + var bookCount, noteCount int + if err := tx.QueryRow("SELECT count(*) FROM books WHERE deleted = 0").Scan(&bookCount); err != nil { + return errors.Wrap(err, "counting local books") + } + if err := tx.QueryRow("SELECT count(*) FROM notes WHERE deleted = 0").Scan(¬eCount); err != nil { + return errors.Wrap(err, "counting local notes") + } + + // If a client has previously synced (lastMaxUSN > 0) but the server was never synced to (MaxUSN = 0), + // and the client has undeleted books or notes, allow to upload all data to the server. + // The client might have switched servers or the server might need to be restored for any reasons. + if syncState.MaxUSN == 0 && lastMaxUSN > 0 && (bookCount > 0 || noteCount > 0) { + log.Debug("empty server detected: server.MaxUSN=%d, local.MaxUSN=%d, books=%d, notes=%d\n", + syncState.MaxUSN, lastMaxUSN, bookCount, noteCount) + + log.Warnf("The server is empty but you have local data. Maybe you switched servers?\n") + log.Debug("server state: MaxUSN = 0 (empty)\n") + log.Debug("local state: %d books, %d notes (MaxUSN = %d)\n", bookCount, noteCount, lastMaxUSN) + + confirmed, err := ui.Confirm(fmt.Sprintf("Upload %d books and %d notes to the server?", bookCount, noteCount), false) + if err != nil { + tx.Rollback() + return errors.Wrap(err, "getting user confirmation") + } + + if !confirmed { + tx.Rollback() + return errors.New("sync cancelled by user") + } + + fmt.Println() // Add newline after confirmation. + + if err := prepareEmptyServerSync(tx); err != nil { + return errors.Wrap(err, "preparing for empty server sync") + } + + // Re-fetch lastMaxUSN after prepareEmptyServerSync + lastMaxUSN, err = getLastMaxUSN(tx) + if err != nil { + return errors.Wrap(err, "getting the last max_usn after prepare") + } + + log.Debug("prepared empty server sync: marked %d books and %d notes as dirty\n", bookCount, noteCount) + } + var syncErr error if isFullSync || lastSyncAt < syncState.FullSyncBefore { syncErr = fullSync(ctx, tx) @@ -953,6 +1043,14 @@ func newRun(ctx context.DnoteCtx) infra.RunEFunc { tx.Rollback() return errors.Wrap(err, "performing the follow-up step sync") } + + // After syncing server changes (which resolves conflicts), send local changes again + // This uploads books/notes that were skipped due to 409 conflicts + _, err = sendChanges(ctx, tx) + if err != nil { + tx.Rollback() + return errors.Wrap(err, "sending changes after conflict resolution") + } } tx.Commit() diff --git a/pkg/cli/cmd/sync/sync_test.go b/pkg/cli/cmd/sync/sync_test.go index 0cfb87e4..34f0c9df 100644 --- a/pkg/cli/cmd/sync/sync_test.go +++ b/pkg/cli/cmd/sync/sync_test.go @@ -3170,3 +3170,70 @@ func TestCleanLocalBooks(t *testing.T) { database.MustScan(t, "getting b3", db.QueryRow("SELECT label FROM books WHERE uuid = ?", "b3-uuid"), &b3.Label) database.MustScan(t, "getting b5", db.QueryRow("SELECT label FROM books WHERE uuid = ?", "b5-uuid"), &b5.Label) } + +func TestPrepareEmptyServerSync(t *testing.T) { + // set up + db := database.InitTestDB(t, "../../tmp/.dnote", nil) + defer database.TeardownTestDB(t, db) + + // Setup: local has synced data (usn > 0, dirty = false) and some deleted items + database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 5, false, false) + database.MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b2-uuid", "b2-label", 8, false, false) + database.MustExec(t, "inserting b3 deleted", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b3-uuid", "b3-label", 6, true, false) + database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, usn, deleted, dirty, added_on) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", "b1-uuid", "note 1", 6, false, false, 1541108743) + database.MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, body, usn, deleted, dirty, added_on) VALUES (?, ?, ?, ?, ?, ?, ?)", "n2-uuid", "b2-uuid", "note 2", 9, false, false, 1541108743) + database.MustExec(t, "inserting n3 deleted", db, "INSERT INTO notes (uuid, book_uuid, body, usn, deleted, dirty, added_on) VALUES (?, ?, ?, ?, ?, ?, ?)", "n3-uuid", "b1-uuid", "note 3", 7, true, false, 1541108743) + database.MustExec(t, "setting last_max_usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 9) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning transaction")) + } + + if err := prepareEmptyServerSync(tx); err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing prepareEmptyServerSync")) + } + + tx.Commit() + + // test - verify non-deleted items are marked dirty with usn=0, deleted items unchanged + var b1, b2, b3 database.Book + database.MustScan(t, "getting b1", db.QueryRow("SELECT usn, dirty, deleted FROM books WHERE uuid = ?", "b1-uuid"), &b1.USN, &b1.Dirty, &b1.Deleted) + database.MustScan(t, "getting b2", db.QueryRow("SELECT usn, dirty, deleted FROM books WHERE uuid = ?", "b2-uuid"), &b2.USN, &b2.Dirty, &b2.Deleted) + database.MustScan(t, "getting b3", db.QueryRow("SELECT usn, dirty, deleted FROM books WHERE uuid = ?", "b3-uuid"), &b3.USN, &b3.Dirty, &b3.Deleted) + + assert.Equal(t, b1.USN, 0, "b1 USN should be reset to 0") + assert.Equal(t, b1.Dirty, true, "b1 should be marked dirty") + assert.Equal(t, b1.Deleted, false, "b1 should not be deleted") + + assert.Equal(t, b2.USN, 0, "b2 USN should be reset to 0") + assert.Equal(t, b2.Dirty, true, "b2 should be marked dirty") + assert.Equal(t, b2.Deleted, false, "b2 should not be deleted") + + assert.Equal(t, b3.USN, 6, "b3 USN should remain unchanged (deleted item)") + assert.Equal(t, b3.Dirty, false, "b3 should not be marked dirty (deleted item)") + assert.Equal(t, b3.Deleted, true, "b3 should remain deleted") + + var n1, n2, n3 database.Note + database.MustScan(t, "getting n1", db.QueryRow("SELECT usn, dirty, deleted FROM notes WHERE uuid = ?", "n1-uuid"), &n1.USN, &n1.Dirty, &n1.Deleted) + database.MustScan(t, "getting n2", db.QueryRow("SELECT usn, dirty, deleted FROM notes WHERE uuid = ?", "n2-uuid"), &n2.USN, &n2.Dirty, &n2.Deleted) + database.MustScan(t, "getting n3", db.QueryRow("SELECT usn, dirty, deleted FROM notes WHERE uuid = ?", "n3-uuid"), &n3.USN, &n3.Dirty, &n3.Deleted) + + assert.Equal(t, n1.USN, 0, "n1 USN should be reset to 0") + assert.Equal(t, n1.Dirty, true, "n1 should be marked dirty") + assert.Equal(t, n1.Deleted, false, "n1 should not be deleted") + + assert.Equal(t, n2.USN, 0, "n2 USN should be reset to 0") + assert.Equal(t, n2.Dirty, true, "n2 should be marked dirty") + assert.Equal(t, n2.Deleted, false, "n2 should not be deleted") + + assert.Equal(t, n3.USN, 7, "n3 USN should remain unchanged (deleted item)") + assert.Equal(t, n3.Dirty, false, "n3 should not be marked dirty (deleted item)") + assert.Equal(t, n3.Deleted, true, "n3 should remain deleted") + + var lastMaxUSN int + database.MustScan(t, "getting last_max_usn", db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + assert.Equal(t, lastMaxUSN, 0, "last_max_usn should be reset to 0") +} diff --git a/pkg/cli/infra/init.go b/pkg/cli/infra/init.go index 2b6c9618..532f1f1e 100644 --- a/pkg/cli/infra/init.go +++ b/pkg/cli/infra/init.go @@ -68,7 +68,10 @@ func getDBPath(paths context.Paths) string { return fmt.Sprintf("%s/%s/%s", paths.Data, consts.DnoteDirName, consts.DnoteDBFileName) } -func newCtx(versionTag string) (context.DnoteCtx, error) { +// newBaseCtx creates a minimal context with paths and database connection. +// This base context is used for file and database initialization before +// being enriched with config values by setupCtx. +func newBaseCtx(versionTag string) (context.DnoteCtx, error) { dnoteDir := getLegacyDnotePath(dirs.Home) paths := context.Paths{ Home: dirs.Home, @@ -95,8 +98,8 @@ func newCtx(versionTag string) (context.DnoteCtx, error) { } // Init initializes the Dnote environment and returns a new dnote context -func Init(apiEndpoint, versionTag string) (*context.DnoteCtx, error) { - ctx, err := newCtx(versionTag) +func Init(versionTag, apiEndpoint string) (*context.DnoteCtx, error) { + ctx, err := newBaseCtx(versionTag) if err != nil { return nil, errors.Wrap(err, "initializing a context") } @@ -119,7 +122,7 @@ func Init(apiEndpoint, versionTag string) (*context.DnoteCtx, error) { return nil, errors.Wrap(err, "running migration") } - ctx, err = SetupCtx(ctx) + ctx, err = setupCtx(ctx, apiEndpoint) if err != nil { return nil, errors.Wrap(err, "setting up the context") } @@ -129,8 +132,10 @@ func Init(apiEndpoint, versionTag string) (*context.DnoteCtx, error) { return &ctx, nil } -// SetupCtx populates the context and returns a new context -func SetupCtx(ctx context.DnoteCtx) (context.DnoteCtx, error) { +// setupCtx enriches the base context with values from config file and database. +// This is called after files and database have been initialized. +// If apiEndpoint is provided, it overrides the value from config. +func setupCtx(ctx context.DnoteCtx, apiEndpoint string) (context.DnoteCtx, error) { db := ctx.DB var sessionKey string @@ -150,13 +155,19 @@ func SetupCtx(ctx context.DnoteCtx) (context.DnoteCtx, error) { return ctx, errors.Wrap(err, "reading config") } + // Use override if provided, otherwise use config value + endpoint := cf.APIEndpoint + if apiEndpoint != "" { + endpoint = apiEndpoint + } + ret := context.DnoteCtx{ Paths: ctx.Paths, Version: ctx.Version, DB: ctx.DB, SessionKey: sessionKey, SessionKeyExpiry: sessionKeyExpiry, - APIEndpoint: cf.APIEndpoint, + APIEndpoint: endpoint, Editor: cf.Editor, Clock: clock.New(), EnableUpgradeCheck: cf.EnableUpgradeCheck, diff --git a/pkg/cli/infra/init_test.go b/pkg/cli/infra/init_test.go index 08f25139..cb50a95f 100644 --- a/pkg/cli/infra/init_test.go +++ b/pkg/cli/infra/init_test.go @@ -19,9 +19,12 @@ package infra import ( + "fmt" + "os" "testing" "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/config" "github.com/dnote/dnote/pkg/cli/database" "github.com/pkg/errors" ) @@ -91,3 +94,49 @@ func TestInitSystemKV_existing(t *testing.T) { db.QueryRow("SELECT value FROM system WHERE key = ?", "testKey"), &val) assert.Equal(t, val, "testVal", "system value should not have been updated") } + +func TestInit_APIEndpointChange(t *testing.T) { + // Create a temporary directory for test + tmpDir, err := os.MkdirTemp("", "dnote-init-test-*") + if err != nil { + t.Fatal(errors.Wrap(err, "creating temp dir")) + } + defer os.RemoveAll(tmpDir) + + // Set up environment to use our temp directory + t.Setenv("XDG_CONFIG_HOME", fmt.Sprintf("%s/config", tmpDir)) + t.Setenv("XDG_DATA_HOME", fmt.Sprintf("%s/data", tmpDir)) + t.Setenv("XDG_CACHE_HOME", fmt.Sprintf("%s/cache", tmpDir)) + + // First init. + endpoint1 := "http://127.0.0.1:3001" + ctx, err := Init("test-version", endpoint1) + if err != nil { + t.Fatal(errors.Wrap(err, "initializing")) + } + defer ctx.DB.Close() + assert.Equal(t, ctx.APIEndpoint, endpoint1, "should use endpoint1 API endpoint") + + // Test that config was written with endpoint1. + cf, err := config.Read(*ctx) + if err != nil { + t.Fatal(errors.Wrap(err, "reading config")) + } + + // Second init with different endpoint. + endpoint2 := "http://127.0.0.1:3002" + ctx2, err := Init("test-version", endpoint2) + if err != nil { + t.Fatal(errors.Wrap(err, "initializing with override")) + } + defer ctx2.DB.Close() + // Context must be using that endpoint. + assert.Equal(t, ctx2.APIEndpoint, endpoint2, "should use endpoint2 API endpoint") + + // The config file shouldn't have been modified. + cf2, err := config.Read(*ctx2) + if err != nil { + t.Fatal(errors.Wrap(err, "reading config after override")) + } + assert.Equal(t, cf2.APIEndpoint, cf.APIEndpoint, "config should still have original endpoint, not endpoint2") +} diff --git a/pkg/cli/main.go b/pkg/cli/main.go index 518e0ee0..31c81dd5 100644 --- a/pkg/cli/main.go +++ b/pkg/cli/main.go @@ -46,7 +46,16 @@ var apiEndpoint string var versionTag = "master" func main() { - ctx, err := infra.Init(apiEndpoint, versionTag) + // Parse flags early to check if --api-endpoint was provided + root.GetRoot().ParseFlags(os.Args[1:]) + + // Use flag value if provided, otherwise use ldflags value + endpoint := apiEndpoint + if flagValue := root.GetAPIEndpointFlag(); flagValue != "" { + endpoint = flagValue + } + + ctx, err := infra.Init(versionTag, endpoint) if err != nil { panic(errors.Wrap(err, "initializing context")) } diff --git a/pkg/cli/main_test.go b/pkg/cli/main_test.go index 05badb02..151d4cbf 100644 --- a/pkg/cli/main_test.go +++ b/pkg/cli/main_test.go @@ -109,7 +109,7 @@ func TestAddNote(t *testing.T) { t.Run("new book", func(t *testing.T) { // Set up and execute testutils.RunDnoteCmd(t, opts, binaryName, "add", "js", "-c", "foo") - testutils.WaitDnoteCmd(t, opts, testutils.UserContent, binaryName, "add", "js") + testutils.MustWaitDnoteCmd(t, opts, testutils.UserContent, binaryName, "add", "js") defer testutils.RemoveDir(t, testDir) @@ -349,7 +349,7 @@ func TestRemoveNote(t *testing.T) { if tc.yesFlag { testutils.RunDnoteCmd(t, opts, binaryName, "remove", "-y", "1") } else { - testutils.WaitDnoteCmd(t, opts, testutils.UserConfirm, binaryName, "remove", "1") + testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveNote, binaryName, "remove", "1") } defer testutils.RemoveDir(t, testDir) @@ -436,7 +436,7 @@ func TestRemoveBook(t *testing.T) { if tc.yesFlag { testutils.RunDnoteCmd(t, opts, binaryName, "remove", "-y", "js") } else { - testutils.WaitDnoteCmd(t, opts, testutils.UserConfirm, binaryName, "remove", "js") + testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveBook, binaryName, "remove", "js") } defer testutils.RemoveDir(t, testDir) diff --git a/pkg/cli/migrate/migrations.go b/pkg/cli/migrate/migrations.go index 0357dd2a..af5ae86e 100644 --- a/pkg/cli/migrate/migrations.go +++ b/pkg/cli/migrate/migrations.go @@ -539,7 +539,10 @@ var lm12 = migration{ return errors.Wrap(err, "reading config") } - cf.APIEndpoint = "https://api.getdnote.com" + // Only set if not already configured + if cf.APIEndpoint == "" { + cf.APIEndpoint = "https://api.getdnote.com" + } err = config.Write(ctx, cf) if err != nil { diff --git a/pkg/cli/testutils/main.go b/pkg/cli/testutils/main.go index afc12f59..9b4e945d 100644 --- a/pkg/cli/testutils/main.go +++ b/pkg/cli/testutils/main.go @@ -20,6 +20,7 @@ package testutils import ( + "bufio" "bytes" "encoding/json" "io" @@ -37,6 +38,16 @@ import ( "github.com/pkg/errors" ) +// Prompts for user input +const ( + PromptRemoveNote = "remove this note?" + PromptDeleteBook = "delete book" + PromptEmptyServer = "The server is empty but you have local data" +) + +// Timeout for waiting for prompts in tests +const promptTimeout = 10 * time.Second + // Login simulates a logged in user by inserting credentials in the local database func Login(t *testing.T, ctx *context.DnoteCtx) { db := ctx.DB @@ -153,58 +164,167 @@ func RunDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, binaryName string, arg . t.Logf("\n%s", stdout) } -// WaitDnoteCmd runs a dnote command and waits until the command is exited -func WaitDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, runFunc func(io.WriteCloser) error, binaryName string, arg ...string) { +// WaitDnoteCmd runs a dnote command and passes stdout to the callback. +func WaitDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, runFunc func(io.Reader, io.WriteCloser) error, binaryName string, arg ...string) (string, error) { t.Logf("running: %s %s", binaryName, strings.Join(arg, " ")) - cmd, stderr, stdout, err := NewDnoteCmd(opts, binaryName, arg...) + binaryPath, err := filepath.Abs(binaryName) if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrap(err, "getting command").Error()) + return "", errors.Wrap(err, "getting absolute path to test binary") + } + + cmd := exec.Command(binaryPath, arg...) + cmd.Env = opts.Env + + var stderr bytes.Buffer + cmd.Stderr = &stderr + + stdout, err := cmd.StdoutPipe() + if err != nil { + return "", errors.Wrap(err, "getting stdout pipe") } stdin, err := cmd.StdinPipe() if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrap(err, "getting stdin %s")) + return "", errors.Wrap(err, "getting stdin") } defer stdin.Close() - // Start the program - err = cmd.Start() - if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrap(err, "starting command")) + if err = cmd.Start(); err != nil { + return "", errors.Wrap(err, "starting command") } - err = runFunc(stdin) + var output bytes.Buffer + tee := io.TeeReader(stdout, &output) + + err = runFunc(tee, stdin) if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrap(err, "running with stdin")) + t.Logf("\n%s", output.String()) + return output.String(), errors.Wrap(err, "running callback") } - err = cmd.Wait() - if err != nil { - t.Logf("\n%s", stdout) - t.Fatal(errors.Wrapf(err, "running command %s", stderr.String())) + io.Copy(&output, stdout) + + if err := cmd.Wait(); err != nil { + t.Logf("\n%s", output.String()) + return output.String(), errors.Wrapf(err, "command failed: %s", stderr.String()) } - // Print stdout if and only if test fails later - t.Logf("\n%s", stdout) + t.Logf("\n%s", output.String()) + return output.String(), nil } -// UserConfirm simulates confirmation from the user by writing to stdin -func UserConfirm(stdin io.WriteCloser) error { - // confirm - if _, err := io.WriteString(stdin, "y\n"); err != nil { - return errors.Wrap(err, "indicating confirmation in stdin") +func MustWaitDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, runFunc func(io.Reader, io.WriteCloser) error, binaryName string, arg ...string) string { + output, err := WaitDnoteCmd(t, opts, runFunc, binaryName, arg...) + if err != nil { + t.Fatal(err) + } + + return output +} + +// waitForPrompt waits for an expected prompt to appear in stdout with a timeout. +// Returns an error if the prompt is not found within the timeout period. +// Handles prompts with or without newlines by reading character by character. +func waitForPrompt(stdout io.Reader, expectedPrompt string, timeout time.Duration) error { + type result struct { + found bool + err error + } + resultCh := make(chan result, 1) + + go func() { + reader := bufio.NewReader(stdout) + var buffer strings.Builder + found := false + + for { + b, err := reader.ReadByte() + if err != nil { + resultCh <- result{found: found, err: err} + return + } + + buffer.WriteByte(b) + if strings.Contains(buffer.String(), expectedPrompt) { + found = true + break + } + } + + resultCh <- result{found: found, err: nil} + }() + + select { + case res := <-resultCh: + if res.err != nil && res.err != io.EOF { + return errors.Wrap(res.err, "reading stdout") + } + if !res.found { + return errors.Errorf("expected prompt '%s' not found in stdout", expectedPrompt) + } + return nil + case <-time.After(timeout): + return errors.Errorf("timeout waiting for prompt '%s'", expectedPrompt) + } +} + +// MustWaitForPrompt waits for an expected prompt with a default timeout. +// Fails the test if the prompt is not found or an error occurs. +func MustWaitForPrompt(t *testing.T, stdout io.Reader, expectedPrompt string) { + if err := waitForPrompt(stdout, expectedPrompt, promptTimeout); err != nil { + t.Fatal(err) + } +} + +// userRespondToPrompt is a helper that waits for a prompt and sends a response. +func userRespondToPrompt(stdout io.Reader, stdin io.WriteCloser, expectedPrompt, response, action string) error { + if err := waitForPrompt(stdout, expectedPrompt, promptTimeout); err != nil { + return err + } + + if _, err := io.WriteString(stdin, response); err != nil { + return errors.Wrapf(err, "indicating %s in stdin", action) } return nil } -// UserContent simulates content from the user by writing to stdin -func UserContent(stdin io.WriteCloser) error { +// userConfirmOutput simulates confirmation from the user by writing to stdin. +// It waits for the expected prompt with a timeout to prevent deadlocks. +func userConfirmOutput(stdout io.Reader, stdin io.WriteCloser, expectedPrompt string) error { + return userRespondToPrompt(stdout, stdin, expectedPrompt, "y\n", "confirmation") +} + +// userCancelOutput simulates cancellation from the user by writing to stdin. +// It waits for the expected prompt with a timeout to prevent deadlocks. +func userCancelOutput(stdout io.Reader, stdin io.WriteCloser, expectedPrompt string) error { + return userRespondToPrompt(stdout, stdin, expectedPrompt, "n\n", "cancellation") +} + +// ConfirmRemoveNote waits for prompt for removing a note and confirms. +func ConfirmRemoveNote(stdout io.Reader, stdin io.WriteCloser) error { + return userConfirmOutput(stdout, stdin, PromptRemoveNote) +} + +// ConfirmRemoveBook waits for prompt for deleting a book confirms. +func ConfirmRemoveBook(stdout io.Reader, stdin io.WriteCloser) error { + return userConfirmOutput(stdout, stdin, PromptDeleteBook) +} + +// UserConfirmEmptyServerSync waits for an empty server prompt and confirms. +func UserConfirmEmptyServerSync(stdout io.Reader, stdin io.WriteCloser) error { + return userConfirmOutput(stdout, stdin, PromptEmptyServer) +} + +// UserCancelEmptyServerSync waits for an empty server prompt and confirms. +func UserCancelEmptyServerSync(stdout io.Reader, stdin io.WriteCloser) error { + return userCancelOutput(stdout, stdin, PromptEmptyServer) +} + +// UserContent simulates content from the user by writing to stdin. +// This is used for piped input where no prompt is shown. +func UserContent(stdout io.Reader, stdin io.WriteCloser) error { longText := `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.` diff --git a/pkg/e2e/sync_test.go b/pkg/e2e/sync_test.go index 2ddf373e..b4fec91f 100644 --- a/pkg/e2e/sync_test.go +++ b/pkg/e2e/sync_test.go @@ -82,10 +82,9 @@ func clearTmp(t *testing.T) { } } -func TestMain(m *testing.M) { - // Set up server database - use file-based DB for e2e tests - dbPath := fmt.Sprintf("%s/server.db", testDir) - serverDb = apitest.InitDB(dbPath) +// setupTestServer creates a test server with its own database +func setupTestServer(dbPath string, serverTime time.Time) (*httptest.Server, *gorm.DB, error) { + db := apitest.InitDB(dbPath) mockClock := clock.NewMock() mockClock.SetNow(serverTime) @@ -94,12 +93,24 @@ func TestMain(m *testing.M) { a.Clock = mockClock a.EmailTemplates = mailer.Templates{} a.EmailBackend = &apitest.MockEmailbackendImplementation{} - a.DB = serverDb + a.DB = db + + server, err := controllers.NewServer(&a) + if err != nil { + return nil, nil, errors.Wrap(err, "initializing server") + } + + return server, db, nil +} + +func TestMain(m *testing.M) { + // Set up server database - use file-based DB for e2e tests + dbPath := fmt.Sprintf("%s/server.db", testDir) var err error - server, err = controllers.NewServer(&a) + server, serverDb, err = setupTestServer(dbPath, serverTime) if err != nil { - panic(errors.Wrap(err, "initializing router")) + panic(err) } defer server.Close() @@ -234,6 +245,10 @@ type systemState struct { // checkState compares the state of the client and the server with the given system state func checkState(t *testing.T, ctx context.DnoteCtx, user database.User, expected systemState) { + checkStateWithDB(t, ctx, user, serverDb, expected) +} + +func checkStateWithDB(t *testing.T, ctx context.DnoteCtx, user database.User, db *gorm.DB, expected systemState) { clientDB := ctx.DB var clientBookCount, clientNoteCount int @@ -250,12 +265,12 @@ func checkState(t *testing.T, ctx context.DnoteCtx, user database.User, expected assert.Equal(t, clientLastSyncAt, expected.clientLastSyncAt, "client last_sync_at mismatch") var serverBookCount, serverNoteCount int64 - apitest.MustExec(t, serverDb.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") - apitest.MustExec(t, serverDb.Model(&database.Book{}).Count(&serverBookCount), "counting api notes") + apitest.MustExec(t, db.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") + apitest.MustExec(t, db.Model(&database.Book{}).Count(&serverBookCount), "counting api notes") assert.Equal(t, serverNoteCount, expected.serverNoteCount, "server note count mismatch") assert.Equal(t, serverBookCount, expected.serverBookCount, "server book count mismatch") var serverUser database.User - apitest.MustExec(t, serverDb.Where("id = ?", user.ID).First(&serverUser), "finding user") + apitest.MustExec(t, db.Where("id = ?", user.ID).First(&serverUser), "finding user") assert.Equal(t, serverUser.MaxUSN, expected.serverUserMaxUSN, "user max_usn mismatch") } @@ -412,7 +427,7 @@ func TestSync_oneway(t *testing.T) { cliDatabase.MustScan(t, "getting id of note to delete", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "css2"), &nid2) clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js3-edited") - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "css", nid2) + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "css", nid2) clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css3") clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css4") @@ -777,9 +792,9 @@ func TestSync_twoway(t *testing.T) { var nid string cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js3"), &nid) - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "algorithms") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "algorithms") clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css4") - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) return map[string]string{ "jsBookUUID": jsBookUUID, @@ -989,7 +1004,7 @@ func TestSync_twoway(t *testing.T) { // 2. on cli clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js2") - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "js") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "math", "-c", "math1") var nid string @@ -1337,7 +1352,7 @@ func TestSync(t *testing.T) { // 2. on cli clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "js") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1391,7 +1406,7 @@ func TestSync(t *testing.T) { clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") var nid string cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2009,7 +2024,7 @@ func TestSync(t *testing.T) { apiDeleteBook(t, user, jsBookUUID, "deleting js book") // 4. on cli - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "js") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2069,7 +2084,7 @@ func TestSync(t *testing.T) { // 4. on cli var nid string cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2614,7 +2629,7 @@ func TestSync(t *testing.T) { clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") var nid string cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) // 3. on server apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") @@ -2688,7 +2703,7 @@ func TestSync(t *testing.T) { clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") var nid string cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) // 3. on server apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") @@ -2989,7 +3004,7 @@ func TestSync(t *testing.T) { // 2. on cli clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "js") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") // 3. on server apiPatchBook(t, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") @@ -3060,7 +3075,7 @@ func TestSync(t *testing.T) { apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js1 note") // 4. on cli - clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirm, cliBinaryName, "remove", "js") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3862,3 +3877,565 @@ func TestFullSync(t *testing.T) { }) }) } + +func TestSync_EmptyServer(t *testing.T) { + t.Run("sync to empty server after syncing to non-empty server", func(t *testing.T) { + // Test server data loss/wipe scenario (disaster recovery): + // Verify empty server detection works when the server loses all its data + + // clean up + apitest.ClearData(serverDb) + defer apitest.ClearData(serverDb) + + clearTmp(t) + + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + + user := setupUser(t, &ctx) + + // Step 1: Create local data and sync to server + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + + // Verify sync succeeded + checkState(t, ctx, user, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Clear all server data to simulate switching to a completely new empty server + apitest.ClearData(serverDb) + // Recreate user and session (simulating a new server) + user = setupUser(t, &ctx) + + // Step 3: Sync again - should detect empty server and prompt user + // User confirms with "y" + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync") + + // Step 4: Verify data was uploaded to the empty server + checkState(t, ctx, user, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Verify the content is correct on both client and server + var cliNote1JS, cliNote1CSS cliDatabase.Note + var cliBookJS, cliBookCSS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", ctx.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body) + cliDatabase.MustScan(t, "finding cliNote1CSS", ctx.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body) + cliDatabase.MustScan(t, "finding cliBookJS", ctx.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label) + cliDatabase.MustScan(t, "finding cliBookCSS", ctx.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label) + + assert.Equal(t, cliNote1JS.Body, "js1", "js note body mismatch") + assert.Equal(t, cliNote1CSS.Body, "css1", "css note body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "js book label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "css book label mismatch") + + // Verify on server side + var serverNoteJS, serverNoteCSS database.Note + var serverBookJS, serverBookCSS database.Book + apitest.MustExec(t, serverDb.Where("body = ?", "js1").First(&serverNoteJS), "finding server note js1") + apitest.MustExec(t, serverDb.Where("body = ?", "css1").First(&serverNoteCSS), "finding server note css1") + apitest.MustExec(t, serverDb.Where("label = ?", "js").First(&serverBookJS), "finding server book js") + apitest.MustExec(t, serverDb.Where("label = ?", "css").First(&serverBookCSS), "finding server book css") + + assert.Equal(t, serverNoteJS.Body, "js1", "server js note body mismatch") + assert.Equal(t, serverNoteCSS.Body, "css1", "server css note body mismatch") + assert.Equal(t, serverBookJS.Label, "js", "server js book label mismatch") + assert.Equal(t, serverBookCSS.Label, "css", "server css book label mismatch") + }) + + t.Run("user cancels empty server prompt", func(t *testing.T) { + // clean up + apitest.ClearData(serverDb) + defer apitest.ClearData(serverDb) + + clearTmp(t) + + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + + user := setupUser(t, &ctx) + + // Step 1: Create local data and sync to server + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + + // Verify initial sync succeeded + checkState(t, ctx, user, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Clear all server data + apitest.ClearData(serverDb) + user = setupUser(t, &ctx) + + // Step 3: Sync again but user cancels with "n" + output, err := clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserCancelEmptyServerSync, cliBinaryName, "sync") + if err == nil { + t.Fatal("Expected sync to fail when user cancels, but it succeeded") + } + + // Verify the prompt appeared + if !strings.Contains(output, clitest.PromptEmptyServer) { + t.Fatalf("Expected empty server warning in output, got: %s", output) + } + + // Step 4: Verify local state unchanged (transaction rolled back) + checkState(t, ctx, user, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 0, + serverBookCount: 0, + serverUserMaxUSN: 0, + }) + + // Verify items still have original USN and dirty=false + var book cliDatabase.Book + var note cliDatabase.Note + cliDatabase.MustScan(t, "checking book state", ctx.DB.QueryRow("SELECT usn, dirty FROM books WHERE label = ?", "js"), &book.USN, &book.Dirty) + cliDatabase.MustScan(t, "checking note state", ctx.DB.QueryRow("SELECT usn, dirty FROM notes WHERE body = ?", "js1"), ¬e.USN, ¬e.Dirty) + + assert.NotEqual(t, book.USN, 0, "book USN should not be reset") + assert.NotEqual(t, note.USN, 0, "note USN should not be reset") + assert.Equal(t, book.Dirty, false, "book should not be marked dirty") + assert.Equal(t, note.Dirty, false, "note should not be marked dirty") + }) + + t.Run("all local data is marked deleted - should not upload", func(t *testing.T) { + // Test edge case: Server MaxUSN=0, local MaxUSN>0, but all items are deleted=true + // Should NOT prompt because there's nothing to upload + + // clean up + apitest.ClearData(serverDb) + defer apitest.ClearData(serverDb) + + clearTmp(t) + + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + + user := setupUser(t, &ctx) + + // Step 1: Create local data and sync to server + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + + // Verify initial sync succeeded + checkState(t, ctx, user, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Delete all local notes and books (mark as deleted) + cliDatabase.MustExec(t, "marking all books deleted", ctx.DB, "UPDATE books SET deleted = 1") + cliDatabase.MustExec(t, "marking all notes deleted", ctx.DB, "UPDATE notes SET deleted = 1") + + // Step 3: Clear server data to simulate switching to empty server + apitest.ClearData(serverDb) + user = setupUser(t, &ctx) + + // Step 4: Sync - should NOT prompt because bookCount=0 and noteCount=0 (counting only deleted=0) + // This should complete without user interaction + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + + // Verify no data was uploaded (server still empty, but client still has deleted items) + // Check server is empty + var serverNoteCount, serverBookCount int64 + apitest.MustExec(t, serverDb.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") + apitest.MustExec(t, serverDb.Model(&database.Book{}).Count(&serverBookCount), "counting server books") + assert.Equal(t, serverNoteCount, int64(0), "server should have no notes") + assert.Equal(t, serverBookCount, int64(0), "server should have no books") + + // Check client still has the deleted items locally + var clientNoteCount, clientBookCount int + cliDatabase.MustScan(t, "counting client notes", ctx.DB.QueryRow("SELECT count(*) FROM notes WHERE deleted = 1"), &clientNoteCount) + cliDatabase.MustScan(t, "counting client books", ctx.DB.QueryRow("SELECT count(*) FROM books WHERE deleted = 1"), &clientBookCount) + assert.Equal(t, clientNoteCount, 2, "client should still have 2 deleted notes") + assert.Equal(t, clientBookCount, 2, "client should still have 2 deleted books") + + // Verify lastMaxUSN was reset to 0 + var lastMaxUSN int + cliDatabase.MustScan(t, "getting lastMaxUSN", ctx.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + assert.Equal(t, lastMaxUSN, 0, "lastMaxUSN should be reset to 0") + }) + + t.Run("race condition - other client uploads first", func(t *testing.T) { + // This test exercises a race condition that can occur during sync: + // While Client A is waiting for user input, Client B uploads data to the server. + // + // The empty server scenario is the natural place to test this because + // an empty server detection triggers a prompt, at which point the test + // can make client B upload data. We trigger the race condition deterministically. + // + // Test flow: + // - Client A detects empty server and prompts user + // - While waiting for confirmation, Client B uploads the same data via API + // - Client A continues and handles the 409 conflict gracefully by: + // 1. Detecting the 409 error when trying to CREATE books that already exist + // 2. Running stepSync to pull the server's books (js, css) + // 3. mergeBook renames local conflicts (js→js_2, css→css_2) + // 4. Retrying sendChanges to upload the renamed books + // - Result: Both clients' data is preserved (4 books total) + + // Clean up + apitest.ClearData(serverDb) + defer apitest.ClearData(serverDb) + clearTmp(t) + + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + + user := setupUser(t, &ctx) + + // Step 1: Create local data and sync to establish lastMaxUSN > 0 + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + + // Verify initial sync succeeded + checkState(t, ctx, user, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Clear server to simulate switching to empty server + apitest.ClearData(serverDb) + user = setupUser(t, &ctx) + + // Step 3: Trigger sync which will detect empty server and prompt user + // Inside the callback (before confirming), we simulate Client B uploading via API. + // We wait for the empty server prompt to ensure Client B uploads AFTER + // GetSyncState but BEFORE the sync decision, creating the race condition deterministically + raceCallback := func(stdout io.Reader, stdin io.WriteCloser) error { + // First, wait for the prompt to ensure Client A has obtained the sync state from the server. + clitest.MustWaitForPrompt(t, stdout, clitest.PromptEmptyServer) + + // Now Client B uploads the same data via API (after Client A got the sync state from the server + // but before its sync decision) + // This creates the race condition: Client A thinks server is empty, but Client B uploads data + jsBookUUID := apiCreateBook(t, user, "js", "client B creating js book") + cssBookUUID := apiCreateBook(t, user, "css", "client B creating css book") + apiCreateNote(t, user, jsBookUUID, "js1", "client B creating js note") + apiCreateNote(t, user, cssBookUUID, "css1", "client B creating css note") + + // Now user confirms + if _, err := io.WriteString(stdin, "y\n"); err != nil { + return errors.Wrap(err, "confirming sync") + } + + return nil + } + + // Step 4: Client A runs sync with race condition + // The 409 conflict is automatically handled: + // - When 409 is detected, isBehind flag is set + // - stepSync pulls Client B's data + // - mergeBook renames Client A's books to js_2, css_2 + // - Renamed books are uploaded + // - Both clients' data is preserved. + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, raceCallback, cliBinaryName, "sync") + + // Verify final state - both clients' data preserved + checkStateWithDB(t, ctx, user, serverDb, systemState{ + clientNoteCount: 4, // Both clients' notes + clientBookCount: 4, // js, css, js_2, css_2 + clientLastMaxUSN: 8, // 4 from Client B + 4 from Client A's renamed books/notes + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 4, + serverUserMaxUSN: 8, + }) + + // Verify server has both clients' books + var svrBookJS, svrBookCSS, svrBookJS2, svrBookCSS2 database.Book + apitest.MustExec(t, serverDb.Where("label = ?", "js").First(&svrBookJS), "finding server book 'js'") + apitest.MustExec(t, serverDb.Where("label = ?", "css").First(&svrBookCSS), "finding server book 'css'") + apitest.MustExec(t, serverDb.Where("label = ?", "js_2").First(&svrBookJS2), "finding server book 'js_2'") + apitest.MustExec(t, serverDb.Where("label = ?", "css_2").First(&svrBookCSS2), "finding server book 'css_2'") + + assert.Equal(t, svrBookJS.Label, "js", "server should have book 'js' (Client B)") + assert.Equal(t, svrBookCSS.Label, "css", "server should have book 'css' (Client B)") + assert.Equal(t, svrBookJS2.Label, "js_2", "server should have book 'js_2' (Client A renamed)") + assert.Equal(t, svrBookCSS2.Label, "css_2", "server should have book 'css_2' (Client A renamed)") + + // Verify client has all books + var cliBookJS, cliBookCSS, cliBookJS2, cliBookCSS2 cliDatabase.Book + cliDatabase.MustScan(t, "finding client book 'js'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding client book 'css'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding client book 'js_2'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) + cliDatabase.MustScan(t, "finding client book 'css_2'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) + + // Verify client UUIDs match server + assert.Equal(t, cliBookJS.UUID, svrBookJS.UUID, "client 'js' UUID should match server") + assert.Equal(t, cliBookCSS.UUID, svrBookCSS.UUID, "client 'css' UUID should match server") + assert.Equal(t, cliBookJS2.UUID, svrBookJS2.UUID, "client 'js_2' UUID should match server") + assert.Equal(t, cliBookCSS2.UUID, svrBookCSS2.UUID, "client 'css_2' UUID should match server") + + // Verify all items have non-zero USN (synced successfully) + assert.NotEqual(t, cliBookJS.USN, 0, "client 'js' should have non-zero USN") + assert.NotEqual(t, cliBookCSS.USN, 0, "client 'css' should have non-zero USN") + assert.NotEqual(t, cliBookJS2.USN, 0, "client 'js_2' should have non-zero USN") + assert.NotEqual(t, cliBookCSS2.USN, 0, "client 'css_2' should have non-zero USN") + }) + + t.Run("sync to server A, then B, then back to A, then back to B", func(t *testing.T) { + // Test switching between two actual servers to verify: + // 1. Empty server detection works when switching to empty server + // 2. No false detection when switching back to non-empty servers + // 3. Both servers maintain independent state across multiple switches + + // Clean up + clearTmp(t) + + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + + // Create Server A with its own database + dbPathA := fmt.Sprintf("%s/serverA.db", testDir) + defer os.Remove(dbPathA) + + serverA, serverDbA, err := setupTestServer(dbPathA, serverTime) + if err != nil { + t.Fatal(errors.Wrap(err, "setting up server A")) + } + defer serverA.Close() + + // Create Server B with its own database + dbPathB := fmt.Sprintf("%s/serverB.db", testDir) + defer os.Remove(dbPathB) + + serverB, serverDbB, err := setupTestServer(dbPathB, serverTime) + if err != nil { + t.Fatal(errors.Wrap(err, "setting up server B")) + } + defer serverB.Close() + + // Step 1: Set up user on Server A and sync + apiEndpointA := fmt.Sprintf("%s/api", serverA.URL) + + userA := apitest.SetupUserData(serverDbA) + apitest.SetupAccountData(serverDbA, userA, "alice@example.com", "pass1234") + sessionA := apitest.SetupSession(serverDbA, userA) + cliDatabase.MustExec(t, "inserting session_key", ctx.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, sessionA.Key) + cliDatabase.MustExec(t, "inserting session_key_expiry", ctx.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, sessionA.ExpiresAt.Unix()) + + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--api-endpoint", apiEndpointA, "sync") + + // Verify sync to Server A succeeded + checkStateWithDB(t, ctx, userA, serverDbA, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Switch to Server B (empty) and sync + apiEndpointB := fmt.Sprintf("%s/api", serverB.URL) + + // Set up user on Server B + userB := apitest.SetupUserData(serverDbB) + apitest.SetupAccountData(serverDbB, userB, "alice@example.com", "pass1234") + sessionB := apitest.SetupSession(serverDbB, userB) + cliDatabase.MustExec(t, "updating session_key for B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry for B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + + // Should detect empty server and prompt + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "--api-endpoint", apiEndpointB, "sync") + + // Verify Server B now has data + checkStateWithDB(t, ctx, userB, serverDbB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 3: Switch back to Server A and sync + cliDatabase.MustExec(t, "updating session_key back to A", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry back to A", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + + // Should NOT trigger empty server detection (Server A has MaxUSN > 0) + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--api-endpoint", apiEndpointA, "sync") + + // Verify Server A still has its data + checkStateWithDB(t, ctx, userA, serverDbA, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 4: Switch back to Server B and sync again + cliDatabase.MustExec(t, "updating session_key back to B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry back to B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + + // Should NOT trigger empty server detection (Server B now has MaxUSN > 0 from Step 2) + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--api-endpoint", apiEndpointB, "sync") + + // Verify both servers maintain independent state + checkStateWithDB(t, ctx, userB, serverDbB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + }) +} + +func TestSync_FreshClientConcurrent(t *testing.T) { + // Test the core issue: Fresh client (never synced, lastMaxUSN=0) syncing to a server + // that already has data uploaded by another client. + // + // Scenario: + // 1. Client A creates local notes (never synced, lastMaxUSN=0, lastSyncAt=0) + // 2. Client B uploads same book names to server first + // 3. Client A syncs + // + // Expected: Client A should pull server data first, detect duplicate book names, + // rename local books to avoid conflicts (js→js_2), then upload successfully. + + // Clean up + apitest.ClearData(serverDb) + defer apitest.ClearData(serverDb) + clearTmp(t) + + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + + user := setupUser(t, &ctx) + + // Client A: Create local data (never sync) + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + + // Client B: Upload same book names to server via API + jsBookUUID := apiCreateBook(t, user, "js", "client B creating js book") + cssBookUUID := apiCreateBook(t, user, "css", "client B creating css book") + apiCreateNote(t, user, jsBookUUID, "js2", "client B note") + apiCreateNote(t, user, cssBookUUID, "css2", "client B note") + + // Client A syncs - should handle the conflict gracefully + // Expected: pulls server data, renames local books to js_2/css_2, uploads successfully + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + + // Verify: Should have 4 books and 4 notes on both client and server + // USN breakdown: 2 books + 2 notes from Client B (USN 1-4), then 2 books + 2 notes from Client A (USN 5-8) + checkStateWithDB(t, ctx, user, serverDb, systemState{ + clientNoteCount: 4, + clientBookCount: 4, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 4, + serverUserMaxUSN: 8, + }) + + // Verify server has all 4 books with correct names + var svrBookJS, svrBookCSS, svrBookJS2, svrBookCSS2 database.Book + apitest.MustExec(t, serverDb.Where("label = ?", "js").First(&svrBookJS), "finding server book 'js'") + apitest.MustExec(t, serverDb.Where("label = ?", "css").First(&svrBookCSS), "finding server book 'css'") + apitest.MustExec(t, serverDb.Where("label = ?", "js_2").First(&svrBookJS2), "finding server book 'js_2'") + apitest.MustExec(t, serverDb.Where("label = ?", "css_2").First(&svrBookCSS2), "finding server book 'css_2'") + + assert.Equal(t, svrBookJS.Label, "js", "server should have book 'js' (Client B)") + assert.Equal(t, svrBookCSS.Label, "css", "server should have book 'css' (Client B)") + assert.Equal(t, svrBookJS2.Label, "js_2", "server should have book 'js_2' (Client A renamed)") + assert.Equal(t, svrBookCSS2.Label, "css_2", "server should have book 'css_2' (Client A renamed)") + + // Verify server has all 4 notes with correct content + var svrNoteJS1, svrNoteJS2, svrNoteCSS1, svrNoteCSS2 database.Note + apitest.MustExec(t, serverDb.Where("body = ?", "js1").First(&svrNoteJS1), "finding server note 'js1'") + apitest.MustExec(t, serverDb.Where("body = ?", "js2").First(&svrNoteJS2), "finding server note 'js2'") + apitest.MustExec(t, serverDb.Where("body = ?", "css1").First(&svrNoteCSS1), "finding server note 'css1'") + apitest.MustExec(t, serverDb.Where("body = ?", "css2").First(&svrNoteCSS2), "finding server note 'css2'") + + assert.Equal(t, svrNoteJS1.BookUUID, svrBookJS2.UUID, "note 'js1' should belong to book 'js_2' (Client A)") + assert.Equal(t, svrNoteJS2.BookUUID, svrBookJS.UUID, "note 'js2' should belong to book 'js' (Client B)") + assert.Equal(t, svrNoteCSS1.BookUUID, svrBookCSS2.UUID, "note 'css1' should belong to book 'css_2' (Client A)") + assert.Equal(t, svrNoteCSS2.BookUUID, svrBookCSS.UUID, "note 'css2' should belong to book 'css' (Client B)") + + // Verify client has all 4 books + var cliBookJS, cliBookCSS, cliBookJS2, cliBookCSS2 cliDatabase.Book + cliDatabase.MustScan(t, "finding client book 'js'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding client book 'css'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding client book 'js_2'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) + cliDatabase.MustScan(t, "finding client book 'css_2'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) + + // Verify client UUIDs match server + assert.Equal(t, cliBookJS.UUID, svrBookJS.UUID, "client 'js' UUID should match server") + assert.Equal(t, cliBookCSS.UUID, svrBookCSS.UUID, "client 'css' UUID should match server") + assert.Equal(t, cliBookJS2.UUID, svrBookJS2.UUID, "client 'js_2' UUID should match server") + assert.Equal(t, cliBookCSS2.UUID, svrBookCSS2.UUID, "client 'css_2' UUID should match server") + + // Verify all books have non-zero USN (synced successfully) + assert.NotEqual(t, cliBookJS.USN, 0, "client 'js' should have non-zero USN") + assert.NotEqual(t, cliBookCSS.USN, 0, "client 'css' should have non-zero USN") + assert.NotEqual(t, cliBookJS2.USN, 0, "client 'js_2' should have non-zero USN") + assert.NotEqual(t, cliBookCSS2.USN, 0, "client 'css_2' should have non-zero USN") + + // Verify client has all 4 notes + var cliNoteJS1, cliNoteJS2, cliNoteCSS1, cliNoteCSS2 cliDatabase.Note + cliDatabase.MustScan(t, "finding client note 'js1'", ctx.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNoteJS1.UUID, &cliNoteJS1.Body, &cliNoteJS1.USN) + cliDatabase.MustScan(t, "finding client note 'js2'", ctx.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js2"), &cliNoteJS2.UUID, &cliNoteJS2.Body, &cliNoteJS2.USN) + cliDatabase.MustScan(t, "finding client note 'css1'", ctx.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliNoteCSS1.UUID, &cliNoteCSS1.Body, &cliNoteCSS1.USN) + cliDatabase.MustScan(t, "finding client note 'css2'", ctx.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css2"), &cliNoteCSS2.UUID, &cliNoteCSS2.Body, &cliNoteCSS2.USN) + + // Verify client note UUIDs match server + assert.Equal(t, cliNoteJS1.UUID, svrNoteJS1.UUID, "client note 'js1' UUID should match server") + assert.Equal(t, cliNoteJS2.UUID, svrNoteJS2.UUID, "client note 'js2' UUID should match server") + assert.Equal(t, cliNoteCSS1.UUID, svrNoteCSS1.UUID, "client note 'css1' UUID should match server") + assert.Equal(t, cliNoteCSS2.UUID, svrNoteCSS2.UUID, "client note 'css2' UUID should match server") + + // Verify all notes have non-zero USN (synced successfully) + assert.NotEqual(t, cliNoteJS1.USN, 0, "client note 'js1' should have non-zero USN") + assert.NotEqual(t, cliNoteJS2.USN, 0, "client note 'js2' should have non-zero USN") + assert.NotEqual(t, cliNoteCSS1.USN, 0, "client note 'css1' should have non-zero USN") + assert.NotEqual(t, cliNoteCSS2.USN, 0, "client note 'css2' should have non-zero USN") +} From 74119b1d0b44ae38a38378cda07ae1e4cfdc5ad1 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 12 Oct 2025 13:02:59 -0700 Subject: [PATCH 09/33] Automate release process (#691) --- .github/workflows/release-cli.yml | 40 +++- .github/workflows/release-server.yml | 21 +- CHANGELOG.md | 300 --------------------------- scripts/generate-changelog.sh | 62 ++++++ 4 files changed, 121 insertions(+), 302 deletions(-) delete mode 100644 CHANGELOG.md create mode 100755 scripts/generate-changelog.sh diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 65b2fd0b..723c2d1a 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -13,6 +13,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + fetch-depth: 0 - uses: actions/setup-go@v6 with: go-version: '>=1.25.0' @@ -36,6 +38,23 @@ jobs: - name: Build CLI run: make version=${{ steps.version.outputs.version }} build-cli + - name: Generate changelog + run: | + VERSION="${{ steps.version.outputs.version }}" + TAG="cli-v${VERSION}" + + # Find previous CLI tag + PREV_TAG=$(git tag --sort=-version:refname | grep "^cli-" | grep -v "^${TAG}$" | head -n 1) + + if [ -z "$PREV_TAG" ]; then + echo "Error: No previous CLI tag found" + echo "This appears to be the first release." + exit 1 + fi + + ./scripts/generate-changelog.sh cli "$TAG" "$PREV_TAG" > /tmp/changelog.txt + cat /tmp/changelog.txt + - name: Create GitHub release env: GH_TOKEN: ${{ github.token }} @@ -54,5 +73,24 @@ jobs: build/cli/*_checksums.txt \ $FLAGS \ --title="$TAG" \ - --notes="Please see the [CHANGELOG](https://github.com/dnote/dnote/blob/master/CHANGELOG.md)" \ + --notes-file=/tmp/changelog.txt \ --draft + + - name: Bump Homebrew formula + env: + HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_RELEASE_TOKEN }} + run: | + VERSION="${{ steps.version.outputs.version }}" + TAG="cli-v${VERSION}" + + # Only bump Homebrew for stable releases (not prereleases) + if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + brew update-reset + brew bump-formula-pr \ + --no-browse \ + --tag="$TAG" \ + --revision="${{ github.sha }}" \ + dnote + else + echo "Skipping Homebrew update for prerelease version: $VERSION" + fi diff --git a/.github/workflows/release-server.yml b/.github/workflows/release-server.yml index 25c6f88b..f52e1508 100644 --- a/.github/workflows/release-server.yml +++ b/.github/workflows/release-server.yml @@ -13,6 +13,8 @@ jobs: steps: - uses: actions/checkout@v5 + with: + fetch-depth: 0 - uses: actions/setup-go@v6 with: go-version: '>=1.25.0' @@ -36,6 +38,23 @@ jobs: - name: Build server run: make version=${{ steps.version.outputs.version }} build-server + - name: Generate changelog + run: | + VERSION="${{ steps.version.outputs.version }}" + TAG="server-v${VERSION}" + + # Find previous server tag + PREV_TAG=$(git tag --sort=-version:refname | grep "^server-" | grep -v "^${TAG}$" | head -n 1) + + if [ -z "$PREV_TAG" ]; then + echo "Error: No previous server tag found" + echo "This appears to be the first release." + exit 1 + fi + + ./scripts/generate-changelog.sh server "$TAG" "$PREV_TAG" > /tmp/changelog.txt + cat /tmp/changelog.txt + - name: Prepare Docker build context run: | VERSION="${{ steps.version.outputs.version }}" @@ -76,5 +95,5 @@ jobs: build/server/*_checksums.txt \ $FLAGS \ --title="$TAG" \ - --notes="Please see the [CHANGELOG](https://github.com/dnote/dnote/blob/master/CHANGELOG.md)" \ + --notes-file=/tmp/changelog.txt \ --draft diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 431232b6..00000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,300 +0,0 @@ -# CHANAGELOG - -All notable changes to the projects under this repository will be documented in this file. - -* [Server](#server) -* [CLI](#cli) - -## Server - -The following log documents the history of the server project. - -### Unreleased - -### 3.0.0-rc1 2025-10-05 - -- Use SQLite instead of Postgres. Please use https://github.com/dnote/pg2sqlite to migrate. - -### 2.1.1 2023-03-04 - -#### Fixed - -- Added the missing CSS and JS in the server release - -### 2.1.0 2023-03-04 - -#### Changed - -- `OnPremise` environment variable is deprecated and is replaced with `OnPremises` -- Upgrade Go from 1.17 to 1.20. - -### 2.0.0 2022-05-09 - -#### Removed - -- The web interface for managing notes and books (#594) - -### 1.0.4 2020-05-23 - -#### Removed - -- Simplify the bundle by removing unnecessary payment logic - -#### Fixed - -- Fix timestamp in the note content view -- Invalidate existing sessions when password is changed - -### 1.0.3 2020-05-03 - -#### Fixed - -- Fix timeline grouping notes by added time rather than updated time. - -#### Changed - -- Sort notes by last activity to make it easier to see the most recently accessed information. - -### 1.0.2 2020-05-03 - -#### Changed - -* Support arm64. - -### 1.0.1 - 2020-03-29 - -- Fix fresh install running migrations against tables that no longer exists. - -### 1.0.0 - 2020-03-22 - -#### Fixed - -- Fix unsubscribe link from the inactive reminder (#433) - -#### Removed - -- Remove the deprecated features related to digests and repetition rules (#432) -- Remove the migration for the deprecated, encrypted Dnote (#433) - -#### Changed - -- Please set `OnPremise` environment to `true` in order to automatically use the Pro version. - -### 0.5.0 - 2020-02-06 - -#### Changed - -- **Deprecated** the digest and digest emails (#397) -- **Deprecated** the repetition rules (#397) - -#### Fixed - -- Fix refocusing to the end of the textarea input (#405) - -### 0.4.0 - 2020-01-09 - -#### Added - -- A web-based digest (#380) - -#### Fixed - -- Send inactive reminders with a correct email type (#385) -- Wrap words in note content (#389) - -### 0.3.4 - 2019-12-24 - -#### Added - -- Remind when the knowledge base stops growing (#375) -- Alert when a password is changed (#375) - -#### Fixed - -- Implement syntax highlighting for code blocks ($377) - -### 0.3.3 - 2019-12-17 - -#### Added - -- Send welcome email with login instructions upon reigstering (#352) -- Add an option to disable registration (#365) - -#### Changed - -- Send emails from the domain that hosts the application for on premise installations (#355) -- For on premise installations, automatically upgrade user accounts (#361) - -### 0.3.2 - 2019-11-20 - -#### Fixed - -- Fix server crash upon landing on a note page (#324). -- Allow to synchronize a large number of records (#321) - -### 0.3.1 - 2019-11-12 - -#### Fixed - -- Fix static files not being embedded in the binary. (#309) -- Fix mobile menu not covering the whole screen. (#308) - -### 0.3.0 - 2019-11-12 - -#### Added - -- Share notes (#300) -- Allow to recover from a missed repetition processing (#305) - -### 0.2.1 - 2019-11-04 - -#### Upgrade Guide - -* Please define the follwoing new environment variables: - - - `WebURL`: the URL to your Dnote server, without the trailing slash. (e.g. `https://my-server.com`) (Please see #290) - - `SmtpPort`: the SMTP port. (e.g. `465`) optional - required *if you want to configure email* - -#### Added - -- Display version number in the settings (#293) -- Allow unsecure database connection in production (#276) - -#### Fixed - -- Allow to customize the app URL in the emails (#290) -- Allow to customize the SMTP port (#292) - -### 0.2.0 - 2019-10-28 - -#### Added - -- Specify spaced repetition rule (#280) - -#### Changed - -- Treat a linebreak as a new line in the preview (#261) -- Allow to have multiple editor states for adding and editing notes (#260) - -#### Fixed - -- Fix jumping focus on editor (#265) - -### 0.1.1 - 2019-09-30 - -#### Fixed - -- Fix asset loading (#257) - - -### 0.1.0 - 2019-09-30 - -#### Added - -- Full-text search (#254) -- Password recovery (#254) -- Embedded notes in the digest emails (#254) - -#### Removed - -- **Breaking Change**: End-to-end encryption was removed. Existing users need to go to `/classic` and follow the automated migration steps. (#254) -- **Breaking Change**: `v1` and `v2` API endpoints were removed, and `v3` API was added as a replacement. - -#### Migration guide - -- In your application, navigate to `/classic` and follow the automated migration steps. - - -## CLI - -The following log documentes the history of the CLI project - -### Unreleased - -None - -### 0.15.2 - 2025-10-05 - -* Support for 32bit linux, freebsd amd64, mac arm64. -* Remove Pro. - -### 0.15.1 - 2024-02-03 - -* Upgrade `color` dependency (#660). -* Use Go 1.21 (#658). - -### 0.15.0 - 2023-05-27 - -* Add `enableUpgradeCheck` configuration to allow to opt out of automatic update check. - -### 0.14.0 - 2023-03-10 - -* Remove `autocomplete` subcommand that was accidentally added by a dependency (#637) - -### 0.13.0 - 2023-02-10 - -* Allow to add note from stdin. - -``` -echo "test" | dnote add mybook - -dnote add mybook << EOF -test line 1 -test line 2 -EOF -``` - -### 0.12.0 - 2020-01-03 - -#### Upgrade guide - -* **On Linux or macOS** Please move your Dnote files to new directories based on the XDG base directory specfication. **On Windows**, no action is required. - -``` -# Move the database file -mv ~/.dnote/dnote.db ~/.local/share/dnote/dnote.db - -# Move the config file -mv ~/.dnote/dnoterc ~/.config/dnote/dnoterc - -# Delete ~/.dnote. (it is safe to delete DNOTE_TMPCONTENT.md files, if they exist.) -rm -rf ~/.dnote -``` - -If `~/.dnote` directory exists, dnote will continue to use that directory for backward compatibility until the next major release. - -#### Added - -- Add `--content-only` flag to print the note content only (#528) - -#### Changed - -- Use XDG base directory on Linux and macOS (#527) - -### 0.11.1 - 2020-04-25 - -#### Fixed - -- Fix upgrade URL (#453) - -#### Changed - -- Display hostname of the self-hosted instance while logging in (#454) -- Display helpful error if endpoint is misconfigured (#455) - -### 0.11.0 - 2020-02-05 - -#### Added - -- Allow to pass credentials through flags while logging in (#403) - -### 0.10.0 - 2019-09-30 - -#### Removed - -- **Breaking Change**: End-to-end encryption was removed. Previous versions will no longer be able to interact with the web API, because `v1` and `v2` endpoints were replaced by a new `v3` endpoint to remove encryption. - -#### Migration guide - -- If you are using Dnote Pro, change the value of `apiEndpoint` in `~/.dnote/dnoterc` to `https://api.getdnote.com`. - diff --git a/scripts/generate-changelog.sh b/scripts/generate-changelog.sh new file mode 100755 index 00000000..8f24a8ec --- /dev/null +++ b/scripts/generate-changelog.sh @@ -0,0 +1,62 @@ +#!/bin/bash +set -e + +# Usage: ./generate-changelog.sh +# Example: ./generate-changelog.sh cli cli-v0.15.2 cli-v0.15.1 + +COMPONENT=$1 +CURRENT_TAG=$2 +PREV_TAG=$3 + +if [ -z "$COMPONENT" ] || [ -z "$CURRENT_TAG" ]; then + echo "Usage: $0 [previous-tag]" + echo "Example: $0 cli cli-v0.15.2 cli-v0.15.1" + exit 1 +fi + +# Validate that tags match the component +if [[ ! "$CURRENT_TAG" =~ ^${COMPONENT}- ]]; then + echo "Error: Current tag '$CURRENT_TAG' doesn't match component '$COMPONENT'" + echo "Expected tag to start with '${COMPONENT}-'" + exit 1 +fi + +if [ -n "$PREV_TAG" ] && [[ ! "$PREV_TAG" =~ ^${COMPONENT}- ]]; then + echo "Error: Previous tag '$PREV_TAG' doesn't match component '$COMPONENT'" + echo "Expected tag to start with '${COMPONENT}-'" + exit 1 +fi + +# Define paths for each component +# Shared paths that apply to both components +SHARED_PATHS="pkg/dirs/" + +if [ "$COMPONENT" == "cli" ]; then + FILTER_PATHS="pkg/cli/ cmd/cli/ $SHARED_PATHS" +elif [ "$COMPONENT" == "server" ]; then + FILTER_PATHS="pkg/server/ host/ $SHARED_PATHS" +else + echo "Unknown component: $COMPONENT" + echo "Valid components: cli, server" + exit 1 +fi + +# Determine commit range +if [ -z "$PREV_TAG" ]; then + echo "Error: No previous tag specified" + exit 1 +fi + +RANGE="$PREV_TAG..$CURRENT_TAG" + +# Get all commits that touched the relevant paths +# Warnings go to stderr (visible in logs), commits go to stdout (captured for file) +COMMITS=$( + for path in $FILTER_PATHS; do + git log --oneline --no-merges --pretty=format:"- %s%n" "$RANGE" -- "$path" 2>&2 + done | sort -u | grep -v "^$" +) + +echo "## What's Changed" +echo "" +echo "$COMMITS" From 346bd9afb1c83eb31282c84f65470ae974cbb936 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 12 Oct 2025 15:08:11 -0700 Subject: [PATCH 10/33] Add dbPath flag and update apiEndpoint flag (#692) * Allow to specify CLI db path as a flag * Make API endpoint flag per command and change case --- .github/workflows/release-cli.yml | 19 --------- pkg/cli/cmd/login/login.go | 8 +++- pkg/cli/cmd/logout/logout.go | 10 +++++ pkg/cli/cmd/root/root.go | 10 ++--- pkg/cli/cmd/sync/sync.go | 7 ++++ pkg/cli/infra/init.go | 48 +++++++++++++--------- pkg/cli/infra/init_test.go | 29 ++++--------- pkg/cli/main.go | 12 ++---- pkg/cli/main_test.go | 68 +++++++++++++++++++++++++++++++ pkg/e2e/sync_test.go | 8 ++-- 10 files changed, 141 insertions(+), 78 deletions(-) diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 723c2d1a..81a2ea5e 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -75,22 +75,3 @@ jobs: --title="$TAG" \ --notes-file=/tmp/changelog.txt \ --draft - - - name: Bump Homebrew formula - env: - HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_RELEASE_TOKEN }} - run: | - VERSION="${{ steps.version.outputs.version }}" - TAG="cli-v${VERSION}" - - # Only bump Homebrew for stable releases (not prereleases) - if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - brew update-reset - brew bump-formula-pr \ - --no-browse \ - --tag="$TAG" \ - --revision="${{ github.sha }}" \ - dnote - else - echo "Skipping Homebrew update for prerelease version: $VERSION" - fi diff --git a/pkg/cli/cmd/login/login.go b/pkg/cli/cmd/login/login.go index 1e667382..4d8ee392 100644 --- a/pkg/cli/cmd/login/login.go +++ b/pkg/cli/cmd/login/login.go @@ -37,7 +37,7 @@ import ( var example = ` dnote login` -var usernameFlag, passwordFlag string +var usernameFlag, passwordFlag, apiEndpointFlag string // NewCmd returns a new login command func NewCmd(ctx context.DnoteCtx) *cobra.Command { @@ -51,6 +51,7 @@ func NewCmd(ctx context.DnoteCtx) *cobra.Command { f := cmd.Flags() f.StringVarP(&usernameFlag, "username", "u", "", "email address for authentication") f.StringVarP(&passwordFlag, "password", "p", "", "password for authentication") + f.StringVar(&apiEndpointFlag, "apiEndpoint", "", "API endpoint to connect to (defaults to value in config)") return cmd } @@ -147,6 +148,11 @@ func getGreeting(ctx context.DnoteCtx) string { func newRun(ctx context.DnoteCtx) infra.RunEFunc { return func(cmd *cobra.Command, args []string) error { + // Override APIEndpoint if flag was provided + if apiEndpointFlag != "" { + ctx.APIEndpoint = apiEndpointFlag + } + greeting := getGreeting(ctx) log.Plain(greeting) diff --git a/pkg/cli/cmd/logout/logout.go b/pkg/cli/cmd/logout/logout.go index 0137e078..008c9652 100644 --- a/pkg/cli/cmd/logout/logout.go +++ b/pkg/cli/cmd/logout/logout.go @@ -37,6 +37,8 @@ var ErrNotLoggedIn = errors.New("not logged in") var example = ` dnote logout` +var apiEndpointFlag string + // NewCmd returns a new logout command func NewCmd(ctx context.DnoteCtx) *cobra.Command { cmd := &cobra.Command{ @@ -46,6 +48,9 @@ func NewCmd(ctx context.DnoteCtx) *cobra.Command { RunE: newRun(ctx), } + f := cmd.Flags() + f.StringVar(&apiEndpointFlag, "apiEndpoint", "", "API endpoint to connect to (defaults to value in config)") + return cmd } @@ -84,6 +89,11 @@ func Do(ctx context.DnoteCtx) error { func newRun(ctx context.DnoteCtx) infra.RunEFunc { return func(cmd *cobra.Command, args []string) error { + // Override APIEndpoint if flag was provided + if apiEndpointFlag != "" { + ctx.APIEndpoint = apiEndpointFlag + } + err := Do(ctx) if err == ErrNotLoggedIn { log.Error("not logged in\n") diff --git a/pkg/cli/cmd/root/root.go b/pkg/cli/cmd/root/root.go index 750629e4..604f7682 100644 --- a/pkg/cli/cmd/root/root.go +++ b/pkg/cli/cmd/root/root.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" ) -var apiEndpointFlag string +var dbPathFlag string var root = &cobra.Command{ Use: "dnote", @@ -35,7 +35,7 @@ var root = &cobra.Command{ } func init() { - root.PersistentFlags().StringVar(&apiEndpointFlag, "api-endpoint", "", "the API endpoint to connect to (defaults to value in config)") + root.PersistentFlags().StringVar(&dbPathFlag, "dbPath", "", "the path to the database file (defaults to standard location)") } // GetRoot returns the root command @@ -43,9 +43,9 @@ func GetRoot() *cobra.Command { return root } -// GetAPIEndpointFlag returns the value of the --api-endpoint flag -func GetAPIEndpointFlag() string { - return apiEndpointFlag +// GetDBPathFlag returns the value of the --dbPath flag +func GetDBPathFlag() string { + return dbPathFlag } // Register adds a new command diff --git a/pkg/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go index ff8e8a5f..a1fea893 100644 --- a/pkg/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -44,6 +44,7 @@ var example = ` dnote sync` var isFullSync bool +var apiEndpointFlag string // NewCmd returns a new sync command func NewCmd(ctx context.DnoteCtx) *cobra.Command { @@ -57,6 +58,7 @@ func NewCmd(ctx context.DnoteCtx) *cobra.Command { f := cmd.Flags() f.BoolVarP(&isFullSync, "full", "f", false, "perform a full sync instead of incrementally syncing only the changed data.") + f.StringVar(&apiEndpointFlag, "apiEndpoint", "", "API endpoint to connect to (defaults to value in config)") return cmd } @@ -931,6 +933,11 @@ func prepareEmptyServerSync(tx *database.DB) error { func newRun(ctx context.DnoteCtx) infra.RunEFunc { return func(cmd *cobra.Command, args []string) error { + // Override APIEndpoint if flag was provided + if apiEndpointFlag != "" { + ctx.APIEndpoint = apiEndpointFlag + } + if ctx.SessionKey == "" { return errors.New("not logged in") } diff --git a/pkg/cli/infra/init.go b/pkg/cli/infra/init.go index 532f1f1e..0d2d767a 100644 --- a/pkg/cli/infra/init.go +++ b/pkg/cli/infra/init.go @@ -42,6 +42,11 @@ import ( "github.com/spf13/cobra" ) +const ( + // DefaultAPIEndpoint is the default API endpoint used when none is configured + DefaultAPIEndpoint = "http://localhost:3001/api" +) + // RunEFunc is a function type of dnote commands type RunEFunc func(*cobra.Command, []string) error @@ -59,7 +64,12 @@ func checkLegacyDBPath() (string, bool) { return "", false } -func getDBPath(paths context.Paths) string { +func getDBPath(paths context.Paths, customPath string) string { + // If custom path is provided, use it + if customPath != "" { + return customPath + } + legacyDnoteDir, ok := checkLegacyDBPath() if ok { return fmt.Sprintf("%s/%s", legacyDnoteDir, consts.DnoteDBFileName) @@ -71,7 +81,7 @@ func getDBPath(paths context.Paths) string { // newBaseCtx creates a minimal context with paths and database connection. // This base context is used for file and database initialization before // being enriched with config values by setupCtx. -func newBaseCtx(versionTag string) (context.DnoteCtx, error) { +func newBaseCtx(versionTag, customDBPath string) (context.DnoteCtx, error) { dnoteDir := getLegacyDnotePath(dirs.Home) paths := context.Paths{ Home: dirs.Home, @@ -81,7 +91,7 @@ func newBaseCtx(versionTag string) (context.DnoteCtx, error) { LegacyDnote: dnoteDir, } - dbPath := getDBPath(paths) + dbPath := getDBPath(paths, customDBPath) db, err := database.Open(dbPath) if err != nil { @@ -98,13 +108,14 @@ func newBaseCtx(versionTag string) (context.DnoteCtx, error) { } // Init initializes the Dnote environment and returns a new dnote context -func Init(versionTag, apiEndpoint string) (*context.DnoteCtx, error) { - ctx, err := newBaseCtx(versionTag) +// apiEndpoint is used when creating a new config file (e.g., from ldflags during tests) +func Init(versionTag, apiEndpoint, dbPath string) (*context.DnoteCtx, error) { + ctx, err := newBaseCtx(versionTag, dbPath) if err != nil { return nil, errors.Wrap(err, "initializing a context") } - if err := InitFiles(ctx, apiEndpoint); err != nil { + if err := initFiles(ctx, apiEndpoint); err != nil { return nil, errors.Wrap(err, "initializing files") } @@ -122,7 +133,7 @@ func Init(versionTag, apiEndpoint string) (*context.DnoteCtx, error) { return nil, errors.Wrap(err, "running migration") } - ctx, err = setupCtx(ctx, apiEndpoint) + ctx, err = setupCtx(ctx) if err != nil { return nil, errors.Wrap(err, "setting up the context") } @@ -134,8 +145,7 @@ func Init(versionTag, apiEndpoint string) (*context.DnoteCtx, error) { // setupCtx enriches the base context with values from config file and database. // This is called after files and database have been initialized. -// If apiEndpoint is provided, it overrides the value from config. -func setupCtx(ctx context.DnoteCtx, apiEndpoint string) (context.DnoteCtx, error) { +func setupCtx(ctx context.DnoteCtx) (context.DnoteCtx, error) { db := ctx.DB var sessionKey string @@ -155,19 +165,13 @@ func setupCtx(ctx context.DnoteCtx, apiEndpoint string) (context.DnoteCtx, error return ctx, errors.Wrap(err, "reading config") } - // Use override if provided, otherwise use config value - endpoint := cf.APIEndpoint - if apiEndpoint != "" { - endpoint = apiEndpoint - } - ret := context.DnoteCtx{ Paths: ctx.Paths, Version: ctx.Version, DB: ctx.DB, SessionKey: sessionKey, SessionKeyExpiry: sessionKeyExpiry, - APIEndpoint: endpoint, + APIEndpoint: cf.APIEndpoint, Editor: cf.Editor, Clock: clock.New(), EnableUpgradeCheck: cf.EnableUpgradeCheck, @@ -367,9 +371,15 @@ func initConfigFile(ctx context.DnoteCtx, apiEndpoint string) error { editor := getEditorCommand() + // Use default API endpoint if none provided + endpoint := apiEndpoint + if endpoint == "" { + endpoint = DefaultAPIEndpoint + } + cf := config.Config{ Editor: editor, - APIEndpoint: apiEndpoint, + APIEndpoint: endpoint, EnableUpgradeCheck: true, } @@ -380,8 +390,8 @@ func initConfigFile(ctx context.DnoteCtx, apiEndpoint string) error { return nil } -// InitFiles creates, if necessary, the dnote directory and files inside -func InitFiles(ctx context.DnoteCtx, apiEndpoint string) error { +// initFiles creates, if necessary, the dnote directory and files inside +func initFiles(ctx context.DnoteCtx, apiEndpoint string) error { if err := initDnoteDir(ctx); err != nil { return errors.Wrap(err, "creating the dnote dir") } diff --git a/pkg/cli/infra/init_test.go b/pkg/cli/infra/init_test.go index cb50a95f..5fff1c93 100644 --- a/pkg/cli/infra/init_test.go +++ b/pkg/cli/infra/init_test.go @@ -95,7 +95,7 @@ func TestInitSystemKV_existing(t *testing.T) { assert.Equal(t, val, "testVal", "system value should not have been updated") } -func TestInit_APIEndpointChange(t *testing.T) { +func TestInit_APIEndpoint(t *testing.T) { // Create a temporary directory for test tmpDir, err := os.MkdirTemp("", "dnote-init-test-*") if err != nil { @@ -108,35 +108,20 @@ func TestInit_APIEndpointChange(t *testing.T) { t.Setenv("XDG_DATA_HOME", fmt.Sprintf("%s/data", tmpDir)) t.Setenv("XDG_CACHE_HOME", fmt.Sprintf("%s/cache", tmpDir)) - // First init. - endpoint1 := "http://127.0.0.1:3001" - ctx, err := Init("test-version", endpoint1) + // Initialize - should create config with default apiEndpoint + ctx, err := Init("test-version", "", "") if err != nil { t.Fatal(errors.Wrap(err, "initializing")) } defer ctx.DB.Close() - assert.Equal(t, ctx.APIEndpoint, endpoint1, "should use endpoint1 API endpoint") - // Test that config was written with endpoint1. + // Read the config that was created cf, err := config.Read(*ctx) if err != nil { t.Fatal(errors.Wrap(err, "reading config")) } - // Second init with different endpoint. - endpoint2 := "http://127.0.0.1:3002" - ctx2, err := Init("test-version", endpoint2) - if err != nil { - t.Fatal(errors.Wrap(err, "initializing with override")) - } - defer ctx2.DB.Close() - // Context must be using that endpoint. - assert.Equal(t, ctx2.APIEndpoint, endpoint2, "should use endpoint2 API endpoint") - - // The config file shouldn't have been modified. - cf2, err := config.Read(*ctx2) - if err != nil { - t.Fatal(errors.Wrap(err, "reading config after override")) - } - assert.Equal(t, cf2.APIEndpoint, cf.APIEndpoint, "config should still have original endpoint, not endpoint2") + // Context should use the apiEndpoint from config + assert.Equal(t, ctx.APIEndpoint, DefaultAPIEndpoint, "context should use apiEndpoint from config") + assert.Equal(t, cf.APIEndpoint, DefaultAPIEndpoint, "context should use apiEndpoint from config") } diff --git a/pkg/cli/main.go b/pkg/cli/main.go index 31c81dd5..1ba97358 100644 --- a/pkg/cli/main.go +++ b/pkg/cli/main.go @@ -46,16 +46,12 @@ var apiEndpoint string var versionTag = "master" func main() { - // Parse flags early to check if --api-endpoint was provided + // Parse flags early to get --dbPath before initializing database root.GetRoot().ParseFlags(os.Args[1:]) + dbPath := root.GetDBPathFlag() - // Use flag value if provided, otherwise use ldflags value - endpoint := apiEndpoint - if flagValue := root.GetAPIEndpointFlag(); flagValue != "" { - endpoint = flagValue - } - - ctx, err := infra.Init(versionTag, endpoint) + // Initialize context - defaultAPIEndpoint is used when creating new config file + ctx, err := infra.Init(versionTag, apiEndpoint, dbPath) if err != nil { panic(errors.Wrap(err, "initializing context")) } diff --git a/pkg/cli/main_test.go b/pkg/cli/main_test.go index 151d4cbf..63a95d87 100644 --- a/pkg/cli/main_test.go +++ b/pkg/cli/main_test.go @@ -501,3 +501,71 @@ func TestRemoveBook(t *testing.T) { }) } } + +func TestDBPathFlag(t *testing.T) { + // Helper function to verify database contents + verifyDatabase := func(t *testing.T, dbPath, expectedBook, expectedNote string) *database.DB { + ok, err := utils.FileExists(dbPath) + if err != nil { + t.Fatal(errors.Wrapf(err, "checking if custom db exists at %s", dbPath)) + } + if !ok { + t.Errorf("custom database was not created at %s", dbPath) + } + + db, err := database.Open(dbPath) + if err != nil { + t.Fatal(errors.Wrapf(err, "opening db at %s", dbPath)) + } + + var noteCount, bookCount int + database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) + database.MustScan(t, "counting notes", db.QueryRow("SELECT count(*) FROM notes"), ¬eCount) + + assert.Equalf(t, bookCount, 1, fmt.Sprintf("%s book count mismatch", dbPath)) + assert.Equalf(t, noteCount, 1, fmt.Sprintf("%s note count mismatch", dbPath)) + + var book database.Book + database.MustScan(t, "getting book", db.QueryRow("SELECT label FROM books"), &book.Label) + assert.Equalf(t, book.Label, expectedBook, fmt.Sprintf("%s book label mismatch", dbPath)) + + var note database.Note + database.MustScan(t, "getting note", db.QueryRow("SELECT body FROM notes"), ¬e.Body) + assert.Equalf(t, note.Body, expectedNote, fmt.Sprintf("%s note body mismatch", dbPath)) + + return db + } + + // Setup - use two different custom database paths + customDBPath1 := "./tmp/custom-test1.db" + customDBPath2 := "./tmp/custom-test2.db" + defer testutils.RemoveDir(t, "./tmp") + + customOpts := testutils.RunDnoteCmdOptions{ + Env: []string{ + fmt.Sprintf("XDG_CONFIG_HOME=%s", testDir), + fmt.Sprintf("XDG_DATA_HOME=%s", testDir), + fmt.Sprintf("XDG_CACHE_HOME=%s", testDir), + }, + } + + // Execute - add different notes to each database + testutils.RunDnoteCmd(t, customOpts, binaryName, "--dbPath", customDBPath1, "add", "db1-book", "-c", "content in db1") + testutils.RunDnoteCmd(t, customOpts, binaryName, "--dbPath", customDBPath2, "add", "db2-book", "-c", "content in db2") + + // Test both databases + db1 := verifyDatabase(t, customDBPath1, "db1-book", "content in db1") + defer db1.Close() + + db2 := verifyDatabase(t, customDBPath2, "db2-book", "content in db2") + defer db2.Close() + + // Verify that the databases are independent + var db1HasDB2Book int + db1.QueryRow("SELECT count(*) FROM books WHERE label = ?", "db2-book").Scan(&db1HasDB2Book) + assert.Equal(t, db1HasDB2Book, 0, "db1 should not have db2's book") + + var db2HasDB1Book int + db2.QueryRow("SELECT count(*) FROM books WHERE label = ?", "db1-book").Scan(&db2HasDB1Book) + assert.Equal(t, db2HasDB1Book, 0, "db2 should not have db1's book") +} diff --git a/pkg/e2e/sync_test.go b/pkg/e2e/sync_test.go index b4fec91f..40fe976c 100644 --- a/pkg/e2e/sync_test.go +++ b/pkg/e2e/sync_test.go @@ -4254,7 +4254,7 @@ func TestSync_EmptyServer(t *testing.T) { clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--api-endpoint", apiEndpointA, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) // Verify sync to Server A succeeded checkStateWithDB(t, ctx, userA, serverDbA, systemState{ @@ -4278,7 +4278,7 @@ func TestSync_EmptyServer(t *testing.T) { cliDatabase.MustExec(t, "updating session_key_expiry for B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) // Should detect empty server and prompt - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "--api-endpoint", apiEndpointB, "sync") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) // Verify Server B now has data checkStateWithDB(t, ctx, userB, serverDbB, systemState{ @@ -4296,7 +4296,7 @@ func TestSync_EmptyServer(t *testing.T) { cliDatabase.MustExec(t, "updating session_key_expiry back to A", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) // Should NOT trigger empty server detection (Server A has MaxUSN > 0) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--api-endpoint", apiEndpointA, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) // Verify Server A still has its data checkStateWithDB(t, ctx, userA, serverDbA, systemState{ @@ -4314,7 +4314,7 @@ func TestSync_EmptyServer(t *testing.T) { cliDatabase.MustExec(t, "updating session_key_expiry back to B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) // Should NOT trigger empty server detection (Server B now has MaxUSN > 0 from Step 2) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--api-endpoint", apiEndpointB, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) // Verify both servers maintain independent state checkStateWithDB(t, ctx, userB, serverDbB, systemState{ From c8238aa327aa16a9a05f9113da6e0a64d4939f25 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 12 Oct 2025 16:17:01 -0700 Subject: [PATCH 11/33] Handle errors (#693) --- pkg/cli/cmd/sync/sync.go | 4 +++- pkg/cli/infra/init.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go index a1fea893..1db3848e 100644 --- a/pkg/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -1060,7 +1060,9 @@ func newRun(ctx context.DnoteCtx) infra.RunEFunc { } } - tx.Commit() + if err := tx.Commit(); err != nil { + return errors.Wrap(err, "committing transaction") + } log.Success("success\n") diff --git a/pkg/cli/infra/init.go b/pkg/cli/infra/init.go index 0d2d767a..4bbaae6e 100644 --- a/pkg/cli/infra/init.go +++ b/pkg/cli/infra/init.go @@ -291,7 +291,9 @@ func InitSystem(ctx context.DnoteCtx) error { return errors.Wrapf(err, "initializing system config for %s", consts.SystemLastSyncAt) } - tx.Commit() + if err := tx.Commit(); err != nil { + return errors.Wrap(err, "committing transaction") + } return nil } From 03889a3d7e1a72ca5d65b6272cac58c22ae422d6 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sat, 18 Oct 2025 16:03:12 -0700 Subject: [PATCH 12/33] Converge if using same book names while syncing (#694) * Add healthcheck for Docker * Prevent nil pointer if endpoint is wrong * Converge if using same book names while syncing --- host/docker/Dockerfile | 3 + pkg/cli/client/client.go | 10 +- pkg/cli/client/client_test.go | 12 +++ pkg/cli/cmd/sync/sync.go | 2 +- pkg/cli/infra/init_test.go | 4 + pkg/cli/testutils/main.go | 9 ++ pkg/e2e/sync_test.go | 181 +++++++++++++++++++++++++++------- 7 files changed, 182 insertions(+), 39 deletions(-) diff --git a/host/docker/Dockerfile b/host/docker/Dockerfile index cd93f6ca..88681591 100644 --- a/host/docker/Dockerfile +++ b/host/docker/Dockerfile @@ -14,3 +14,6 @@ ENTRYPOINT ["./entrypoint.sh"] CMD ./dnote-server start EXPOSE 3001 + +HEALTHCHECK --interval=30s --timeout=3s --start-period=10s \ + CMD wget --no-verbose --tries=1 -O /dev/null http://localhost:3001/health || exit 1 diff --git a/pkg/cli/client/client.go b/pkg/cli/client/client.go index 021afe7d..86df4374 100644 --- a/pkg/cli/client/client.go +++ b/pkg/cli/client/client.go @@ -579,10 +579,12 @@ func Signin(ctx context.DnoteCtx, email, password string) (SigninResponse, error return SigninResponse{}, errors.Wrap(err, "marshaling payload") } res, err := doReq(ctx, "POST", "/v3/signin", string(b), nil) - - if res.StatusCode == http.StatusUnauthorized { - return SigninResponse{}, ErrInvalidLogin - } else if err != nil { + if err != nil { + // Check if this is a 401 Unauthorized error + var httpErr *HTTPError + if errors.As(err, &httpErr) && httpErr.StatusCode == http.StatusUnauthorized { + return SigninResponse{}, ErrInvalidLogin + } return SigninResponse{}, errors.Wrap(err, "making http request") } diff --git a/pkg/cli/client/client_test.go b/pkg/cli/client/client_test.go index 31b6d6c8..3bb99e93 100644 --- a/pkg/cli/client/client_test.go +++ b/pkg/cli/client/client_test.go @@ -124,6 +124,18 @@ func TestSignIn(t *testing.T) { assert.Equal(t, result.Key, "", "Key mismatch") assert.Equal(t, result.ExpiresAt, int64(0), "ExpiresAt mismatch") }) + + t.Run("network error", func(t *testing.T) { + // Use an invalid endpoint that will fail to connect + endpoint := "http://localhost:99999/api" + result, err := Signin(context.DnoteCtx{APIEndpoint: endpoint, HTTPClient: testClient}, "alice@example.com", "pass1234") + + if err == nil { + t.Error("error should have been returned for network failure") + } + assert.Equal(t, result.Key, "", "Key mismatch") + assert.Equal(t, result.ExpiresAt, int64(0), "ExpiresAt mismatch") + }) } func TestSignOut(t *testing.T) { diff --git a/pkg/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go index 1db3848e..28ec71a7 100644 --- a/pkg/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -222,7 +222,7 @@ func mergeBook(tx *database.DB, b client.SyncFragBook, mode int) error { return errors.Wrap(err, "getting a new book label for conflict resolution") } - if _, err := tx.Exec("UPDATE books SET label = ?, dirty = ? WHERE label = ?", newLabel, true, b.Label); err != nil { + if _, err := tx.Exec("UPDATE books SET label = ?, dirty = ? WHERE label = ? AND uuid != ?", newLabel, true, b.Label, b.UUID); err != nil { return errors.Wrap(err, "resolving duplicate book label") } } diff --git a/pkg/cli/infra/init_test.go b/pkg/cli/infra/init_test.go index 5fff1c93..546baab0 100644 --- a/pkg/cli/infra/init_test.go +++ b/pkg/cli/infra/init_test.go @@ -26,6 +26,7 @@ import ( "github.com/dnote/dnote/pkg/assert" "github.com/dnote/dnote/pkg/cli/config" "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/dirs" "github.com/pkg/errors" ) @@ -108,6 +109,9 @@ func TestInit_APIEndpoint(t *testing.T) { t.Setenv("XDG_DATA_HOME", fmt.Sprintf("%s/data", tmpDir)) t.Setenv("XDG_CACHE_HOME", fmt.Sprintf("%s/cache", tmpDir)) + // Force dirs package to reload with new environment + dirs.Reload() + // Initialize - should create config with default apiEndpoint ctx, err := Init("test-version", "", "") if err != nil { diff --git a/pkg/cli/testutils/main.go b/pkg/cli/testutils/main.go index 9b4e945d..ee853b48 100644 --- a/pkg/cli/testutils/main.go +++ b/pkg/cli/testutils/main.go @@ -368,3 +368,12 @@ func MustGenerateUUID(t *testing.T) string { return ret } + +func MustOpenDatabase(t *testing.T, dbPath string) *database.DB { + db, err := database.Open(dbPath) + if err != nil { + t.Fatal(errors.Wrap(err, "opening database")) + } + + return db +} diff --git a/pkg/e2e/sync_test.go b/pkg/e2e/sync_test.go index 40fe976c..c2a1c4ee 100644 --- a/pkg/e2e/sync_test.go +++ b/pkg/e2e/sync_test.go @@ -36,6 +36,7 @@ import ( "github.com/dnote/dnote/pkg/cli/consts" "github.com/dnote/dnote/pkg/cli/context" cliDatabase "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/testutils" clitest "github.com/dnote/dnote/pkg/cli/testutils" "github.com/dnote/dnote/pkg/clock" "github.com/dnote/dnote/pkg/server/app" @@ -134,18 +135,28 @@ func TestMain(m *testing.M) { } // helpers -func setupUser(t *testing.T, ctx *context.DnoteCtx) database.User { +func setupUser(t *testing.T, db *cliDatabase.DB) database.User { user := apitest.SetupUserData(serverDb) apitest.SetupAccountData(serverDb, user, "alice@example.com", "pass1234") - // log in the user in CLI - session := apitest.SetupSession(serverDb, user) - cliDatabase.MustExec(t, "inserting session_key", ctx.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, session.Key) - cliDatabase.MustExec(t, "inserting session_key_expiry", ctx.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, session.ExpiresAt.Unix()) + return user +} + +func setupUserAndLogin(t *testing.T, db *cliDatabase.DB) database.User { + user := setupUser(t, db) + login(t, db, user) return user } +// log in the user in CLI +func login(t *testing.T, db *cliDatabase.DB, user database.User) { + session := apitest.SetupSession(serverDb, user) + + cliDatabase.MustExec(t, "inserting session_key", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, session.Key) + cliDatabase.MustExec(t, "inserting session_key_expiry", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, session.ExpiresAt.Unix()) +} + func apiCreateBook(t *testing.T, user database.User, name, message string) string { res := doHTTPReq(t, "POST", "/v3/books", fmt.Sprintf(`{"name": "%s"}`, name), message, user) @@ -221,7 +232,7 @@ func testSyncCmd(t *testing.T, fullSync bool, setup setupFunc, assert assertFunc ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) ids := setup(t, ctx, user) if fullSync { @@ -245,12 +256,10 @@ type systemState struct { // checkState compares the state of the client and the server with the given system state func checkState(t *testing.T, ctx context.DnoteCtx, user database.User, expected systemState) { - checkStateWithDB(t, ctx, user, serverDb, expected) + checkStateWithDB(t, ctx.DB, user, serverDb, expected) } -func checkStateWithDB(t *testing.T, ctx context.DnoteCtx, user database.User, db *gorm.DB, expected systemState) { - clientDB := ctx.DB - +func checkStateWithDB(t *testing.T, clientDB *cliDatabase.DB, user database.User, serverDB *gorm.DB, expected systemState) { var clientBookCount, clientNoteCount int cliDatabase.MustScan(t, "counting client notes", clientDB.QueryRow("SELECT count(*) FROM notes"), &clientNoteCount) cliDatabase.MustScan(t, "counting client books", clientDB.QueryRow("SELECT count(*) FROM books"), &clientBookCount) @@ -265,12 +274,12 @@ func checkStateWithDB(t *testing.T, ctx context.DnoteCtx, user database.User, db assert.Equal(t, clientLastSyncAt, expected.clientLastSyncAt, "client last_sync_at mismatch") var serverBookCount, serverNoteCount int64 - apitest.MustExec(t, db.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") - apitest.MustExec(t, db.Model(&database.Book{}).Count(&serverBookCount), "counting api notes") + apitest.MustExec(t, serverDB.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") + apitest.MustExec(t, serverDB.Model(&database.Book{}).Count(&serverBookCount), "counting api notes") assert.Equal(t, serverNoteCount, expected.serverNoteCount, "server note count mismatch") assert.Equal(t, serverBookCount, expected.serverBookCount, "server book count mismatch") var serverUser database.User - apitest.MustExec(t, db.Where("id = ?", user.ID).First(&serverUser), "finding user") + apitest.MustExec(t, serverDB.Where("id = ?", user.ID).First(&serverUser), "finding user") assert.Equal(t, serverUser.MaxUSN, expected.serverUserMaxUSN, "user max_usn mismatch") } @@ -387,7 +396,7 @@ func TestSync_oneway(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) setup(t, ctx, user) clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") @@ -401,7 +410,7 @@ func TestSync_oneway(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) setup(t, ctx, user) clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") @@ -543,7 +552,7 @@ func TestSync_oneway(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) setup(t, ctx, user) clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") @@ -557,7 +566,7 @@ func TestSync_oneway(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) setup(t, ctx, user) clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") @@ -3849,7 +3858,7 @@ func TestFullSync(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) ids := setup(t, ctx, user) clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") @@ -3867,7 +3876,7 @@ func TestFullSync(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) ids := setup(t, ctx, user) clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") @@ -3892,7 +3901,7 @@ func TestSync_EmptyServer(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) // Step 1: Create local data and sync to server clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") @@ -3913,7 +3922,7 @@ func TestSync_EmptyServer(t *testing.T) { // Step 2: Clear all server data to simulate switching to a completely new empty server apitest.ClearData(serverDb) // Recreate user and session (simulating a new server) - user = setupUser(t, &ctx) + user = setupUserAndLogin(t, ctx.DB) // Step 3: Sync again - should detect empty server and prompt user // User confirms with "y" @@ -3967,7 +3976,7 @@ func TestSync_EmptyServer(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) // Step 1: Create local data and sync to server clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") @@ -3987,7 +3996,7 @@ func TestSync_EmptyServer(t *testing.T) { // Step 2: Clear all server data apitest.ClearData(serverDb) - user = setupUser(t, &ctx) + user = setupUserAndLogin(t, ctx.DB) // Step 3: Sync again but user cancels with "n" output, err := clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserCancelEmptyServerSync, cliBinaryName, "sync") @@ -4036,7 +4045,7 @@ func TestSync_EmptyServer(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) // Step 1: Create local data and sync to server clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") @@ -4060,7 +4069,7 @@ func TestSync_EmptyServer(t *testing.T) { // Step 3: Clear server data to simulate switching to empty server apitest.ClearData(serverDb) - user = setupUser(t, &ctx) + user = setupUserAndLogin(t, ctx.DB) // Step 4: Sync - should NOT prompt because bookCount=0 and noteCount=0 (counting only deleted=0) // This should complete without user interaction @@ -4113,7 +4122,7 @@ func TestSync_EmptyServer(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) // Step 1: Create local data and sync to establish lastMaxUSN > 0 clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") @@ -4133,7 +4142,7 @@ func TestSync_EmptyServer(t *testing.T) { // Step 2: Clear server to simulate switching to empty server apitest.ClearData(serverDb) - user = setupUser(t, &ctx) + user = setupUserAndLogin(t, ctx.DB) // Step 3: Trigger sync which will detect empty server and prompt user // Inside the callback (before confirming), we simulate Client B uploading via API. @@ -4169,7 +4178,7 @@ func TestSync_EmptyServer(t *testing.T) { clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, raceCallback, cliBinaryName, "sync") // Verify final state - both clients' data preserved - checkStateWithDB(t, ctx, user, serverDb, systemState{ + checkStateWithDB(t, ctx.DB, user, serverDb, systemState{ clientNoteCount: 4, // Both clients' notes clientBookCount: 4, // js, css, js_2, css_2 clientLastMaxUSN: 8, // 4 from Client B + 4 from Client A's renamed books/notes @@ -4257,7 +4266,7 @@ func TestSync_EmptyServer(t *testing.T) { clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) // Verify sync to Server A succeeded - checkStateWithDB(t, ctx, userA, serverDbA, systemState{ + checkStateWithDB(t, ctx.DB, userA, serverDbA, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4281,7 +4290,7 @@ func TestSync_EmptyServer(t *testing.T) { clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) // Verify Server B now has data - checkStateWithDB(t, ctx, userB, serverDbB, systemState{ + checkStateWithDB(t, ctx.DB, userB, serverDbB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4299,7 +4308,7 @@ func TestSync_EmptyServer(t *testing.T) { clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) // Verify Server A still has its data - checkStateWithDB(t, ctx, userA, serverDbA, systemState{ + checkStateWithDB(t, ctx.DB, userA, serverDbA, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4317,7 +4326,7 @@ func TestSync_EmptyServer(t *testing.T) { clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) // Verify both servers maintain independent state - checkStateWithDB(t, ctx, userB, serverDbB, systemState{ + checkStateWithDB(t, ctx.DB, userB, serverDbB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4349,7 +4358,7 @@ func TestSync_FreshClientConcurrent(t *testing.T) { ctx := context.InitTestCtx(t, paths, nil) defer context.TeardownTestCtx(t, ctx) - user := setupUser(t, &ctx) + user := setupUserAndLogin(t, ctx.DB) // Client A: Create local data (never sync) clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") @@ -4367,7 +4376,7 @@ func TestSync_FreshClientConcurrent(t *testing.T) { // Verify: Should have 4 books and 4 notes on both client and server // USN breakdown: 2 books + 2 notes from Client B (USN 1-4), then 2 books + 2 notes from Client A (USN 5-8) - checkStateWithDB(t, ctx, user, serverDb, systemState{ + checkStateWithDB(t, ctx.DB, user, serverDb, systemState{ clientNoteCount: 4, clientBookCount: 4, clientLastMaxUSN: 8, @@ -4439,3 +4448,107 @@ func TestSync_FreshClientConcurrent(t *testing.T) { assert.NotEqual(t, cliNoteCSS1.USN, 0, "client note 'css1' should have non-zero USN") assert.NotEqual(t, cliNoteCSS2.USN, 0, "client note 'css2' should have non-zero USN") } + +// TestSync_ConvergeSameBookNames tests that two clients don't enter an infinite sync loop if they +// try to sync books with the same names. Books shouldn't get marked dirty when re-downloaded from server. +func TestSync_ConvergeSameBookNames(t *testing.T) { + // Clean up and prepare server + apitest.ClearData(serverDb) + defer apitest.ClearData(serverDb) + + clearTmp(t) + + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + + // Setup two separate client databases + client1DB := fmt.Sprintf("%s/client1.db", tmpDirPath) + client2DB := fmt.Sprintf("%s/client2.db", tmpDirPath) + defer os.Remove(client1DB) + defer os.Remove(client2DB) + + // Set up sessions + user := setupUser(t, ctx.DB) + db1 := testutils.MustOpenDatabase(t, client1DB) + db2 := testutils.MustOpenDatabase(t, client2DB) + defer db1.Close() + defer db2.Close() + + // Client 1: First sync to empty server + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "add", "testbook", "-c", "client1 note1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "add", "anotherbook", "-c", "client1 note2") + login(t, db1, user) + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + checkStateWithDB(t, db1, user, serverDb, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Client 2: Sync (downloads client 1's data, adds own notes) ===== + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client2DB, "add", "testbook", "-c", "client2 note1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client2DB, "add", "anotherbook", "-c", "client2 note2") + login(t, db2, user) + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client2DB, "sync") + // Verify state after client2 sync + checkStateWithDB(t, db2, user, serverDb, systemState{ + clientNoteCount: 4, + clientBookCount: 2, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 2, + serverUserMaxUSN: 8, + }) + + // Client 1: Sync again. It downloads client2's changes (2 extra notes). + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + + // Verify MaxUSN did not increase (client1 should only download, not upload) + // Client1 still has: 2 original books + 4 notes (2 own + 2 from client2) + checkStateWithDB(t, db1, user, serverDb, systemState{ + clientNoteCount: 4, + clientBookCount: 2, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 2, + serverUserMaxUSN: 8, + }) + + // Verify no infinite loop: alternate syncing + // Both clients should be able to sync without any changes (MaxUSN stays at 8) + for range 3 { + // Client 2 syncs + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client2DB, "sync") + + // Verify client2 state unchanged + checkStateWithDB(t, db2, user, serverDb, systemState{ + clientNoteCount: 4, + clientBookCount: 2, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 2, + serverUserMaxUSN: 8, + }) + + // Client 1 syncs + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + + // Verify client1 state unchanged + checkStateWithDB(t, db1, user, serverDb, systemState{ + clientNoteCount: 4, + clientBookCount: 2, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 2, + serverUserMaxUSN: 8, + }) + } +} From 41f25514f0c2c9c21db848315fbf1aae956fc03d Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 19 Oct 2025 01:01:26 -0700 Subject: [PATCH 13/33] Link to the doc (#695) --- README.md | 4 +- SELF_HOSTING.md | 124 +++++++++--------------------------------- host/docker/README.md | 30 ---------- 3 files changed, 29 insertions(+), 129 deletions(-) delete mode 100644 host/docker/README.md diff --git a/README.md b/README.md index e9469d83..fbe46e26 100644 --- a/README.md +++ b/README.md @@ -51,8 +51,8 @@ services: restart: unless-stopped ``` -Or see the [guide](https://github.com/dnote/dnote/blob/master/SELF_HOSTING.md) for binary installation and configuration options. +Or see the [guide](https://www.getdnote.com/docs/server/manual) for binary installation. ## Documentation -See the [Dnote wiki](https://github.com/dnote/dnote/wiki) for full documentation. +See the [Dnote doc](https://www.getdnote.com/docs). diff --git a/SELF_HOSTING.md b/SELF_HOSTING.md index d033b45e..3638cb01 100644 --- a/SELF_HOSTING.md +++ b/SELF_HOSTING.md @@ -1,8 +1,33 @@ # Self-Hosting Dnote Server -For Docker installation, see [the Docker guide](https://github.com/dnote/dnote/blob/master/host/docker/README.md). +Please see the [doc](https://www.getdnote.com/docs/server) for more. -## Quick Start +## Docker Installation + +1. Install [Docker](https://docs.docker.com/install/). +2. Install Docker [Compose plugin](https://docs.docker.com/compose/install/linux/). +3. Download the [compose.yml](https://raw.githubusercontent.com/dnote/dnote/master/host/docker/compose.yml) file by running: + +``` +curl https://raw.githubusercontent.com/dnote/dnote/master/host/docker/compose.yml > compose.yml +``` + +4. Run the following to download the images and run the containers + +``` +docker compose pull +docker compose up -d +``` + +Visit http://localhost:3001 in your browser to see Dnote running. + +### Supported platform + +Currently, the official Docker image for Dnote supports Linux running AMD64 CPU architecture. + +If you run ARM64, please install Dnote server by downloading a binary distribution (see below). + +## Manual Installation Download from [releases](https://github.com/dnote/dnote/releases), extract, and run: @@ -15,98 +40,3 @@ dnote-server start --webUrl=https://your.server You're up and running. Database: `~/.local/share/dnote/server.db` (customize with `--dbPath`). Run `dnote-server start --help` for options. Set `apiEndpoint: https://your.server/api` in `~/.config/dnote/dnoterc` to connect your CLI to the server. - -## Optional guide - -### Nginx - -Create `/etc/nginx/sites-enabled/dnote`: - -``` -server { - server_name my-dnote-server.com; - - location / { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header Host $host; - proxy_pass http://127.0.0.1:3001; - } -} -``` - -Replace `my-dnote-server.com` with your domain, then reload: - -```bash -sudo service nginx reload -``` - -### Apache2 - -Enable `mod_proxy`, then create `/etc/apache2/sites-available/dnote.conf`: - -``` - - ServerName notes.example.com - - ProxyRequests Off - ProxyPreserveHost On - ProxyPass / http://127.0.0.1:3001/ keepalive=On - ProxyPassReverse / http://127.0.0.1:3001/ - RequestHeader set X-Forwarded-HTTPS "0" - -``` - -Enable and restart: - -```bash -a2ensite dnote -sudo service apache2 restart -``` - -### TLS - -Use LetsEncrypt to obtain a certificate and configure HTTPS in your reverse proxy. - -### systemd Daemon - -Create `/etc/systemd/system/dnote.service`: - -``` -[Unit] -Description=Starts the dnote server -Requires=network.target -After=network.target - -[Service] -Type=simple -User=$user -Restart=always -RestartSec=3 -WorkingDirectory=/home/$user -ExecStart=/usr/local/bin/dnote-server start --webUrl=$WebURL - -[Install] -WantedBy=multi-user.target -``` - -Replace `$user` and `$WebURL`. Add `--dbPath` to `ExecStart` if you want a custom database location. - -Enable and start: - -```bash -sudo systemctl daemon-reload -sudo systemctl enable dnote -sudo systemctl start dnote -``` - -### Email Support - -If you want emails, add these environment variables: - -- `SmtpHost` - SMTP hostname -- `SmtpPort` - SMTP port -- `SmtpUsername` - SMTP username -- `SmtpPassword` - SMTP password - -For systemd, add as `Environment=` lines in the service file. diff --git a/host/docker/README.md b/host/docker/README.md deleted file mode 100644 index 179492b6..00000000 --- a/host/docker/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# Dnote Docker Image - -The official Dnote docker image. - -## Installing Dnote Server Using Docker - -1. Install [Docker](https://docs.docker.com/install/). -2. Install Docker [Compose plugin](https://docs.docker.com/compose/install/linux/). -3. Download the [compose.yml](https://raw.githubusercontent.com/dnote/dnote/master/host/docker/compose.yml) file by running: - -``` -curl https://raw.githubusercontent.com/dnote/dnote/master/host/docker/compose.yml > compose.yml -``` - -4. Run the following to download the images and run the containers - -``` -docker compose pull -docker compose up -d -``` - -Visit http://localhost:3001 in your browser to see Dnote running. - -Please see [the installation guide](https://github.com/dnote/dnote/blob/master/SELF_HOSTING.md) for further configuration. - -## Supported platform - -Currently, the official Docker image for Dnote supports Linux running AMD64 CPU architecture. - -If you run ARM64, please install Dnote server by downloading a binary distribution by following [the guide](https://github.com/dnote/dnote/blob/master/SELF_HOSTING.md). From 850f9cc6c9fbe6785d8aaf4f57961745d2588afd Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 19 Oct 2025 11:01:48 -0700 Subject: [PATCH 14/33] Manage users with server CLI (#696) --- .gitignore | 2 +- pkg/assert/prompt.go | 87 ++++++++++ pkg/cli/testutils/main.go | 85 +-------- pkg/cli/ui/terminal.go | 21 +-- pkg/e2e/server_test.go | 140 +++++++++++++++ pkg/prompt/prompt.go | 56 ++++++ pkg/prompt/prompt_test.go | 148 ++++++++++++++++ pkg/server/app/errors.go | 3 + pkg/server/app/testutils.go | 2 +- pkg/server/app/users.go | 99 ++++++++++- pkg/server/app/users_test.go | 299 ++++++++++++++++++++++++++++++++ pkg/server/cmd/helpers.go | 111 ++++++++++++ pkg/server/cmd/root.go | 60 +++++++ pkg/server/cmd/start.go | 91 ++++++++++ pkg/server/cmd/user.go | 190 ++++++++++++++++++++ pkg/server/cmd/user_test.go | 114 ++++++++++++ pkg/server/cmd/version.go | 29 ++++ pkg/server/controllers/users.go | 37 +--- pkg/server/log/log_test.go | 38 ++++ pkg/server/main.go | 151 +--------------- 20 files changed, 1484 insertions(+), 279 deletions(-) create mode 100644 pkg/assert/prompt.go create mode 100644 pkg/prompt/prompt.go create mode 100644 pkg/prompt/prompt_test.go create mode 100644 pkg/server/cmd/helpers.go create mode 100644 pkg/server/cmd/root.go create mode 100644 pkg/server/cmd/start.go create mode 100644 pkg/server/cmd/user.go create mode 100644 pkg/server/cmd/user_test.go create mode 100644 pkg/server/cmd/version.go create mode 100644 pkg/server/log/log_test.go diff --git a/.gitignore b/.gitignore index 57d82ddc..2847e75d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,4 @@ node_modules /test tmp *.db -server +/server diff --git a/pkg/assert/prompt.go b/pkg/assert/prompt.go new file mode 100644 index 00000000..d4ec5d25 --- /dev/null +++ b/pkg/assert/prompt.go @@ -0,0 +1,87 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Dnote. If not, see . + */ + +package assert + +import ( + "bufio" + "io" + "strings" + "time" + + "github.com/pkg/errors" +) + +// WaitForPrompt waits for an expected prompt to appear in stdout with a timeout. +// Returns an error if the prompt is not found within the timeout period. +// Handles prompts with or without newlines by reading character by character. +func WaitForPrompt(stdout io.Reader, expectedPrompt string, timeout time.Duration) error { + type result struct { + found bool + err error + } + resultCh := make(chan result, 1) + + go func() { + reader := bufio.NewReader(stdout) + var buffer strings.Builder + found := false + + for { + b, err := reader.ReadByte() + if err != nil { + resultCh <- result{found: found, err: err} + return + } + + buffer.WriteByte(b) + if strings.Contains(buffer.String(), expectedPrompt) { + found = true + break + } + } + + resultCh <- result{found: found, err: nil} + }() + + select { + case res := <-resultCh: + if res.err != nil && res.err != io.EOF { + return errors.Wrap(res.err, "reading stdout") + } + if !res.found { + return errors.Errorf("expected prompt '%s' not found in stdout", expectedPrompt) + } + return nil + case <-time.After(timeout): + return errors.Errorf("timeout waiting for prompt '%s'", expectedPrompt) + } +} + +// RespondToPrompt is a helper that waits for a prompt and sends a response. +func RespondToPrompt(stdout io.Reader, stdin io.WriteCloser, expectedPrompt, response string, timeout time.Duration) error { + if err := WaitForPrompt(stdout, expectedPrompt, timeout); err != nil { + return err + } + + if _, err := io.WriteString(stdin, response); err != nil { + return errors.Wrap(err, "writing response to stdin") + } + + return nil +} diff --git a/pkg/cli/testutils/main.go b/pkg/cli/testutils/main.go index ee853b48..6c6caa64 100644 --- a/pkg/cli/testutils/main.go +++ b/pkg/cli/testutils/main.go @@ -20,7 +20,6 @@ package testutils import ( - "bufio" "bytes" "encoding/json" "io" @@ -31,6 +30,7 @@ import ( "testing" "time" + "github.com/dnote/dnote/pkg/assert" "github.com/dnote/dnote/pkg/cli/consts" "github.com/dnote/dnote/pkg/cli/context" "github.com/dnote/dnote/pkg/cli/database" @@ -223,103 +223,32 @@ func MustWaitDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, runFunc func(io.Rea return output } -// waitForPrompt waits for an expected prompt to appear in stdout with a timeout. -// Returns an error if the prompt is not found within the timeout period. -// Handles prompts with or without newlines by reading character by character. -func waitForPrompt(stdout io.Reader, expectedPrompt string, timeout time.Duration) error { - type result struct { - found bool - err error - } - resultCh := make(chan result, 1) - - go func() { - reader := bufio.NewReader(stdout) - var buffer strings.Builder - found := false - - for { - b, err := reader.ReadByte() - if err != nil { - resultCh <- result{found: found, err: err} - return - } - - buffer.WriteByte(b) - if strings.Contains(buffer.String(), expectedPrompt) { - found = true - break - } - } - - resultCh <- result{found: found, err: nil} - }() - - select { - case res := <-resultCh: - if res.err != nil && res.err != io.EOF { - return errors.Wrap(res.err, "reading stdout") - } - if !res.found { - return errors.Errorf("expected prompt '%s' not found in stdout", expectedPrompt) - } - return nil - case <-time.After(timeout): - return errors.Errorf("timeout waiting for prompt '%s'", expectedPrompt) - } -} - // MustWaitForPrompt waits for an expected prompt with a default timeout. // Fails the test if the prompt is not found or an error occurs. func MustWaitForPrompt(t *testing.T, stdout io.Reader, expectedPrompt string) { - if err := waitForPrompt(stdout, expectedPrompt, promptTimeout); err != nil { + if err := assert.WaitForPrompt(stdout, expectedPrompt, promptTimeout); err != nil { t.Fatal(err) } } -// userRespondToPrompt is a helper that waits for a prompt and sends a response. -func userRespondToPrompt(stdout io.Reader, stdin io.WriteCloser, expectedPrompt, response, action string) error { - if err := waitForPrompt(stdout, expectedPrompt, promptTimeout); err != nil { - return err - } - - if _, err := io.WriteString(stdin, response); err != nil { - return errors.Wrapf(err, "indicating %s in stdin", action) - } - - return nil -} - -// userConfirmOutput simulates confirmation from the user by writing to stdin. -// It waits for the expected prompt with a timeout to prevent deadlocks. -func userConfirmOutput(stdout io.Reader, stdin io.WriteCloser, expectedPrompt string) error { - return userRespondToPrompt(stdout, stdin, expectedPrompt, "y\n", "confirmation") -} - -// userCancelOutput simulates cancellation from the user by writing to stdin. -// It waits for the expected prompt with a timeout to prevent deadlocks. -func userCancelOutput(stdout io.Reader, stdin io.WriteCloser, expectedPrompt string) error { - return userRespondToPrompt(stdout, stdin, expectedPrompt, "n\n", "cancellation") -} - // ConfirmRemoveNote waits for prompt for removing a note and confirms. func ConfirmRemoveNote(stdout io.Reader, stdin io.WriteCloser) error { - return userConfirmOutput(stdout, stdin, PromptRemoveNote) + return assert.RespondToPrompt(stdout, stdin, PromptRemoveNote, "y\n", promptTimeout) } // ConfirmRemoveBook waits for prompt for deleting a book confirms. func ConfirmRemoveBook(stdout io.Reader, stdin io.WriteCloser) error { - return userConfirmOutput(stdout, stdin, PromptDeleteBook) + return assert.RespondToPrompt(stdout, stdin, PromptDeleteBook, "y\n", promptTimeout) } // UserConfirmEmptyServerSync waits for an empty server prompt and confirms. func UserConfirmEmptyServerSync(stdout io.Reader, stdin io.WriteCloser) error { - return userConfirmOutput(stdout, stdin, PromptEmptyServer) + return assert.RespondToPrompt(stdout, stdin, PromptEmptyServer, "y\n", promptTimeout) } -// UserCancelEmptyServerSync waits for an empty server prompt and confirms. +// UserCancelEmptyServerSync waits for an empty server prompt and cancels. func UserCancelEmptyServerSync(stdout io.Reader, stdin io.WriteCloser) error { - return userCancelOutput(stdout, stdin, PromptEmptyServer) + return assert.RespondToPrompt(stdout, stdin, PromptEmptyServer, "n\n", promptTimeout) } // UserContent simulates content from the user by writing to stdin. diff --git a/pkg/cli/ui/terminal.go b/pkg/cli/ui/terminal.go index ab52873d..899060c7 100644 --- a/pkg/cli/ui/terminal.go +++ b/pkg/cli/ui/terminal.go @@ -26,6 +26,7 @@ import ( "syscall" "github.com/dnote/dnote/pkg/cli/log" + "github.com/dnote/dnote/pkg/prompt" "github.com/pkg/errors" "golang.org/x/crypto/ssh/terminal" ) @@ -73,26 +74,16 @@ func PromptPassword(message string, dest *string) error { // Confirm prompts for user input to confirm a choice func Confirm(question string, optimistic bool) (bool, error) { - var choices string - if optimistic { - choices = "(Y/n)" - } else { - choices = "(y/N)" - } + message := prompt.FormatQuestion(question, optimistic) - message := fmt.Sprintf("%s %s", question, choices) + // Use log.Askf for colored prompt in CLI + log.Askf(message, false) - var input string - if err := PromptInput(message, &input); err != nil { + confirmed, err := prompt.ReadYesNo(os.Stdin, optimistic) + if err != nil { return false, errors.Wrap(err, "Failed to get user input") } - confirmed := input == "y" - - if optimistic { - confirmed = confirmed || input == "" - } - return confirmed, nil } diff --git a/pkg/e2e/server_test.go b/pkg/e2e/server_test.go index c37b7320..cfe6a711 100644 --- a/pkg/e2e/server_test.go +++ b/pkg/e2e/server_test.go @@ -19,6 +19,7 @@ package main import ( + "bytes" "fmt" "net/http" "os" @@ -181,3 +182,142 @@ func TestServerUnknownCommand(t *testing.T) { assert.Equal(t, strings.Contains(outputStr, "Unknown command"), true, "output should contain unknown command message") assert.Equal(t, strings.Contains(outputStr, "Dnote server - a simple command line notebook"), true, "output should show help") } + +func TestServerUserCreate(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + cmd := exec.Command(testServerBinary, "user", "create", + "--dbPath", tmpDB, + "--email", "test@example.com", + "--password", "password123") + output, err := cmd.CombinedOutput() + + if err != nil { + t.Fatalf("user create failed: %v\nOutput: %s", err, output) + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "User created successfully"), true, "output should show success message") + assert.Equal(t, strings.Contains(outputStr, "test@example.com"), true, "output should show email") + + // Verify user exists in database + db, err := gorm.Open(sqlite.Open(tmpDB), &gorm.Config{}) + if err != nil { + t.Fatalf("failed to open database: %v", err) + } + defer func() { + sqlDB, _ := db.DB() + sqlDB.Close() + }() + + var count int64 + db.Table("users").Count(&count) + assert.Equal(t, count, int64(1), "should have created 1 user") +} + +func TestServerUserCreateShortPassword(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + cmd := exec.Command(testServerBinary, "user", "create", + "--dbPath", tmpDB, + "--email", "test@example.com", + "--password", "short") + output, err := cmd.CombinedOutput() + + // Should fail with short password + if err == nil { + t.Fatal("expected command to fail with short password") + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "password should be longer than 8 characters"), true, "output should show password error") +} + +func TestServerUserResetPassword(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Create user first + createCmd := exec.Command(testServerBinary, "user", "create", + "--dbPath", tmpDB, + "--email", "test@example.com", + "--password", "oldpassword123") + if output, err := createCmd.CombinedOutput(); err != nil { + t.Fatalf("failed to create user: %v\nOutput: %s", err, output) + } + + // Reset password + resetCmd := exec.Command(testServerBinary, "user", "reset-password", + "--dbPath", tmpDB, + "--email", "test@example.com", + "--password", "newpassword123") + output, err := resetCmd.CombinedOutput() + + if err != nil { + t.Fatalf("reset-password failed: %v\nOutput: %s", err, output) + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "Password reset successfully"), true, "output should show success message") +} + +func TestServerUserRemove(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Create user first + createCmd := exec.Command(testServerBinary, "user", "create", + "--dbPath", tmpDB, + "--email", "test@example.com", + "--password", "password123") + if output, err := createCmd.CombinedOutput(); err != nil { + t.Fatalf("failed to create user: %v\nOutput: %s", err, output) + } + + // Remove user with confirmation + removeCmd := exec.Command(testServerBinary, "user", "remove", + "--dbPath", tmpDB, + "--email", "test@example.com") + + // Pipe "y" to stdin to confirm removal + stdin, err := removeCmd.StdinPipe() + if err != nil { + t.Fatalf("failed to create stdin pipe: %v", err) + } + + // Capture output + stdout, err := removeCmd.StdoutPipe() + if err != nil { + t.Fatalf("failed to create stdout pipe: %v", err) + } + + var stderr bytes.Buffer + removeCmd.Stderr = &stderr + + // Start command + if err := removeCmd.Start(); err != nil { + t.Fatalf("failed to start remove command: %v", err) + } + + // Wait for prompt and send "y" to confirm + if err := assert.RespondToPrompt(stdout, stdin, "Remove user test@example.com?", "y\n", 10*time.Second); err != nil { + t.Fatalf("failed to confirm removal: %v", err) + } + + // Wait for command to finish + if err := removeCmd.Wait(); err != nil { + t.Fatalf("user remove failed: %v\nStderr: %s", err, stderr.String()) + } + + // Verify user was removed + db, err := gorm.Open(sqlite.Open(tmpDB), &gorm.Config{}) + if err != nil { + t.Fatalf("failed to open database: %v", err) + } + defer func() { + sqlDB, _ := db.DB() + sqlDB.Close() + }() + + var count int64 + db.Table("users").Count(&count) + assert.Equal(t, count, int64(0), "should have 0 users after removal") +} diff --git a/pkg/prompt/prompt.go b/pkg/prompt/prompt.go new file mode 100644 index 00000000..1d413a27 --- /dev/null +++ b/pkg/prompt/prompt.go @@ -0,0 +1,56 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Dnote. If not, see . + */ + +// Package prompt provides utilities for interactive yes/no prompts +package prompt + +import ( + "bufio" + "fmt" + "io" + "strings" +) + +// FormatQuestion formats a yes/no question with the appropriate choice indicator +func FormatQuestion(question string, optimistic bool) string { + choices := "(y/N)" + if optimistic { + choices = "(Y/n)" + } + return fmt.Sprintf("%s %s", question, choices) +} + +// ReadYesNo reads and parses a yes/no response from the given reader. +// Returns true if confirmed, respecting optimistic mode. +// In optimistic mode, empty input is treated as confirmation. +func ReadYesNo(r io.Reader, optimistic bool) (bool, error) { + reader := bufio.NewReader(r) + input, err := reader.ReadString('\n') + if err != nil { + return false, err + } + + input = strings.ToLower(strings.TrimSpace(input)) + confirmed := input == "y" + + if optimistic { + confirmed = confirmed || input == "" + } + + return confirmed, nil +} diff --git a/pkg/prompt/prompt_test.go b/pkg/prompt/prompt_test.go new file mode 100644 index 00000000..f0df9480 --- /dev/null +++ b/pkg/prompt/prompt_test.go @@ -0,0 +1,148 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Dnote. If not, see . + */ + +package prompt + +import ( + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" +) + +func TestFormatQuestion(t *testing.T) { + testCases := []struct { + question string + optimistic bool + expected string + }{ + { + question: "Are you sure?", + optimistic: false, + expected: "Are you sure? (y/N)", + }, + { + question: "Continue?", + optimistic: true, + expected: "Continue? (Y/n)", + }, + } + + for _, tc := range testCases { + t.Run(tc.question, func(t *testing.T) { + result := FormatQuestion(tc.question, tc.optimistic) + assert.Equal(t, result, tc.expected, "formatted question mismatch") + }) + } +} + +func TestReadYesNo(t *testing.T) { + testCases := []struct { + name string + input string + optimistic bool + expected bool + }{ + { + name: "pessimistic with y", + input: "y\n", + optimistic: false, + expected: true, + }, + { + name: "pessimistic with Y (uppercase)", + input: "Y\n", + optimistic: false, + expected: true, + }, + { + name: "pessimistic with n", + input: "n\n", + optimistic: false, + expected: false, + }, + { + name: "pessimistic with empty", + input: "\n", + optimistic: false, + expected: false, + }, + { + name: "pessimistic with whitespace", + input: " \n", + optimistic: false, + expected: false, + }, + { + name: "optimistic with y", + input: "y\n", + optimistic: true, + expected: true, + }, + { + name: "optimistic with n", + input: "n\n", + optimistic: true, + expected: false, + }, + { + name: "optimistic with empty", + input: "\n", + optimistic: true, + expected: true, + }, + { + name: "optimistic with whitespace", + input: " \n", + optimistic: true, + expected: true, + }, + { + name: "invalid input defaults to no", + input: "maybe\n", + optimistic: false, + expected: false, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + // Create a reader with test input + reader := strings.NewReader(tc.input) + + // Test ReadYesNo + result, err := ReadYesNo(reader, tc.optimistic) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + + assert.Equal(t, result, tc.expected, "ReadYesNo result mismatch") + }) + } +} + +func TestReadYesNo_Error(t *testing.T) { + // Test error case with EOF (empty reader) + reader := strings.NewReader("") + + _, err := ReadYesNo(reader, false) + if err == nil { + t.Fatal("expected error when reading from empty reader") + } +} + diff --git a/pkg/server/app/errors.go b/pkg/server/app/errors.go index 895fc40f..48f193b9 100644 --- a/pkg/server/app/errors.go +++ b/pkg/server/app/errors.go @@ -79,4 +79,7 @@ var ( ErrInvalidPassword appError = "Invalid currnet password." // ErrEmailTooLong is an error for email length exceeding the limit ErrEmailTooLong appError = "Email is too long." + + // ErrUserHasExistingResources is an error for attempting to remove a user with existing notes or books + ErrUserHasExistingResources appError = "cannot remove user with existing notes or books" ) diff --git a/pkg/server/app/testutils.go b/pkg/server/app/testutils.go index 06664c5f..45dbd5bb 100644 --- a/pkg/server/app/testutils.go +++ b/pkg/server/app/testutils.go @@ -36,7 +36,7 @@ func NewTest() App { WebURL: "http://127.0.0.0.1", Port: "3000", DisableRegistration: false, - DBPath: ":memory:", + DBPath: "", AssetBaseURL: "", } } diff --git a/pkg/server/app/users.go b/pkg/server/app/users.go index 5c9d7f1f..b3993d55 100644 --- a/pkg/server/app/users.go +++ b/pkg/server/app/users.go @@ -29,6 +29,15 @@ import ( "gorm.io/gorm" ) +// validatePassword validates a password +func validatePassword(password string) error { + if len(password) < 8 { + return ErrPasswordTooShort + } + + return nil +} + // TouchLastLoginAt updates the last login timestamp func (a *App) TouchLastLoginAt(user database.User, tx *gorm.DB) error { t := a.Clock.Now() @@ -45,8 +54,8 @@ func (a *App) CreateUser(email, password string, passwordConfirmation string) (d return database.User{}, ErrEmailRequired } - if len(password) < 8 { - return database.User{}, ErrPasswordTooShort + if err := validatePassword(password); err != nil { + return database.User{}, err } if password != passwordConfirmation { @@ -102,8 +111,8 @@ func (a *App) CreateUser(email, password string, passwordConfirmation string) (d return user, nil } -// Authenticate authenticates a user -func (a *App) Authenticate(email, password string) (*database.User, error) { +// GetAccountByEmail finds an account by email +func (a *App) GetAccountByEmail(email string) (*database.Account, error) { var account database.Account err := a.DB.Where("email = ?", email).First(&account).Error if errors.Is(err, gorm.ErrRecordNotFound) { @@ -112,6 +121,16 @@ func (a *App) Authenticate(email, password string) (*database.User, error) { return nil, err } + return &account, nil +} + +// Authenticate authenticates a user +func (a *App) Authenticate(email, password string) (*database.User, error) { + account, err := a.GetAccountByEmail(email) + if err != nil { + return nil, err + } + err = bcrypt.CompareHashAndPassword([]byte(account.Password.String), []byte(password)) if err != nil { return nil, ErrLoginInvalid @@ -126,6 +145,78 @@ func (a *App) Authenticate(email, password string) (*database.User, error) { return &user, nil } +// UpdateAccountPassword updates an account's password with validation +func UpdateAccountPassword(db *gorm.DB, account *database.Account, newPassword string) error { + // Validate password + if err := validatePassword(newPassword); err != nil { + return err + } + + // Hash the password + hashedPassword, err := bcrypt.GenerateFromPassword([]byte(newPassword), bcrypt.DefaultCost) + if err != nil { + return pkgErrors.Wrap(err, "hashing password") + } + + // Update the password + if err := db.Model(&account).Update("password", string(hashedPassword)).Error; err != nil { + return pkgErrors.Wrap(err, "updating password") + } + + return nil +} + +// RemoveUser removes a user and their account from the system +// Returns an error if the user has any notes or books +func (a *App) RemoveUser(email string) error { + // Find the account and user + account, err := a.GetAccountByEmail(email) + if err != nil { + return err + } + + // Check if user has any notes + var noteCount int64 + if err := a.DB.Model(&database.Note{}).Where("user_id = ? AND deleted = ?", account.UserID, false).Count(¬eCount).Error; err != nil { + return pkgErrors.Wrap(err, "counting notes") + } + if noteCount > 0 { + return ErrUserHasExistingResources + } + + // Check if user has any books + var bookCount int64 + if err := a.DB.Model(&database.Book{}).Where("user_id = ? AND deleted = ?", account.UserID, false).Count(&bookCount).Error; err != nil { + return pkgErrors.Wrap(err, "counting books") + } + if bookCount > 0 { + return ErrUserHasExistingResources + } + + // Delete account and user in a transaction + tx := a.DB.Begin() + + if err := tx.Delete(&account).Error; err != nil { + tx.Rollback() + return pkgErrors.Wrap(err, "deleting account") + } + + var user database.User + if err := tx.Where("id = ?", account.UserID).First(&user).Error; err != nil { + tx.Rollback() + return pkgErrors.Wrap(err, "finding user") + } + + if err := tx.Delete(&user).Error; err != nil { + tx.Rollback() + return pkgErrors.Wrap(err, "deleting user") + } + + tx.Commit() + + return nil +} + // SignIn signs in a user func (a *App) SignIn(user *database.User) (*database.Session, error) { err := a.TouchLastLoginAt(*user, a.DB) diff --git a/pkg/server/app/users_test.go b/pkg/server/app/users_test.go index 45c43514..a4c3a60d 100644 --- a/pkg/server/app/users_test.go +++ b/pkg/server/app/users_test.go @@ -28,6 +28,42 @@ import ( "golang.org/x/crypto/bcrypt" ) +func TestValidatePassword(t *testing.T) { + testCases := []struct { + name string + password string + wantErr error + }{ + { + name: "valid password", + password: "password123", + wantErr: nil, + }, + { + name: "valid password exactly 8 chars", + password: "12345678", + wantErr: nil, + }, + { + name: "password too short", + password: "1234567", + wantErr: ErrPasswordTooShort, + }, + { + name: "empty password", + password: "", + wantErr: ErrPasswordTooShort, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + err := validatePassword(tc.password) + assert.Equal(t, err, tc.wantErr, "error mismatch") + }) + } +} + func TestCreateUser_ProValue(t *testing.T) { db := testutils.InitMemoryDB(t) @@ -46,6 +82,36 @@ func TestCreateUser_ProValue(t *testing.T) { } +func TestGetAccountByEmail(t *testing.T) { + t.Run("success", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@example.com", "password123") + + a := NewTest() + a.DB = db + + account, err := a.GetAccountByEmail("alice@example.com") + + assert.Equal(t, err, nil, "should not error") + assert.Equal(t, account.Email.String, "alice@example.com", "email mismatch") + assert.Equal(t, account.UserID, user.ID, "user ID mismatch") + }) + + t.Run("not found", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + a := NewTest() + a.DB = db + + account, err := a.GetAccountByEmail("nonexistent@example.com") + + assert.Equal(t, err, ErrNotFound, "should return ErrNotFound") + assert.Equal(t, account, (*database.Account)(nil), "account should be nil") + }) +} + func TestCreateUser(t *testing.T) { t.Run("success", func(t *testing.T) { db := testutils.InitMemoryDB(t) @@ -92,3 +158,236 @@ func TestCreateUser(t *testing.T) { assert.Equal(t, accountCount, int64(1), "account count mismatch") }) } + +func TestUpdateAccountPassword(t *testing.T) { + t.Run("success", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") + + err := UpdateAccountPassword(db, &account, "newpassword123") + + assert.Equal(t, err, nil, "should not error") + + // Verify password was updated in database + var updatedAccount database.Account + testutils.MustExec(t, db.Where("id = ?", account.ID).First(&updatedAccount), "finding updated account") + + // Verify new password works + passwordErr := bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("newpassword123")) + assert.Equal(t, passwordErr, nil, "New password should match") + + // Verify old password no longer works + oldPasswordErr := bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("oldpassword123")) + assert.NotEqual(t, oldPasswordErr, nil, "Old password should not match") + }) + + t.Run("password too short", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") + + err := UpdateAccountPassword(db, &account, "short") + + assert.Equal(t, err, ErrPasswordTooShort, "should return ErrPasswordTooShort") + + // Verify password was NOT updated in database + var unchangedAccount database.Account + testutils.MustExec(t, db.Where("id = ?", account.ID).First(&unchangedAccount), "finding unchanged account") + + // Verify old password still works + passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedAccount.Password.String), []byte("oldpassword123")) + assert.Equal(t, passwordErr, nil, "Old password should still match") + }) + + t.Run("empty password", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") + + err := UpdateAccountPassword(db, &account, "") + + assert.Equal(t, err, ErrPasswordTooShort, "should return ErrPasswordTooShort") + + // Verify password was NOT updated in database + var unchangedAccount database.Account + testutils.MustExec(t, db.Where("id = ?", account.ID).First(&unchangedAccount), "finding unchanged account") + + // Verify old password still works + passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedAccount.Password.String), []byte("oldpassword123")) + assert.Equal(t, passwordErr, nil, "Old password should still match") + }) + + t.Run("transaction rollback", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") + + // Start a transaction and rollback to verify UpdateAccountPassword respects transactions + tx := db.Begin() + err := UpdateAccountPassword(tx, &account, "newpassword123") + assert.Equal(t, err, nil, "should not error") + tx.Rollback() + + // Verify password was NOT updated after rollback + var unchangedAccount database.Account + testutils.MustExec(t, db.Where("id = ?", account.ID).First(&unchangedAccount), "finding unchanged account") + + // Verify old password still works + passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedAccount.Password.String), []byte("oldpassword123")) + assert.Equal(t, passwordErr, nil, "Old password should still match after rollback") + }) + + t.Run("transaction commit", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") + + // Start a transaction and commit to verify UpdateAccountPassword respects transactions + tx := db.Begin() + err := UpdateAccountPassword(tx, &account, "newpassword123") + assert.Equal(t, err, nil, "should not error") + tx.Commit() + + // Verify password was updated after commit + var updatedAccount database.Account + testutils.MustExec(t, db.Where("id = ?", account.ID).First(&updatedAccount), "finding updated account") + + // Verify new password works + passwordErr := bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("newpassword123")) + assert.Equal(t, passwordErr, nil, "New password should match after commit") + }) +} + +func TestRemoveUser(t *testing.T) { + t.Run("success", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@example.com", "password123") + + a := NewTest() + a.DB = db + + err := a.RemoveUser("alice@example.com") + + assert.Equal(t, err, nil, "should not error") + + // Verify user was deleted + var userCount int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") + assert.Equal(t, userCount, int64(0), "user should be deleted") + + // Verify account was deleted + var accountCount int64 + testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting accounts") + assert.Equal(t, accountCount, int64(0), "account should be deleted") + }) + + t.Run("user not found", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + a := NewTest() + a.DB = db + + err := a.RemoveUser("nonexistent@example.com") + + assert.Equal(t, err, ErrNotFound, "should return ErrNotFound") + }) + + t.Run("user has notes", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@example.com", "password123") + + book := database.Book{UserID: user.ID, Label: "testbook", Deleted: false} + testutils.MustExec(t, db.Save(&book), "creating book") + + note := database.Note{UserID: user.ID, BookUUID: book.UUID, Body: "test note", Deleted: false} + testutils.MustExec(t, db.Save(¬e), "creating note") + + a := NewTest() + a.DB = db + + err := a.RemoveUser("alice@example.com") + + assert.Equal(t, err, ErrUserHasExistingResources, "should return ErrUserHasExistingResources") + + // Verify user was NOT deleted + var userCount int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") + assert.Equal(t, userCount, int64(1), "user should not be deleted") + + // Verify account was NOT deleted + var accountCount int64 + testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting accounts") + assert.Equal(t, accountCount, int64(1), "account should not be deleted") + }) + + t.Run("user has books", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@example.com", "password123") + + book := database.Book{UserID: user.ID, Label: "testbook", Deleted: false} + testutils.MustExec(t, db.Save(&book), "creating book") + + a := NewTest() + a.DB = db + + err := a.RemoveUser("alice@example.com") + + assert.Equal(t, err, ErrUserHasExistingResources, "should return ErrUserHasExistingResources") + + // Verify user was NOT deleted + var userCount int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") + assert.Equal(t, userCount, int64(1), "user should not be deleted") + + // Verify account was NOT deleted + var accountCount int64 + testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting accounts") + assert.Equal(t, accountCount, int64(1), "account should not be deleted") + }) + + t.Run("user has deleted notes and books", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@example.com", "password123") + + book := database.Book{UserID: user.ID, Label: "testbook", Deleted: false} + testutils.MustExec(t, db.Save(&book), "creating book") + + note := database.Note{UserID: user.ID, BookUUID: book.UUID, Body: "test note", Deleted: false} + testutils.MustExec(t, db.Save(¬e), "creating note") + + // Soft delete the note and book + testutils.MustExec(t, db.Model(¬e).Update("deleted", true), "soft deleting note") + testutils.MustExec(t, db.Model(&book).Update("deleted", true), "soft deleting book") + + a := NewTest() + a.DB = db + + err := a.RemoveUser("alice@example.com") + + assert.Equal(t, err, nil, "should not error when user only has deleted notes and books") + + // Verify user was deleted + var userCount int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") + assert.Equal(t, userCount, int64(0), "user should be deleted") + + // Verify account was deleted + var accountCount int64 + testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting accounts") + assert.Equal(t, accountCount, int64(0), "account should be deleted") + }) +} diff --git a/pkg/server/cmd/helpers.go b/pkg/server/cmd/helpers.go new file mode 100644 index 00000000..a22c8721 --- /dev/null +++ b/pkg/server/cmd/helpers.go @@ -0,0 +1,111 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Dnote. If not, see . + */ + +package cmd + +import ( + "flag" + "fmt" + "os" + + "github.com/dnote/dnote/pkg/clock" + "github.com/dnote/dnote/pkg/server/app" + "github.com/dnote/dnote/pkg/server/config" + "github.com/dnote/dnote/pkg/server/database" + "github.com/dnote/dnote/pkg/server/log" + "github.com/dnote/dnote/pkg/server/mailer" + "gorm.io/gorm" +) + +func initDB(dbPath string) *gorm.DB { + db := database.Open(dbPath) + database.InitSchema(db) + database.Migrate(db) + + return db +} + +func initApp(cfg config.Config) app.App { + db := initDB(cfg.DBPath) + + emailBackend, err := mailer.NewDefaultBackend(cfg.IsProd()) + if err != nil { + emailBackend = &mailer.DefaultBackend{Enabled: false} + } else { + log.Info("Email backend configured") + } + + return app.App{ + DB: db, + Clock: clock.New(), + EmailTemplates: mailer.NewTemplates(), + EmailBackend: emailBackend, + HTTP500Page: cfg.HTTP500Page, + AppEnv: cfg.AppEnv, + WebURL: cfg.WebURL, + DisableRegistration: cfg.DisableRegistration, + Port: cfg.Port, + DBPath: cfg.DBPath, + AssetBaseURL: cfg.AssetBaseURL, + } +} + +// setupFlagSet creates a FlagSet with standard usage format +func setupFlagSet(name, usageCmd string) *flag.FlagSet { + fs := flag.NewFlagSet(name, flag.ExitOnError) + fs.Usage = func() { + fmt.Printf(`Usage: + %s [flags] + +Flags: +`, usageCmd) + fs.PrintDefaults() + } + return fs +} + +// requireString validates that a required string flag is not empty +func requireString(fs *flag.FlagSet, value, fieldName string) { + if value == "" { + fmt.Printf("Error: %s is required\n", fieldName) + fs.Usage() + os.Exit(1) + } +} + +// setupAppWithDB creates config, initializes app, and returns cleanup function +func setupAppWithDB(fs *flag.FlagSet, dbPath string) (*app.App, func()) { + cfg, err := config.New(config.Params{ + DBPath: dbPath, + }) + if err != nil { + fmt.Printf("Error: %s\n\n", err) + fs.Usage() + os.Exit(1) + } + + a := initApp(cfg) + cleanup := func() { + sqlDB, err := a.DB.DB() + if err == nil { + sqlDB.Close() + } + } + + return &a, cleanup +} diff --git a/pkg/server/cmd/root.go b/pkg/server/cmd/root.go new file mode 100644 index 00000000..1ed2129f --- /dev/null +++ b/pkg/server/cmd/root.go @@ -0,0 +1,60 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Dnote. If not, see . + */ + +package cmd + +import ( + "fmt" + "os" +) + +func rootCmd() { + fmt.Printf(`Dnote server - a simple command line notebook + +Usage: + dnote-server [command] [flags] + +Available commands: + start: Start the server (use 'dnote-server start --help' for flags) + user: Manage users (use 'dnote-server user' for subcommands) + version: Print the version +`) +} + +// Execute is the main entry point for the CLI +func Execute() { + if len(os.Args) < 2 { + rootCmd() + return + } + + cmd := os.Args[1] + + switch cmd { + case "start": + startCmd(os.Args[2:]) + case "user": + userCmd(os.Args[2:]) + case "version": + versionCmd() + default: + fmt.Printf("Unknown command %s\n", cmd) + rootCmd() + os.Exit(1) + } +} diff --git a/pkg/server/cmd/start.go b/pkg/server/cmd/start.go new file mode 100644 index 00000000..cbbc60ed --- /dev/null +++ b/pkg/server/cmd/start.go @@ -0,0 +1,91 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Dnote. If not, see . + */ + +package cmd + +import ( + "fmt" + "net/http" + "os" + + "github.com/dnote/dnote/pkg/server/buildinfo" + "github.com/dnote/dnote/pkg/server/config" + "github.com/dnote/dnote/pkg/server/controllers" + "github.com/dnote/dnote/pkg/server/log" + "github.com/pkg/errors" +) + +func startCmd(args []string) { + fs := setupFlagSet("start", "dnote-server start") + + appEnv := fs.String("appEnv", "", "Application environment (env: APP_ENV, default: PRODUCTION)") + port := fs.String("port", "", "Server port (env: PORT, default: 3001)") + webURL := fs.String("webUrl", "", "Full URL to server without trailing slash (env: WebURL, default: http://localhost:3001)") + dbPath := fs.String("dbPath", "", "Path to SQLite database file (env: DBPath, default: $XDG_DATA_HOME/dnote/server.db)") + disableRegistration := fs.Bool("disableRegistration", false, "Disable user registration (env: DisableRegistration, default: false)") + logLevel := fs.String("logLevel", "", "Log level: debug, info, warn, or error (env: LOG_LEVEL, default: info)") + + fs.Parse(args) + + cfg, err := config.New(config.Params{ + AppEnv: *appEnv, + Port: *port, + WebURL: *webURL, + DBPath: *dbPath, + DisableRegistration: *disableRegistration, + LogLevel: *logLevel, + }) + if err != nil { + fmt.Printf("Error: %s\n\n", err) + fs.Usage() + os.Exit(1) + } + + // Set log level + log.SetLevel(cfg.LogLevel) + + app := initApp(cfg) + defer func() { + sqlDB, err := app.DB.DB() + if err == nil { + sqlDB.Close() + } + }() + + ctl := controllers.New(&app) + rc := controllers.RouteConfig{ + WebRoutes: controllers.NewWebRoutes(&app, ctl), + APIRoutes: controllers.NewAPIRoutes(&app, ctl), + Controllers: ctl, + } + + r, err := controllers.NewRouter(&app, rc) + if err != nil { + panic(errors.Wrap(err, "initializing router")) + } + + log.WithFields(log.Fields{ + "version": buildinfo.Version, + "port": cfg.Port, + }).Info("Dnote server starting") + + if err := http.ListenAndServe(fmt.Sprintf(":%s", cfg.Port), r); err != nil { + log.ErrorWrap(err, "server failed") + os.Exit(1) + } +} diff --git a/pkg/server/cmd/user.go b/pkg/server/cmd/user.go new file mode 100644 index 00000000..6123cdae --- /dev/null +++ b/pkg/server/cmd/user.go @@ -0,0 +1,190 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Dnote. If not, see . + */ + +package cmd + +import ( + "fmt" + "io" + "os" + + "github.com/dnote/dnote/pkg/prompt" + "github.com/dnote/dnote/pkg/server/app" + "github.com/dnote/dnote/pkg/server/log" + "github.com/pkg/errors" +) + +// confirm prompts for user input to confirm a choice +func confirm(r io.Reader, question string, optimistic bool) (bool, error) { + message := prompt.FormatQuestion(question, optimistic) + fmt.Print(message + " ") + + confirmed, err := prompt.ReadYesNo(r, optimistic) + if err != nil { + return false, errors.Wrap(err, "reading stdin") + } + + return confirmed, nil +} + +func userCreateCmd(args []string) { + fs := setupFlagSet("create", "dnote-server user create") + + email := fs.String("email", "", "User email address (required)") + password := fs.String("password", "", "User password (required)") + dbPath := fs.String("dbPath", "", "Path to SQLite database file (env: DBPath, default: $XDG_DATA_HOME/dnote/server.db)") + + fs.Parse(args) + + requireString(fs, *email, "email") + requireString(fs, *password, "password") + + a, cleanup := setupAppWithDB(fs, *dbPath) + defer cleanup() + + _, err := a.CreateUser(*email, *password, *password) + if err != nil { + log.ErrorWrap(err, "creating user") + os.Exit(1) + } + + fmt.Printf("User created successfully\n") + fmt.Printf("Email: %s\n", *email) +} + +func userRemoveCmd(args []string, stdin io.Reader) { + fs := setupFlagSet("remove", "dnote-server user remove") + + email := fs.String("email", "", "User email address (required)") + dbPath := fs.String("dbPath", "", "Path to SQLite database file (env: DBPath, default: $XDG_DATA_HOME/dnote/server.db)") + + fs.Parse(args) + + requireString(fs, *email, "email") + + a, cleanup := setupAppWithDB(fs, *dbPath) + defer cleanup() + + // Check if user exists first + _, err := a.GetAccountByEmail(*email) + if err != nil { + if errors.Is(err, app.ErrNotFound) { + fmt.Printf("Error: user with email %s not found\n", *email) + } else { + log.ErrorWrap(err, "finding account") + } + os.Exit(1) + } + + // Show confirmation prompt + ok, err := confirm(stdin, fmt.Sprintf("Remove user %s?", *email), false) + if err != nil { + log.ErrorWrap(err, "getting confirmation") + os.Exit(1) + } + if !ok { + fmt.Println("Aborted by user") + os.Exit(0) + } + + // Remove the user + if err := a.RemoveUser(*email); err != nil { + if errors.Is(err, app.ErrNotFound) { + fmt.Printf("Error: user with email %s not found\n", *email) + } else if errors.Is(err, app.ErrUserHasExistingResources) { + fmt.Printf("Error: %s\n", err) + } else { + log.ErrorWrap(err, "removing user") + } + os.Exit(1) + } + + fmt.Printf("User removed successfully\n") + fmt.Printf("Email: %s\n", *email) +} + +func userResetPasswordCmd(args []string) { + fs := setupFlagSet("reset-password", "dnote-server user reset-password") + + email := fs.String("email", "", "User email address (required)") + password := fs.String("password", "", "New password (required)") + dbPath := fs.String("dbPath", "", "Path to SQLite database file (env: DBPath, default: $XDG_DATA_HOME/dnote/server.db)") + + fs.Parse(args) + + requireString(fs, *email, "email") + requireString(fs, *password, "password") + + a, cleanup := setupAppWithDB(fs, *dbPath) + defer cleanup() + + // Find the account + account, err := a.GetAccountByEmail(*email) + if err != nil { + if errors.Is(err, app.ErrNotFound) { + fmt.Printf("Error: user with email %s not found\n", *email) + } else { + log.ErrorWrap(err, "finding account") + } + os.Exit(1) + } + + // Update the password + if err := app.UpdateAccountPassword(a.DB, account, *password); err != nil { + log.ErrorWrap(err, "updating password") + os.Exit(1) + } + + fmt.Printf("Password reset successfully\n") + fmt.Printf("Email: %s\n", *email) +} + +func userCmd(args []string) { + if len(args) < 1 { + fmt.Println(`Usage: + dnote-server user [command] + +Available commands: + create: Create a new user + remove: Remove a user + reset-password: Reset a user's password`) + os.Exit(1) + } + + subcommand := args[0] + subArgs := []string{} + if len(args) > 1 { + subArgs = args[1:] + } + + switch subcommand { + case "create": + userCreateCmd(subArgs) + case "remove": + userRemoveCmd(subArgs, os.Stdin) + case "reset-password": + userResetPasswordCmd(subArgs) + default: + fmt.Printf("Unknown subcommand: %s\n\n", subcommand) + fmt.Println(`Available commands: + create: Create a new user + remove: Remove a user (only if they have no notes or books) + reset-password: Reset a user's password`) + os.Exit(1) + } +} diff --git a/pkg/server/cmd/user_test.go b/pkg/server/cmd/user_test.go new file mode 100644 index 00000000..d3536d52 --- /dev/null +++ b/pkg/server/cmd/user_test.go @@ -0,0 +1,114 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Dnote. If not, see . + */ + +package cmd + +import ( + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/server/database" + "github.com/dnote/dnote/pkg/server/testutils" + "golang.org/x/crypto/bcrypt" +) + +func TestUserCreateCmd(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Call the function directly + userCreateCmd([]string{"--dbPath", tmpDB, "--email", "test@example.com", "--password", "password123"}) + + // Verify user was created in database + db := testutils.InitDB(tmpDB) + defer func() { + sqlDB, _ := db.DB() + sqlDB.Close() + }() + + var count int64 + testutils.MustExec(t, db.Model(&database.User{}).Count(&count), "counting users") + assert.Equal(t, count, int64(1), "should have 1 user") + + var account database.Account + testutils.MustExec(t, db.Where("email = ?", "test@example.com").First(&account), "finding account") + assert.Equal(t, account.Email.String, "test@example.com", "email mismatch") +} + +func TestUserRemoveCmd(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Create a user first + db := testutils.InitDB(tmpDB) + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "test@example.com", "password123") + sqlDB, _ := db.DB() + sqlDB.Close() + + // Remove the user with mock stdin that responds "y" + mockStdin := strings.NewReader("y\n") + userRemoveCmd([]string{"--dbPath", tmpDB, "--email", "test@example.com"}, mockStdin) + + // Verify user was removed + db2 := testutils.InitDB(tmpDB) + defer func() { + sqlDB2, _ := db2.DB() + sqlDB2.Close() + }() + + var count int64 + testutils.MustExec(t, db2.Model(&database.User{}).Count(&count), "counting users") + assert.Equal(t, count, int64(0), "should have 0 users") +} + +func TestUserResetPasswordCmd(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Create a user first + db := testutils.InitDB(tmpDB) + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "test@example.com", "oldpassword123") + oldPasswordHash := account.Password.String + sqlDB, _ := db.DB() + sqlDB.Close() + + // Reset password + userResetPasswordCmd([]string{"--dbPath", tmpDB, "--email", "test@example.com", "--password", "newpassword123"}) + + // Verify password was changed + db2 := testutils.InitDB(tmpDB) + defer func() { + sqlDB2, _ := db2.DB() + sqlDB2.Close() + }() + + var updatedAccount database.Account + testutils.MustExec(t, db2.Where("email = ?", "test@example.com").First(&updatedAccount), "finding account") + + // Verify password hash changed + assert.Equal(t, updatedAccount.Password.String != oldPasswordHash, true, "password hash should be different") + assert.Equal(t, len(updatedAccount.Password.String) > 0, true, "password should be set") + + // Verify new password works + err := bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("newpassword123")) + assert.Equal(t, err, nil, "new password should match") + + // Verify old password doesn't work + err = bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("oldpassword123")) + assert.Equal(t, err != nil, true, "old password should not match") +} diff --git a/pkg/server/cmd/version.go b/pkg/server/cmd/version.go new file mode 100644 index 00000000..99c68429 --- /dev/null +++ b/pkg/server/cmd/version.go @@ -0,0 +1,29 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Dnote. If not, see . + */ + +package cmd + +import ( + "fmt" + + "github.com/dnote/dnote/pkg/server/buildinfo" +) + +func versionCmd() { + fmt.Printf("dnote-server-%s\n", buildinfo.Version) +} diff --git a/pkg/server/controllers/users.go b/pkg/server/controllers/users.go index 67baca6a..b1945d8f 100644 --- a/pkg/server/controllers/users.go +++ b/pkg/server/controllers/users.go @@ -396,27 +396,21 @@ func (u *Users) PasswordReset(w http.ResponseWriter, r *http.Request) { return } - tx := u.app.DB.Begin() - - hashedPassword, err := bcrypt.GenerateFromPassword([]byte(params.Password), bcrypt.DefaultCost) - if err != nil { - tx.Rollback() - handleHTMLError(w, r, err, "hashing password", u.PasswordResetConfirmView, vd) - return - } - var account database.Account if err := u.app.DB.Where("user_id = ?", token.UserID).First(&account).Error; err != nil { - tx.Rollback() handleHTMLError(w, r, err, "finding user", u.PasswordResetConfirmView, vd) return } - if err := tx.Model(&account).Update("password", string(hashedPassword)).Error; err != nil { + tx := u.app.DB.Begin() + + // Update the password + if err := app.UpdateAccountPassword(tx, &account, params.Password); err != nil { tx.Rollback() handleHTMLError(w, r, err, "updating password", u.PasswordResetConfirmView, vd) return } + if err := tx.Model(&token).Update("used_at", time.Now()).Error; err != nil { tx.Rollback() handleHTMLError(w, r, err, "updating password reset token", u.PasswordResetConfirmView, vd) @@ -514,18 +508,7 @@ func (u *Users) PasswordUpdate(w http.ResponseWriter, r *http.Request) { return } - if err := validatePassword(form.NewPassword); err != nil { - handleHTMLError(w, r, err, "invalid password", u.SettingView, vd) - return - } - - hashedNewPassword, err := bcrypt.GenerateFromPassword([]byte(form.NewPassword), bcrypt.DefaultCost) - if err != nil { - handleHTMLError(w, r, err, "hashing password", u.SettingView, vd) - return - } - - if err := u.app.DB.Model(&account).Update("password", string(hashedNewPassword)).Error; err != nil { + if err := app.UpdateAccountPassword(u.app.DB, &account, form.NewPassword); err != nil { handleHTMLError(w, r, err, "updating password", u.SettingView, vd) return } @@ -537,14 +520,6 @@ func (u *Users) PasswordUpdate(w http.ResponseWriter, r *http.Request) { views.RedirectAlert(w, r, "/", http.StatusFound, alert) } -func validatePassword(password string) error { - if len(password) < 8 { - return app.ErrPasswordTooShort - } - - return nil -} - type updateProfileForm struct { Email string `schema:"email"` Password string `schema:"password"` diff --git a/pkg/server/log/log_test.go b/pkg/server/log/log_test.go new file mode 100644 index 00000000..3df63b3a --- /dev/null +++ b/pkg/server/log/log_test.go @@ -0,0 +1,38 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Dnote. If not, see . + */ + +package log + +import ( + "testing" +) + +func TestSetLevel(t *testing.T) { + // Reset to default after test + defer SetLevel(LevelInfo) + + SetLevel(LevelDebug) + if currentLevel != LevelDebug { + t.Errorf("Expected level %s, got %s", LevelDebug, currentLevel) + } + + SetLevel(LevelError) + if currentLevel != LevelError { + t.Errorf("Expected level %s, got %s", LevelError, currentLevel) + } +} diff --git a/pkg/server/main.go b/pkg/server/main.go index e8fa1aa8..701912ea 100644 --- a/pkg/server/main.go +++ b/pkg/server/main.go @@ -19,156 +19,9 @@ package main import ( - "flag" - "fmt" - "net/http" - "os" - - "github.com/dnote/dnote/pkg/clock" - "github.com/dnote/dnote/pkg/server/app" - "github.com/dnote/dnote/pkg/server/buildinfo" - "github.com/dnote/dnote/pkg/server/config" - "github.com/dnote/dnote/pkg/server/controllers" - "github.com/dnote/dnote/pkg/server/database" - "github.com/dnote/dnote/pkg/server/log" - "github.com/dnote/dnote/pkg/server/mailer" - "github.com/pkg/errors" - "gorm.io/gorm" + "github.com/dnote/dnote/pkg/server/cmd" ) -func initDB(dbPath string) *gorm.DB { - db := database.Open(dbPath) - database.InitSchema(db) - database.Migrate(db) - - return db -} - -func initApp(cfg config.Config) app.App { - db := initDB(cfg.DBPath) - - emailBackend, err := mailer.NewDefaultBackend(cfg.IsProd()) - if err != nil { - emailBackend = &mailer.DefaultBackend{Enabled: false} - } else { - log.Info("Email backend configured") - } - - return app.App{ - DB: db, - Clock: clock.New(), - EmailTemplates: mailer.NewTemplates(), - EmailBackend: emailBackend, - HTTP500Page: cfg.HTTP500Page, - AppEnv: cfg.AppEnv, - WebURL: cfg.WebURL, - DisableRegistration: cfg.DisableRegistration, - Port: cfg.Port, - DBPath: cfg.DBPath, - AssetBaseURL: cfg.AssetBaseURL, - } -} - -func startCmd(args []string) { - startFlags := flag.NewFlagSet("start", flag.ExitOnError) - startFlags.Usage = func() { - fmt.Printf(`Usage: - dnote-server start [flags] - -Flags: -`) - startFlags.PrintDefaults() - } - - appEnv := startFlags.String("appEnv", "", "Application environment (env: APP_ENV, default: PRODUCTION)") - port := startFlags.String("port", "", "Server port (env: PORT, default: 3001)") - webURL := startFlags.String("webUrl", "", "Full URL to server without trailing slash (env: WebURL, default: http://localhost:3001)") - dbPath := startFlags.String("dbPath", "", "Path to SQLite database file (env: DBPath, default: $XDG_DATA_HOME/dnote/server.db)") - disableRegistration := startFlags.Bool("disableRegistration", false, "Disable user registration (env: DisableRegistration, default: false)") - logLevel := startFlags.String("logLevel", "", "Log level: debug, info, warn, or error (env: LOG_LEVEL, default: info)") - - startFlags.Parse(args) - - cfg, err := config.New(config.Params{ - AppEnv: *appEnv, - Port: *port, - WebURL: *webURL, - DBPath: *dbPath, - DisableRegistration: *disableRegistration, - LogLevel: *logLevel, - }) - if err != nil { - fmt.Printf("Error: %s\n\n", err) - startFlags.Usage() - os.Exit(1) - } - - // Set log level - log.SetLevel(cfg.LogLevel) - - app := initApp(cfg) - defer func() { - sqlDB, err := app.DB.DB() - if err == nil { - sqlDB.Close() - } - }() - - ctl := controllers.New(&app) - rc := controllers.RouteConfig{ - WebRoutes: controllers.NewWebRoutes(&app, ctl), - APIRoutes: controllers.NewAPIRoutes(&app, ctl), - Controllers: ctl, - } - - r, err := controllers.NewRouter(&app, rc) - if err != nil { - panic(errors.Wrap(err, "initializing router")) - } - - log.WithFields(log.Fields{ - "version": buildinfo.Version, - "port": cfg.Port, - }).Info("Dnote server starting") - - if err := http.ListenAndServe(fmt.Sprintf(":%s", cfg.Port), r); err != nil { - log.ErrorWrap(err, "server failed") - os.Exit(1) - } -} - -func versionCmd() { - fmt.Printf("dnote-server-%s\n", buildinfo.Version) -} - -func rootCmd() { - fmt.Printf(`Dnote server - a simple command line notebook - -Usage: - dnote-server [command] [flags] - -Available commands: - start: Start the server (use 'dnote-server start --help' for flags) - version: Print the version -`) -} - func main() { - if len(os.Args) < 2 { - rootCmd() - return - } - - cmd := os.Args[1] - - switch cmd { - case "start": - startCmd(os.Args[2:]) - case "version": - versionCmd() - default: - fmt.Printf("Unknown command %s\n", cmd) - rootCmd() - os.Exit(1) - } + cmd.Execute() } From 7d44c541a4da9c8cd6d842f891af8d5c0b76a704 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 19 Oct 2025 14:30:55 -0700 Subject: [PATCH 15/33] Add Docker images for linux arm64, armv7, 386 (#697) * Add multi-platform Docker support for ARM64, ARMv7, and 386 * Support freebsd amd64 for server * Build docker images locally --- .github/workflows/release-server.yml | 12 ++++- Makefile | 56 ++++--------------- host/docker/Dockerfile | 28 ++++++++-- host/docker/build.sh | 80 ++++++++++++++++++++++++++-- host/docker/release.sh | 13 ----- scripts/cli/release-homebrew.sh | 53 ------------------ scripts/release.sh | 57 -------------------- scripts/server/build.sh | 3 ++ 8 files changed, 122 insertions(+), 180 deletions(-) delete mode 100755 host/docker/release.sh delete mode 100755 scripts/cli/release-homebrew.sh delete mode 100755 scripts/release.sh diff --git a/.github/workflows/release-server.yml b/.github/workflows/release-server.yml index f52e1508..a5f52933 100644 --- a/.github/workflows/release-server.yml +++ b/.github/workflows/release-server.yml @@ -55,10 +55,19 @@ jobs: ./scripts/generate-changelog.sh server "$TAG" "$PREV_TAG" > /tmp/changelog.txt cat /tmp/changelog.txt + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Prepare Docker build context run: | VERSION="${{ steps.version.outputs.version }}" cp build/server/dnote_server_${VERSION}_linux_amd64.tar.gz host/docker/ + cp build/server/dnote_server_${VERSION}_linux_arm64.tar.gz host/docker/ + cp build/server/dnote_server_${VERSION}_linux_arm.tar.gz host/docker/ + cp build/server/dnote_server_${VERSION}_linux_386.tar.gz host/docker/ - name: Login to Docker Hub uses: docker/login-action@v3 @@ -71,11 +80,12 @@ jobs: with: context: ./host/docker push: true + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386 tags: | dnote/dnote:${{ steps.version.outputs.version }} dnote/dnote:latest build-args: | - tarballName=dnote_server_${{ steps.version.outputs.version }}_linux_amd64.tar.gz + version=${{ steps.version.outputs.version }} - name: Create GitHub release env: diff --git a/Makefile b/Makefile index 12cf32cf..5037c408 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,15 @@ endif @${currentDir}/scripts/server/build.sh $(version) .PHONY: build-server +build-server-docker: build-server +ifndef version + $(error version is required. Usage: make version=0.1.0 [platform=linux/amd64] build-server-docker) +endif + + @echo "==> building Docker image" + @(cd ${currentDir}/host/docker && ./build.sh $(version) $(platform)) +.PHONY: build-server-docker + build-cli: ifeq ($(debug), true) @echo "==> building cli in dev mode" @@ -82,53 +91,6 @@ endif endif .PHONY: build-cli -## release -release-cli: clean build-cli -ifndef version - $(error version is required. Usage: make version=0.1.0 release-cli) -endif -ifndef GH - $(error please install github-cli) -endif - - @echo "==> releasing cli" - @${currentDir}/scripts/release.sh cli $(version) ${cliOutputDir} -.PHONY: release-cli - -release-cli-homebrew: -ifndef version - $(error version is required. Usage: make version=0.1.0 release-cli-homebrew) -endif - - @echo "==> releasing cli on Homebrew" - @${currentDir}/scripts/cli/release-homebrew.sh $(version) -.PHONY: release-cli - -release-server: -ifndef version - $(error version is required. Usage: make version=0.1.0 release-server) -endif -ifndef GH - $(error please install github-cli) -endif - - @echo "==> releasing server" - @${currentDir}/scripts/release.sh server $(version) ${serverOutputDir} - - @echo "==> building and releasing docker image" - @(cd ${currentDir}/host/docker && ./build.sh $(version)) - @(cd ${currentDir}/host/docker && ./release.sh $(version)) -.PHONY: release-server - -# migrations -create-migration: -ifndef filename - $(error filename is required. Usage: make filename=your-filename create-migration) -endif - - @(cd ${currentDir}/pkg/server/database && ./scripts/create-migration.sh $(filename)) -.PHONY: create-migration - clean: @git clean -f @rm -rf build diff --git a/host/docker/Dockerfile b/host/docker/Dockerfile index 88681591..e67da318 100644 --- a/host/docker/Dockerfile +++ b/host/docker/Dockerfile @@ -1,12 +1,30 @@ FROM busybox:glibc -ARG tarballName -RUN test -n "$tarballName" +ARG TARGETPLATFORM +ARG version -WORKDIR dnote +RUN test -n "$TARGETPLATFORM" || (echo "TARGETPLATFORM is required" && exit 1) +RUN test -n "$version" || (echo "version is required" && exit 1) -COPY "$tarballName" . -RUN tar -xvzf "$tarballName" +WORKDIR /tmp/tarballs + +# Copy all architecture tarballs +COPY dnote_server_*.tar.gz ./ + +# Select and extract the correct tarball based on target platform +RUN case "$TARGETPLATFORM" in \ + "linux/amd64") ARCH="amd64" ;; \ + "linux/arm64") ARCH="arm64" ;; \ + "linux/arm/v7") ARCH="arm" ;; \ + "linux/386") ARCH="386" ;; \ + *) echo "Unsupported platform: $TARGETPLATFORM" && exit 1 ;; \ + esac && \ + TARBALL="dnote_server_${version}_linux_${ARCH}.tar.gz" && \ + echo "Extracting $TARBALL for $TARGETPLATFORM" && \ + mkdir -p /dnote && \ + tar -xvzf "$TARBALL" -C /dnote + +WORKDIR /dnote COPY entrypoint.sh . ENTRYPOINT ["./entrypoint.sh"] diff --git a/host/docker/build.sh b/host/docker/build.sh index 3ea9c143..add55578 100755 --- a/host/docker/build.sh +++ b/host/docker/build.sh @@ -1,13 +1,85 @@ #!/usr/bin/env bash +# Build Docker image for local testing +# +# Usage: +# # builds for host platform (auto-detected) +# ./build.sh 1.0.0 +# +# # builds arm64 +# ./build.sh 1.0.0 linux/arm64 +# +# # builds multiple platforms +# ./build.sh 1.0.0 "linux/amd64,linux/arm64,linux/arm/v7,linux/386" set -eux version=$1 +# Detect host platform if not specified +if [ -z "${2:-}" ]; then + HOST_ARCH=$(uname -m) + case "$HOST_ARCH" in + x86_64) platform="linux/amd64" ;; + aarch64|arm64) platform="linux/arm64" ;; + armv7l) platform="linux/arm/v7" ;; + i386|i686) platform="linux/386" ;; + *) + echo "Warning: Unsupported architecture: $HOST_ARCH, defaulting to linux/amd64" + platform="linux/amd64" + ;; + esac + echo "Auto-detected platform: $platform" +else + platform=$2 +fi + dir=$(dirname "${BASH_SOURCE[0]}") projectDir="$dir/../.." -tarballName="dnote_server_${version}_linux_amd64.tar.gz" -# copy over the build artifact to the Docker build context -cp "$projectDir/build/server/$tarballName" "$dir" +# Copy all Linux tarballs to Docker build context +cp "$projectDir/build/server/dnote_server_${version}_linux_amd64.tar.gz" "$dir/" +cp "$projectDir/build/server/dnote_server_${version}_linux_arm64.tar.gz" "$dir/" +cp "$projectDir/build/server/dnote_server_${version}_linux_arm.tar.gz" "$dir/" +cp "$projectDir/build/server/dnote_server_${version}_linux_386.tar.gz" "$dir/" -docker build --network=host -t dnote/dnote:"$version" --build-arg tarballName="$tarballName" . +# Count platforms (check for comma) +if [[ "$platform" == *","* ]]; then + echo "Building for multiple platforms: $platform" + + # Check if multiarch builder exists, create if not + if ! docker buildx ls | grep -q "multiarch"; then + echo "Creating multiarch builder for multi-platform builds..." + docker buildx create --name multiarch --use + docker buildx inspect --bootstrap + else + echo "Using existing multiarch builder" + docker buildx use multiarch + fi + echo "" + + docker buildx build \ + --platform "$platform" \ + -t dnote/dnote:"$version" \ + -t dnote/dnote:latest \ + --build-arg version="$version" \ + "$dir" + + # Switch back to default builder + docker buildx use default +else + echo "Building for single platform: $platform" + echo "Image will be loaded to local Docker daemon" + + docker buildx build \ + --platform "$platform" \ + -t dnote/dnote:"$version" \ + -t dnote/dnote:latest \ + --build-arg version="$version" \ + --load \ + "$dir" +fi + +echo "" +echo "Build complete!" +if [[ "$platform" != *","* ]]; then + echo "Test with: docker run --rm dnote/dnote:$version ./dnote-server version" +fi diff --git a/host/docker/release.sh b/host/docker/release.sh deleted file mode 100755 index 4c2be4af..00000000 --- a/host/docker/release.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -set -eux - -version=$1 - -docker login - -# tag the release -docker tag dnote/dnote:"$version" dnote/dnote:latest - -# publish -docker push dnote/dnote:"$version" -docker push dnote/dnote:latest diff --git a/scripts/cli/release-homebrew.sh b/scripts/cli/release-homebrew.sh deleted file mode 100755 index f48f16dc..00000000 --- a/scripts/cli/release-homebrew.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env bash -set -eux - -currentDir=$(dirname "${BASH_SOURCE[0]}") -cliHomebrewDir=${currentDir}/../../homebrew-dnote - -if [ ! -d "$cliHomebrewDir" ]; then - echo "homebrew-dnote not found locally. Cloning." - git clone git@github.com:dnote/homebrew-dnote.git "$cliHomebrewDir" -fi - -version=$1 - -echo "version: $version" - -# Download source tarball and calculate SHA256 -source_url="https://github.com/dnote/dnote/archive/refs/tags/cli-v${version}.tar.gz" -echo "Calculating SHA256 for: $source_url" -sha=$(curl -L "$source_url" | shasum -a 256 | cut -d ' ' -f 1) - -pushd "$cliHomebrewDir" - -echo "pulling latest dnote-homebrew repo" -git checkout master -git pull origin master - -cat > ./Formula/dnote.rb << EOF -class Dnote < Formula - desc "Simple command line notebook for programmers" - homepage "https://www.getdnote.com" - url "https://github.com/dnote/dnote/archive/refs/tags/cli-v${version}.tar.gz" - sha256 "${sha}" - license "GPL-3.0" - head "https://github.com/dnote/dnote.git", branch: "master" - - depends_on "go" => :build - - def install - ldflags = "-s -w -X main.apiEndpoint=https://api.getdnote.com -X main.versionTag=#{version}" - system "go", "build", *std_go_args(ldflags: ldflags), "-tags", "fts5", "./pkg/cli" - end - - test do - system "#{bin}/dnote", "version" - end -end -EOF - -git add . -git commit --author="Bot " -m "Release ${version}" -git push origin master - -popd diff --git a/scripts/release.sh b/scripts/release.sh deleted file mode 100755 index 3cda5897..00000000 --- a/scripts/release.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash -# -# release.sh releases the tarballs and checksum in the build directory -# to GitHub and brew. A prerequisite is to build those files using build.sh. -# use: ./scripts/release.sh cli v0.4.8 path/to/assets - -set -euxo pipefail - -project=$1 -version=$2 -assetPath=$3 - -if [ "$project" != "cli" ] && [ "$project" != "server" ]; then - echo "unrecognized project '$project'" - exit 1 -fi -if [ -z "$version" ]; then - echo "no version specified." - exit 1 -fi -if [[ $version == v* ]]; then - echo "do not prefix version with v" - exit 1 -fi - -# 1. push tag -version_tag="$project-v$version" - -echo "* tagging and pushing the tag" -git tag -a "$version_tag" -m "Release $version_tag" -git push --tags - -# 2. release on GitHub -files=("$assetPath"/*) -file_flags=() -for file in "${files[@]}"; do - file_flags+=("$file") -done - -# mark as prerelease if version is not in a form of major.minor.patch -# e.g. 1.0.1-beta.1 -flags=() -if [[ ! "$version" =~ ^[0-9]+.[0-9]+.[0-9]+$ ]]; then - flags+=("--prerelease") -fi - -echo "* creating release" -set -x - -# Create release -gh release create \ - "$version_tag" \ - "${file_flags[@]}" \ - "${flags[@]}" \ - --title="$version_tag"\ - --notes="Please see the [CHANGELOG](https://github.com/dnote/dnote/blob/master/CHANGELOG.md)" \ - --draft diff --git a/scripts/server/build.sh b/scripts/server/build.sh index a4e24df5..8ee95164 100755 --- a/scripts/server/build.sh +++ b/scripts/server/build.sh @@ -74,3 +74,6 @@ go install src.techknowlogick.com/xgo@latest build linux amd64 build linux arm64 +build linux arm +build linux 386 +build freebsd amd64 From 505fc679660d44a55777f05ffd504e9f83804cbd Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 19 Oct 2025 14:57:29 -0700 Subject: [PATCH 16/33] Fix server release for freebsd (#698) --- scripts/server/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/server/build.sh b/scripts/server/build.sh index 8ee95164..f9c6428e 100755 --- a/scripts/server/build.sh +++ b/scripts/server/build.sh @@ -51,7 +51,7 @@ build() { popd - mv "$destDir/server-${platform}-"* "$destDir/dnote-server" + mv "$destDir/server-${platform}"* "$destDir/dnote-server" # build tarball tarballName="dnote_server_${version}_${platform}_${arch}.tar.gz" From 83ac43b737f9351eb0cf0af4220d34ad2fa0bd04 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 19 Oct 2025 15:38:52 -0700 Subject: [PATCH 17/33] Specify DBPath for docker (#699) --- host/docker/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/host/docker/Dockerfile b/host/docker/Dockerfile index e67da318..71b3d1fa 100644 --- a/host/docker/Dockerfile +++ b/host/docker/Dockerfile @@ -26,6 +26,9 @@ RUN case "$TARGETPLATFORM" in \ WORKDIR /dnote +# Set default database path for all processes (main server, docker exec, shells) +ENV DBPath=/data/dnote.db + COPY entrypoint.sh . ENTRYPOINT ["./entrypoint.sh"] From b03ca999a52f0dcbd4be2c560af76ae7487fdf5d Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 19 Oct 2025 18:32:20 -0700 Subject: [PATCH 18/33] Remove the unused encrypted and public fields (#700) * Remove encrypted fields from notes and books * Remove public from notes * Use consistent flags --- pkg/cli/cmd/sync/sync.go | 3 +- pkg/cli/crypt/crypto.go | 123 -------------- pkg/cli/crypt/crypto_test.go | 118 ------------- pkg/e2e/server_test.go | 30 +++- pkg/server/app/books.go | 13 +- pkg/server/app/notes.go | 53 ++---- pkg/server/app/notes_test.go | 49 +++--- pkg/server/cmd/helpers.go | 25 ++- pkg/server/controllers/books.go | 11 -- pkg/server/controllers/notes.go | 27 +-- pkg/server/controllers/notes_test.go | 185 ++------------------- pkg/server/controllers/routes.go | 2 +- pkg/server/controllers/sync.go | 2 - pkg/server/database/models.go | 3 - pkg/server/middleware/auth.go | 6 +- pkg/server/middleware/auth_test.go | 34 ++++ pkg/server/operations/notes_test.go | 51 ++---- pkg/server/permissions/permissions.go | 3 - pkg/server/permissions/permissions_test.go | 44 +---- pkg/server/presenters/note.go | 2 - pkg/server/presenters/note_test.go | 4 - pkg/server/tmpl/app_test.go | 40 ----- 22 files changed, 175 insertions(+), 653 deletions(-) delete mode 100644 pkg/cli/crypt/crypto.go delete mode 100644 pkg/cli/crypt/crypto_test.go diff --git a/pkg/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go index 28ec71a7..ec66a2cb 100644 --- a/pkg/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -97,8 +97,7 @@ func (l syncList) getLength() int { return len(l.Notes) + len(l.Books) + len(l.ExpungedNotes) + len(l.ExpungedBooks) } -// processFragments categorizes items in sync fragments into a sync list. It also decrypts any -// encrypted data in sync fragments. +// processFragments categorizes items in sync fragments into a sync list. func processFragments(fragments []client.SyncFragment) (syncList, error) { notes := map[string]client.SyncFragNote{} books := map[string]client.SyncFragBook{} diff --git a/pkg/cli/crypt/crypto.go b/pkg/cli/crypt/crypto.go deleted file mode 100644 index 3637c7ca..00000000 --- a/pkg/cli/crypt/crypto.go +++ /dev/null @@ -1,123 +0,0 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . - */ - -// Package crypt provides cryptographic funcitonalities -package crypt - -import ( - "crypto/aes" - "crypto/cipher" - "crypto/rand" - "crypto/sha256" - "encoding/base64" - "io" - - "github.com/pkg/errors" - "golang.org/x/crypto/hkdf" - "golang.org/x/crypto/pbkdf2" -) - -var aesGcmNonceSize = 12 - -func runHkdf(secret, salt, info []byte) ([]byte, error) { - r := hkdf.New(sha256.New, secret, salt, info) - - ret := make([]byte, 32) - _, err := io.ReadFull(r, ret) - if err != nil { - return []byte{}, errors.Wrap(err, "reading key bytes") - } - - return ret, nil -} - -// MakeKeys derives, from the given credential, a key set comprising of an encryption key -// and an authentication key -func MakeKeys(password, email []byte, iteration int) ([]byte, []byte, error) { - masterKey := pbkdf2.Key([]byte(password), []byte(email), iteration, 32, sha256.New) - - authKey, err := runHkdf(masterKey, email, []byte("auth")) - if err != nil { - return nil, nil, errors.Wrap(err, "deriving auth key") - } - - return masterKey, authKey, nil -} - -// AesGcmEncrypt encrypts the plaintext using AES in a GCM mode. It returns -// a ciphertext prepended by a 12 byte pseudo-random nonce, encoded in base64. -func AesGcmEncrypt(key, plaintext []byte) (string, error) { - if key == nil { - return "", errors.New("no key provided") - } - - block, err := aes.NewCipher(key) - if err != nil { - return "", errors.Wrap(err, "initializing aes") - } - - aesgcm, err := cipher.NewGCM(block) - if err != nil { - return "", errors.Wrap(err, "initializing gcm") - } - - nonce := make([]byte, aesGcmNonceSize) - if _, err := io.ReadFull(rand.Reader, nonce); err != nil { - return "", errors.Wrap(err, "generating nonce") - } - - ciphertext := aesgcm.Seal(nonce, nonce, []byte(plaintext), nil) - cipherKeyB64 := base64.StdEncoding.EncodeToString(ciphertext) - - return cipherKeyB64, nil -} - -// AesGcmDecrypt decrypts the encrypted data using AES in a GCM mode. The data should be -// a base64 encoded string in the format of 12 byte nonce followed by a ciphertext. -func AesGcmDecrypt(key []byte, dataB64 string) ([]byte, error) { - if key == nil { - return nil, errors.New("no key provided") - } - - data, err := base64.StdEncoding.DecodeString(dataB64) - if err != nil { - return nil, errors.Wrap(err, "decoding base64 data") - } - - block, err := aes.NewCipher(key) - if err != nil { - return nil, errors.Wrap(err, "initializing aes") - } - - aesgcm, err := cipher.NewGCM(block) - if err != nil { - return nil, errors.Wrap(err, "initializing gcm") - } - - if len(data) < aesGcmNonceSize { - return nil, errors.Wrap(err, "malformed data") - } - - nonce, ciphertext := data[:aesGcmNonceSize], data[aesGcmNonceSize:] - plaintext, err := aesgcm.Open(nil, nonce, ciphertext, nil) - if err != nil { - return nil, errors.Wrap(err, "decrypting") - } - - return plaintext, nil -} diff --git a/pkg/cli/crypt/crypto_test.go b/pkg/cli/crypt/crypto_test.go deleted file mode 100644 index 805e2724..00000000 --- a/pkg/cli/crypt/crypto_test.go +++ /dev/null @@ -1,118 +0,0 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . - */ - -package crypt - -import ( - "crypto/aes" - "crypto/cipher" - "encoding/base64" - "fmt" - "testing" - - "github.com/dnote/dnote/pkg/assert" - "github.com/pkg/errors" -) - -func TestAesGcmEncrypt(t *testing.T) { - testCases := []struct { - key []byte - plaintext []byte - }{ - { - key: []byte("AES256Key-32Characters1234567890"), - plaintext: []byte("foo bar baz quz"), - }, - { - key: []byte("AES256Key-32Charactersabcdefghij"), - plaintext: []byte("1234 foo 5678 bar 7890 baz"), - }, - } - - for _, tc := range testCases { - t.Run(fmt.Sprintf("key %s plaintext %s", tc.key, tc.plaintext), func(t *testing.T) { - // encrypt - dataB64, err := AesGcmEncrypt(tc.key, tc.plaintext) - if err != nil { - t.Fatal(errors.Wrap(err, "performing encryption")) - } - - // test that data can be decrypted - data, err := base64.StdEncoding.DecodeString(dataB64) - if err != nil { - t.Fatal(errors.Wrap(err, "decoding data from base64")) - } - - nonce, ciphertext := data[:12], data[12:] - - fmt.Println(string(data)) - - block, err := aes.NewCipher([]byte(tc.key)) - if err != nil { - t.Fatal(errors.Wrap(err, "initializing aes")) - } - - aesgcm, err := cipher.NewGCM(block) - if err != nil { - t.Fatal(errors.Wrap(err, "initializing gcm")) - } - - plaintext, err := aesgcm.Open(nil, nonce, ciphertext, nil) - if err != nil { - t.Fatal(errors.Wrap(err, "decode")) - } - - assert.DeepEqual(t, plaintext, tc.plaintext, "plaintext mismatch") - }) - } -} - -func TestAesGcmDecrypt(t *testing.T) { - testCases := []struct { - key []byte - ciphertextB64 string - expectedPlaintext string - }{ - { - key: []byte("AES256Key-32Characters1234567890"), - ciphertextB64: "M2ov9hWMQ52v1S/zigwX3bJt4cVCV02uiRm/grKqN/rZxNkJrD7vK4Ii0g==", - expectedPlaintext: "foo bar baz quz", - }, - { - key: []byte("AES256Key-32Characters1234567890"), - ciphertextB64: "M4csFKUIUbD1FBEzLgHjscoKgN0lhMGJ0n2nKWiCkE/qSKlRP7kS", - expectedPlaintext: "foo\n1\nbar\n2", - }, - { - key: []byte("AES256Key-32Characters1234567890"), - ciphertextB64: "pe/fnw73MR1clmVIlRSJ5gDwBdnPly/DF7DsR5dJVz4dHZlv0b10WzvJEGOCHZEr+Q==", - expectedPlaintext: "föo\nbār\nbåz & qūz", - }, - } - - for _, tc := range testCases { - t.Run(fmt.Sprintf("key %s ciphertext %s", tc.key, tc.ciphertextB64), func(t *testing.T) { - plaintext, err := AesGcmDecrypt(tc.key, tc.ciphertextB64) - if err != nil { - t.Fatal(errors.Wrap(err, "performing decryption")) - } - - assert.DeepEqual(t, plaintext, []byte(tc.expectedPlaintext), "plaintext mismatch") - }) - } -} diff --git a/pkg/e2e/server_test.go b/pkg/e2e/server_test.go index cfe6a711..39da46de 100644 --- a/pkg/e2e/server_test.go +++ b/pkg/e2e/server_test.go @@ -50,7 +50,7 @@ func TestServerStart(t *testing.T) { port := "13456" // Use different port to avoid conflicts with main test server // Start server in background - cmd := exec.Command(testServerBinary, "start", "-port", port) + cmd := exec.Command(testServerBinary, "start", "--port", port) cmd.Env = append(os.Environ(), "DBPath="+tmpDB, "WebURL=http://localhost:"+port, @@ -143,11 +143,11 @@ func TestServerStartHelp(t *testing.T) { outputStr := string(output) assert.Equal(t, strings.Contains(outputStr, "dnote-server start [flags]"), true, "output should contain usage") - assert.Equal(t, strings.Contains(outputStr, "-appEnv"), true, "output should contain appEnv flag") - assert.Equal(t, strings.Contains(outputStr, "-port"), true, "output should contain port flag") - assert.Equal(t, strings.Contains(outputStr, "-webUrl"), true, "output should contain webUrl flag") - assert.Equal(t, strings.Contains(outputStr, "-dbPath"), true, "output should contain dbPath flag") - assert.Equal(t, strings.Contains(outputStr, "-disableRegistration"), true, "output should contain disableRegistration flag") + assert.Equal(t, strings.Contains(outputStr, "--appEnv"), true, "output should contain appEnv flag") + assert.Equal(t, strings.Contains(outputStr, "--port"), true, "output should contain port flag") + assert.Equal(t, strings.Contains(outputStr, "--webUrl"), true, "output should contain webUrl flag") + assert.Equal(t, strings.Contains(outputStr, "--dbPath"), true, "output should contain dbPath flag") + assert.Equal(t, strings.Contains(outputStr, "--disableRegistration"), true, "output should contain disableRegistration flag") } func TestServerStartInvalidConfig(t *testing.T) { @@ -166,7 +166,7 @@ func TestServerStartInvalidConfig(t *testing.T) { assert.Equal(t, strings.Contains(outputStr, "Error:"), true, "output should contain error message") assert.Equal(t, strings.Contains(outputStr, "Invalid WebURL"), true, "output should mention invalid WebURL") assert.Equal(t, strings.Contains(outputStr, "dnote-server start [flags]"), true, "output should show usage") - assert.Equal(t, strings.Contains(outputStr, "-webUrl"), true, "output should show flags") + assert.Equal(t, strings.Contains(outputStr, "--webUrl"), true, "output should show flags") } func TestServerUnknownCommand(t *testing.T) { @@ -321,3 +321,19 @@ func TestServerUserRemove(t *testing.T) { db.Table("users").Count(&count) assert.Equal(t, count, int64(0), "should have 0 users after removal") } + +func TestServerUserCreateHelp(t *testing.T) { + cmd := exec.Command(testServerBinary, "user", "create", "--help") + output, err := cmd.CombinedOutput() + + if err != nil { + t.Fatalf("help command failed: %v\nOutput: %s", err, output) + } + + outputStr := string(output) + + // Verify help shows double-dash flags for consistency with CLI + assert.Equal(t, strings.Contains(outputStr, "--email"), true, "help should show --email (double dash)") + assert.Equal(t, strings.Contains(outputStr, "--password"), true, "help should show --password (double dash)") + assert.Equal(t, strings.Contains(outputStr, "--dbPath"), true, "help should show --dbPath (double dash)") +} diff --git a/pkg/server/app/books.go b/pkg/server/app/books.go index c3b89ec0..a476a0c4 100644 --- a/pkg/server/app/books.go +++ b/pkg/server/app/books.go @@ -41,12 +41,11 @@ func (a *App) CreateBook(user database.User, name string) (database.Book, error) } book := database.Book{ - UUID: uuid, - UserID: user.ID, - Label: name, - AddedOn: a.Clock.Now().UnixNano(), - USN: nextUSN, - Encrypted: false, + UUID: uuid, + UserID: user.ID, + Label: name, + AddedOn: a.Clock.Now().UnixNano(), + USN: nextUSN, } if err := tx.Create(&book).Error; err != nil { tx.Rollback() @@ -99,8 +98,6 @@ func (a *App) UpdateBook(tx *gorm.DB, user database.User, book database.Book, la book.USN = nextUSN book.EditedOn = a.Clock.Now().UnixNano() book.Deleted = false - // TODO: remove after all users have been migrated - book.Encrypted = false if err := tx.Save(&book).Error; err != nil { return book, errors.Wrap(err, "updating the book") diff --git a/pkg/server/app/notes.go b/pkg/server/app/notes.go index 7773953d..e9f6f60b 100644 --- a/pkg/server/app/notes.go +++ b/pkg/server/app/notes.go @@ -30,7 +30,7 @@ import ( // CreateNote creates a note with the next usn and updates the user's max_usn. // It returns the created note. -func (a *App) CreateNote(user database.User, bookUUID, content string, addedOn *int64, editedOn *int64, public bool, client string) (database.Note, error) { +func (a *App) CreateNote(user database.User, bookUUID, content string, addedOn *int64, editedOn *int64, client string) (database.Note, error) { tx := a.DB.Begin() nextUSN, err := incrementUserUSN(tx, user.ID) @@ -59,16 +59,14 @@ func (a *App) CreateNote(user database.User, bookUUID, content string, addedOn * } note := database.Note{ - UUID: uuid, - BookUUID: bookUUID, - UserID: user.ID, - AddedOn: noteAddedOn, - EditedOn: noteEditedOn, - USN: nextUSN, - Body: content, - Public: public, - Encrypted: false, - Client: client, + UUID: uuid, + BookUUID: bookUUID, + UserID: user.ID, + AddedOn: noteAddedOn, + EditedOn: noteEditedOn, + USN: nextUSN, + Body: content, + Client: client, } if err := tx.Create(¬e).Error; err != nil { tx.Rollback() @@ -84,7 +82,6 @@ func (a *App) CreateNote(user database.User, bookUUID, content string, addedOn * type UpdateNoteParams struct { BookUUID *string Content *string - Public *bool } // GetBookUUID gets the bookUUID from the UpdateNoteParams @@ -105,15 +102,6 @@ func (r UpdateNoteParams) GetContent() string { return *r.Content } -// GetPublic gets the public field from the UpdateNoteParams -func (r UpdateNoteParams) GetPublic() bool { - if r.Public == nil { - return false - } - - return *r.Public -} - // UpdateNote creates a note with the next usn and updates the user's max_usn func (a *App) UpdateNote(tx *gorm.DB, user database.User, note database.Note, p *UpdateNoteParams) (database.Note, error) { nextUSN, err := incrementUserUSN(tx, user.ID) @@ -127,15 +115,10 @@ func (a *App) UpdateNote(tx *gorm.DB, user database.User, note database.Note, p if p.Content != nil { note.Body = p.GetContent() } - if p.Public != nil { - note.Public = p.GetPublic() - } note.USN = nextUSN note.EditedOn = a.Clock.Now().UnixNano() note.Deleted = false - // TODO: remove after all users are migrated - note.Encrypted = false if err := tx.Save(¬e).Error; err != nil { return note, pkgErrors.Wrap(err, "editing note") @@ -180,13 +163,12 @@ func (a *App) GetUserNoteByUUID(userID int, uuid string) (*database.Note, error) // GetNotesParams is params for finding notes type GetNotesParams struct { - Year int - Month int - Page int - Books []string - Search string - Encrypted bool - PerPage int + Year int + Month int + Page int + Books []string + Search string + PerPage int } type ftsParams struct { @@ -215,14 +197,13 @@ notes.added_on, notes.edited_on, notes.usn, notes.deleted, -notes.encrypted, ` + bodyExpr) } func getNotesBaseQuery(db *gorm.DB, userID int, q GetNotesParams) *gorm.DB { conn := db.Where( - "notes.user_id = ? AND notes.deleted = ? AND notes.encrypted = ?", - userID, false, q.Encrypted, + "notes.user_id = ? AND notes.deleted = ?", + userID, false, ) if q.Search != "" { diff --git a/pkg/server/app/notes_test.go b/pkg/server/app/notes_test.go index 7813c54b..42a0bd8a 100644 --- a/pkg/server/app/notes_test.go +++ b/pkg/server/app/notes_test.go @@ -91,7 +91,7 @@ func TestCreateNote(t *testing.T) { a.DB = db a.Clock = mockClock - if _, err := a.CreateNote(user, b1.UUID, "note content", tc.addedOn, tc.editedOn, false, ""); err != nil { + if _, err := a.CreateNote(user, b1.UUID, "note content", tc.addedOn, tc.editedOn, ""); err != nil { t.Fatal(errors.Wrapf(err, "creating note for test case %d", idx)) } @@ -139,7 +139,7 @@ func TestCreateNote_EmptyBody(t *testing.T) { a.Clock = clock.NewMock() // Create note with empty body - note, err := a.CreateNote(user, b1.UUID, "", nil, nil, false, "") + note, err := a.CreateNote(user, b1.UUID, "", nil, nil, "") if err != nil { t.Fatal(errors.Wrap(err, "creating note with empty body")) } @@ -188,7 +188,6 @@ func TestUpdateNote(t *testing.T) { c := clock.NewMock() content := "updated test content" - public := true a := NewTest() a.DB = db @@ -197,7 +196,6 @@ func TestUpdateNote(t *testing.T) { tx := db.Begin() if _, err := a.UpdateNote(tx, user, note, &UpdateNoteParams{ Content: &content, - Public: &public, }); err != nil { tx.Rollback() t.Fatal(errors.Wrap(err, "updating note")) @@ -218,7 +216,6 @@ func TestUpdateNote(t *testing.T) { assert.Equal(t, noteCount, int64(1), "note count mismatch") assert.Equal(t, noteRecord.UserID, user.ID, "note UserID mismatch") assert.Equal(t, noteRecord.Body, content, "note Body mismatch") - assert.Equal(t, noteRecord.Public, public, "note Public mismatch") assert.Equal(t, noteRecord.Deleted, false, "note Deleted mismatch") assert.Equal(t, noteRecord.USN, expectedUSN, "note USN mismatch") assert.Equal(t, userRecord.MaxUSN, expectedUSN, "user MaxUSN mismatch") @@ -374,10 +371,9 @@ func TestGetNotes_FTSSearch(t *testing.T) { // Search "baz" result, err := a.GetNotes(user.ID, GetNotesParams{ - Search: "baz", - Encrypted: false, - Page: 1, - PerPage: 30, + Search: "baz", + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search")) @@ -390,10 +386,9 @@ func TestGetNotes_FTSSearch(t *testing.T) { // Search for "running" - should return 1 note result, err = a.GetNotes(user.ID, GetNotesParams{ - Search: "running", - Encrypted: false, - Page: 1, - PerPage: 30, + Search: "running", + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search for review")) @@ -405,10 +400,9 @@ func TestGetNotes_FTSSearch(t *testing.T) { // Search for non-existent term - should return 0 notes result, err = a.GetNotes(user.ID, GetNotesParams{ - Search: "nonexistent", - Encrypted: false, - Page: 1, - PerPage: 30, + Search: "nonexistent", + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search for nonexistent")) @@ -437,10 +431,9 @@ func TestGetNotes_FTSSearch_Snippet(t *testing.T) { // Search for "keyword" in long note - should return snippet with "..." result, err := a.GetNotes(user.ID, GetNotesParams{ - Search: "keyword", - Encrypted: false, - Page: 1, - PerPage: 30, + Search: "keyword", + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search for keyword")) @@ -472,10 +465,9 @@ func TestGetNotes_FTSSearch_ShortWord(t *testing.T) { a.Clock = clock.NewMock() result, err := a.GetNotes(user.ID, GetNotesParams{ - Search: "a", - Encrypted: false, - Page: 1, - PerPage: 30, + Search: "a", + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search for 'a'")) @@ -504,10 +496,9 @@ func TestGetNotes_All(t *testing.T) { a.Clock = clock.NewMock() result, err := a.GetNotes(user.ID, GetNotesParams{ - Search: "", - Encrypted: false, - Page: 1, - PerPage: 30, + Search: "", + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search for 'a'")) diff --git a/pkg/server/cmd/helpers.go b/pkg/server/cmd/helpers.go index a22c8721..eb58c318 100644 --- a/pkg/server/cmd/helpers.go +++ b/pkg/server/cmd/helpers.go @@ -65,6 +65,29 @@ func initApp(cfg config.Config) app.App { } } +// printFlags prints flags with -- prefix for consistency with CLI +func printFlags(fs *flag.FlagSet) { + fs.VisitAll(func(f *flag.Flag) { + fmt.Printf(" --%s", f.Name) + + // Print type hint for non-boolean flags + name, usage := flag.UnquoteUsage(f) + if name != "" { + fmt.Printf(" %s", name) + } + fmt.Println() + + // Print usage description with indentation + if usage != "" { + fmt.Printf(" \t%s", usage) + if f.DefValue != "" && f.DefValue != "false" { + fmt.Printf(" (default: %s)", f.DefValue) + } + fmt.Println() + } + }) +} + // setupFlagSet creates a FlagSet with standard usage format func setupFlagSet(name, usageCmd string) *flag.FlagSet { fs := flag.NewFlagSet(name, flag.ExitOnError) @@ -74,7 +97,7 @@ func setupFlagSet(name, usageCmd string) *flag.FlagSet { Flags: `, usageCmd) - fs.PrintDefaults() + printFlags(fs) } return fs } diff --git a/pkg/server/controllers/books.go b/pkg/server/controllers/books.go index e2aa6de0..1b4f3810 100644 --- a/pkg/server/controllers/books.go +++ b/pkg/server/controllers/books.go @@ -56,22 +56,11 @@ func (b *Books) getBooks(r *http.Request) ([]database.Book, error) { query := r.URL.Query() name := query.Get("name") - encryptedStr := query.Get("encrypted") if name != "" { part := fmt.Sprintf("%%%s%%", name) conn = conn.Where("LOWER(label) LIKE ?", part) } - if encryptedStr != "" { - var encrypted bool - if encryptedStr == "true" { - encrypted = true - } else { - encrypted = false - } - - conn = conn.Where("encrypted = ?", encrypted) - } var books []database.Book if err := conn.Find(&books).Error; err != nil { diff --git a/pkg/server/controllers/notes.go b/pkg/server/controllers/notes.go index a7434366..dd34a78d 100644 --- a/pkg/server/controllers/notes.go +++ b/pkg/server/controllers/notes.go @@ -73,7 +73,6 @@ func parseGetNotesQuery(q url.Values) (app.GetNotesParams, error) { yearStr := q.Get("year") monthStr := q.Get("month") books := q["book"] - encryptedStr := q.Get("encrypted") pageStr := q.Get("page") page, err := parsePageQuery(q) @@ -107,21 +106,13 @@ func parseGetNotesQuery(q url.Values) (app.GetNotesParams, error) { month = m } - var encrypted bool - if strings.ToLower(encryptedStr) == "true" { - encrypted = true - } else { - encrypted = false - } - ret := app.GetNotesParams{ - Year: year, - Month: month, - Page: page, - Search: parseSearchQuery(q), - Books: books, - Encrypted: encrypted, - PerPage: notesPerPage, + Year: year, + Month: month, + Page: page, + Search: parseSearchQuery(q), + Books: books, + PerPage: notesPerPage, } return ret, nil @@ -231,7 +222,7 @@ func (n *Notes) create(r *http.Request) (database.Note, error) { } client := getClientType(r) - note, err := n.app.CreateNote(*user, params.BookUUID, params.Content, params.AddedOn, params.EditedOn, false, client) + note, err := n.app.CreateNote(*user, params.BookUUID, params.Content, params.AddedOn, params.EditedOn, client) if err != nil { return database.Note{}, errors.Wrap(err, "creating note") } @@ -310,11 +301,10 @@ func (n *Notes) V3Delete(w http.ResponseWriter, r *http.Request) { type updateNotePayload struct { BookUUID *string `schema:"book_uuid" json:"book_uuid"` Content *string `schema:"content" json:"content"` - Public *bool `schema:"public" json:"public"` } func validateUpdateNotePayload(p updateNotePayload) error { - if p.BookUUID == nil && p.Content == nil && p.Public == nil { + if p.BookUUID == nil && p.Content == nil { return app.ErrEmptyUpdate } @@ -350,7 +340,6 @@ func (n *Notes) update(r *http.Request) (database.Note, error) { note, err = n.app.UpdateNote(tx, *user, note, &app.UpdateNoteParams{ BookUUID: params.BookUUID, Content: params.Content, - Public: params.Public, }) if err != nil { tx.Rollback() diff --git a/pkg/server/controllers/notes_test.go b/pkg/server/controllers/notes_test.go index 6bf3c06b..ce3f20c7 100644 --- a/pkg/server/controllers/notes_test.go +++ b/pkg/server/controllers/notes_test.go @@ -42,7 +42,6 @@ func getExpectedNotePayload(n database.Note, b database.Book, u database.User) p UpdatedAt: truncateMicro(n.UpdatedAt), Body: n.Body, AddedOn: n.AddedOn, - Public: n.Public, USN: n.USN, Book: presenters.NoteBook{ UUID: b.UUID, @@ -189,7 +188,9 @@ func TestGetNote(t *testing.T) { defer server.Close() user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "user@test.com", "pass1234") anotherUser := testutils.SetupUserData(db) + testutils.SetupAccountData(db, anotherUser, "another@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -198,22 +199,13 @@ func TestGetNote(t *testing.T) { } testutils.MustExec(t, db.Save(&b1), "preparing b1") - privateNote := database.Note{ + note := database.Note{ UUID: testutils.MustUUID(t), UserID: user.ID, BookUUID: b1.UUID, - Body: "privateNote content", - Public: false, + Body: "note content", } - testutils.MustExec(t, db.Save(&privateNote), "preparing privateNote") - publicNote := database.Note{ - UUID: testutils.MustUUID(t), - UserID: user.ID, - BookUUID: b1.UUID, - Body: "publicNote content", - Public: true, - } - testutils.MustExec(t, db.Save(&publicNote), "preparing publicNote") + testutils.MustExec(t, db.Save(¬e), "preparing note") deletedNote := database.Note{ UUID: testutils.MustUUID(t), UserID: user.ID, @@ -226,9 +218,9 @@ func TestGetNote(t *testing.T) { return fmt.Sprintf("/api/v3/notes/%s", noteUUID) } - t.Run("owner accessing private note", func(t *testing.T) { + t.Run("owner accessing note", func(t *testing.T) { // Execute - url := getURL(publicNote.UUID) + url := getURL(note.UUID) req := testutils.MakeReq(server.URL, "GET", url, "") res := testutils.HTTPAuthDo(t, db, req, user) @@ -240,58 +232,16 @@ func TestGetNote(t *testing.T) { t.Fatal(errors.Wrap(err, "decoding payload")) } - var n2Record database.Note - testutils.MustExec(t, db.Where("uuid = ?", publicNote.UUID).First(&n2Record), "finding n2Record") + var noteRecord database.Note + testutils.MustExec(t, db.Where("uuid = ?", note.UUID).First(¬eRecord), "finding noteRecord") - expected := getExpectedNotePayload(n2Record, b1, user) + expected := getExpectedNotePayload(noteRecord, b1, user) assert.DeepEqual(t, payload, expected, "payload mismatch") }) - t.Run("owner accessing public note", func(t *testing.T) { + t.Run("non-owner accessing note", func(t *testing.T) { // Execute - url := getURL(publicNote.UUID) - req := testutils.MakeReq(server.URL, "GET", url, "") - res := testutils.HTTPAuthDo(t, db, req, user) - - // Test - assert.StatusCodeEquals(t, res, http.StatusOK, "") - - var payload presenters.Note - if err := json.NewDecoder(res.Body).Decode(&payload); err != nil { - t.Fatal(errors.Wrap(err, "decoding payload")) - } - - var n2Record database.Note - testutils.MustExec(t, db.Where("uuid = ?", publicNote.UUID).First(&n2Record), "finding n2Record") - - expected := getExpectedNotePayload(n2Record, b1, user) - assert.DeepEqual(t, payload, expected, "payload mismatch") - }) - - t.Run("non-owner accessing public note", func(t *testing.T) { - // Execute - url := getURL(publicNote.UUID) - req := testutils.MakeReq(server.URL, "GET", url, "") - res := testutils.HTTPAuthDo(t, db, req, anotherUser) - - // Test - assert.StatusCodeEquals(t, res, http.StatusOK, "") - - var payload presenters.Note - if err := json.NewDecoder(res.Body).Decode(&payload); err != nil { - t.Fatal(errors.Wrap(err, "decoding payload")) - } - - var n2Record database.Note - testutils.MustExec(t, db.Where("uuid = ?", publicNote.UUID).First(&n2Record), "finding n2Record") - - expected := getExpectedNotePayload(n2Record, b1, user) - assert.DeepEqual(t, payload, expected, "payload mismatch") - }) - - t.Run("non-owner accessing private note", func(t *testing.T) { - // Execute - url := getURL(privateNote.UUID) + url := getURL(note.UUID) req := testutils.MakeReq(server.URL, "GET", url, "") res := testutils.HTTPAuthDo(t, db, req, anotherUser) @@ -306,42 +256,21 @@ func TestGetNote(t *testing.T) { assert.DeepEqual(t, string(body), "not found\n", "payload mismatch") }) - t.Run("guest accessing public note", func(t *testing.T) { + t.Run("guest accessing note", func(t *testing.T) { // Execute - url := getURL(publicNote.UUID) + url := getURL(note.UUID) req := testutils.MakeReq(server.URL, "GET", url, "") res := testutils.HTTPDo(t, req) // Test - assert.StatusCodeEquals(t, res, http.StatusOK, "") - - var payload presenters.Note - if err := json.NewDecoder(res.Body).Decode(&payload); err != nil { - t.Fatal(errors.Wrap(err, "decoding payload")) - } - - var n2Record database.Note - testutils.MustExec(t, db.Where("uuid = ?", publicNote.UUID).First(&n2Record), "finding n2Record") - - expected := getExpectedNotePayload(n2Record, b1, user) - assert.DeepEqual(t, payload, expected, "payload mismatch") - }) - - t.Run("guest accessing private note", func(t *testing.T) { - // Execute - url := getURL(privateNote.UUID) - req := testutils.MakeReq(server.URL, "GET", url, "") - res := testutils.HTTPDo(t, req) - - // Test - assert.StatusCodeEquals(t, res, http.StatusNotFound, "") + assert.StatusCodeEquals(t, res, http.StatusUnauthorized, "") body, err := io.ReadAll(res.Body) if err != nil { t.Fatal(errors.Wrap(err, "reading body")) } - assert.DeepEqual(t, string(body), "not found\n", "payload mismatch") + assert.DeepEqual(t, string(body), "unauthorized\n", "payload mismatch") }) t.Run("nonexistent", func(t *testing.T) { @@ -533,7 +462,6 @@ func TestUpdateNote(t *testing.T) { type payloadData struct { Content *string `schema:"content" json:"content,omitempty"` BookUUID *string `schema:"book_uuid" json:"book_uuid,omitempty"` - Public *bool `schema:"public" json:"public,omitempty"` } testCases := []struct { @@ -541,12 +469,10 @@ func TestUpdateNote(t *testing.T) { noteUUID string noteBookUUID string noteBody string - notePublic bool noteDeleted bool expectedNoteBody string expectedNoteBookName string expectedNoteBookUUID string - expectedNotePublic bool }{ { payload: testutils.PayloadWrapper{ @@ -556,13 +482,11 @@ func TestUpdateNote(t *testing.T) { }, noteUUID: "ab50aa32-b232-40d8-b10f-10a7f9134053", noteBookUUID: b1UUID, - notePublic: false, noteBody: "original content", noteDeleted: false, expectedNoteBookUUID: b1UUID, expectedNoteBody: "some updated content", expectedNoteBookName: "css", - expectedNotePublic: false, }, { payload: testutils.PayloadWrapper{ @@ -572,13 +496,11 @@ func TestUpdateNote(t *testing.T) { }, noteUUID: "ab50aa32-b232-40d8-b10f-10a7f9134053", noteBookUUID: b1UUID, - notePublic: false, noteBody: "original content", noteDeleted: false, expectedNoteBookUUID: b1UUID, expectedNoteBody: "original content", expectedNoteBookName: "css", - expectedNotePublic: false, }, { payload: testutils.PayloadWrapper{ @@ -588,13 +510,11 @@ func TestUpdateNote(t *testing.T) { }, noteUUID: "ab50aa32-b232-40d8-b10f-10a7f9134053", noteBookUUID: b1UUID, - notePublic: false, noteBody: "original content", noteDeleted: false, expectedNoteBookUUID: b2UUID, expectedNoteBody: "original content", expectedNoteBookName: "js", - expectedNotePublic: false, }, { payload: testutils.PayloadWrapper{ @@ -605,13 +525,11 @@ func TestUpdateNote(t *testing.T) { }, noteUUID: "ab50aa32-b232-40d8-b10f-10a7f9134053", noteBookUUID: b1UUID, - notePublic: false, noteBody: "original content", noteDeleted: false, expectedNoteBookUUID: b2UUID, expectedNoteBody: "some updated content", expectedNoteBookName: "js", - expectedNotePublic: false, }, { payload: testutils.PayloadWrapper{ @@ -622,80 +540,11 @@ func TestUpdateNote(t *testing.T) { }, noteUUID: "ab50aa32-b232-40d8-b10f-10a7f9134053", noteBookUUID: b1UUID, - notePublic: false, noteBody: "", noteDeleted: true, expectedNoteBookUUID: b1UUID, expectedNoteBody: updatedBody, expectedNoteBookName: "js", - expectedNotePublic: false, - }, - { - payload: testutils.PayloadWrapper{ - Data: payloadData{ - Public: &testutils.TrueVal, - }, - }, - noteUUID: "ab50aa32-b232-40d8-b10f-10a7f9134053", - noteBookUUID: b1UUID, - notePublic: false, - noteBody: "original content", - noteDeleted: false, - expectedNoteBookUUID: b1UUID, - expectedNoteBody: "original content", - expectedNoteBookName: "css", - expectedNotePublic: true, - }, - { - payload: testutils.PayloadWrapper{ - Data: payloadData{ - Public: &testutils.FalseVal, - }, - }, - noteUUID: "ab50aa32-b232-40d8-b10f-10a7f9134053", - noteBookUUID: b1UUID, - notePublic: true, - noteBody: "original content", - noteDeleted: false, - expectedNoteBookUUID: b1UUID, - expectedNoteBody: "original content", - expectedNoteBookName: "css", - expectedNotePublic: false, - }, - { - payload: testutils.PayloadWrapper{ - Data: payloadData{ - Content: &updatedBody, - Public: &testutils.FalseVal, - }, - }, - noteUUID: "ab50aa32-b232-40d8-b10f-10a7f9134053", - noteBookUUID: b1UUID, - notePublic: true, - noteBody: "original content", - noteDeleted: false, - expectedNoteBookUUID: b1UUID, - expectedNoteBody: updatedBody, - expectedNoteBookName: "css", - expectedNotePublic: false, - }, - { - payload: testutils.PayloadWrapper{ - Data: payloadData{ - BookUUID: &b2UUID, - Content: &updatedBody, - Public: &testutils.TrueVal, - }, - }, - noteUUID: "ab50aa32-b232-40d8-b10f-10a7f9134053", - noteBookUUID: b1UUID, - notePublic: false, - noteBody: "original content", - noteDeleted: false, - expectedNoteBookUUID: b2UUID, - expectedNoteBody: updatedBody, - expectedNoteBookName: "js", - expectedNotePublic: true, }, } @@ -734,7 +583,6 @@ func TestUpdateNote(t *testing.T) { BookUUID: tc.noteBookUUID, Body: tc.noteBody, Deleted: tc.noteDeleted, - Public: tc.notePublic, } testutils.MustExec(t, db.Save(¬e), "preparing note") @@ -765,7 +613,6 @@ func TestUpdateNote(t *testing.T) { assert.Equal(t, noteRecord.UUID, tc.noteUUID, "note uuid mismatch for test case") assert.Equal(t, noteRecord.Body, tc.expectedNoteBody, "note content mismatch for test case") assert.Equal(t, noteRecord.BookUUID, tc.expectedNoteBookUUID, "note book_uuid mismatch for test case") - assert.Equal(t, noteRecord.Public, tc.expectedNotePublic, "note public mismatch for test case") assert.Equal(t, noteRecord.USN, 102, "note usn mismatch for test case") assert.Equal(t, userRecord.MaxUSN, 102, "user max_usn mismatch for test case") diff --git a/pkg/server/controllers/routes.go b/pkg/server/controllers/routes.go index db8b706d..ff7be403 100644 --- a/pkg/server/controllers/routes.go +++ b/pkg/server/controllers/routes.go @@ -82,7 +82,7 @@ func NewAPIRoutes(a *app.App, c *Controllers) []Route { {"POST", "/v3/signout", c.Users.V3Logout, true}, {"OPTIONS", "/v3/signout", c.Users.logoutOptions, true}, {"GET", "/v3/notes", mw.Auth(a.DB, c.Notes.V3Index, nil), true}, - {"GET", "/v3/notes/{noteUUID}", c.Notes.V3Show, true}, + {"GET", "/v3/notes/{noteUUID}", mw.Auth(a.DB, c.Notes.V3Show, nil), true}, {"POST", "/v3/notes", mw.Auth(a.DB, c.Notes.V3Create, nil), true}, {"DELETE", "/v3/notes/{noteUUID}", mw.Auth(a.DB, c.Notes.V3Delete, nil), true}, {"PATCH", "/v3/notes/{noteUUID}", mw.Auth(a.DB, c.Notes.V3Update, nil), true}, diff --git a/pkg/server/controllers/sync.go b/pkg/server/controllers/sync.go index 2ce8d02c..e93be7cd 100644 --- a/pkg/server/controllers/sync.go +++ b/pkg/server/controllers/sync.go @@ -75,7 +75,6 @@ type SyncFragNote struct { AddedOn int64 `json:"added_on"` EditedOn int64 `json:"edited_on"` Body string `json:"content"` - Public bool `json:"public"` Deleted bool `json:"deleted"` } @@ -89,7 +88,6 @@ func NewFragNote(note database.Note) SyncFragNote { AddedOn: note.AddedOn, EditedOn: note.EditedOn, Body: note.Body, - Public: note.Public, Deleted: note.Deleted, BookUUID: note.BookUUID, } diff --git a/pkg/server/database/models.go b/pkg/server/database/models.go index 98571e10..99e41c96 100644 --- a/pkg/server/database/models.go +++ b/pkg/server/database/models.go @@ -40,7 +40,6 @@ type Book struct { EditedOn int64 `json:"edited_on"` USN int `json:"-" gorm:"index"` Deleted bool `json:"-" gorm:"default:false"` - Encrypted bool `json:"-" gorm:"default:false"` } // Note is a model for a note @@ -54,10 +53,8 @@ type Note struct { Body string `json:"content"` AddedOn int64 `json:"added_on"` EditedOn int64 `json:"edited_on"` - Public bool `json:"public" gorm:"default:false"` USN int `json:"-" gorm:"index"` Deleted bool `json:"-" gorm:"default:false"` - Encrypted bool `json:"-" gorm:"default:false"` Client string `gorm:"index"` } diff --git a/pkg/server/middleware/auth.go b/pkg/server/middleware/auth.go index 984079e4..f74d1efa 100644 --- a/pkg/server/middleware/auth.go +++ b/pkg/server/middleware/auth.go @@ -101,7 +101,11 @@ func WithAccount(db *gorm.DB, next http.HandlerFunc) http.HandlerFunc { user := context.User(r.Context()) var account database.Account - if err := db.Where("user_id = ?", user.ID).First(&account).Error; err != nil { + err := db.Where("user_id = ?", user.ID).First(&account).Error + if errors.Is(err, gorm.ErrRecordNotFound) { + DoError(w, "account not found", err, http.StatusForbidden) + return + } else if err != nil { DoError(w, "finding account", err, http.StatusInternalServerError) return } diff --git a/pkg/server/middleware/auth_test.go b/pkg/server/middleware/auth_test.go index 1485befa..c0d94096 100644 --- a/pkg/server/middleware/auth_test.go +++ b/pkg/server/middleware/auth_test.go @@ -233,3 +233,37 @@ func TestTokenAuth(t *testing.T) { assert.Equal(t, res.StatusCode, http.StatusUnauthorized, "status code mismatch") }) } + +func TestWithAccount(t *testing.T) { + db := testutils.InitMemoryDB(t) + + handler := func(w http.ResponseWriter, r *http.Request) { + w.WriteHeader(http.StatusOK) + } + + t.Run("user with account", func(t *testing.T) { + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + + server := httptest.NewServer(Auth(db, handler, nil)) + defer server.Close() + + req := testutils.MakeReq(server.URL, "GET", "/", "") + res := testutils.HTTPAuthDo(t, db, req, user) + + assert.Equal(t, res.StatusCode, http.StatusOK, "status code mismatch") + }) + + t.Run("user without account", func(t *testing.T) { + user := testutils.SetupUserData(db) + // Note: not creating account for this user + + server := httptest.NewServer(Auth(db, handler, nil)) + defer server.Close() + + req := testutils.MakeReq(server.URL, "GET", "/", "") + res := testutils.HTTPAuthDo(t, db, req, user) + + assert.Equal(t, res.StatusCode, http.StatusForbidden, "status code mismatch") + }) +} diff --git a/pkg/server/operations/notes_test.go b/pkg/server/operations/notes_test.go index 6124b7e0..f003f7cb 100644 --- a/pkg/server/operations/notes_test.go +++ b/pkg/server/operations/notes_test.go @@ -40,29 +40,17 @@ func TestGetNote(t *testing.T) { } testutils.MustExec(t, db.Save(&b1), "preparing b1") - privateNote := database.Note{ + note := database.Note{ UUID: testutils.MustUUID(t), UserID: user.ID, BookUUID: b1.UUID, - Body: "privateNote content", + Body: "note content", Deleted: false, - Public: false, } - testutils.MustExec(t, db.Save(&privateNote), "preparing privateNote") + testutils.MustExec(t, db.Save(¬e), "preparing note") - publicNote := database.Note{ - UUID: testutils.MustUUID(t), - UserID: user.ID, - BookUUID: b1.UUID, - Body: "privateNote content", - Deleted: false, - Public: true, - } - testutils.MustExec(t, db.Save(&publicNote), "preparing privateNote") - - var privateNoteRecord, publicNoteRecord database.Note - testutils.MustExec(t, db.Where("uuid = ?", privateNote.UUID).Preload("Book").Preload("User").First(&privateNoteRecord), "finding privateNote") - testutils.MustExec(t, db.Where("uuid = ?", publicNote.UUID).Preload("Book").Preload("User").First(&publicNoteRecord), "finding publicNote") + var noteRecord database.Note + testutils.MustExec(t, db.Where("uuid = ?", note.UUID).Preload("Book").Preload("User").First(¬eRecord), "finding note") testCases := []struct { name string @@ -72,40 +60,26 @@ func TestGetNote(t *testing.T) { expectedNote database.Note }{ { - name: "owner accessing private note", + name: "owner accessing note", user: user, - note: privateNote, + note: note, expectedOK: true, - expectedNote: privateNoteRecord, + expectedNote: noteRecord, }, { - name: "non-owner accessing private note", + name: "non-owner accessing note", user: anotherUser, - note: privateNote, + note: note, expectedOK: false, expectedNote: database.Note{}, }, { - name: "non-owner accessing public note", - user: anotherUser, - note: publicNote, - expectedOK: true, - expectedNote: publicNoteRecord, - }, - { - name: "guest accessing private note", + name: "guest accessing note", user: database.User{}, - note: privateNote, + note: note, expectedOK: false, expectedNote: database.Note{}, }, - { - name: "guest accessing public note", - user: database.User{}, - note: publicNote, - expectedOK: true, - expectedNote: publicNoteRecord, - }, } for _, tc := range testCases { @@ -139,7 +113,6 @@ func TestGetNote_nonexistent(t *testing.T) { BookUUID: b1.UUID, Body: "n1 content", Deleted: false, - Public: false, } testutils.MustExec(t, db.Save(&n1), "preparing n1") diff --git a/pkg/server/permissions/permissions.go b/pkg/server/permissions/permissions.go index e3e10e63..d9d017d9 100644 --- a/pkg/server/permissions/permissions.go +++ b/pkg/server/permissions/permissions.go @@ -24,9 +24,6 @@ import ( // ViewNote checks if the given user can view the given note func ViewNote(user *database.User, note database.Note) bool { - if note.Public { - return true - } if user == nil { return false } diff --git a/pkg/server/permissions/permissions_test.go b/pkg/server/permissions/permissions_test.go index 4054b66f..ed439d28 100644 --- a/pkg/server/permissions/permissions_test.go +++ b/pkg/server/permissions/permissions_test.go @@ -39,53 +39,27 @@ func TestViewNote(t *testing.T) { } testutils.MustExec(t, db.Save(&b1), "preparing b1") - privateNote := database.Note{ + note := database.Note{ UUID: testutils.MustUUID(t), UserID: user.ID, BookUUID: b1.UUID, - Body: "privateNote content", + Body: "note content", Deleted: false, - Public: false, } - testutils.MustExec(t, db.Save(&privateNote), "preparing privateNote") + testutils.MustExec(t, db.Save(¬e), "preparing note") - publicNote := database.Note{ - UUID: testutils.MustUUID(t), - UserID: user.ID, - BookUUID: b1.UUID, - Body: "privateNote content", - Deleted: false, - Public: true, - } - testutils.MustExec(t, db.Save(&publicNote), "preparing privateNote") - - t.Run("owner accessing private note", func(t *testing.T) { - result := ViewNote(&user, privateNote) + t.Run("owner accessing note", func(t *testing.T) { + result := ViewNote(&user, note) assert.Equal(t, result, true, "result mismatch") }) - t.Run("owner accessing public note", func(t *testing.T) { - result := ViewNote(&user, publicNote) - assert.Equal(t, result, true, "result mismatch") - }) - - t.Run("non-owner accessing private note", func(t *testing.T) { - result := ViewNote(&anotherUser, privateNote) + t.Run("non-owner accessing note", func(t *testing.T) { + result := ViewNote(&anotherUser, note) assert.Equal(t, result, false, "result mismatch") }) - t.Run("non-owner accessing public note", func(t *testing.T) { - result := ViewNote(&anotherUser, publicNote) - assert.Equal(t, result, true, "result mismatch") - }) - - t.Run("guest accessing private note", func(t *testing.T) { - result := ViewNote(nil, privateNote) + t.Run("guest accessing note", func(t *testing.T) { + result := ViewNote(nil, note) assert.Equal(t, result, false, "result mismatch") }) - - t.Run("guest accessing public note", func(t *testing.T) { - result := ViewNote(nil, publicNote) - assert.Equal(t, result, true, "result mismatch") - }) } diff --git a/pkg/server/presenters/note.go b/pkg/server/presenters/note.go index 4119dd28..a20bb879 100644 --- a/pkg/server/presenters/note.go +++ b/pkg/server/presenters/note.go @@ -31,7 +31,6 @@ type Note struct { UpdatedAt time.Time `json:"updated_at"` Body string `json:"content"` AddedOn int64 `json:"added_on"` - Public bool `json:"public"` USN int `json:"usn"` Book NoteBook `json:"book"` User NoteUser `json:"user"` @@ -57,7 +56,6 @@ func PresentNote(note database.Note) Note { UpdatedAt: FormatTS(note.UpdatedAt), Body: note.Body, AddedOn: note.AddedOn, - Public: note.Public, USN: note.USN, Book: NoteBook{ UUID: note.Book.UUID, diff --git a/pkg/server/presenters/note_test.go b/pkg/server/presenters/note_test.go index 822c5cea..878acf67 100644 --- a/pkg/server/presenters/note_test.go +++ b/pkg/server/presenters/note_test.go @@ -41,7 +41,6 @@ func TestPresentNote(t *testing.T) { BookUUID: "f1e2d3c4-b5a6-4987-b654-321fedcba098", Body: "Test note content", AddedOn: 1234567890, - Public: true, USN: 100, Book: database.Book{ UUID: "f1e2d3c4-b5a6-4987-b654-321fedcba098", @@ -57,7 +56,6 @@ func TestPresentNote(t *testing.T) { assert.Equal(t, got.UUID, "a1b2c3d4-e5f6-4789-a012-3456789abcde", "UUID mismatch") assert.Equal(t, got.Body, "Test note content", "Body mismatch") assert.Equal(t, got.AddedOn, int64(1234567890), "AddedOn mismatch") - assert.Equal(t, got.Public, true, "Public mismatch") assert.Equal(t, got.USN, 100, "USN mismatch") assert.Equal(t, got.CreatedAt, FormatTS(createdAt), "CreatedAt mismatch") assert.Equal(t, got.UpdatedAt, FormatTS(updatedAt), "UpdatedAt mismatch") @@ -84,7 +82,6 @@ func TestPresentNotes(t *testing.T) { BookUUID: "f1e2d3c4-b5a6-4987-b654-321fedcba098", Body: "First note", AddedOn: 1000000000, - Public: false, USN: 10, Book: database.Book{ UUID: "f1e2d3c4-b5a6-4987-b654-321fedcba098", @@ -105,7 +102,6 @@ func TestPresentNotes(t *testing.T) { BookUUID: "abcdef01-2345-4678-9abc-def012345678", Body: "Second note", AddedOn: 2000000000, - Public: true, USN: 20, Book: database.Book{ UUID: "abcdef01-2345-4678-9abc-def012345678", diff --git a/pkg/server/tmpl/app_test.go b/pkg/server/tmpl/app_test.go index fba9bed4..8772bf92 100644 --- a/pkg/server/tmpl/app_test.go +++ b/pkg/server/tmpl/app_test.go @@ -19,12 +19,10 @@ package tmpl import ( - "fmt" "net/http" "testing" "github.com/dnote/dnote/pkg/assert" - "github.com/dnote/dnote/pkg/server/database" "github.com/dnote/dnote/pkg/server/testutils" "github.com/pkg/errors" ) @@ -50,42 +48,4 @@ func TestAppShellExecute(t *testing.T) { assert.Equal(t, string(b), "Dnote", "result mismatch") }) - - t.Run("note", func(t *testing.T) { - db := testutils.InitMemoryDB(t) - - user := testutils.SetupUserData(db) - b1 := database.Book{ - UUID: testutils.MustUUID(t), - UserID: user.ID, - Label: "js", - } - testutils.MustExec(t, db.Save(&b1), "preparing b1") - n1 := database.Note{ - UUID: testutils.MustUUID(t), - UserID: user.ID, - BookUUID: b1.UUID, - Public: true, - Body: "n1 content", - } - testutils.MustExec(t, db.Save(&n1), "preparing note") - - a, err := NewAppShell(db, []byte("{{ .MetaTags }}")) - if err != nil { - t.Fatal(errors.Wrap(err, "preparing app shell")) - } - - endpoint := fmt.Sprintf("http://mock.url/notes/%s", n1.UUID) - r, err := http.NewRequest("GET", endpoint, nil) - if err != nil { - t.Fatal(errors.Wrap(err, "preparing request")) - } - - b, err := a.Execute(r) - if err != nil { - t.Fatal(errors.Wrap(err, "executing")) - } - - assert.NotEqual(t, string(b), "", "result should not be empty") - }) } From 0a5728faf3ce84a6fd6da855129f3fc7a6031d70 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 19 Oct 2025 21:05:47 -0700 Subject: [PATCH 19/33] Merge user and account (#701) --- pkg/e2e/sync_test.go | 9 +- pkg/server/app/books_test.go | 12 +- pkg/server/app/helpers_test.go | 2 +- pkg/server/app/notes_test.go | 24 +-- pkg/server/app/users.go | 73 +++------ pkg/server/app/users_test.go | 127 ++++++--------- pkg/server/cmd/user.go | 12 +- pkg/server/cmd/user_test.go | 26 ++-- pkg/server/context/user.go | 21 +-- pkg/server/controllers/books_test.go | 39 ++--- pkg/server/controllers/notes_test.go | 21 +-- pkg/server/controllers/users.go | 60 ++----- pkg/server/controllers/users_test.go | 146 +++++++----------- pkg/server/database/database.go | 1 - pkg/server/database/models.go | 13 +- pkg/server/middleware/auth.go | 23 --- pkg/server/middleware/auth_test.go | 25 +-- pkg/server/operations/notes_test.go | 6 +- pkg/server/permissions/permissions_test.go | 4 +- pkg/server/session/session.go | 4 +- pkg/server/session/session_test.go | 25 +-- pkg/server/testutils/main.go | 38 ++--- pkg/server/token/token_test.go | 2 +- pkg/server/views/data.go | 5 +- .../views/templates/layouts/navbar.gohtml | 2 +- pkg/server/views/view.go | 5 +- 26 files changed, 248 insertions(+), 477 deletions(-) diff --git a/pkg/e2e/sync_test.go b/pkg/e2e/sync_test.go index c2a1c4ee..73ea3b31 100644 --- a/pkg/e2e/sync_test.go +++ b/pkg/e2e/sync_test.go @@ -136,8 +136,7 @@ func TestMain(m *testing.M) { // helpers func setupUser(t *testing.T, db *cliDatabase.DB) database.User { - user := apitest.SetupUserData(serverDb) - apitest.SetupAccountData(serverDb, user, "alice@example.com", "pass1234") + user := apitest.SetupUserData(serverDb, "alice@example.com", "pass1234") return user } @@ -4255,8 +4254,7 @@ func TestSync_EmptyServer(t *testing.T) { // Step 1: Set up user on Server A and sync apiEndpointA := fmt.Sprintf("%s/api", serverA.URL) - userA := apitest.SetupUserData(serverDbA) - apitest.SetupAccountData(serverDbA, userA, "alice@example.com", "pass1234") + userA := apitest.SetupUserData(serverDbA, "alice@example.com", "pass1234") sessionA := apitest.SetupSession(serverDbA, userA) cliDatabase.MustExec(t, "inserting session_key", ctx.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, sessionA.Key) cliDatabase.MustExec(t, "inserting session_key_expiry", ctx.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, sessionA.ExpiresAt.Unix()) @@ -4280,8 +4278,7 @@ func TestSync_EmptyServer(t *testing.T) { apiEndpointB := fmt.Sprintf("%s/api", serverB.URL) // Set up user on Server B - userB := apitest.SetupUserData(serverDbB) - apitest.SetupAccountData(serverDbB, userB, "alice@example.com", "pass1234") + userB := apitest.SetupUserData(serverDbB, "alice@example.com", "pass1234") sessionB := apitest.SetupSession(serverDbB, userB) cliDatabase.MustExec(t, "updating session_key for B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) cliDatabase.MustExec(t, "updating session_key_expiry for B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) diff --git a/pkg/server/app/books_test.go b/pkg/server/app/books_test.go index 85df4770..66a27077 100644 --- a/pkg/server/app/books_test.go +++ b/pkg/server/app/books_test.go @@ -56,10 +56,10 @@ func TestCreateBook(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) - anotherUser := testutils.SetupUserData(db) + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) a := NewTest() @@ -122,10 +122,10 @@ func TestDeleteBook(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) - anotherUser := testutils.SetupUserData(db) + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) book := database.Book{UserID: user.ID, Label: "js", Deleted: false} @@ -201,10 +201,10 @@ func TestUpdateBook(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) - anotherUser := testutils.SetupUserData(db) + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) b := database.Book{UserID: user.ID, Deleted: false, Label: tc.expectedLabel} diff --git a/pkg/server/app/helpers_test.go b/pkg/server/app/helpers_test.go index 2c7a2828..ad309514 100644 --- a/pkg/server/app/helpers_test.go +++ b/pkg/server/app/helpers_test.go @@ -48,7 +48,7 @@ func TestIncremenetUserUSN(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.maxUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) // execute diff --git a/pkg/server/app/notes_test.go b/pkg/server/app/notes_test.go index 42a0bd8a..38195079 100644 --- a/pkg/server/app/notes_test.go +++ b/pkg/server/app/notes_test.go @@ -77,11 +77,11 @@ func TestCreateNote(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) fmt.Println(user) - anotherUser := testutils.SetupUserData(db) + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) b1 := database.Book{UserID: user.ID, Label: "js", Deleted: false} @@ -130,7 +130,7 @@ func TestCreateNote(t *testing.T) { func TestCreateNote_EmptyBody(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -169,10 +169,10 @@ func TestUpdateNote(t *testing.T) { t.Run(fmt.Sprintf("test case %d", idx), func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), "preparing user max_usn for test case") - anotherUser := testutils.SetupUserData(db) + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), "preparing user max_usn for test case") b1 := database.Book{UserID: user.ID, Label: "js", Deleted: false} @@ -234,7 +234,7 @@ func TestUpdateNote(t *testing.T) { func TestUpdateNote_SameContent(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -291,10 +291,10 @@ func TestDeleteNote(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), fmt.Sprintf("preparing user max_usn for test case %d", idx)) - anotherUser := testutils.SetupUserData(db) + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) b1 := database.Book{UserID: user.ID, Label: "testBook"} @@ -351,7 +351,7 @@ func TestDeleteNote(t *testing.T) { func TestGetNotes_FTSSearch(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -415,7 +415,7 @@ func TestGetNotes_FTSSearch(t *testing.T) { func TestGetNotes_FTSSearch_Snippet(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -449,7 +449,7 @@ func TestGetNotes_FTSSearch_Snippet(t *testing.T) { func TestGetNotes_FTSSearch_ShortWord(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -481,7 +481,7 @@ func TestGetNotes_FTSSearch_ShortWord(t *testing.T) { func TestGetNotes_All(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") diff --git a/pkg/server/app/users.go b/pkg/server/app/users.go index b3993d55..6e9535e7 100644 --- a/pkg/server/app/users.go +++ b/pkg/server/app/users.go @@ -65,7 +65,7 @@ func (a *App) CreateUser(email, password string, passwordConfirmation string) (d tx := a.DB.Begin() var count int64 - if err := tx.Model(database.Account{}).Where("email = ?", email).Count(&count).Error; err != nil { + if err := tx.Model(&database.User{}).Where("email = ?", email).Count(&count).Error; err != nil { return database.User{}, pkgErrors.Wrap(err, "counting user") } if count > 0 { @@ -85,21 +85,14 @@ func (a *App) CreateUser(email, password string, passwordConfirmation string) (d } user := database.User{ - UUID: uuid, + UUID: uuid, + Email: database.ToNullString(email), + Password: database.ToNullString(string(hashedPassword)), } if err = tx.Save(&user).Error; err != nil { tx.Rollback() return database.User{}, pkgErrors.Wrap(err, "saving user") } - account := database.Account{ - Email: database.ToNullString(email), - Password: database.ToNullString(string(hashedPassword)), - UserID: user.ID, - } - if err = tx.Save(&account).Error; err != nil { - tx.Rollback() - return database.User{}, pkgErrors.Wrap(err, "saving account") - } if err := a.TouchLastLoginAt(user, tx); err != nil { tx.Rollback() @@ -111,42 +104,36 @@ func (a *App) CreateUser(email, password string, passwordConfirmation string) (d return user, nil } -// GetAccountByEmail finds an account by email -func (a *App) GetAccountByEmail(email string) (*database.Account, error) { - var account database.Account - err := a.DB.Where("email = ?", email).First(&account).Error +// GetUserByEmail finds a user by email +func (a *App) GetUserByEmail(email string) (*database.User, error) { + var user database.User + err := a.DB.Where("email = ?", email).First(&user).Error if errors.Is(err, gorm.ErrRecordNotFound) { return nil, ErrNotFound } else if err != nil { return nil, err } - return &account, nil + return &user, nil } // Authenticate authenticates a user func (a *App) Authenticate(email, password string) (*database.User, error) { - account, err := a.GetAccountByEmail(email) + user, err := a.GetUserByEmail(email) if err != nil { return nil, err } - err = bcrypt.CompareHashAndPassword([]byte(account.Password.String), []byte(password)) + err = bcrypt.CompareHashAndPassword([]byte(user.Password.String), []byte(password)) if err != nil { return nil, ErrLoginInvalid } - var user database.User - err = a.DB.Where("id = ?", account.UserID).First(&user).Error - if err != nil { - return nil, pkgErrors.Wrap(err, "finding user") - } - - return &user, nil + return user, nil } -// UpdateAccountPassword updates an account's password with validation -func UpdateAccountPassword(db *gorm.DB, account *database.Account, newPassword string) error { +// UpdateUserPassword updates a user's password with validation +func UpdateUserPassword(db *gorm.DB, user *database.User, newPassword string) error { // Validate password if err := validatePassword(newPassword); err != nil { return err @@ -159,25 +146,25 @@ func UpdateAccountPassword(db *gorm.DB, account *database.Account, newPassword s } // Update the password - if err := db.Model(&account).Update("password", string(hashedPassword)).Error; err != nil { + if err := db.Model(&user).Update("password", string(hashedPassword)).Error; err != nil { return pkgErrors.Wrap(err, "updating password") } return nil } -// RemoveUser removes a user and their account from the system +// RemoveUser removes a user from the system // Returns an error if the user has any notes or books func (a *App) RemoveUser(email string) error { - // Find the account and user - account, err := a.GetAccountByEmail(email) + // Find the user + user, err := a.GetUserByEmail(email) if err != nil { return err } // Check if user has any notes var noteCount int64 - if err := a.DB.Model(&database.Note{}).Where("user_id = ? AND deleted = ?", account.UserID, false).Count(¬eCount).Error; err != nil { + if err := a.DB.Model(&database.Note{}).Where("user_id = ? AND deleted = ?", user.ID, false).Count(¬eCount).Error; err != nil { return pkgErrors.Wrap(err, "counting notes") } if noteCount > 0 { @@ -186,34 +173,18 @@ func (a *App) RemoveUser(email string) error { // Check if user has any books var bookCount int64 - if err := a.DB.Model(&database.Book{}).Where("user_id = ? AND deleted = ?", account.UserID, false).Count(&bookCount).Error; err != nil { + if err := a.DB.Model(&database.Book{}).Where("user_id = ? AND deleted = ?", user.ID, false).Count(&bookCount).Error; err != nil { return pkgErrors.Wrap(err, "counting books") } if bookCount > 0 { return ErrUserHasExistingResources } - // Delete account and user in a transaction - tx := a.DB.Begin() - - if err := tx.Delete(&account).Error; err != nil { - tx.Rollback() - return pkgErrors.Wrap(err, "deleting account") - } - - var user database.User - if err := tx.Where("id = ?", account.UserID).First(&user).Error; err != nil { - tx.Rollback() - return pkgErrors.Wrap(err, "finding user") - } - - if err := tx.Delete(&user).Error; err != nil { - tx.Rollback() + // Delete user + if err := a.DB.Delete(&user).Error; err != nil { return pkgErrors.Wrap(err, "deleting user") } - tx.Commit() - return nil } diff --git a/pkg/server/app/users_test.go b/pkg/server/app/users_test.go index a4c3a60d..90184fec 100644 --- a/pkg/server/app/users_test.go +++ b/pkg/server/app/users_test.go @@ -82,21 +82,20 @@ func TestCreateUser_ProValue(t *testing.T) { } -func TestGetAccountByEmail(t *testing.T) { +func TestGetUserByEmail(t *testing.T) { t.Run("success", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@example.com", "password123") + user := testutils.SetupUserData(db, "alice@example.com", "password123") a := NewTest() a.DB = db - account, err := a.GetAccountByEmail("alice@example.com") + foundUser, err := a.GetUserByEmail("alice@example.com") assert.Equal(t, err, nil, "should not error") - assert.Equal(t, account.Email.String, "alice@example.com", "email mismatch") - assert.Equal(t, account.UserID, user.ID, "user ID mismatch") + assert.Equal(t, foundUser.Email.String, "alice@example.com", "email mismatch") + assert.Equal(t, foundUser.ID, user.ID, "user ID mismatch") }) t.Run("not found", func(t *testing.T) { @@ -105,10 +104,10 @@ func TestGetAccountByEmail(t *testing.T) { a := NewTest() a.DB = db - account, err := a.GetAccountByEmail("nonexistent@example.com") + user, err := a.GetUserByEmail("nonexistent@example.com") assert.Equal(t, err, ErrNotFound, "should return ErrNotFound") - assert.Equal(t, account, (*database.Account)(nil), "account should be nil") + assert.Equal(t, user, (*database.User)(nil), "user should be nil") }) } @@ -124,25 +123,21 @@ func TestCreateUser(t *testing.T) { var userCount int64 testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting user") - assert.Equal(t, userCount, int64(1), "book count mismatch") + assert.Equal(t, userCount, int64(1), "user count mismatch") - var accountCount int64 - var accountRecord database.Account - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") - testutils.MustExec(t, db.First(&accountRecord), "finding account") + var userRecord database.User + testutils.MustExec(t, db.First(&userRecord), "finding user") - assert.Equal(t, accountCount, int64(1), "account count mismatch") - assert.Equal(t, accountRecord.Email.String, "alice@example.com", "account email mismatch") + assert.Equal(t, userRecord.Email.String, "alice@example.com", "user email mismatch") - passwordErr := bcrypt.CompareHashAndPassword([]byte(accountRecord.Password.String), []byte("pass1234")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(userRecord.Password.String), []byte("pass1234")) assert.Equal(t, passwordErr, nil, "Password mismatch") }) t.Run("duplicate email", func(t *testing.T) { db := testutils.InitMemoryDB(t) - aliceUser := testutils.SetupUserData(db) - testutils.SetupAccountData(db, aliceUser, "alice@example.com", "somepassword") + testutils.SetupUserData(db, "alice@example.com", "somepassword") a := NewTest() a.DB = db @@ -150,116 +145,109 @@ func TestCreateUser(t *testing.T) { assert.Equal(t, err, ErrDuplicateEmail, "error mismatch") - var userCount, accountCount int64 + var userCount int64 testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting user") - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") assert.Equal(t, userCount, int64(1), "user count mismatch") - assert.Equal(t, accountCount, int64(1), "account count mismatch") }) } -func TestUpdateAccountPassword(t *testing.T) { +func TestUpdateUserPassword(t *testing.T) { t.Run("success", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") - err := UpdateAccountPassword(db, &account, "newpassword123") + err := UpdateUserPassword(db, &user, "newpassword123") assert.Equal(t, err, nil, "should not error") // Verify password was updated in database - var updatedAccount database.Account - testutils.MustExec(t, db.Where("id = ?", account.ID).First(&updatedAccount), "finding updated account") + var updatedUser database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&updatedUser), "finding updated user") // Verify new password works - passwordErr := bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("newpassword123")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(updatedUser.Password.String), []byte("newpassword123")) assert.Equal(t, passwordErr, nil, "New password should match") // Verify old password no longer works - oldPasswordErr := bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("oldpassword123")) + oldPasswordErr := bcrypt.CompareHashAndPassword([]byte(updatedUser.Password.String), []byte("oldpassword123")) assert.NotEqual(t, oldPasswordErr, nil, "Old password should not match") }) t.Run("password too short", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") - err := UpdateAccountPassword(db, &account, "short") + err := UpdateUserPassword(db, &user, "short") assert.Equal(t, err, ErrPasswordTooShort, "should return ErrPasswordTooShort") // Verify password was NOT updated in database - var unchangedAccount database.Account - testutils.MustExec(t, db.Where("id = ?", account.ID).First(&unchangedAccount), "finding unchanged account") + var unchangedUser database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&unchangedUser), "finding unchanged user") // Verify old password still works - passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedAccount.Password.String), []byte("oldpassword123")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedUser.Password.String), []byte("oldpassword123")) assert.Equal(t, passwordErr, nil, "Old password should still match") }) t.Run("empty password", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") - err := UpdateAccountPassword(db, &account, "") + err := UpdateUserPassword(db, &user, "") assert.Equal(t, err, ErrPasswordTooShort, "should return ErrPasswordTooShort") // Verify password was NOT updated in database - var unchangedAccount database.Account - testutils.MustExec(t, db.Where("id = ?", account.ID).First(&unchangedAccount), "finding unchanged account") + var unchangedUser database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&unchangedUser), "finding unchanged user") // Verify old password still works - passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedAccount.Password.String), []byte("oldpassword123")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedUser.Password.String), []byte("oldpassword123")) assert.Equal(t, passwordErr, nil, "Old password should still match") }) t.Run("transaction rollback", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") - // Start a transaction and rollback to verify UpdateAccountPassword respects transactions + // Start a transaction and rollback to verify UpdateUserPassword respects transactions tx := db.Begin() - err := UpdateAccountPassword(tx, &account, "newpassword123") + err := UpdateUserPassword(tx, &user, "newpassword123") assert.Equal(t, err, nil, "should not error") tx.Rollback() // Verify password was NOT updated after rollback - var unchangedAccount database.Account - testutils.MustExec(t, db.Where("id = ?", account.ID).First(&unchangedAccount), "finding unchanged account") + var unchangedUser database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&unchangedUser), "finding unchanged user") // Verify old password still works - passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedAccount.Password.String), []byte("oldpassword123")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(unchangedUser.Password.String), []byte("oldpassword123")) assert.Equal(t, passwordErr, nil, "Old password should still match after rollback") }) t.Run("transaction commit", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") - // Start a transaction and commit to verify UpdateAccountPassword respects transactions + // Start a transaction and commit to verify UpdateUserPassword respects transactions tx := db.Begin() - err := UpdateAccountPassword(tx, &account, "newpassword123") + err := UpdateUserPassword(tx, &user, "newpassword123") assert.Equal(t, err, nil, "should not error") tx.Commit() // Verify password was updated after commit - var updatedAccount database.Account - testutils.MustExec(t, db.Where("id = ?", account.ID).First(&updatedAccount), "finding updated account") + var updatedUser database.User + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&updatedUser), "finding updated user") // Verify new password works - passwordErr := bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("newpassword123")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(updatedUser.Password.String), []byte("newpassword123")) assert.Equal(t, passwordErr, nil, "New password should match after commit") }) } @@ -268,8 +256,7 @@ func TestRemoveUser(t *testing.T) { t.Run("success", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@example.com", "password123") + testutils.SetupUserData(db, "alice@example.com", "password123") a := NewTest() a.DB = db @@ -282,11 +269,6 @@ func TestRemoveUser(t *testing.T) { var userCount int64 testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") assert.Equal(t, userCount, int64(0), "user should be deleted") - - // Verify account was deleted - var accountCount int64 - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting accounts") - assert.Equal(t, accountCount, int64(0), "account should be deleted") }) t.Run("user not found", func(t *testing.T) { @@ -303,8 +285,7 @@ func TestRemoveUser(t *testing.T) { t.Run("user has notes", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@example.com", "password123") + user := testutils.SetupUserData(db, "alice@example.com", "password123") book := database.Book{UserID: user.ID, Label: "testbook", Deleted: false} testutils.MustExec(t, db.Save(&book), "creating book") @@ -324,17 +305,12 @@ func TestRemoveUser(t *testing.T) { testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") assert.Equal(t, userCount, int64(1), "user should not be deleted") - // Verify account was NOT deleted - var accountCount int64 - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting accounts") - assert.Equal(t, accountCount, int64(1), "account should not be deleted") }) t.Run("user has books", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@example.com", "password123") + user := testutils.SetupUserData(db, "alice@example.com", "password123") book := database.Book{UserID: user.ID, Label: "testbook", Deleted: false} testutils.MustExec(t, db.Save(&book), "creating book") @@ -351,17 +327,12 @@ func TestRemoveUser(t *testing.T) { testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") assert.Equal(t, userCount, int64(1), "user should not be deleted") - // Verify account was NOT deleted - var accountCount int64 - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting accounts") - assert.Equal(t, accountCount, int64(1), "account should not be deleted") }) t.Run("user has deleted notes and books", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@example.com", "password123") + user := testutils.SetupUserData(db, "alice@example.com", "password123") book := database.Book{UserID: user.ID, Label: "testbook", Deleted: false} testutils.MustExec(t, db.Save(&book), "creating book") @@ -385,9 +356,5 @@ func TestRemoveUser(t *testing.T) { testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting users") assert.Equal(t, userCount, int64(0), "user should be deleted") - // Verify account was deleted - var accountCount int64 - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting accounts") - assert.Equal(t, accountCount, int64(0), "account should be deleted") }) } diff --git a/pkg/server/cmd/user.go b/pkg/server/cmd/user.go index 6123cdae..ec5b4ea2 100644 --- a/pkg/server/cmd/user.go +++ b/pkg/server/cmd/user.go @@ -81,12 +81,12 @@ func userRemoveCmd(args []string, stdin io.Reader) { defer cleanup() // Check if user exists first - _, err := a.GetAccountByEmail(*email) + _, err := a.GetUserByEmail(*email) if err != nil { if errors.Is(err, app.ErrNotFound) { fmt.Printf("Error: user with email %s not found\n", *email) } else { - log.ErrorWrap(err, "finding account") + log.ErrorWrap(err, "finding user") } os.Exit(1) } @@ -133,19 +133,19 @@ func userResetPasswordCmd(args []string) { a, cleanup := setupAppWithDB(fs, *dbPath) defer cleanup() - // Find the account - account, err := a.GetAccountByEmail(*email) + // Find the user + user, err := a.GetUserByEmail(*email) if err != nil { if errors.Is(err, app.ErrNotFound) { fmt.Printf("Error: user with email %s not found\n", *email) } else { - log.ErrorWrap(err, "finding account") + log.ErrorWrap(err, "finding user") } os.Exit(1) } // Update the password - if err := app.UpdateAccountPassword(a.DB, account, *password); err != nil { + if err := app.UpdateUserPassword(a.DB, user, *password); err != nil { log.ErrorWrap(err, "updating password") os.Exit(1) } diff --git a/pkg/server/cmd/user_test.go b/pkg/server/cmd/user_test.go index d3536d52..ea81832a 100644 --- a/pkg/server/cmd/user_test.go +++ b/pkg/server/cmd/user_test.go @@ -45,9 +45,9 @@ func TestUserCreateCmd(t *testing.T) { testutils.MustExec(t, db.Model(&database.User{}).Count(&count), "counting users") assert.Equal(t, count, int64(1), "should have 1 user") - var account database.Account - testutils.MustExec(t, db.Where("email = ?", "test@example.com").First(&account), "finding account") - assert.Equal(t, account.Email.String, "test@example.com", "email mismatch") + var user database.User + testutils.MustExec(t, db.Where("email = ?", "test@example.com").First(&user), "finding user") + assert.Equal(t, user.Email.String, "test@example.com", "email mismatch") } func TestUserRemoveCmd(t *testing.T) { @@ -55,8 +55,7 @@ func TestUserRemoveCmd(t *testing.T) { // Create a user first db := testutils.InitDB(tmpDB) - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "test@example.com", "password123") + testutils.SetupUserData(db, "test@example.com", "password123") sqlDB, _ := db.DB() sqlDB.Close() @@ -81,9 +80,8 @@ func TestUserResetPasswordCmd(t *testing.T) { // Create a user first db := testutils.InitDB(tmpDB) - user := testutils.SetupUserData(db) - account := testutils.SetupAccountData(db, user, "test@example.com", "oldpassword123") - oldPasswordHash := account.Password.String + user := testutils.SetupUserData(db, "test@example.com", "oldpassword123") + oldPasswordHash := user.Password.String sqlDB, _ := db.DB() sqlDB.Close() @@ -97,18 +95,18 @@ func TestUserResetPasswordCmd(t *testing.T) { sqlDB2.Close() }() - var updatedAccount database.Account - testutils.MustExec(t, db2.Where("email = ?", "test@example.com").First(&updatedAccount), "finding account") + var updatedUser database.User + testutils.MustExec(t, db2.Where("email = ?", "test@example.com").First(&updatedUser), "finding user") // Verify password hash changed - assert.Equal(t, updatedAccount.Password.String != oldPasswordHash, true, "password hash should be different") - assert.Equal(t, len(updatedAccount.Password.String) > 0, true, "password should be set") + assert.Equal(t, updatedUser.Password.String != oldPasswordHash, true, "password hash should be different") + assert.Equal(t, len(updatedUser.Password.String) > 0, true, "password should be set") // Verify new password works - err := bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("newpassword123")) + err := bcrypt.CompareHashAndPassword([]byte(updatedUser.Password.String), []byte("newpassword123")) assert.Equal(t, err, nil, "new password should match") // Verify old password doesn't work - err = bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("oldpassword123")) + err = bcrypt.CompareHashAndPassword([]byte(updatedUser.Password.String), []byte("oldpassword123")) assert.Equal(t, err != nil, true, "old password should not match") } diff --git a/pkg/server/context/user.go b/pkg/server/context/user.go index 77d66916..64171df7 100644 --- a/pkg/server/context/user.go +++ b/pkg/server/context/user.go @@ -25,9 +25,8 @@ import ( ) const ( - userKey privateKey = "user" - accountKey privateKey = "account" - tokenKey privateKey = "token" + userKey privateKey = "user" + tokenKey privateKey = "token" ) type privateKey string @@ -37,11 +36,6 @@ func WithUser(ctx context.Context, user *database.User) context.Context { return context.WithValue(ctx, userKey, user) } -// WithAccount creates a new context with the given account -func WithAccount(ctx context.Context, account *database.Account) context.Context { - return context.WithValue(ctx, accountKey, account) -} - // WithToken creates a new context with the given user func WithToken(ctx context.Context, tok *database.Token) context.Context { return context.WithValue(ctx, tokenKey, tok) @@ -59,17 +53,6 @@ func User(ctx context.Context) *database.User { return nil } -// Account retrieves an account from the given context. -func Account(ctx context.Context) *database.Account { - if temp := ctx.Value(accountKey); temp != nil { - if account, ok := temp.(*database.Account); ok { - return account - } - } - - return nil -} - // Token retrieves a token from the given context. func Token(ctx context.Context) *database.Token { if temp := ctx.Value(tokenKey); temp != nil { diff --git a/pkg/server/controllers/books_test.go b/pkg/server/controllers/books_test.go index d59dcd17..e2302f22 100644 --- a/pkg/server/controllers/books_test.go +++ b/pkg/server/controllers/books_test.go @@ -50,10 +50,8 @@ func TestGetBooks(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") - anotherUser := testutils.SetupUserData(db) - testutils.SetupAccountData(db, anotherUser, "bob@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db, "bob@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -143,10 +141,8 @@ func TestGetBooksByName(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") - anotherUser := testutils.SetupUserData(db) - testutils.SetupAccountData(db, anotherUser, "bob@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db, "bob@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -212,10 +208,8 @@ func TestGetBook(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") - anotherUser := testutils.SetupUserData(db) - testutils.SetupAccountData(db, anotherUser, "bob@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db, "bob@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -276,10 +270,8 @@ func TestGetBookNonOwner(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") - nonOwner := testutils.SetupUserData(db) - testutils.SetupAccountData(db, nonOwner, "bob@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + nonOwner := testutils.SetupUserData(db, "bob@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -314,8 +306,7 @@ func TestCreateBook(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 101), "preparing user max_usn") req := testutils.MakeReq(server.URL, "POST", "/api/v3/books", `{"name": "js"}`) @@ -375,8 +366,7 @@ func TestCreateBook(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 101), "preparing user max_usn") b1 := database.Book{ @@ -465,8 +455,7 @@ func TestUpdateBook(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 101), "preparing user max_usn") b1 := database.Book{ @@ -550,11 +539,9 @@ func TestDeleteBook(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 58), "preparing user max_usn") - anotherUser := testutils.SetupUserData(db) - testutils.SetupAccountData(db, anotherUser, "bob@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db, "bob@test.com", "pass1234") testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 109), "preparing another user max_usn") b1 := database.Book{ diff --git a/pkg/server/controllers/notes_test.go b/pkg/server/controllers/notes_test.go index ce3f20c7..b69f7c1e 100644 --- a/pkg/server/controllers/notes_test.go +++ b/pkg/server/controllers/notes_test.go @@ -63,10 +63,8 @@ func TestGetNotes(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") - anotherUser := testutils.SetupUserData(db) - testutils.SetupAccountData(db, anotherUser, "bob@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db, "bob@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -187,10 +185,8 @@ func TestGetNote(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "user@test.com", "pass1234") - anotherUser := testutils.SetupUserData(db) - testutils.SetupAccountData(db, anotherUser, "another@test.com", "pass1234") + user := testutils.SetupUserData(db, "user@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db, "another@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -318,8 +314,7 @@ func TestCreateNote(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 101), "preparing user max_usn") b1 := database.Book{ @@ -400,8 +395,7 @@ func TestDeleteNote(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 981), "preparing user max_usn") b1 := database.Book{ @@ -559,8 +553,7 @@ func TestUpdateNote(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 101), "preparing user max_usn") diff --git a/pkg/server/controllers/users.go b/pkg/server/controllers/users.go index b1945d8f..bf1e6384 100644 --- a/pkg/server/controllers/users.go +++ b/pkg/server/controllers/users.go @@ -307,23 +307,23 @@ func (u *Users) CreateResetToken(w http.ResponseWriter, r *http.Request) { return } - var account database.Account - err := u.app.DB.Where("email = ?", form.Email).First(&account).Error + var user database.User + err := u.app.DB.Where("email = ?", form.Email).First(&user).Error if errors.Is(err, gorm.ErrRecordNotFound) { return } if err != nil { - handleHTMLError(w, r, err, "finding account", u.PasswordResetView, vd) + handleHTMLError(w, r, err, "finding user", u.PasswordResetView, vd) return } - resetToken, err := token.Create(u.app.DB, account.UserID, database.TokenTypeResetPassword) + resetToken, err := token.Create(u.app.DB, user.ID, database.TokenTypeResetPassword) if err != nil { handleHTMLError(w, r, err, "generating token", u.PasswordResetView, vd) return } - if err := u.app.SendPasswordResetEmail(account.Email.String, resetToken.Value); err != nil { + if err := u.app.SendPasswordResetEmail(user.Email.String, resetToken.Value); err != nil { handleHTMLError(w, r, err, "sending password reset email", u.PasswordResetView, vd) return } @@ -396,8 +396,8 @@ func (u *Users) PasswordReset(w http.ResponseWriter, r *http.Request) { return } - var account database.Account - if err := u.app.DB.Where("user_id = ?", token.UserID).First(&account).Error; err != nil { + var user database.User + if err := u.app.DB.Where("id = ?", token.UserID).First(&user).Error; err != nil { handleHTMLError(w, r, err, "finding user", u.PasswordResetConfirmView, vd) return } @@ -405,7 +405,7 @@ func (u *Users) PasswordReset(w http.ResponseWriter, r *http.Request) { tx := u.app.DB.Begin() // Update the password - if err := app.UpdateAccountPassword(tx, &account, params.Password); err != nil { + if err := app.UpdateUserPassword(tx, &user, params.Password); err != nil { tx.Rollback() handleHTMLError(w, r, err, "updating password", u.PasswordResetConfirmView, vd) return @@ -417,7 +417,7 @@ func (u *Users) PasswordReset(w http.ResponseWriter, r *http.Request) { return } - if err := u.app.DeleteUserSessions(tx, account.UserID); err != nil { + if err := u.app.DeleteUserSessions(tx, user.ID); err != nil { tx.Rollback() handleHTMLError(w, r, err, "deleting user sessions", u.PasswordResetConfirmView, vd) return @@ -425,19 +425,13 @@ func (u *Users) PasswordReset(w http.ResponseWriter, r *http.Request) { tx.Commit() - var user database.User - if err := u.app.DB.Where("id = ?", account.UserID).First(&user).Error; err != nil { - handleHTMLError(w, r, err, "finding user", u.PasswordResetConfirmView, vd) - return - } - alert := views.Alert{ Level: views.AlertLvlSuccess, Message: "Password reset successful", } views.RedirectAlert(w, r, "/login", http.StatusFound, alert) - if err := u.app.SendPasswordResetAlertEmail(account.Email.String); err != nil { + if err := u.app.SendPasswordResetAlertEmail(user.Email.String); err != nil { log.ErrorWrap(err, "sending password reset email") } } @@ -493,14 +487,8 @@ func (u *Users) PasswordUpdate(w http.ResponseWriter, r *http.Request) { return } - var account database.Account - if err := u.app.DB.Where("user_id = ?", user.ID).First(&account).Error; err != nil { - handleHTMLError(w, r, err, "getting account", u.SettingView, vd) - return - } - password := []byte(form.OldPassword) - if err := bcrypt.CompareHashAndPassword([]byte(account.Password.String), password); err != nil { + if err := bcrypt.CompareHashAndPassword([]byte(user.Password.String), password); err != nil { log.WithFields(log.Fields{ "user_id": user.ID, }).Warn("invalid password update attempt") @@ -508,7 +496,7 @@ func (u *Users) PasswordUpdate(w http.ResponseWriter, r *http.Request) { return } - if err := app.UpdateAccountPassword(u.app.DB, &account, form.NewPassword); err != nil { + if err := app.UpdateUserPassword(u.app.DB, user, form.NewPassword); err != nil { handleHTMLError(w, r, err, "updating password", u.SettingView, vd) return } @@ -534,12 +522,6 @@ func (u *Users) ProfileUpdate(w http.ResponseWriter, r *http.Request) { return } - var account database.Account - if err := u.app.DB.Where("user_id = ?", user.ID).First(&account).Error; err != nil { - handleHTMLError(w, r, err, "getting account", u.SettingView, vd) - return - } - var form updateProfileForm if err := parseRequestData(r, &form); err != nil { handleHTMLError(w, r, err, "parsing payload", u.SettingView, vd) @@ -547,7 +529,7 @@ func (u *Users) ProfileUpdate(w http.ResponseWriter, r *http.Request) { } password := []byte(form.Password) - if err := bcrypt.CompareHashAndPassword([]byte(account.Password.String), password); err != nil { + if err := bcrypt.CompareHashAndPassword([]byte(user.Password.String), password); err != nil { log.WithFields(log.Fields{ "user_id": user.ID, }).Warn("invalid email update attempt") @@ -561,23 +543,13 @@ func (u *Users) ProfileUpdate(w http.ResponseWriter, r *http.Request) { return } - tx := u.app.DB.Begin() - if err := tx.Save(&user).Error; err != nil { - tx.Rollback() + user.Email.String = form.Email + + if err := u.app.DB.Save(&user).Error; err != nil { handleHTMLError(w, r, err, "saving user", u.SettingView, vd) return } - account.Email.String = form.Email - - if err := tx.Save(&account).Error; err != nil { - tx.Rollback() - handleHTMLError(w, r, err, "saving account", u.SettingView, vd) - return - } - - tx.Commit() - alert := views.Alert{ Level: views.AlertLvlSuccess, Message: "Email change successful", diff --git a/pkg/server/controllers/users_test.go b/pkg/server/controllers/users_test.go index 643cb016..03f6c53e 100644 --- a/pkg/server/controllers/users_test.go +++ b/pkg/server/controllers/users_test.go @@ -98,15 +98,14 @@ func TestJoin(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusFound, "") - var account database.Account - testutils.MustExec(t, db.Where("email = ?", tc.email).First(&account), "finding account") - assert.Equal(t, account.Email.String, tc.email, "Email mismatch") - assert.NotEqual(t, account.UserID, 0, "UserID mismatch") - passwordErr := bcrypt.CompareHashAndPassword([]byte(account.Password.String), []byte(tc.password)) + var user database.User + testutils.MustExec(t, db.Where("email = ?", tc.email).First(&user), "finding account") + assert.Equal(t, user.Email.String, tc.email, "Email mismatch") + assert.NotEqual(t, user.ID, 0, "UserID mismatch") + passwordErr := bcrypt.CompareHashAndPassword([]byte(user.Password.String), []byte(tc.password)) assert.Equal(t, passwordErr, nil, "Password mismatch") - var user database.User - testutils.MustExec(t, db.Where("id = ?", account.UserID).First(&user), "finding user") + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&user), "finding user") assert.Equal(t, user.MaxUSN, 0, "MaxUSN mismatch") // welcome email @@ -140,11 +139,9 @@ func TestJoinError(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status mismatch") - var accountCount, userCount int64 - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") + var userCount int64 testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting user") - assert.Equal(t, accountCount, int64(0), "accountCount mismatch") assert.Equal(t, userCount, int64(0), "userCount mismatch") }) @@ -168,11 +165,9 @@ func TestJoinError(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status mismatch") - var accountCount, userCount int64 - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") + var userCount int64 testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting user") - assert.Equal(t, accountCount, int64(0), "accountCount mismatch") assert.Equal(t, userCount, int64(0), "userCount mismatch") }) @@ -198,11 +193,9 @@ func TestJoinError(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status mismatch") - var accountCount, userCount int64 - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") + var userCount int64 testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting user") - assert.Equal(t, accountCount, int64(0), "accountCount mismatch") assert.Equal(t, userCount, int64(0), "userCount mismatch") }) } @@ -217,8 +210,7 @@ func TestJoinDuplicateEmail(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db, "alice@example.com", "somepassword") dat := url.Values{} dat.Set("email", "alice@example.com") @@ -232,15 +224,13 @@ func TestJoinDuplicateEmail(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "status code mismatch") - var accountCount, userCount, verificationTokenCount int64 - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") + var userCount, verificationTokenCount int64 testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting user") testutils.MustExec(t, db.Model(&database.Token{}).Count(&verificationTokenCount), "counting verification token") var user database.User testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding user") - assert.Equal(t, accountCount, int64(1), "account count mismatch") assert.Equal(t, userCount, int64(1), "user count mismatch") assert.Equal(t, verificationTokenCount, int64(0), "verification_token should not have been created") assert.Equal(t, user.LastLoginAt, (*time.Time)(nil), "LastLoginAt mismatch") @@ -268,11 +258,9 @@ func TestJoinDisabled(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusNotFound, "status code mismatch") - var accountCount, userCount int64 - testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") + var userCount int64 testutils.MustExec(t, db.Model(&database.User{}).Count(&userCount), "counting user") - assert.Equal(t, accountCount, int64(0), "account count mismatch") assert.Equal(t, userCount, int64(0), "user count mismatch") } @@ -286,8 +274,7 @@ func TestLogin(t *testing.T) { a.DB = db server := MustNewServer(t, &a) - u := testutils.SetupUserData(db) - testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") + _ = testutils.SetupUserData(db, "alice@example.com", "pass1234") defer server.Close() // Execute @@ -346,8 +333,7 @@ func TestLogin(t *testing.T) { a.DB = db server := MustNewServer(t, &a) - u := testutils.SetupUserData(db) - testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") + _ = testutils.SetupUserData(db, "alice@example.com", "pass1234") defer server.Close() var req *http.Request @@ -386,8 +372,7 @@ func TestLogin(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") + _ = testutils.SetupUserData(db, "alice@example.com", "pass1234") var req *http.Request if target == testutils.EndpointWeb { @@ -456,9 +441,8 @@ func TestLogout(t *testing.T) { a.DB = db server := MustNewServer(t, &a) - aliceUser := testutils.SetupUserData(db) - testutils.SetupAccountData(db, aliceUser, "alice@example.com", "pass1234") - anotherUser := testutils.SetupUserData(db) + aliceUser := testutils.SetupUserData(db, "alice@example.com", "pass1234") + anotherUser := testutils.SetupUserData(db, "bob@example.com", "password123") session1ExpiresAt := time.Now().Add(time.Hour * 24) session1 := database.Session{ @@ -570,8 +554,7 @@ func TestResetPassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, u, "alice@example.com", "oldpassword") + u := testutils.SetupUserData(db, "alice@example.com", "oldpassword") tok := database.Token{ UserID: u.ID, Value: "MivFxYiSMMA4An9dP24DNQ==", @@ -593,7 +576,7 @@ func TestResetPassword(t *testing.T) { } testutils.MustExec(t, db.Save(&s2), "preparing user session 2") - anotherUser := testutils.SetupUserData(db) + anotherUser := testutils.SetupUserData(db, "bob@example.com", "password123") testutils.MustExec(t, db.Save(&database.Session{ Key: "some-session-key-3", UserID: anotherUser.ID, @@ -613,12 +596,12 @@ func TestResetPassword(t *testing.T) { assert.StatusCodeEquals(t, res, http.StatusFound, "Status code mismatch") var resetToken database.Token - var account database.Account + var user database.User testutils.MustExec(t, db.Where("value = ?", "MivFxYiSMMA4An9dP24DNQ==").First(&resetToken), "finding reset token") - testutils.MustExec(t, db.Where("id = ?", acc.ID).First(&account), "finding account") + testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding account") assert.NotEqual(t, resetToken.UsedAt, nil, "reset_token UsedAt mismatch") - passwordErr := bcrypt.CompareHashAndPassword([]byte(account.Password.String), []byte("newpassword")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(user.Password.String), []byte("newpassword")) assert.Equal(t, passwordErr, nil, "Password mismatch") var s1Count, s2Count int64 @@ -646,8 +629,7 @@ func TestResetPassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db, "alice@example.com", "somepassword") tok := database.Token{ UserID: u.ID, Value: "MivFxYiSMMA4An9dP24DNQ==", @@ -668,12 +650,12 @@ func TestResetPassword(t *testing.T) { assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status code mismatch") var resetToken database.Token - var account database.Account + var user database.User testutils.MustExec(t, db.Where("value = ?", "MivFxYiSMMA4An9dP24DNQ==").First(&resetToken), "finding reset token") - testutils.MustExec(t, db.Where("id = ?", acc.ID).First(&account), "finding account") + testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding account") - assert.Equal(t, acc.Password, account.Password, "password should not have been updated") - assert.Equal(t, acc.Password, account.Password, "password should not have been updated") + assert.Equal(t, u.Password, user.Password, "password should not have been updated") + assert.Equal(t, u.Password, user.Password, "password should not have been updated") assert.Equal(t, resetToken.UsedAt, (*time.Time)(nil), "used_at should be nil") }) @@ -687,8 +669,7 @@ func TestResetPassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db, "alice@example.com", "somepassword") tok := database.Token{ UserID: u.ID, Value: "MivFxYiSMMA4An9dP24DNQ==", @@ -710,10 +691,10 @@ func TestResetPassword(t *testing.T) { assert.StatusCodeEquals(t, res, http.StatusGone, "Status code mismatch") var resetToken database.Token - var account database.Account + var user database.User testutils.MustExec(t, db.Where("value = ?", "MivFxYiSMMA4An9dP24DNQ==").First(&resetToken), "failed to find reset_token") - testutils.MustExec(t, db.Where("id = ?", acc.ID).First(&account), "failed to find account") - assert.Equal(t, acc.Password, account.Password, "password should not have been updated") + testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "failed to find account") + assert.Equal(t, u.Password, user.Password, "password should not have been updated") assert.Equal(t, resetToken.UsedAt, (*time.Time)(nil), "used_at should be nil") }) @@ -727,8 +708,7 @@ func TestResetPassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db, "alice@example.com", "somepassword") usedAt := time.Now().Add(time.Hour * -11).UTC() tok := database.Token{ @@ -753,10 +733,10 @@ func TestResetPassword(t *testing.T) { assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status code mismatch") var resetToken database.Token - var account database.Account + var user database.User testutils.MustExec(t, db.Where("value = ?", "MivFxYiSMMA4An9dP24DNQ==").First(&resetToken), "failed to find reset_token") - testutils.MustExec(t, db.Where("id = ?", acc.ID).First(&account), "failed to find account") - assert.Equal(t, acc.Password, account.Password, "password should not have been updated") + testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "failed to find account") + assert.Equal(t, u.Password, user.Password, "password should not have been updated") resetTokenUsedAtUTC := resetToken.UsedAt.UTC() if resetTokenUsedAtUTC.Year() != usedAt.Year() || @@ -782,8 +762,7 @@ func TestCreateResetToken(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db, "alice@example.com", "somepassword") // Execute dat := url.Values{} @@ -816,8 +795,7 @@ func TestCreateResetToken(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") + _ = testutils.SetupUserData(db, "alice@example.com", "somepassword") // Execute dat := url.Values{} @@ -846,8 +824,7 @@ func TestUpdatePassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword") + user := testutils.SetupUserData(db, "alice@example.com", "oldpassword") // Execute dat := url.Values{} @@ -861,10 +838,9 @@ func TestUpdatePassword(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusFound, "Status code mismsatch") - var account database.Account - testutils.MustExec(t, db.Where("user_id = ?", user.ID).First(&account), "finding account") + testutils.MustExec(t, db.Where("id = ?", user.ID).First(&user), "finding account") - passwordErr := bcrypt.CompareHashAndPassword([]byte(account.Password.String), []byte("newpassword")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(user.Password.String), []byte("newpassword")) assert.Equal(t, passwordErr, nil, "Password mismatch") }) @@ -877,8 +853,7 @@ func TestUpdatePassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, u, "alice@example.com", "oldpassword") + u := testutils.SetupUserData(db, "alice@example.com", "oldpassword") // Execute dat := url.Values{} @@ -892,9 +867,9 @@ func TestUpdatePassword(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusUnauthorized, "Status code mismsatch") - var account database.Account - testutils.MustExec(t, db.Where("user_id = ?", u.ID).First(&account), "finding account") - assert.Equal(t, acc.Password.String, account.Password.String, "password should not have been updated") + var user database.User + testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding account") + assert.Equal(t, u.Password.String, user.Password.String, "password should not have been updated") }) t.Run("password too short", func(t *testing.T) { @@ -907,8 +882,7 @@ func TestUpdatePassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, u, "alice@example.com", "oldpassword") + u := testutils.SetupUserData(db, "alice@example.com", "oldpassword") // Execute dat := url.Values{} @@ -922,9 +896,9 @@ func TestUpdatePassword(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status code mismsatch") - var account database.Account - testutils.MustExec(t, db.Where("user_id = ?", u.ID).First(&account), "finding account") - assert.Equal(t, acc.Password.String, account.Password.String, "password should not have been updated") + var user database.User + testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding account") + assert.Equal(t, u.Password.String, user.Password.String, "password should not have been updated") }) t.Run("password confirmation mismatch", func(t *testing.T) { @@ -937,8 +911,7 @@ func TestUpdatePassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - acc := testutils.SetupAccountData(db, u, "alice@example.com", "oldpassword") + u := testutils.SetupUserData(db, "alice@example.com", "oldpassword") // Execute dat := url.Values{} @@ -952,9 +925,9 @@ func TestUpdatePassword(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status code mismsatch") - var account database.Account - testutils.MustExec(t, db.Where("user_id = ?", u.ID).First(&account), "finding account") - assert.Equal(t, acc.Password.String, account.Password.String, "password should not have been updated") + var user database.User + testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding account") + assert.Equal(t, u.Password.String, user.Password.String, "password should not have been updated") }) } @@ -969,8 +942,7 @@ func TestUpdateEmail(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") + u := testutils.SetupUserData(db, "alice@example.com", "pass1234") // Execute dat := url.Values{} @@ -984,11 +956,10 @@ func TestUpdateEmail(t *testing.T) { assert.StatusCodeEquals(t, res, http.StatusFound, "Status code mismatch") var user database.User - var account database.Account testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding user") - testutils.MustExec(t, db.Where("user_id = ?", u.ID).First(&account), "finding account") + testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding account") - assert.Equal(t, account.Email.String, "alice-new@example.com", "email mismatch") + assert.Equal(t, user.Email.String, "alice-new@example.com", "email mismatch") }) t.Run("password mismatch", func(t *testing.T) { @@ -1001,8 +972,7 @@ func TestUpdateEmail(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db) - testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") + u := testutils.SetupUserData(db, "alice@example.com", "pass1234") // Execute dat := url.Values{} @@ -1016,11 +986,9 @@ func TestUpdateEmail(t *testing.T) { assert.StatusCodeEquals(t, res, http.StatusUnauthorized, "Status code mismsatch") var user database.User - var account database.Account testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding user") - testutils.MustExec(t, db.Where("user_id = ?", u.ID).First(&account), "finding account") - assert.Equal(t, account.Email.String, "alice@example.com", "email mismatch") + assert.Equal(t, user.Email.String, "alice@example.com", "email mismatch") }) } diff --git a/pkg/server/database/database.go b/pkg/server/database/database.go index eaab7c50..f73d45af 100644 --- a/pkg/server/database/database.go +++ b/pkg/server/database/database.go @@ -36,7 +36,6 @@ var ( func InitSchema(db *gorm.DB) { if err := db.AutoMigrate( &User{}, - &Account{}, &Book{}, &Note{}, &Token{}, diff --git a/pkg/server/database/models.go b/pkg/server/database/models.go index 99e41c96..576dee7f 100644 --- a/pkg/server/database/models.go +++ b/pkg/server/database/models.go @@ -61,20 +61,13 @@ type Note struct { // User is a model for a user type User struct { Model - UUID string `json:"uuid" gorm:"type:text;index"` - Account Account `gorm:"foreignKey:UserID"` + UUID string `json:"uuid" gorm:"type:text;index"` + Email NullString `gorm:"index"` + Password NullString `json:"-"` LastLoginAt *time.Time `json:"-"` MaxUSN int `json:"-" gorm:"default:0"` } -// Account is a model for an account -type Account struct { - Model - UserID int `gorm:"index"` - Email NullString - Password NullString -} - // Token is a model for a token type Token struct { Model diff --git a/pkg/server/middleware/auth.go b/pkg/server/middleware/auth.go index f74d1efa..daf92dc3 100644 --- a/pkg/server/middleware/auth.go +++ b/pkg/server/middleware/auth.go @@ -67,8 +67,6 @@ type AuthParams struct { // Auth is an authentication middleware func Auth(db *gorm.DB, next http.HandlerFunc, p *AuthParams) http.HandlerFunc { - next = WithAccount(db, next) - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { user, ok, err := AuthWithSession(db, r) if !ok { @@ -93,27 +91,6 @@ func Auth(db *gorm.DB, next http.HandlerFunc, p *AuthParams) http.HandlerFunc { ctx := context.WithUser(r.Context(), &user) next.ServeHTTP(w, r.WithContext(ctx)) }) - -} - -func WithAccount(db *gorm.DB, next http.HandlerFunc) http.HandlerFunc { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - user := context.User(r.Context()) - - var account database.Account - err := db.Where("user_id = ?", user.ID).First(&account).Error - if errors.Is(err, gorm.ErrRecordNotFound) { - DoError(w, "account not found", err, http.StatusForbidden) - return - } else if err != nil { - DoError(w, "finding account", err, http.StatusInternalServerError) - return - } - - ctx := context.WithAccount(r.Context(), &account) - - next.ServeHTTP(w, r.WithContext(ctx)) - }) } // TokenAuth is an authentication middleware with token diff --git a/pkg/server/middleware/auth_test.go b/pkg/server/middleware/auth_test.go index c0d94096..95c935a2 100644 --- a/pkg/server/middleware/auth_test.go +++ b/pkg/server/middleware/auth_test.go @@ -47,7 +47,7 @@ func TestGuestOnly(t *testing.T) { }) t.Run("logged in", func(t *testing.T) { - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") req := testutils.MakeReq(server.URL, "GET", "/", "") res := testutils.HTTPAuthDo(t, db, req, user) @@ -67,8 +67,7 @@ func TestGuestOnly(t *testing.T) { func TestAuth(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") session := database.Session{ Key: "A9xgggqzTHETy++GDi1NpDNe0iyqosPm9bitdeNGkJU=", @@ -175,7 +174,7 @@ func TestAuth(t *testing.T) { func TestTokenAuth(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") tok := database.Token{ UserID: user.ID, Type: database.TokenTypeResetPassword, @@ -241,9 +240,8 @@ func TestWithAccount(t *testing.T) { w.WriteHeader(http.StatusOK) } - t.Run("user with account", func(t *testing.T) { - user := testutils.SetupUserData(db) - testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + t.Run("authenticated user", func(t *testing.T) { + user := testutils.SetupUserData(db, "alice@test.com", "pass1234") server := httptest.NewServer(Auth(db, handler, nil)) defer server.Close() @@ -253,17 +251,4 @@ func TestWithAccount(t *testing.T) { assert.Equal(t, res.StatusCode, http.StatusOK, "status code mismatch") }) - - t.Run("user without account", func(t *testing.T) { - user := testutils.SetupUserData(db) - // Note: not creating account for this user - - server := httptest.NewServer(Auth(db, handler, nil)) - defer server.Close() - - req := testutils.MakeReq(server.URL, "GET", "/", "") - res := testutils.HTTPAuthDo(t, db, req, user) - - assert.Equal(t, res.StatusCode, http.StatusForbidden, "status code mismatch") - }) } diff --git a/pkg/server/operations/notes_test.go b/pkg/server/operations/notes_test.go index f003f7cb..a2ccb023 100644 --- a/pkg/server/operations/notes_test.go +++ b/pkg/server/operations/notes_test.go @@ -30,8 +30,8 @@ import ( func TestGetNote(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - anotherUser := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -98,7 +98,7 @@ func TestGetNote(t *testing.T) { func TestGetNote_nonexistent(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") b1 := database.Book{ UUID: testutils.MustUUID(t), diff --git a/pkg/server/permissions/permissions_test.go b/pkg/server/permissions/permissions_test.go index ed439d28..13f13f97 100644 --- a/pkg/server/permissions/permissions_test.go +++ b/pkg/server/permissions/permissions_test.go @@ -29,8 +29,8 @@ import ( func TestViewNote(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db) - anotherUser := testutils.SetupUserData(db) + user := testutils.SetupUserData(db, "user@test.com", "password123") + anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") b1 := database.Book{ UUID: testutils.MustUUID(t), diff --git a/pkg/server/session/session.go b/pkg/server/session/session.go index a9494c58..d7c3d0d8 100644 --- a/pkg/server/session/session.go +++ b/pkg/server/session/session.go @@ -29,9 +29,9 @@ type Session struct { } // New returns a new session for the given user -func New(user database.User, account database.Account) Session { +func New(user database.User) Session { return Session{ UUID: user.UUID, - Email: account.Email.String, + Email: user.Email.String, } } diff --git a/pkg/server/session/session_test.go b/pkg/server/session/session_test.go index dec674b7..dddfa18b 100644 --- a/pkg/server/session/session_test.go +++ b/pkg/server/session/session_test.go @@ -27,33 +27,34 @@ import ( ) func TestNew(t *testing.T) { - u1 := database.User{UUID: "0f5f0054-d23f-4be1-b5fb-57673109e9cb"} - a1 := database.Account{Email: database.ToNullString("alice@example.com")} + u1 := database.User{ + UUID: "0f5f0054-d23f-4be1-b5fb-57673109e9cb", + Email: database.ToNullString("alice@example.com"), + } - u2 := database.User{UUID: "718a1041-bbe6-496e-bbe4-ea7e572c295e"} - a2 := database.Account{Email: database.ToNullString("bob@example.com")} + u2 := database.User{ + UUID: "718a1041-bbe6-496e-bbe4-ea7e572c295e", + Email: database.ToNullString("bob@example.com"), + } testCases := []struct { - user database.User - account database.Account + user database.User }{ { - user: u1, - account: a1, + user: u1, }, { - user: u2, - account: a2, + user: u2, }, } for idx, tc := range testCases { t.Run(fmt.Sprintf("user %d", idx), func(t *testing.T) { // Execute - got := New(tc.user, tc.account) + got := New(tc.user) expected := Session{ UUID: tc.user.UUID, - Email: tc.account.Email.String, + Email: tc.user.Email.String, } assert.DeepEqual(t, got, expected, "result mismatch") diff --git a/pkg/server/testutils/main.go b/pkg/server/testutils/main.go index 08bc07de..45c547d0 100644 --- a/pkg/server/testutils/main.go +++ b/pkg/server/testutils/main.go @@ -82,9 +82,6 @@ func ClearData(db *gorm.DB) { if err := db.Where("1 = 1").Delete(&database.Session{}).Error; err != nil { panic(errors.Wrap(err, "Failed to clear sessions")) } - if err := db.Where("1 = 1").Delete(&database.Account{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear accounts")) - } if err := db.Where("1 = 1").Delete(&database.User{}).Error; err != nil { panic(errors.Wrap(err, "Failed to clear users")) } @@ -99,15 +96,22 @@ func MustUUID(t *testing.T) string { return uuid } -// SetupUserData creates and returns a new user for testing purposes -func SetupUserData(db *gorm.DB) database.User { +// SetupUserData creates and returns a new user with email and password for testing purposes +func SetupUserData(db *gorm.DB, email, password string) database.User { uuid, err := helpers.GenUUID() if err != nil { panic(errors.Wrap(err, "Failed to generate UUID")) } + hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) + if err != nil { + panic(errors.Wrap(err, "Failed to hash password")) + } + user := database.User{ - UUID: uuid, + UUID: uuid, + Email: database.ToNullString(email), + Password: database.ToNullString(string(hashedPassword)), } if err := db.Save(&user).Error; err != nil { @@ -117,28 +121,6 @@ func SetupUserData(db *gorm.DB) database.User { return user } -// SetupAccountData creates and returns a new account for the user -func SetupAccountData(db *gorm.DB, user database.User, email, password string) database.Account { - account := database.Account{ - UserID: user.ID, - } - if email != "" { - account.Email = database.ToNullString(email) - } - - hashedPassword, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) - if err != nil { - panic(errors.Wrap(err, "Failed to hash password")) - } - account.Password = database.ToNullString(string(hashedPassword)) - - if err := db.Save(&account).Error; err != nil { - panic(errors.Wrap(err, "Failed to prepare account")) - } - - return account -} - // SetupSession creates and returns a new user session func SetupSession(db *gorm.DB, user database.User) database.Session { session := database.Session{ diff --git a/pkg/server/token/token_test.go b/pkg/server/token/token_test.go index 426ff3d1..c7469d4f 100644 --- a/pkg/server/token/token_test.go +++ b/pkg/server/token/token_test.go @@ -42,7 +42,7 @@ func TestCreate(t *testing.T) { db := testutils.InitMemoryDB(t) // Set up - u := testutils.SetupUserData(db) + u := testutils.SetupUserData(db, "user@test.com", "password123") // Execute tok, err := Create(db, u.ID, tc.kind) diff --git a/pkg/server/views/data.go b/pkg/server/views/data.go index 451cade8..98444364 100644 --- a/pkg/server/views/data.go +++ b/pkg/server/views/data.go @@ -50,9 +50,8 @@ type Alert struct { type Data struct { Alert *Alert // CSRF template.HTML - User *database.User - Account *database.Account - Yield map[string]interface{} + User *database.User + Yield map[string]interface{} } func getErrMessage(err error) string { diff --git a/pkg/server/views/templates/layouts/navbar.gohtml b/pkg/server/views/templates/layouts/navbar.gohtml index ea7c026f..b39a1e4e 100644 --- a/pkg/server/views/templates/layouts/navbar.gohtml +++ b/pkg/server/views/templates/layouts/navbar.gohtml @@ -41,7 +41,7 @@
diff --git a/pkg/server/views/view.go b/pkg/server/views/view.go index 3484dca8..438735a1 100644 --- a/pkg/server/views/view.go +++ b/pkg/server/views/view.go @@ -108,14 +108,13 @@ func (v *View) Render(w http.ResponseWriter, r *http.Request, data *Data, status } vd.User = context.User(r.Context()) - vd.Account = context.Account(r.Context()) // Put user data in Yield if vd.Yield == nil { vd.Yield = map[string]interface{}{} } - if vd.Account != nil { - vd.Yield["Email"] = vd.Account.Email.String + if vd.User != nil { + vd.Yield["Email"] = vd.User.Email.String } vd.Yield["CurrentPath"] = r.URL.Path vd.Yield["Standalone"] = buildinfo.Standalone From e3380a4dfafe88e7e3197619b8d1093e466fdf45 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 19 Oct 2025 21:42:53 -0700 Subject: [PATCH 20/33] Remove unused templates (#702) --- pkg/server/tmpl/app.go | 103 ------------- pkg/server/tmpl/app_test.go | 51 ------- pkg/server/tmpl/data.go | 141 ------------------ pkg/server/tmpl/data_test.go | 68 --------- pkg/server/tmpl/tmpl.go | 29 ---- pkg/server/views/templates/books/index.gohtml | 20 --- pkg/server/views/templates/books/show.gohtml | 4 - pkg/server/views/templates/icons/book.gohtml | 17 --- pkg/server/views/templates/icons/caret.gohtml | 26 ---- pkg/server/views/templates/notes/index.gohtml | 91 ----------- pkg/server/views/templates/notes/show.gohtml | 33 ---- .../templates/partials/page_toolbar.gohtml | 5 - .../views/templates/partials/time.gohtml | 13 -- 13 files changed, 601 deletions(-) delete mode 100644 pkg/server/tmpl/app.go delete mode 100644 pkg/server/tmpl/app_test.go delete mode 100644 pkg/server/tmpl/data.go delete mode 100644 pkg/server/tmpl/data_test.go delete mode 100644 pkg/server/tmpl/tmpl.go delete mode 100644 pkg/server/views/templates/books/index.gohtml delete mode 100644 pkg/server/views/templates/books/show.gohtml delete mode 100644 pkg/server/views/templates/icons/book.gohtml delete mode 100644 pkg/server/views/templates/icons/caret.gohtml delete mode 100644 pkg/server/views/templates/notes/index.gohtml delete mode 100644 pkg/server/views/templates/notes/show.gohtml delete mode 100644 pkg/server/views/templates/partials/page_toolbar.gohtml delete mode 100644 pkg/server/views/templates/partials/time.gohtml diff --git a/pkg/server/tmpl/app.go b/pkg/server/tmpl/app.go deleted file mode 100644 index 7f084a85..00000000 --- a/pkg/server/tmpl/app.go +++ /dev/null @@ -1,103 +0,0 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -package tmpl - -import ( - "bytes" - "html/template" - "net/http" - "regexp" - - "gorm.io/gorm" - "github.com/pkg/errors" -) - -// routes -var notesPathRegex = regexp.MustCompile("^/notes/([^/]+)$") - -// template names -var templateIndex = "index" -var templateNoteMetaTags = "note_metatags" - -// AppShell represents the application in HTML -type AppShell struct { - DB *gorm.DB - T *template.Template -} - -// ErrNotFound is an error indicating that a resource was not found -var ErrNotFound = errors.New("not found") - -// NewAppShell parses the templates for the application -func NewAppShell(db *gorm.DB, content []byte) (AppShell, error) { - t, err := template.New(templateIndex).Parse(string(content)) - if err != nil { - return AppShell{}, errors.Wrap(err, "parsing the index template") - } - - _, err = t.New(templateNoteMetaTags).Parse(noteMetaTags) - if err != nil { - return AppShell{}, errors.Wrap(err, "parsing the note meta tags template") - } - - return AppShell{DB: db, T: t}, nil -} - -// Execute executes the index template -func (a AppShell) Execute(r *http.Request) ([]byte, error) { - data, err := a.getData(r) - if err != nil { - return nil, errors.Wrap(err, "getting data") - } - - var buf bytes.Buffer - if err := a.T.ExecuteTemplate(&buf, templateIndex, data); err != nil { - return nil, errors.Wrap(err, "executing template") - } - - return buf.Bytes(), nil -} - -func (a AppShell) getData(r *http.Request) (tmplData, error) { - path := r.URL.Path - - if ok, params := matchPath(path, notesPathRegex); ok { - p, err := a.newNotePage(r, params[0]) - if err != nil { - return tmplData{}, errors.Wrap(err, "instantiating note page") - } - - return p.getData() - } - - p := defaultPage{} - return p.getData(), nil -} - -// matchPath checks if the given path matches the given regular expressions -// and returns a boolean as well as any parameters from regex capture groups. -func matchPath(p string, reg *regexp.Regexp) (bool, []string) { - match := notesPathRegex.FindStringSubmatch(p) - - if len(match) > 0 { - return true, match[1:] - } - - return false, nil -} diff --git a/pkg/server/tmpl/app_test.go b/pkg/server/tmpl/app_test.go deleted file mode 100644 index 8772bf92..00000000 --- a/pkg/server/tmpl/app_test.go +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -package tmpl - -import ( - "net/http" - "testing" - - "github.com/dnote/dnote/pkg/assert" - "github.com/dnote/dnote/pkg/server/testutils" - "github.com/pkg/errors" -) - -func TestAppShellExecute(t *testing.T) { - t.Run("home", func(t *testing.T) { - db := testutils.InitMemoryDB(t) - - a, err := NewAppShell(db, []byte("{{ .Title }}{{ .MetaTags }}")) - if err != nil { - t.Fatal(errors.Wrap(err, "preparing app shell")) - } - - r, err := http.NewRequest("GET", "http://mock.url/", nil) - if err != nil { - t.Fatal(errors.Wrap(err, "preparing request")) - } - - b, err := a.Execute(r) - if err != nil { - t.Fatal(errors.Wrap(err, "executing")) - } - - assert.Equal(t, string(b), "Dnote", "result mismatch") - }) -} diff --git a/pkg/server/tmpl/data.go b/pkg/server/tmpl/data.go deleted file mode 100644 index 186c1467..00000000 --- a/pkg/server/tmpl/data.go +++ /dev/null @@ -1,141 +0,0 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -package tmpl - -import ( - "bytes" - "fmt" - "html/template" - "net/http" - "regexp" - "strings" - "time" - - "github.com/dnote/dnote/pkg/server/database" - "github.com/dnote/dnote/pkg/server/middleware" - "github.com/dnote/dnote/pkg/server/operations" - "github.com/pkg/errors" -) - -var newlineRegexp = regexp.MustCompile(`\r?\n`) - -// tmplData is the data to be passed to the app shell template -type tmplData struct { - Title string - MetaTags template.HTML -} - -type noteMetaTagsData struct { - Title string - Description string -} - -type notePage struct { - Note database.Note - T *template.Template -} - -func (a AppShell) newNotePage(r *http.Request, noteUUID string) (notePage, error) { - user, _, err := middleware.AuthWithSession(a.DB, r) - if err != nil { - return notePage{}, errors.Wrap(err, "authenticating with session") - } - - note, ok, err := operations.GetNote(a.DB, noteUUID, &user) - - if !ok { - return notePage{}, ErrNotFound - } - if err != nil { - return notePage{}, errors.Wrap(err, "getting note") - } - - return notePage{note, a.T}, nil -} - -func (p notePage) getTitle() string { - note := p.Note - date := time.Unix(0, note.AddedOn).Format("Jan 2 2006") - - return fmt.Sprintf("Note: %s (%s)", note.Book.Label, date) -} - -func excerpt(s string, maxLen int) string { - if len(s) > maxLen { - - var lastIdx int - if maxLen > 3 { - lastIdx = maxLen - 3 - } else { - lastIdx = maxLen - } - - return s[:lastIdx] + "..." - } - - return s -} - -func formatMetaDescContent(s string) string { - desc := excerpt(s, 200) - desc = strings.Trim(desc, " ") - - return newlineRegexp.ReplaceAllString(desc, " ") -} - -func (p notePage) getMetaTags() (template.HTML, error) { - title := p.getTitle() - desc := formatMetaDescContent(p.Note.Body) - - data := noteMetaTagsData{ - Title: title, - Description: desc, - } - - var buf bytes.Buffer - if err := p.T.ExecuteTemplate(&buf, templateNoteMetaTags, data); err != nil { - return "", errors.Wrap(err, "executing template") - } - - return template.HTML(buf.String()), nil -} - -func (p notePage) getData() (tmplData, error) { - mt, err := p.getMetaTags() - if err != nil { - return tmplData{}, errors.Wrap(err, "getting meta tags") - } - - dat := tmplData{ - Title: p.getTitle(), - MetaTags: mt, - } - - return dat, nil -} - -type defaultPage struct { -} - -func (p defaultPage) getData() tmplData { - return tmplData{ - Title: "Dnote", - MetaTags: "", - } -} diff --git a/pkg/server/tmpl/data_test.go b/pkg/server/tmpl/data_test.go deleted file mode 100644 index c072d12e..00000000 --- a/pkg/server/tmpl/data_test.go +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -package tmpl - -import ( - "html/template" - "testing" - "time" - - "github.com/dnote/dnote/pkg/assert" - "github.com/dnote/dnote/pkg/server/database" - "github.com/dnote/dnote/pkg/server/testutils" - "github.com/pkg/errors" -) - -func TestDefaultPageGetData(t *testing.T) { - p := defaultPage{} - - result := p.getData() - - assert.Equal(t, result.MetaTags, template.HTML(""), "MetaTags mismatch") - assert.Equal(t, result.Title, "Dnote", "Title mismatch") -} - -func TestNotePageGetData(t *testing.T) { - // Set time.Local to UTC for deterministic test - time.Local = time.UTC - - db := testutils.InitMemoryDB(t) - a, err := NewAppShell(db, nil) - if err != nil { - t.Fatal(errors.Wrap(err, "preparing app shell")) - } - - p := notePage{ - Note: database.Note{ - Book: database.Book{ - Label: "vocabulary", - }, - AddedOn: time.Date(2019, time.January, 2, 0, 0, 0, 0, time.UTC).UnixNano(), - }, - T: a.T, - } - - result, err := p.getData() - if err != nil { - t.Fatal(errors.Wrap(err, "executing")) - } - - assert.NotEqual(t, result.MetaTags, template.HTML(""), "MetaTags should not be empty") - assert.Equal(t, result.Title, "Note: vocabulary (Jan 2 2019)", "Title mismatch") -} diff --git a/pkg/server/tmpl/tmpl.go b/pkg/server/tmpl/tmpl.go deleted file mode 100644 index fbc13398..00000000 --- a/pkg/server/tmpl/tmpl.go +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -package tmpl - -var noteMetaTags = ` - - - - - - - -` diff --git a/pkg/server/views/templates/books/index.gohtml b/pkg/server/views/templates/books/index.gohtml deleted file mode 100644 index 46ebbecc..00000000 --- a/pkg/server/views/templates/books/index.gohtml +++ /dev/null @@ -1,20 +0,0 @@ -{{define "yield"}} -
- -
-

Books

-
- -
- -
-
-{{end}} diff --git a/pkg/server/views/templates/books/show.gohtml b/pkg/server/views/templates/books/show.gohtml deleted file mode 100644 index 4d84d095..00000000 --- a/pkg/server/views/templates/books/show.gohtml +++ /dev/null @@ -1,4 +0,0 @@ -{{define "yield"}} - content - {{ .Note.Body }} -{{end}} diff --git a/pkg/server/views/templates/icons/book.gohtml b/pkg/server/views/templates/icons/book.gohtml deleted file mode 100644 index a04a3e68..00000000 --- a/pkg/server/views/templates/icons/book.gohtml +++ /dev/null @@ -1,17 +0,0 @@ -{{define "book"}} - - Book - Icon depicting a book - - -{{end}} diff --git a/pkg/server/views/templates/icons/caret.gohtml b/pkg/server/views/templates/icons/caret.gohtml deleted file mode 100644 index 0a9f60a0..00000000 --- a/pkg/server/views/templates/icons/caret.gohtml +++ /dev/null @@ -1,26 +0,0 @@ -{{define "caret"}} - - - - -{{end}} diff --git a/pkg/server/views/templates/notes/index.gohtml b/pkg/server/views/templates/notes/index.gohtml deleted file mode 100644 index 168430f5..00000000 --- a/pkg/server/views/templates/notes/index.gohtml +++ /dev/null @@ -1,91 +0,0 @@ -{{define "yield"}} -
-

Notes

- - {{template "pageToolbar" dict "data" . "class" "toolbar"}} - -
- {{if eq (len .NoteGroups) 0 }} -
No notes found.
- {{end}} - - {{range .NoteGroups}} - {{template "noteGroup" .}} - {{end}} -
-
-{{end}} - -{{define "noteGroup"}} -
-
-

- -

-
- -
    - {{range .Data}} - {{template "noteItem" .}} - {{end}} -
-
-{{end}} - -{{define "noteItem"}} -
  • - -
    -
    -

    - {{ .Book.Label }} -

    - - {{template "time" dict "value" .UpdatedAt "text" (timeAgo .UpdatedAt)}} -
    - -
    - {{ excerpt .Body 160 }} -
    -
    -     -
    • -{{end}} - -{{define "pageToolbarContent"}} - -{{end}} - -{{define "pager"}} - -{{$ariaLabel := ""}} -{{if eq .direction "left"}} - {{$ariaLabel = "Previous page"}} -{{else}} - {{$ariaLabel = "Next page"}} -{{end}} - -{{if .disabled}} - - {{template "caret" dict "direction" .direction "stroke" "gray"}} - -{{else}} - - {{template "caret" dict "direction" .direction "stroke" "black"}} - -{{end}} -{{end}} diff --git a/pkg/server/views/templates/notes/show.gohtml b/pkg/server/views/templates/notes/show.gohtml deleted file mode 100644 index 7051bee4..00000000 --- a/pkg/server/views/templates/notes/show.gohtml +++ /dev/null @@ -1,33 +0,0 @@ -{{define "yield"}} -
    -
    -
    -
    -
    - {{template "book" dict "fill" "#000000"}} - -

    - - {{ .Note.Book.Label }} - -

    -
    -
    - - -
    -
    - {{ .Content }} -
    -
    - -
    -
    - Last edit: - {{ timeFormat .Note.UpdatedAt "January 02, 2006" }} -
    -
    -
    -
    -
    -{{end}} diff --git a/pkg/server/views/templates/partials/page_toolbar.gohtml b/pkg/server/views/templates/partials/page_toolbar.gohtml deleted file mode 100644 index 4d1abdfd..00000000 --- a/pkg/server/views/templates/partials/page_toolbar.gohtml +++ /dev/null @@ -1,5 +0,0 @@ -{{define "pageToolbar"}} -
    - {{template "pageToolbarContent" .data}} -
    -{{end}} diff --git a/pkg/server/views/templates/partials/time.gohtml b/pkg/server/views/templates/partials/time.gohtml deleted file mode 100644 index b05b3a86..00000000 --- a/pkg/server/views/templates/partials/time.gohtml +++ /dev/null @@ -1,13 +0,0 @@ -{{define "time"}} - -{{$mobileText := defaultValue .mobileText .text}} - - - - -{{end}} From f6a4c6344ccbdb964954a6460fa9012225a1ce28 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sat, 25 Oct 2025 20:51:57 -0700 Subject: [PATCH 21/33] Remove public from CLI (#703) * Remove public from CLI * Write migration and test * Use in-memory db for a test server * Simplify CLI test db teardown * Restructure packages to reduce duplication --- Makefile | 11 +- pkg/cli/COMMANDS.md | 2 +- pkg/cli/client/client.go | 5 +- pkg/cli/cmd/add/add.go | 2 +- pkg/cli/cmd/sync/sync.go | 14 +- pkg/cli/cmd/sync/sync_test.go | 130 +- pkg/cli/context/files.go | 51 + pkg/cli/context/files_test.go | 65 + pkg/cli/context/testutils.go | 77 +- pkg/cli/database/models.go | 12 +- pkg/cli/database/models_test.go | 83 +- pkg/cli/database/queries.go | 2 - pkg/cli/database/queries_test.go | 39 +- pkg/cli/database/schema.sql | 40 + pkg/cli/database/schema/main.go | 166 ++ pkg/cli/database/schema/main_test.go | 84 + pkg/cli/database/testutils.go | 132 +- pkg/cli/infra/init.go | 33 +- pkg/cli/infra/init_test.go | 6 +- pkg/cli/main_test.go | 94 +- .../migrate/fixtures/local-12-pre-schema.sql | 8 - .../migrate/fixtures/local-14-pre-schema.sql | 42 + pkg/cli/migrate/legacy_test.go | 14 +- pkg/cli/migrate/migrate.go | 1 + pkg/cli/migrate/migrate_test.go | 200 ++- pkg/cli/migrate/migrations.go | 12 + pkg/cli/testutils/main.go | 11 +- pkg/cli/ui/editor_test.go | 18 +- pkg/cli/utils/files.go | 18 + .../sync/main_test.go => utils/files_test.go} | 30 +- pkg/clock/clock.go | 8 +- pkg/e2e/sync_test.go | 1546 ++++++++--------- pkg/server/.env.test | 1 - pkg/server/app/notes_test.go | 6 +- pkg/server/testutils/main.go | 20 - scripts/cli/test.sh | 7 +- scripts/e2e/test.sh | 6 +- scripts/server/test-local.sh | 4 - 38 files changed, 1647 insertions(+), 1353 deletions(-) create mode 100644 pkg/cli/context/files.go create mode 100644 pkg/cli/context/files_test.go create mode 100644 pkg/cli/database/schema.sql create mode 100644 pkg/cli/database/schema/main.go create mode 100644 pkg/cli/database/schema/main_test.go create mode 100644 pkg/cli/migrate/fixtures/local-14-pre-schema.sql rename pkg/cli/{cmd/sync/main_test.go => utils/files_test.go} (55%) delete mode 100644 pkg/server/.env.test diff --git a/Makefile b/Makefile index 5037c408..c38819c0 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ endif test: test-cli test-api test-e2e .PHONY: test -test-cli: +test-cli: generate-cli-schema @echo "==> running CLI test" @(${currentDir}/scripts/cli/test.sh) .PHONY: test-cli @@ -76,7 +76,14 @@ endif @(cd ${currentDir}/host/docker && ./build.sh $(version) $(platform)) .PHONY: build-server-docker -build-cli: +generate-cli-schema: + @echo "==> generating CLI database schema" + @mkdir -p pkg/cli/database + @touch pkg/cli/database/schema.sql + @go run -tags fts5 ./pkg/cli/database/schema +.PHONY: generate-cli-schema + +build-cli: generate-cli-schema ifeq ($(debug), true) @echo "==> building cli in dev mode" @${currentDir}/scripts/cli/dev.sh diff --git a/pkg/cli/COMMANDS.md b/pkg/cli/COMMANDS.md index 73d34007..c3402152 100644 --- a/pkg/cli/COMMANDS.md +++ b/pkg/cli/COMMANDS.md @@ -96,7 +96,7 @@ dnote find "merge sort" -b algorithm _alias: s_ -Sync notes with Dnote server. All your data is encrypted before being sent to the server. +Sync notes with Dnote server. ## dnote login diff --git a/pkg/cli/client/client.go b/pkg/cli/client/client.go index 86df4374..1e122a3d 100644 --- a/pkg/cli/client/client.go +++ b/pkg/cli/client/client.go @@ -246,7 +246,6 @@ type SyncFragNote struct { AddedOn int64 `json:"added_on"` EditedOn int64 `json:"edited_on"` Body string `json:"content"` - Public bool `json:"public"` Deleted bool `json:"deleted"` } @@ -458,7 +457,6 @@ func CreateNote(ctx context.DnoteCtx, bookUUID, content string) (CreateNoteResp, type updateNotePayload struct { BookUUID *string `json:"book_uuid"` Body *string `json:"content"` - Public *bool `json:"public"` } // UpdateNoteResp is the response from create book api @@ -468,11 +466,10 @@ type UpdateNoteResp struct { } // UpdateNote updates a note in the server -func UpdateNote(ctx context.DnoteCtx, uuid, bookUUID, content string, public bool) (UpdateNoteResp, error) { +func UpdateNote(ctx context.DnoteCtx, uuid, bookUUID, content string) (UpdateNoteResp, error) { payload := updateNotePayload{ BookUUID: &bookUUID, Body: &content, - Public: &public, } b, err := json.Marshal(payload) if err != nil { diff --git a/pkg/cli/cmd/add/add.go b/pkg/cli/cmd/add/add.go index aa8c8453..2d6591a2 100644 --- a/pkg/cli/cmd/add/add.go +++ b/pkg/cli/cmd/add/add.go @@ -173,7 +173,7 @@ func writeNote(ctx context.DnoteCtx, bookLabel string, content string, ts int64) return 0, errors.Wrap(err, "generating uuid") } - n := database.NewNote(noteUUID, bookUUID, content, ts, 0, 0, false, false, true) + n := database.NewNote(noteUUID, bookUUID, content, ts, 0, 0, false, true) err = n.Insert(tx) if err != nil { diff --git a/pkg/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go index ec66a2cb..fd870751 100644 --- a/pkg/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -280,8 +280,8 @@ func mergeNote(tx *database.DB, serverNote client.SyncFragNote, localNote databa // if the local copy is deleted, and it was edited on the server, override with server values and mark it not dirty. if localNote.Deleted { - if _, err := tx.Exec("UPDATE notes SET usn = ?, book_uuid = ?, body = ?, edited_on = ?, deleted = ?, public = ?, dirty = ? WHERE uuid = ?", - serverNote.USN, serverNote.BookUUID, serverNote.Body, serverNote.EditedOn, serverNote.Deleted, serverNote.Public, false, serverNote.UUID); err != nil { + if _, err := tx.Exec("UPDATE notes SET usn = ?, book_uuid = ?, body = ?, edited_on = ?, deleted = ?, dirty = ? WHERE uuid = ?", + serverNote.USN, serverNote.BookUUID, serverNote.Body, serverNote.EditedOn, serverNote.Deleted, false, serverNote.UUID); err != nil { return errors.Wrapf(err, "updating local note %s", serverNote.UUID) } @@ -311,7 +311,7 @@ func stepSyncNote(tx *database.DB, n client.SyncFragNote) error { // if note exists in the server and does not exist in the client, insert the note. if err == sql.ErrNoRows { - note := database.NewNote(n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Public, n.Deleted, false) + note := database.NewNote(n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Deleted, false) if err := note.Insert(tx); err != nil { return errors.Wrapf(err, "inserting note with uuid %s", n.UUID) @@ -335,7 +335,7 @@ func fullSyncNote(tx *database.DB, n client.SyncFragNote) error { // if note exists in the server and does not exist in the client, insert the note. if err == sql.ErrNoRows { - note := database.NewNote(n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Public, n.Deleted, false) + note := database.NewNote(n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Deleted, false) if err := note.Insert(tx); err != nil { return errors.Wrapf(err, "inserting note with uuid %s", n.UUID) @@ -758,7 +758,7 @@ func sendBooks(ctx context.DnoteCtx, tx *database.DB) (bool, error) { func sendNotes(ctx context.DnoteCtx, tx *database.DB) (bool, error) { isBehind := false - rows, err := tx.Query("SELECT uuid, book_uuid, body, public, deleted, usn, added_on FROM notes WHERE dirty") + rows, err := tx.Query("SELECT uuid, book_uuid, body, deleted, usn, added_on FROM notes WHERE dirty") if err != nil { return isBehind, errors.Wrap(err, "getting syncable notes") } @@ -767,7 +767,7 @@ func sendNotes(ctx context.DnoteCtx, tx *database.DB) (bool, error) { for rows.Next() { var note database.Note - if err = rows.Scan(¬e.UUID, ¬e.BookUUID, ¬e.Body, ¬e.Public, ¬e.Deleted, ¬e.USN, ¬e.AddedOn); err != nil { + if err = rows.Scan(¬e.UUID, ¬e.BookUUID, ¬e.Body, ¬e.Deleted, ¬e.USN, ¬e.AddedOn); err != nil { return isBehind, errors.Wrap(err, "scanning a syncable note") } @@ -822,7 +822,7 @@ func sendNotes(ctx context.DnoteCtx, tx *database.DB) (bool, error) { respUSN = resp.Result.USN } else { - resp, err := client.UpdateNote(ctx, note.UUID, note.BookUUID, note.Body, note.Public) + resp, err := client.UpdateNote(ctx, note.UUID, note.BookUUID, note.Body) if err != nil { return isBehind, errors.Wrap(err, "updating a note") } diff --git a/pkg/cli/cmd/sync/sync_test.go b/pkg/cli/cmd/sync/sync_test.go index 34f0c9df..828179f5 100644 --- a/pkg/cli/cmd/sync/sync_test.go +++ b/pkg/cli/cmd/sync/sync_test.go @@ -36,6 +36,7 @@ import ( "github.com/pkg/errors" ) + func TestProcessFragments(t *testing.T) { fragments := []client.SyncFragment{ { @@ -106,8 +107,7 @@ func TestProcessFragments(t *testing.T) { func TestGetLastSyncAt(t *testing.T) { // set up - db := database.InitTestDB(t, "../../tmp/.dnote", nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "setting up last_sync_at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, 1541108743) // exec @@ -129,8 +129,7 @@ func TestGetLastSyncAt(t *testing.T) { func TestGetLastMaxUSN(t *testing.T) { // set up - db := database.InitTestDB(t, "../../tmp/.dnote", nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "setting up last_max_usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 20001) // exec @@ -176,8 +175,7 @@ func TestResolveLabel(t *testing.T) { for idx, tc := range testCases { func() { // set up - db := database.InitTestDB(t, "../../tmp/.dnote", nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b1-uuid", "js") database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b2-uuid", "css_2") @@ -206,8 +204,7 @@ func TestResolveLabel(t *testing.T) { func TestSyncDeleteNote(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) // execute tx, err := db.Begin() @@ -235,8 +232,7 @@ func TestSyncDeleteNote(t *testing.T) { b1UUID := testutils.MustGenerateUUID(t) // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") database.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, true) @@ -305,8 +301,7 @@ func TestSyncDeleteNote(t *testing.T) { b1UUID := testutils.MustGenerateUUID(t) // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") database.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, false) @@ -361,8 +356,7 @@ func TestSyncDeleteNote(t *testing.T) { func TestSyncDeleteBook(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b1-uuid", "b1-label") var b1 database.Book @@ -406,8 +400,7 @@ func TestSyncDeleteBook(t *testing.T) { b1UUID := testutils.MustGenerateUUID(t) // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", b1UUID, "b1-label", 12, true) database.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, true) @@ -472,8 +465,7 @@ func TestSyncDeleteBook(t *testing.T) { b2UUID := testutils.MustGenerateUUID(t) // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") database.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, false) @@ -538,8 +530,7 @@ func TestSyncDeleteBook(t *testing.T) { b1UUID := testutils.MustGenerateUUID(t) // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") database.MustExec(t, "inserting n1 for test case %d", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 10, "n1 body", 1541108743, false, true) @@ -590,8 +581,7 @@ func TestSyncDeleteBook(t *testing.T) { func TestFullSyncNote(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") @@ -822,8 +812,7 @@ n1 body edited for idx, tc := range testCases { func() { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") database.MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "b2-label") @@ -884,8 +873,7 @@ n1 body edited func TestFullSyncBook(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, 555, "b1-label", true, false) @@ -1023,8 +1011,7 @@ func TestFullSyncBook(t *testing.T) { for idx, tc := range testCases { func() { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, tc.clientUSN, tc.clientLabel, tc.clientDirty, tc.clientDeleted) @@ -1076,8 +1063,7 @@ func TestFullSyncBook(t *testing.T) { func TestStepSyncNote(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") @@ -1234,8 +1220,7 @@ n1 body edited for idx, tc := range testCases { func() { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") database.MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "b2-label") @@ -1296,8 +1281,7 @@ n1 body edited func TestStepSyncBook(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, 555, "b1-label", true, false) @@ -1419,8 +1403,7 @@ func TestStepSyncBook(t *testing.T) { for idx, tc := range testCases { func() { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, fmt.Sprintf("inserting book for test case %d", idx), db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", b1UUID, tc.clientUSN, tc.clientLabel, tc.clientDirty, tc.clientDeleted) @@ -1483,8 +1466,7 @@ func TestStepSyncBook(t *testing.T) { func TestMergeBook(t *testing.T) { t.Run("insert, no duplicates", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) // test tx, err := db.Begin() @@ -1527,8 +1509,7 @@ func TestMergeBook(t *testing.T) { t.Run("insert, 1 duplicate", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) // test @@ -1579,8 +1560,7 @@ func TestMergeBook(t *testing.T) { t.Run("insert, 3 duplicates", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b2-uuid", 2, "foo_2", true, false) @@ -1648,8 +1628,7 @@ func TestMergeBook(t *testing.T) { t.Run("update, no duplicates", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) // test tx, err := db.Begin() @@ -1695,8 +1674,7 @@ func TestMergeBook(t *testing.T) { t.Run("update, 1 duplicate", func(t *testing.T) { // set up - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b2-uuid", 2, "bar", false, false) @@ -1749,8 +1727,7 @@ func TestMergeBook(t *testing.T) { t.Run("update, 3 duplicate", func(t *testing.T) { // set uj - db := database.InitTestDB(t, dbPath, nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b2-uuid", 2, "bar", false, false) @@ -1820,11 +1797,8 @@ func TestMergeBook(t *testing.T) { func TestSaveServerState(t *testing.T) { // set up - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - testutils.Login(t, &ctx) - - db := ctx.DB + db := database.InitTestMemoryDB(t) + testutils.LoginDB(t, db) database.MustExec(t, "inserting last synced at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, int64(1231108742)) database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 8) @@ -1864,8 +1838,7 @@ func TestSaveServerState(t *testing.T) { // are updated accordingly based on the server response. func TestSendBooks(t *testing.T) { // set up - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) + ctx := context.InitTestCtx(t) testutils.Login(t, &ctx) db := ctx.DB @@ -1900,7 +1873,7 @@ func TestSendBooks(t *testing.T) { var updatesUUIDs []string var deletedUUIDs []string - // fire up a test server. It decrypts the payload for test purposes. + // fire up a test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.String() == "/v3/books" && r.Method == "POST" { var payload client.CreateBookPayload @@ -1967,7 +1940,7 @@ func TestSendBooks(t *testing.T) { // test - // First, decrypt data so that they can be asserted + // First, sort data so that they can be asserted sort.SliceStable(createdLabels, func(i, j int) bool { return strings.Compare(createdLabels[i], createdLabels[j]) < 0 }) @@ -2097,9 +2070,8 @@ func TestSendBooks_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t, paths, nil) + ctx := context.InitTestCtx(t) ctx.APIEndpoint = ts.URL - defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) db := ctx.DB @@ -2145,9 +2117,8 @@ func TestSendBooks_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t, paths, nil) + ctx := context.InitTestCtx(t) ctx.APIEndpoint = ts.URL - defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) db := ctx.DB @@ -2193,9 +2164,8 @@ func TestSendBooks_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t, paths, nil) + ctx := context.InitTestCtx(t) ctx.APIEndpoint = ts.URL - defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) db := ctx.DB @@ -2228,8 +2198,7 @@ func TestSendBooks_isBehind(t *testing.T) { // uuid from the incoming data. func TestSendNotes(t *testing.T) { // set up - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) + ctx := context.InitTestCtx(t) testutils.Login(t, &ctx) db := ctx.DB @@ -2264,7 +2233,7 @@ func TestSendNotes(t *testing.T) { var updatedUUIDs []string var deletedUUIDs []string - // fire up a test server. It decrypts the payload for test purposes. + // fire up a test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.String() == "/v3/notes" && r.Method == "POST" { var payload client.CreateNotePayload @@ -2381,8 +2350,7 @@ func TestSendNotes(t *testing.T) { func TestSendNotes_addedOn(t *testing.T) { // set up - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) + ctx := context.InitTestCtx(t) testutils.Login(t, &ctx) db := ctx.DB @@ -2393,7 +2361,7 @@ func TestSendNotes_addedOn(t *testing.T) { b1UUID := "b1-uuid" database.MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, body, added_on, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?)", "n1-uuid", b1UUID, 0, "n1-body", 1541108743, false, true) - // fire up a test server. It decrypts the payload for test purposes. + // fire up a test server ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.String() == "/v3/notes" && r.Method == "POST" { resp := client.CreateNoteResp{ @@ -2513,8 +2481,7 @@ func TestSendNotes_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) + ctx := context.InitTestCtx(t) testutils.Login(t, &ctx) ctx.APIEndpoint = ts.URL @@ -2562,8 +2529,7 @@ func TestSendNotes_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) + ctx := context.InitTestCtx(t) testutils.Login(t, &ctx) ctx.APIEndpoint = ts.URL @@ -2611,8 +2577,7 @@ func TestSendNotes_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) + ctx := context.InitTestCtx(t) testutils.Login(t, &ctx) ctx.APIEndpoint = ts.URL @@ -2777,8 +2742,7 @@ n1 body edited for idx, tc := range testCases { func() { // set up - db := database.InitTestDB(t, "../../tmp/.dnote", nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, fmt.Sprintf("inserting b1 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", b1UUID, "b1-label", 5, false) database.MustExec(t, fmt.Sprintf("inserting b2 for test case %d", idx), db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", b2UUID, "b2-label", 6, false) @@ -2859,8 +2823,7 @@ n1 body edited func TestCheckBookPristine(t *testing.T) { // set up - db := database.InitTestDB(t, "../../tmp/.dnote", nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", "b1-uuid", "b1-label", 5, false) database.MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, dirty) VALUES (?, ?, ?, ?)", "b2-uuid", "b2-label", 6, false) @@ -3033,8 +2996,7 @@ func TestCheckBookInList(t *testing.T) { func TestCleanLocalNotes(t *testing.T) { // set up - db := database.InitTestDB(t, "../../tmp/.dnote", nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) list := syncList{ Notes: map[string]client.SyncFragNote{ @@ -3105,8 +3067,7 @@ func TestCleanLocalNotes(t *testing.T) { func TestCleanLocalBooks(t *testing.T) { // set up - db := database.InitTestDB(t, "../../tmp/.dnote", nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) list := syncList{ Notes: map[string]client.SyncFragNote{ @@ -3173,8 +3134,7 @@ func TestCleanLocalBooks(t *testing.T) { func TestPrepareEmptyServerSync(t *testing.T) { // set up - db := database.InitTestDB(t, "../../tmp/.dnote", nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) // Setup: local has synced data (usn > 0, dirty = false) and some deleted items database.MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", "b1-uuid", "b1-label", 5, false, false) diff --git a/pkg/cli/context/files.go b/pkg/cli/context/files.go new file mode 100644 index 00000000..098b2cd5 --- /dev/null +++ b/pkg/cli/context/files.go @@ -0,0 +1,51 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Dnote. If not, see . + */ + +package context + +import ( + "path/filepath" + + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/utils" + "github.com/pkg/errors" +) + +// InitDnoteDirs creates the dnote directories if they don't already exist. +func InitDnoteDirs(paths Paths) error { + if paths.Config != "" { + configDir := filepath.Join(paths.Config, consts.DnoteDirName) + if err := utils.EnsureDir(configDir); err != nil { + return errors.Wrap(err, "initializing config dir") + } + } + if paths.Data != "" { + dataDir := filepath.Join(paths.Data, consts.DnoteDirName) + if err := utils.EnsureDir(dataDir); err != nil { + return errors.Wrap(err, "initializing data dir") + } + } + if paths.Cache != "" { + cacheDir := filepath.Join(paths.Cache, consts.DnoteDirName) + if err := utils.EnsureDir(cacheDir); err != nil { + return errors.Wrap(err, "initializing cache dir") + } + } + + return nil +} diff --git a/pkg/cli/context/files_test.go b/pkg/cli/context/files_test.go new file mode 100644 index 00000000..2422a795 --- /dev/null +++ b/pkg/cli/context/files_test.go @@ -0,0 +1,65 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Dnote. If not, see . + */ + +package context + +import ( + "os" + "path/filepath" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" +) + +func assertDirsExist(t *testing.T, paths Paths) { + configDir := filepath.Join(paths.Config, consts.DnoteDirName) + info, err := os.Stat(configDir) + assert.Equal(t, err, nil, "config dir should exist") + assert.Equal(t, info.IsDir(), true, "config should be a directory") + + dataDir := filepath.Join(paths.Data, consts.DnoteDirName) + info, err = os.Stat(dataDir) + assert.Equal(t, err, nil, "data dir should exist") + assert.Equal(t, info.IsDir(), true, "data should be a directory") + + cacheDir := filepath.Join(paths.Cache, consts.DnoteDirName) + info, err = os.Stat(cacheDir) + assert.Equal(t, err, nil, "cache dir should exist") + assert.Equal(t, info.IsDir(), true, "cache should be a directory") +} + +func TestInitDnoteDirs(t *testing.T) { + tmpDir := t.TempDir() + + paths := Paths{ + Config: filepath.Join(tmpDir, "config"), + Data: filepath.Join(tmpDir, "data"), + Cache: filepath.Join(tmpDir, "cache"), + } + + // Initialize directories + err := InitDnoteDirs(paths) + assert.Equal(t, err, nil, "InitDnoteDirs should succeed") + assertDirsExist(t, paths) + + // Call again - should be idempotent + err = InitDnoteDirs(paths) + assert.Equal(t, err, nil, "InitDnoteDirs should succeed when dirs already exist") + assertDirsExist(t, paths) +} diff --git a/pkg/cli/context/testutils.go b/pkg/cli/context/testutils.go index 8453dd3a..62fed833 100644 --- a/pkg/cli/context/testutils.go +++ b/pkg/cli/context/testutils.go @@ -19,8 +19,7 @@ package context import ( - "fmt" - "os" + "path/filepath" "testing" "github.com/dnote/dnote/pkg/cli/consts" @@ -29,11 +28,27 @@ import ( "github.com/pkg/errors" ) -// InitTestCtx initializes a test context -func InitTestCtx(t *testing.T, paths Paths, dbOpts *database.TestDBOptions) DnoteCtx { - dbPath := fmt.Sprintf("%s/%s/%s", paths.Data, consts.DnoteDirName, consts.DnoteDBFileName) +// getDefaultTestPaths creates default test paths with all paths pointing to a temp directory +func getDefaultTestPaths(t *testing.T) Paths { + tmpDir := t.TempDir() + return Paths{ + Home: tmpDir, + Cache: tmpDir, + Config: tmpDir, + Data: tmpDir, + } +} - db := database.InitTestDB(t, dbPath, dbOpts) + +// InitTestCtx initializes a test context with an in-memory database +// and a temporary directory for all paths +func InitTestCtx(t *testing.T) DnoteCtx { + paths := getDefaultTestPaths(t) + db := database.InitTestMemoryDB(t) + + if err := InitDnoteDirs(paths); err != nil { + t.Fatal(errors.Wrap(err, "creating test directories")) + } return DnoteCtx{ DB: db, @@ -42,17 +57,47 @@ func InitTestCtx(t *testing.T, paths Paths, dbOpts *database.TestDBOptions) Dnot } } -// TeardownTestCtx cleans up the test context -func TeardownTestCtx(t *testing.T, ctx DnoteCtx) { - database.TeardownTestDB(t, ctx.DB) +// InitTestCtxWithDB initializes a test context with the provided database +// and a temporary directory for all paths. +// Used when you need full control over database initialization (e.g. migration tests). +func InitTestCtxWithDB(t *testing.T, db *database.DB) DnoteCtx { + paths := getDefaultTestPaths(t) - if err := os.RemoveAll(ctx.Paths.Data); err != nil { - t.Fatal(errors.Wrap(err, "removing test data directory")) + if err := InitDnoteDirs(paths); err != nil { + t.Fatal(errors.Wrap(err, "creating test directories")) } - if err := os.RemoveAll(ctx.Paths.Config); err != nil { - t.Fatal(errors.Wrap(err, "removing test config directory")) - } - if err := os.RemoveAll(ctx.Paths.Cache); err != nil { - t.Fatal(errors.Wrap(err, "removing test cache directory")) + + return DnoteCtx{ + DB: db, + Paths: paths, + Clock: clock.NewMock(), // Use a mock clock to test times + } +} + +// InitTestCtxWithFileDB initializes a test context with a file-based database +// at the expected path. +func InitTestCtxWithFileDB(t *testing.T) DnoteCtx { + paths := getDefaultTestPaths(t) + + if err := InitDnoteDirs(paths); err != nil { + t.Fatal(errors.Wrap(err, "creating test directories")) + } + + dbPath := filepath.Join(paths.Data, consts.DnoteDirName, consts.DnoteDBFileName) + db, err := database.Open(dbPath) + if err != nil { + t.Fatal(errors.Wrap(err, "opening database")) + } + + if _, err := db.Exec(database.GetDefaultSchemaSQL()); err != nil { + t.Fatal(errors.Wrap(err, "running schema sql")) + } + + t.Cleanup(func() { db.Close() }) + + return DnoteCtx{ + DB: db, + Paths: paths, + Clock: clock.NewMock(), // Use a mock clock to test times } } diff --git a/pkg/cli/database/models.go b/pkg/cli/database/models.go index 05dd2f06..b26a6b5a 100644 --- a/pkg/cli/database/models.go +++ b/pkg/cli/database/models.go @@ -41,13 +41,12 @@ type Note struct { AddedOn int64 `json:"added_on"` EditedOn int64 `json:"edited_on"` USN int `json:"usn"` - Public bool `json:"public"` Deleted bool `json:"deleted"` Dirty bool `json:"dirty"` } // NewNote constructs a note with the given data -func NewNote(uuid, bookUUID, body string, addedOn, editedOn int64, usn int, public, deleted, dirty bool) Note { +func NewNote(uuid, bookUUID, body string, addedOn, editedOn int64, usn int, deleted, dirty bool) Note { return Note{ UUID: uuid, BookUUID: bookUUID, @@ -55,7 +54,6 @@ func NewNote(uuid, bookUUID, body string, addedOn, editedOn int64, usn int, publ AddedOn: addedOn, EditedOn: editedOn, USN: usn, - Public: public, Deleted: deleted, Dirty: dirty, } @@ -63,8 +61,8 @@ func NewNote(uuid, bookUUID, body string, addedOn, editedOn int64, usn int, publ // Insert inserts a new note func (n Note) Insert(db *DB) error { - _, err := db.Exec("INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", - n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Public, n.Deleted, n.Dirty) + _, err := db.Exec("INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", + n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Deleted, n.Dirty) if err != nil { return errors.Wrapf(err, "inserting note with uuid %s", n.UUID) @@ -75,8 +73,8 @@ func (n Note) Insert(db *DB) error { // Update updates the note with the given data func (n Note) Update(db *DB) error { - _, err := db.Exec("UPDATE notes SET book_uuid = ?, body = ?, added_on = ?, edited_on = ?, usn = ?, public = ?, deleted = ?, dirty = ? WHERE uuid = ?", - n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Public, n.Deleted, n.Dirty, n.UUID) + _, err := db.Exec("UPDATE notes SET book_uuid = ?, body = ?, added_on = ?, edited_on = ?, usn = ?, deleted = ?, dirty = ? WHERE uuid = ?", + n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Deleted, n.Dirty, n.UUID) if err != nil { return errors.Wrapf(err, "updating the note with uuid %s", n.UUID) diff --git a/pkg/cli/database/models_test.go b/pkg/cli/database/models_test.go index 197937fc..53565d7b 100644 --- a/pkg/cli/database/models_test.go +++ b/pkg/cli/database/models_test.go @@ -34,7 +34,6 @@ func TestNewNote(t *testing.T) { addedOn int64 editedOn int64 usn int - public bool deleted bool dirty bool }{ @@ -45,7 +44,6 @@ func TestNewNote(t *testing.T) { addedOn: 1542058875, editedOn: 0, usn: 0, - public: false, deleted: false, dirty: false, }, @@ -56,14 +54,13 @@ func TestNewNote(t *testing.T) { addedOn: 1542058875, editedOn: 1542058876, usn: 1008, - public: true, deleted: true, dirty: true, }, } for idx, tc := range testCases { - got := NewNote(tc.uuid, tc.bookUUID, tc.body, tc.addedOn, tc.editedOn, tc.usn, tc.public, tc.deleted, tc.dirty) + got := NewNote(tc.uuid, tc.bookUUID, tc.body, tc.addedOn, tc.editedOn, tc.usn, tc.deleted, tc.dirty) assert.Equal(t, got.UUID, tc.uuid, fmt.Sprintf("UUID mismatch for test case %d", idx)) assert.Equal(t, got.BookUUID, tc.bookUUID, fmt.Sprintf("BookUUID mismatch for test case %d", idx)) @@ -71,7 +68,6 @@ func TestNewNote(t *testing.T) { assert.Equal(t, got.AddedOn, tc.addedOn, fmt.Sprintf("AddedOn mismatch for test case %d", idx)) assert.Equal(t, got.EditedOn, tc.editedOn, fmt.Sprintf("EditedOn mismatch for test case %d", idx)) assert.Equal(t, got.USN, tc.usn, fmt.Sprintf("USN mismatch for test case %d", idx)) - assert.Equal(t, got.Public, tc.public, fmt.Sprintf("Public mismatch for test case %d", idx)) assert.Equal(t, got.Deleted, tc.deleted, fmt.Sprintf("Deleted mismatch for test case %d", idx)) assert.Equal(t, got.Dirty, tc.dirty, fmt.Sprintf("Dirty mismatch for test case %d", idx)) } @@ -85,7 +81,6 @@ func TestNoteInsert(t *testing.T) { addedOn int64 editedOn int64 usn int - public bool deleted bool dirty bool }{ @@ -96,7 +91,6 @@ func TestNoteInsert(t *testing.T) { addedOn: 1542058875, editedOn: 0, usn: 0, - public: false, deleted: false, dirty: false, }, @@ -107,7 +101,6 @@ func TestNoteInsert(t *testing.T) { addedOn: 1542058875, editedOn: 1542058876, usn: 1008, - public: true, deleted: true, dirty: true, }, @@ -116,8 +109,7 @@ func TestNoteInsert(t *testing.T) { for idx, tc := range testCases { func() { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) n := Note{ UUID: tc.uuid, @@ -126,7 +118,6 @@ func TestNoteInsert(t *testing.T) { AddedOn: tc.addedOn, EditedOn: tc.editedOn, USN: tc.usn, - Public: tc.public, Deleted: tc.deleted, Dirty: tc.dirty, } @@ -148,10 +139,10 @@ func TestNoteInsert(t *testing.T) { var uuid, bookUUID, body string var addedOn, editedOn int64 var usn int - var public, deleted, dirty bool + var deleted, dirty bool MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty FROM notes WHERE uuid = ?", tc.uuid), - &uuid, &bookUUID, &body, &addedOn, &editedOn, &usn, &public, &deleted, &dirty) + db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty FROM notes WHERE uuid = ?", tc.uuid), + &uuid, &bookUUID, &body, &addedOn, &editedOn, &usn, &deleted, &dirty) assert.Equal(t, uuid, tc.uuid, fmt.Sprintf("uuid mismatch for test case %d", idx)) assert.Equal(t, bookUUID, tc.bookUUID, fmt.Sprintf("bookUUID mismatch for test case %d", idx)) @@ -159,7 +150,6 @@ func TestNoteInsert(t *testing.T) { assert.Equal(t, addedOn, tc.addedOn, fmt.Sprintf("addedOn mismatch for test case %d", idx)) assert.Equal(t, editedOn, tc.editedOn, fmt.Sprintf("editedOn mismatch for test case %d", idx)) assert.Equal(t, usn, tc.usn, fmt.Sprintf("usn mismatch for test case %d", idx)) - assert.Equal(t, public, tc.public, fmt.Sprintf("public mismatch for test case %d", idx)) assert.Equal(t, deleted, tc.deleted, fmt.Sprintf("deleted mismatch for test case %d", idx)) assert.Equal(t, dirty, tc.dirty, fmt.Sprintf("dirty mismatch for test case %d", idx)) }() @@ -174,14 +164,12 @@ func TestNoteUpdate(t *testing.T) { addedOn int64 editedOn int64 usn int - public bool deleted bool dirty bool newBookUUID string newBody string newEditedOn int64 newUSN int - newPublic bool newDeleted bool newDirty bool }{ @@ -192,14 +180,12 @@ func TestNoteUpdate(t *testing.T) { addedOn: 1542058875, editedOn: 0, usn: 0, - public: false, deleted: false, dirty: false, newBookUUID: "b1-uuid", newBody: "n1-body edited", newEditedOn: 1542058879, newUSN: 0, - newPublic: false, newDeleted: false, newDirty: false, }, @@ -210,14 +196,12 @@ func TestNoteUpdate(t *testing.T) { addedOn: 1542058875, editedOn: 0, usn: 0, - public: false, deleted: false, dirty: true, newBookUUID: "b2-uuid", newBody: "n1-body", newEditedOn: 1542058879, newUSN: 0, - newPublic: true, newDeleted: false, newDirty: false, }, @@ -228,14 +212,12 @@ func TestNoteUpdate(t *testing.T) { addedOn: 1542058875, editedOn: 0, usn: 10, - public: false, deleted: false, dirty: false, newBookUUID: "", newBody: "", newEditedOn: 1542058879, newUSN: 151, - newPublic: false, newDeleted: true, newDirty: false, }, @@ -246,14 +228,12 @@ func TestNoteUpdate(t *testing.T) { addedOn: 1542058875, editedOn: 0, usn: 0, - public: false, deleted: false, dirty: false, newBookUUID: "", newBody: "", newEditedOn: 1542058879, newUSN: 15, - newPublic: false, newDeleted: true, newDirty: false, }, @@ -262,8 +242,7 @@ func TestNoteUpdate(t *testing.T) { for idx, tc := range testCases { func() { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) n1 := Note{ UUID: tc.uuid, @@ -272,7 +251,6 @@ func TestNoteUpdate(t *testing.T) { AddedOn: tc.addedOn, EditedOn: tc.editedOn, USN: tc.usn, - Public: tc.public, Deleted: tc.deleted, Dirty: tc.dirty, } @@ -283,13 +261,12 @@ func TestNoteUpdate(t *testing.T) { AddedOn: 1542058875, EditedOn: 0, USN: 39, - Public: false, Deleted: false, Dirty: false, } - MustExec(t, fmt.Sprintf("inserting n1 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n1.UUID, n1.BookUUID, n1.USN, n1.AddedOn, n1.EditedOn, n1.Body, n1.Public, n1.Deleted, n1.Dirty) - MustExec(t, fmt.Sprintf("inserting n2 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n2.UUID, n2.BookUUID, n2.USN, n2.AddedOn, n2.EditedOn, n2.Body, n2.Public, n2.Deleted, n2.Dirty) + MustExec(t, fmt.Sprintf("inserting n1 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1.UUID, n1.BookUUID, n1.USN, n1.AddedOn, n1.EditedOn, n1.Body, n1.Deleted, n1.Dirty) + MustExec(t, fmt.Sprintf("inserting n2 for test case %d", idx), db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n2.UUID, n2.BookUUID, n2.USN, n2.AddedOn, n2.EditedOn, n2.Body, n2.Deleted, n2.Dirty) // execute tx, err := db.Begin() @@ -301,7 +278,6 @@ func TestNoteUpdate(t *testing.T) { n1.Body = tc.newBody n1.EditedOn = tc.newEditedOn n1.USN = tc.newUSN - n1.Public = tc.newPublic n1.Deleted = tc.newDeleted n1.Dirty = tc.newDirty @@ -315,11 +291,11 @@ func TestNoteUpdate(t *testing.T) { // test var n1Record, n2Record Note MustScan(t, "getting n1", - db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty FROM notes WHERE uuid = ?", tc.uuid), - &n1Record.UUID, &n1Record.BookUUID, &n1Record.Body, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.USN, &n1Record.Public, &n1Record.Deleted, &n1Record.Dirty) + db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty FROM notes WHERE uuid = ?", tc.uuid), + &n1Record.UUID, &n1Record.BookUUID, &n1Record.Body, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.USN, &n1Record.Deleted, &n1Record.Dirty) MustScan(t, "getting n2", - db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), - &n2Record.UUID, &n2Record.BookUUID, &n2Record.Body, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.USN, &n2Record.Public, &n2Record.Deleted, &n2Record.Dirty) + db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), + &n2Record.UUID, &n2Record.BookUUID, &n2Record.Body, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.USN, &n2Record.Deleted, &n2Record.Dirty) assert.Equal(t, n1Record.UUID, n1.UUID, fmt.Sprintf("n1 uuid mismatch for test case %d", idx)) assert.Equal(t, n1Record.BookUUID, tc.newBookUUID, fmt.Sprintf("n1 bookUUID mismatch for test case %d", idx)) @@ -327,7 +303,6 @@ func TestNoteUpdate(t *testing.T) { assert.Equal(t, n1Record.AddedOn, n1.AddedOn, fmt.Sprintf("n1 addedOn mismatch for test case %d", idx)) assert.Equal(t, n1Record.EditedOn, tc.newEditedOn, fmt.Sprintf("n1 editedOn mismatch for test case %d", idx)) assert.Equal(t, n1Record.USN, tc.newUSN, fmt.Sprintf("n1 usn mismatch for test case %d", idx)) - assert.Equal(t, n1Record.Public, tc.newPublic, fmt.Sprintf("n1 public mismatch for test case %d", idx)) assert.Equal(t, n1Record.Deleted, tc.newDeleted, fmt.Sprintf("n1 deleted mismatch for test case %d", idx)) assert.Equal(t, n1Record.Dirty, tc.newDirty, fmt.Sprintf("n1 dirty mismatch for test case %d", idx)) @@ -337,7 +312,6 @@ func TestNoteUpdate(t *testing.T) { assert.Equal(t, n2Record.AddedOn, n2.AddedOn, fmt.Sprintf("n2 addedOn mismatch for test case %d", idx)) assert.Equal(t, n2Record.EditedOn, n2.EditedOn, fmt.Sprintf("n2 editedOn mismatch for test case %d", idx)) assert.Equal(t, n2Record.USN, n2.USN, fmt.Sprintf("n2 usn mismatch for test case %d", idx)) - assert.Equal(t, n2Record.Public, n2.Public, fmt.Sprintf("n2 public mismatch for test case %d", idx)) assert.Equal(t, n2Record.Deleted, n2.Deleted, fmt.Sprintf("n2 deleted mismatch for test case %d", idx)) assert.Equal(t, n2Record.Dirty, n2.Dirty, fmt.Sprintf("n2 dirty mismatch for test case %d", idx)) }() @@ -359,8 +333,7 @@ func TestNoteUpdateUUID(t *testing.T) { for idx, tc := range testCases { t.Run(fmt.Sprintf("testCase%d", idx), func(t *testing.T) { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) n1 := Note{ UUID: "n1-uuid", @@ -414,8 +387,7 @@ func TestNoteUpdateUUID(t *testing.T) { func TestNoteExpunge(t *testing.T) { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) n1 := Note{ UUID: "n1-uuid", @@ -424,7 +396,6 @@ func TestNoteExpunge(t *testing.T) { AddedOn: 1542058874, EditedOn: 0, USN: 22, - Public: false, Deleted: false, Dirty: false, } @@ -435,13 +406,12 @@ func TestNoteExpunge(t *testing.T) { AddedOn: 1542058875, EditedOn: 0, USN: 39, - Public: false, Deleted: false, Dirty: false, } - MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n1.UUID, n1.BookUUID, n1.USN, n1.AddedOn, n1.EditedOn, n1.Body, n1.Public, n1.Deleted, n1.Dirty) - MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n2.UUID, n2.BookUUID, n2.USN, n2.AddedOn, n2.EditedOn, n2.Body, n2.Public, n2.Deleted, n2.Dirty) + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1.UUID, n1.BookUUID, n1.USN, n1.AddedOn, n1.EditedOn, n1.Body, n1.Deleted, n1.Dirty) + MustExec(t, "inserting n2", db, "INSERT INTO notes (uuid, book_uuid, usn, added_on, edited_on, body, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n2.UUID, n2.BookUUID, n2.USN, n2.AddedOn, n2.EditedOn, n2.Body, n2.Deleted, n2.Dirty) // execute tx, err := db.Begin() @@ -464,8 +434,8 @@ func TestNoteExpunge(t *testing.T) { var n2Record Note MustScan(t, "getting n2", - db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), - &n2Record.UUID, &n2Record.BookUUID, &n2Record.Body, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.USN, &n2Record.Public, &n2Record.Deleted, &n2Record.Dirty) + db.QueryRow("SELECT uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), + &n2Record.UUID, &n2Record.BookUUID, &n2Record.Body, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.USN, &n2Record.Deleted, &n2Record.Dirty) assert.Equal(t, n2Record.UUID, n2.UUID, "n2 uuid mismatch") assert.Equal(t, n2Record.BookUUID, n2.BookUUID, "n2 bookUUID mismatch") @@ -473,7 +443,6 @@ func TestNoteExpunge(t *testing.T) { assert.Equal(t, n2Record.AddedOn, n2.AddedOn, "n2 addedOn mismatch") assert.Equal(t, n2Record.EditedOn, n2.EditedOn, "n2 editedOn mismatch") assert.Equal(t, n2Record.USN, n2.USN, "n2 usn mismatch") - assert.Equal(t, n2Record.Public, n2.Public, "n2 public mismatch") assert.Equal(t, n2Record.Deleted, n2.Deleted, "n2 deleted mismatch") assert.Equal(t, n2Record.Dirty, n2.Dirty, "n2 dirty mismatch") } @@ -540,8 +509,7 @@ func TestBookInsert(t *testing.T) { for idx, tc := range testCases { func() { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) b := Book{ UUID: tc.uuid, @@ -621,8 +589,7 @@ func TestBookUpdate(t *testing.T) { for idx, tc := range testCases { func() { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) b1 := Book{ UUID: "b1-uuid", @@ -700,8 +667,7 @@ func TestBookUpdateUUID(t *testing.T) { t.Run(fmt.Sprintf("testCase%d", idx), func(t *testing.T) { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) b1 := Book{ UUID: "b1-uuid", @@ -751,8 +717,7 @@ func TestBookUpdateUUID(t *testing.T) { func TestBookExpunge(t *testing.T) { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) b1 := Book{ UUID: "b1-uuid", @@ -806,8 +771,7 @@ func TestBookExpunge(t *testing.T) { // TestNoteFTS tests that note full text search indices stay in sync with the notes after insert, update and delete func TestNoteFTS(t *testing.T) { // set up - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) // execute - insert n := Note{ @@ -817,7 +781,6 @@ func TestNoteFTS(t *testing.T) { AddedOn: 1542058875, EditedOn: 0, USN: 0, - Public: false, Deleted: false, Dirty: false, } diff --git a/pkg/cli/database/queries.go b/pkg/cli/database/queries.go index fe0884bc..e8ec5ce5 100644 --- a/pkg/cli/database/queries.go +++ b/pkg/cli/database/queries.go @@ -170,7 +170,6 @@ func GetActiveNote(db *DB, rowid int) (Note, error) { added_on, edited_on, usn, - public, deleted, dirty FROM notes WHERE rowid = ? AND deleted = false;`, rowid).Scan( @@ -181,7 +180,6 @@ func GetActiveNote(db *DB, rowid int) (Note, error) { &ret.AddedOn, &ret.EditedOn, &ret.USN, - &ret.Public, &ret.Deleted, &ret.Dirty, ) diff --git a/pkg/cli/database/queries_test.go b/pkg/cli/database/queries_test.go index cbfc71f2..cccc697f 100644 --- a/pkg/cli/database/queries_test.go +++ b/pkg/cli/database/queries_test.go @@ -47,8 +47,7 @@ func TestInsertSystem(t *testing.T) { for _, tc := range testCases { t.Run(fmt.Sprintf("insert %s %s", tc.key, tc.val), func(t *testing.T) { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) // execute tx, err := db.Begin() @@ -95,8 +94,7 @@ func TestUpsertSystem(t *testing.T) { for _, tc := range testCases { t.Run(fmt.Sprintf("insert %s %s", tc.key, tc.val), func(t *testing.T) { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "baz", "quz") @@ -134,8 +132,7 @@ func TestUpsertSystem(t *testing.T) { func TestGetSystem(t *testing.T) { t.Run(fmt.Sprintf("get string value"), func(t *testing.T) { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) // execute MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", "bar") @@ -157,8 +154,7 @@ func TestGetSystem(t *testing.T) { t.Run(fmt.Sprintf("get int64 value"), func(t *testing.T) { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) // execute MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", 1234) @@ -198,8 +194,7 @@ func TestUpdateSystem(t *testing.T) { for _, tc := range testCases { t.Run(fmt.Sprintf("update %s %s", tc.key, tc.val), func(t *testing.T) { // Setup - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", "fuz") MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "baz", "quz") @@ -238,11 +233,10 @@ func TestUpdateSystem(t *testing.T) { func TestGetActiveNote(t *testing.T) { t.Run("not deleted", func(t *testing.T) { // set up - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) n1UUID := "n1-uuid" - MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, "b1-uuid", "n1 content", 1542058875, 1542058876, 1, true, false, true) + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, "b1-uuid", "n1 content", 1542058875, 1542058876, 1, false, true) var n1RowID int MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", n1UUID), &n1RowID) @@ -261,18 +255,16 @@ func TestGetActiveNote(t *testing.T) { assert.Equal(t, got.AddedOn, int64(1542058875), "AddedOn mismatch") assert.Equal(t, got.EditedOn, int64(1542058876), "EditedOn mismatch") assert.Equal(t, got.USN, 1, "USN mismatch") - assert.Equal(t, got.Public, true, "Public mismatch") assert.Equal(t, got.Deleted, false, "Deleted mismatch") assert.Equal(t, got.Dirty, true, "Dirty mismatch") }) t.Run("deleted", func(t *testing.T) { // set up - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) n1UUID := "n1-uuid" - MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, "b1-uuid", "n1 content", 1542058875, 1542058876, 1, true, true, true) + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", n1UUID, "b1-uuid", "n1 content", 1542058875, 1542058876, 1, true, true) var n1RowID int MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", n1UUID), &n1RowID) @@ -292,11 +284,10 @@ func TestGetActiveNote(t *testing.T) { func TestUpdateNoteContent(t *testing.T) { // set up - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) uuid := "n1-uuid" - MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", uuid, "b1-uuid", "n1 content", 1542058875, 0, 1, false, false, false) + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", uuid, "b1-uuid", "n1 content", 1542058875, 0, 1, false, false) var rowid int MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", uuid), &rowid) @@ -324,8 +315,7 @@ func TestUpdateNoteContent(t *testing.T) { func TestUpdateNoteBook(t *testing.T) { // set up - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) b1UUID := "b1-uuid" b2UUID := "b2-uuid" @@ -333,7 +323,7 @@ func TestUpdateNoteBook(t *testing.T) { MustExec(t, "inserting b2", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b2UUID, "b2-label", 9, false, false) uuid := "n1-uuid" - MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, public, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", uuid, b1UUID, "n1 content", 1542058875, 0, 1, false, false, false) + MustExec(t, "inserting n1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on, edited_on, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", uuid, b1UUID, "n1 content", 1542058875, 0, 1, false, false) var rowid int MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", uuid), &rowid) @@ -361,8 +351,7 @@ func TestUpdateNoteBook(t *testing.T) { func TestUpdateBookName(t *testing.T) { // set up - db := InitTestDB(t, "../tmp/dnote-test.db", nil) - defer TeardownTestDB(t, db) + db := InitTestMemoryDB(t) b1UUID := "b1-uuid" MustExec(t, "inserting b1", db, "INSERT INTO books (uuid, label, usn, deleted, dirty) VALUES (?, ?, ?, ?, ?)", b1UUID, "b1-label", 8, false, false) diff --git a/pkg/cli/database/schema.sql b/pkg/cli/database/schema.sql new file mode 100644 index 00000000..9a9de094 --- /dev/null +++ b/pkg/cli/database/schema.sql @@ -0,0 +1,40 @@ +-- This is the final state of the CLI database after all migrations. +-- Auto-generated by generate-schema.go. Do not edit manually. +CREATE TABLE books + ( + uuid text PRIMARY KEY, + label text NOT NULL + , dirty bool DEFAULT false, usn int DEFAULT 0 NOT NULL, deleted bool DEFAULT false); +CREATE TABLE system + ( + key string NOT NULL, + value text NOT NULL + ); +CREATE UNIQUE INDEX idx_books_label ON books(label); +CREATE UNIQUE INDEX idx_books_uuid ON books(uuid); +CREATE TABLE "notes" + ( + uuid text NOT NULL, + book_uuid text NOT NULL, + body text NOT NULL, + added_on integer NOT NULL, + edited_on integer DEFAULT 0, + dirty bool DEFAULT false, + usn int DEFAULT 0 NOT NULL, + deleted bool DEFAULT false + ); +CREATE VIRTUAL TABLE note_fts USING fts5(content=notes, body, tokenize="porter unicode61 categories 'L* N* Co Ps Pe'"); +CREATE TRIGGER notes_after_insert AFTER INSERT ON notes BEGIN + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; +CREATE TRIGGER notes_after_delete AFTER DELETE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + END; +CREATE TRIGGER notes_after_update AFTER UPDATE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; + +-- Migration version data. +INSERT INTO system (key, value) VALUES ('schema', 14); +INSERT INTO system (key, value) VALUES ('remote_schema', 1); diff --git a/pkg/cli/database/schema/main.go b/pkg/cli/database/schema/main.go new file mode 100644 index 00000000..2596c84a --- /dev/null +++ b/pkg/cli/database/schema/main.go @@ -0,0 +1,166 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Dnote. If not, see . + */ + +// Command schema generates the CLI database schema.sql file. +package main + +import ( + "fmt" + "os" + "path/filepath" + "strings" + + "github.com/dnote/dnote/pkg/cli/config" + "github.com/dnote/dnote/pkg/cli/consts" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/migrate" +) + +func main() { + tmpDir, err := os.MkdirTemp("", "dnote-schema-gen-*") + if err != nil { + fmt.Fprintf(os.Stderr, "Error: %v\n", err) + os.Exit(1) + } + defer os.RemoveAll(tmpDir) + + schemaPath := filepath.Join("pkg", "cli", "database", "schema.sql") + + if err := run(tmpDir, schemaPath); err != nil { + fmt.Fprintf(os.Stderr, "Error: %v\n", err) + os.Exit(1) + } +} + +func run(tmpDir, outputPath string) error { + schema, err := generateSchema(tmpDir) + if err != nil { + return err + } + + if err := os.WriteFile(outputPath, []byte(schema), 0644); err != nil { + return fmt.Errorf("writing schema file: %w", err) + } + + fmt.Printf("Schema generated successfully at %s\n", outputPath) + return nil +} + +// generateSchema creates a fresh database, runs all migrations, and extracts the schema +func generateSchema(tmpDir string) (string, error) { + // Create dnote directory structure in temp dir + dnoteDir := filepath.Join(tmpDir, "dnote") + if err := os.MkdirAll(dnoteDir, 0755); err != nil { + return "", fmt.Errorf("creating dnote dir: %w", err) + } + + // Use a file-based database + dbPath := filepath.Join(tmpDir, "schema.db") + + // Create context + ctx := context.DnoteCtx{ + Paths: context.Paths{ + Home: tmpDir, + Config: tmpDir, + Data: tmpDir, + Cache: tmpDir, + }, + Version: "schema-gen", + } + + // Open database + db, err := database.Open(dbPath) + if err != nil { + return "", fmt.Errorf("opening database: %w", err) + } + defer db.Close() + ctx.DB = db + + // Initialize database with base tables + if err := infra.InitDB(ctx); err != nil { + return "", fmt.Errorf("initializing database: %w", err) + } + + // Initialize system data + if err := infra.InitSystem(ctx); err != nil { + return "", fmt.Errorf("initializing system: %w", err) + } + + // Create minimal config file + if err := config.Write(ctx, config.Config{}); err != nil { + return "", fmt.Errorf("writing initial config: %w", err) + } + + // Run all local migrations + if err := migrate.Run(ctx, migrate.LocalSequence, migrate.LocalMode); err != nil { + return "", fmt.Errorf("running migrations: %w", err) + } + + // Extract schema before closing database + schema, err := extractSchema(db) + if err != nil { + return "", fmt.Errorf("extracting schema: %w", err) + } + + // Add INSERT statements for migration versions. + systemData := "\n-- Migration version data.\n" + systemData += fmt.Sprintf("INSERT INTO system (key, value) VALUES ('%s', %d);\n", consts.SystemSchema, len(migrate.LocalSequence)) + systemData += fmt.Sprintf("INSERT INTO system (key, value) VALUES ('%s', %d);\n", consts.SystemRemoteSchema, len(migrate.RemoteSequence)) + + return schema + systemData, nil +} + +// extractSchema extracts the complete schema by querying sqlite_master +func extractSchema(db *database.DB) (string, error) { + // Query sqlite_master for all schema objects, excluding FTS shadow tables + // FTS shadow tables are internal tables automatically created by FTS virtual tables + rows, err := db.Conn.Query(`SELECT sql FROM sqlite_master + WHERE sql IS NOT NULL + AND name NOT LIKE 'sqlite_%' + AND (type != 'table' + OR (type = 'table' AND name NOT IN ( + SELECT m1.name FROM sqlite_master m1 + JOIN sqlite_master m2 ON m1.name LIKE m2.name || '_%' + WHERE m2.type = 'table' AND m2.sql LIKE '%VIRTUAL TABLE%' + )))`) + if err != nil { + return "", fmt.Errorf("querying sqlite_master: %w", err) + } + defer rows.Close() + + var schemas []string + for rows.Next() { + var sql string + if err := rows.Scan(&sql); err != nil { + return "", fmt.Errorf("scanning row: %w", err) + } + schemas = append(schemas, sql) + } + + if err := rows.Err(); err != nil { + return "", fmt.Errorf("iterating rows: %w", err) + } + + // Add autogenerated header comment + header := `-- This is the final state of the CLI database after all migrations. +-- Auto-generated by generate-schema.go. Do not edit manually. +` + return header + strings.Join(schemas, ";\n") + ";\n", nil +} diff --git a/pkg/cli/database/schema/main_test.go b/pkg/cli/database/schema/main_test.go new file mode 100644 index 00000000..24bd9fc0 --- /dev/null +++ b/pkg/cli/database/schema/main_test.go @@ -0,0 +1,84 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Dnote. If not, see . + */ + +package main + +import ( + "fmt" + "os" + "path/filepath" + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" +) + +func TestRun(t *testing.T) { + tmpDir := t.TempDir() + outputPath := filepath.Join(tmpDir, "schema.sql") + + // Run the function + if err := run(tmpDir, outputPath); err != nil { + t.Fatalf("run() failed: %v", err) + } + + // Verify schema.sql was created + content, err := os.ReadFile(outputPath) + if err != nil { + t.Fatalf("reading schema.sql: %v", err) + } + + schema := string(content) + + // Verify it has the header + assert.Equal(t, strings.HasPrefix(schema, "-- This is the final state"), true, "schema.sql should have header comment") + + // Verify schema contains expected tables + expectedTables := []string{ + "CREATE TABLE books", + "CREATE TABLE system", + "CREATE TABLE \"notes\"", + "CREATE VIRTUAL TABLE note_fts", + } + + for _, expected := range expectedTables { + assert.Equal(t, strings.Contains(schema, expected), true, fmt.Sprintf("schema should contain %s", expected)) + } + + // Verify schema contains triggers + expectedTriggers := []string{ + "CREATE TRIGGER notes_after_insert", + "CREATE TRIGGER notes_after_delete", + "CREATE TRIGGER notes_after_update", + } + + for _, expected := range expectedTriggers { + assert.Equal(t, strings.Contains(schema, expected), true, fmt.Sprintf("schema should contain %s", expected)) + } + + // Verify schema does not contain sqlite internal tables + assert.Equal(t, strings.Contains(schema, "sqlite_sequence"), false, "schema should not contain sqlite_sequence") + + // Verify system key-value pairs for schema versions are present + expectedSchemaKey := fmt.Sprintf("INSERT INTO system (key, value) VALUES ('%s',", consts.SystemSchema) + assert.Equal(t, strings.Contains(schema, expectedSchemaKey), true, "schema should contain schema version INSERT statement") + + expectedRemoteSchemaKey := fmt.Sprintf("INSERT INTO system (key, value) VALUES ('%s',", consts.SystemRemoteSchema) + assert.Equal(t, strings.Contains(schema, expectedRemoteSchemaKey), true, "schema should contain remote_schema version INSERT statement") +} diff --git a/pkg/cli/database/testutils.go b/pkg/cli/database/testutils.go index 28fd7067..16685686 100644 --- a/pkg/cli/database/testutils.go +++ b/pkg/cli/database/testutils.go @@ -20,8 +20,8 @@ package database import ( "database/sql" + _ "embed" "fmt" - "os" "path/filepath" "testing" @@ -30,56 +30,13 @@ import ( "github.com/pkg/errors" ) -var defaultSchemaSQL = `CREATE TABLE books - ( - uuid text PRIMARY KEY, - label text NOT NULL - , dirty bool DEFAULT false, usn int DEFAULT 0 NOT NULL, deleted bool DEFAULT false); -CREATE TABLE system - ( - key string NOT NULL, - value text NOT NULL - ); -CREATE UNIQUE INDEX idx_books_label ON books(label); -CREATE UNIQUE INDEX idx_books_uuid ON books(uuid); -CREATE TABLE IF NOT EXISTS "notes" - ( - uuid text NOT NULL, - book_uuid text NOT NULL, - body text NOT NULL, - added_on integer NOT NULL, - edited_on integer DEFAULT 0, - public bool DEFAULT false, - dirty bool DEFAULT false, - usn int DEFAULT 0 NOT NULL, - deleted bool DEFAULT false - ); -CREATE VIRTUAL TABLE note_fts USING fts5(content=notes, body, tokenize="porter unicode61 categories 'L* N* Co Ps Pe'") -/* note_fts(body) */; -CREATE TABLE IF NOT EXISTS 'note_fts_data'(id INTEGER PRIMARY KEY, block BLOB); -CREATE TABLE IF NOT EXISTS 'note_fts_idx'(segid, term, pgno, PRIMARY KEY(segid, term)) WITHOUT ROWID; -CREATE TABLE IF NOT EXISTS 'note_fts_docsize'(id INTEGER PRIMARY KEY, sz BLOB); -CREATE TABLE IF NOT EXISTS 'note_fts_config'(k PRIMARY KEY, v) WITHOUT ROWID; -CREATE TRIGGER notes_after_insert AFTER INSERT ON notes BEGIN - INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); - END; -CREATE TRIGGER notes_after_delete AFTER DELETE ON notes BEGIN - INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); - END; -CREATE TRIGGER notes_after_update AFTER UPDATE ON notes BEGIN - INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); - INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); - END; -CREATE TABLE actions - ( - uuid text PRIMARY KEY, - schema integer NOT NULL, - type text NOT NULL, - data text NOT NULL, - timestamp integer NOT NULL - ); -CREATE UNIQUE INDEX idx_notes_uuid ON notes(uuid); -CREATE INDEX idx_notes_book_uuid ON notes(book_uuid);` +//go:embed schema.sql +var defaultSchemaSQL string + +// GetDefaultSchemaSQL returns the default schema SQL for tests +func GetDefaultSchemaSQL() string { + return defaultSchemaSQL +} // MustScan scans the given row and fails a test in case of any errors func MustScan(t *testing.T, message string, row *sql.Row, args ...interface{}) { @@ -99,29 +56,47 @@ func MustExec(t *testing.T, message string, db *DB, query string, args ...interf return result } -// TestDBOptions contains options for test database -type TestDBOptions struct { - SchemaSQLPath string - SkipMigration bool +// InitTestMemoryDB initializes an in-memory test database with the default schema. +func InitTestMemoryDB(t *testing.T) *DB { + return InitTestMemoryDBRaw(t, "") } -// InitTestDB initializes a test database and opens connection to it -func InitTestDB(t *testing.T, dbPath string, options *TestDBOptions) *DB { +// InitTestFileDB initializes a file-based test database with the default schema. +func InitTestFileDB(t *testing.T) (*DB, string) { + dbPath := filepath.Join(t.TempDir(), "dnote.db") + db := InitTestFileDBRaw(t, dbPath) + return db, dbPath +} + +// InitTestFileDBRaw initializes a file-based test database at the specified path with the default schema. +func InitTestFileDBRaw(t *testing.T, dbPath string) *DB { db, err := Open(dbPath) if err != nil { - t.Fatal(errors.Wrap(err, "opening database connection")) + t.Fatal(errors.Wrap(err, "opening database")) } - dir, _ := filepath.Split(dbPath) - err = os.MkdirAll(dir, 0777) + if _, err := db.Exec(defaultSchemaSQL); err != nil { + t.Fatal(errors.Wrap(err, "running schema sql")) + } + + t.Cleanup(func() { db.Close() }) + return db +} + +// InitTestMemoryDBRaw initializes an in-memory test database without marking migrations complete. +// If schemaPath is empty, uses the default schema. Used for migration testing. +func InitTestMemoryDBRaw(t *testing.T, schemaPath string) *DB { + uuid := mustGenerateTestUUID(t) + dbName := fmt.Sprintf("file:%s?mode=memory&cache=shared", uuid) + + db, err := Open(dbName) if err != nil { - t.Fatal(errors.Wrap(err, "creating the directory for test database file")) + t.Fatal(errors.Wrap(err, "opening in-memory database")) } var schemaSQL string - if options != nil && options.SchemaSQLPath != "" { - b := utils.ReadFileAbs(options.SchemaSQLPath) - schemaSQL = string(b) + if schemaPath != "" { + schemaSQL = string(utils.ReadFileAbs(schemaPath)) } else { schemaSQL = defaultSchemaSQL } @@ -130,24 +105,10 @@ func InitTestDB(t *testing.T, dbPath string, options *TestDBOptions) *DB { t.Fatal(errors.Wrap(err, "running schema sql")) } - if options == nil || !options.SkipMigration { - MarkMigrationComplete(t, db) - } - + t.Cleanup(func() { db.Close() }) return db } -// TeardownTestDB closes the test database and removes the its file -func TeardownTestDB(t *testing.T, db *DB) { - if err := db.Close(); err != nil { - t.Fatal(errors.Wrap(err, "closing database")) - } - - if err := os.RemoveAll(db.Filepath); err != nil { - t.Fatal(errors.Wrap(err, "removing database file")) - } -} - // OpenTestDB opens the database connection to a test database // without initializing any schema func OpenTestDB(t *testing.T, dnoteDir string) *DB { @@ -160,12 +121,11 @@ func OpenTestDB(t *testing.T, dnoteDir string) *DB { return db } -// MarkMigrationComplete marks all migrations as complete in the database -func MarkMigrationComplete(t *testing.T, db *DB) { - if _, err := db.Exec("INSERT INTO system (key, value) VALUES (? , ?);", consts.SystemSchema, 12); err != nil { - t.Fatal(errors.Wrap(err, "inserting schema")) - } - if _, err := db.Exec("INSERT INTO system (key, value) VALUES (? , ?);", consts.SystemRemoteSchema, 1); err != nil { - t.Fatal(errors.Wrap(err, "inserting remote schema")) +// mustGenerateTestUUID generates a UUID for test databases and fails the test on error +func mustGenerateTestUUID(t *testing.T) string { + uuid, err := utils.GenerateUUID() + if err != nil { + t.Fatal(errors.Wrap(err, "generating UUID for test database")) } + return uuid } diff --git a/pkg/cli/infra/init.go b/pkg/cli/infra/init.go index 4bbaae6e..1e572cf7 100644 --- a/pkg/cli/infra/init.go +++ b/pkg/cli/infra/init.go @@ -24,7 +24,6 @@ import ( "database/sql" "fmt" "os" - "path/filepath" "strconv" "time" @@ -329,36 +328,6 @@ func getEditorCommand() string { return ret } -func initDir(path string) error { - ok, err := utils.FileExists(path) - if err != nil { - return errors.Wrapf(err, "checking if dir exists at %s", path) - } - if ok { - return nil - } - - if err := os.MkdirAll(path, 0755); err != nil { - return errors.Wrapf(err, "creating a directory at %s", path) - } - - return nil -} - -// initDnoteDir initializes missing directories that Dnote uses -func initDnoteDir(ctx context.DnoteCtx) error { - if err := initDir(filepath.Join(ctx.Paths.Config, consts.DnoteDirName)); err != nil { - return errors.Wrap(err, "initializing config dir") - } - if err := initDir(filepath.Join(ctx.Paths.Data, consts.DnoteDirName)); err != nil { - return errors.Wrap(err, "initializing data dir") - } - if err := initDir(filepath.Join(ctx.Paths.Cache, consts.DnoteDirName)); err != nil { - return errors.Wrap(err, "initializing cache dir") - } - - return nil -} // initConfigFile populates a new config file if it does not exist yet func initConfigFile(ctx context.DnoteCtx, apiEndpoint string) error { @@ -394,7 +363,7 @@ func initConfigFile(ctx context.DnoteCtx, apiEndpoint string) error { // initFiles creates, if necessary, the dnote directory and files inside func initFiles(ctx context.DnoteCtx, apiEndpoint string) error { - if err := initDnoteDir(ctx); err != nil { + if err := context.InitDnoteDirs(ctx.Paths); err != nil { return errors.Wrap(err, "creating the dnote dir") } if err := initConfigFile(ctx, apiEndpoint); err != nil { diff --git a/pkg/cli/infra/init_test.go b/pkg/cli/infra/init_test.go index 546baab0..6ac0d5cf 100644 --- a/pkg/cli/infra/init_test.go +++ b/pkg/cli/infra/init_test.go @@ -32,8 +32,7 @@ import ( func TestInitSystemKV(t *testing.T) { // Setup - db := database.InitTestDB(t, "../tmp/dnote-test.db", nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) var originalCount int database.MustScan(t, "counting system configs", db.QueryRow("SELECT count(*) FROM system"), &originalCount) @@ -64,8 +63,7 @@ func TestInitSystemKV(t *testing.T) { func TestInitSystemKV_existing(t *testing.T) { // Setup - db := database.InitTestDB(t, "../tmp/dnote-test.db", nil) - defer database.TeardownTestDB(t, db) + db := database.InitTestMemoryDB(t) database.MustExec(t, "inserting a system config", db, "INSERT INTO system (key, value) VALUES (?, ?)", "testKey", "testVal") diff --git a/pkg/cli/main_test.go b/pkg/cli/main_test.go index 63a95d87..0d9ad71a 100644 --- a/pkg/cli/main_test.go +++ b/pkg/cli/main_test.go @@ -35,14 +35,17 @@ import ( var binaryName = "test-dnote" -var testDir = "./tmp/.dnote" - -var opts = testutils.RunDnoteCmdOptions{ - Env: []string{ - fmt.Sprintf("XDG_CONFIG_HOME=%s", testDir), - fmt.Sprintf("XDG_DATA_HOME=%s", testDir), - fmt.Sprintf("XDG_CACHE_HOME=%s", testDir), - }, +// setupTestEnv creates a unique test directory for parallel test execution +func setupTestEnv(t *testing.T) (string, testutils.RunDnoteCmdOptions) { + testDir := t.TempDir() + opts := testutils.RunDnoteCmdOptions{ + Env: []string{ + fmt.Sprintf("XDG_CONFIG_HOME=%s", testDir), + fmt.Sprintf("XDG_DATA_HOME=%s", testDir), + fmt.Sprintf("XDG_CACHE_HOME=%s", testDir), + }, + } + return testDir, opts } func TestMain(m *testing.M) { @@ -55,10 +58,11 @@ func TestMain(m *testing.M) { } func TestInit(t *testing.T) { + testDir, opts := setupTestEnv(t) + // Execute // run an arbitrary command "view" due to https://github.com/spf13/cobra/issues/1056 testutils.RunDnoteCmd(t, opts, binaryName, "view") - defer testutils.RemoveDir(t, testDir) db := database.OpenTestDB(t, testDir) @@ -107,12 +111,12 @@ func TestInit(t *testing.T) { func TestAddNote(t *testing.T) { t.Run("new book", func(t *testing.T) { + testDir, opts := setupTestEnv(t) + // Set up and execute testutils.RunDnoteCmd(t, opts, binaryName, "add", "js", "-c", "foo") testutils.MustWaitDnoteCmd(t, opts, testutils.UserContent, binaryName, "add", "js") - defer testutils.RemoveDir(t, testDir) - db := database.OpenTestDB(t, testDir) // Test @@ -138,13 +142,14 @@ func TestAddNote(t *testing.T) { }) t.Run("existing book", func(t *testing.T) { + _, opts := setupTestEnv(t) + // Setup - db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) + db, dbPath := database.InitTestFileDB(t) testutils.Setup3(t, db) // Execute - testutils.RunDnoteCmd(t, opts, binaryName, "add", "js", "-c", "foo") - defer testutils.RemoveDir(t, testDir) + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "add", "js", "-c", "foo") // Test @@ -179,13 +184,14 @@ func TestAddNote(t *testing.T) { func TestEditNote(t *testing.T) { t.Run("content flag", func(t *testing.T) { + _, opts := setupTestEnv(t) + // Setup - db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) + db, dbPath := database.InitTestFileDB(t) testutils.Setup4(t, db) // Execute - testutils.RunDnoteCmd(t, opts, binaryName, "edit", "2", "-c", "foo bar") - defer testutils.RemoveDir(t, testDir) + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "2", "-c", "foo bar") // Test var noteCount, bookCount int @@ -212,13 +218,14 @@ func TestEditNote(t *testing.T) { }) t.Run("book flag", func(t *testing.T) { + _, opts := setupTestEnv(t) + // Setup - db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) + db, dbPath := database.InitTestFileDB(t) testutils.Setup5(t, db) // Execute - testutils.RunDnoteCmd(t, opts, binaryName, "edit", "2", "-b", "linux") - defer testutils.RemoveDir(t, testDir) + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "2", "-b", "linux") // Test var noteCount, bookCount int @@ -246,13 +253,14 @@ func TestEditNote(t *testing.T) { }) t.Run("book flag and content flag", func(t *testing.T) { + _, opts := setupTestEnv(t) + // Setup - db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) + db, dbPath := database.InitTestFileDB(t) testutils.Setup5(t, db) // Execute - testutils.RunDnoteCmd(t, opts, binaryName, "edit", "2", "-b", "linux", "-c", "n2 body updated") - defer testutils.RemoveDir(t, testDir) + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "2", "-b", "linux", "-c", "n2 body updated") // Test var noteCount, bookCount int @@ -282,13 +290,14 @@ func TestEditNote(t *testing.T) { func TestEditBook(t *testing.T) { t.Run("name flag", func(t *testing.T) { + _, opts := setupTestEnv(t) + // Setup - db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) + db, dbPath := database.InitTestFileDB(t) testutils.Setup1(t, db) // Execute - testutils.RunDnoteCmd(t, opts, binaryName, "edit", "js", "-n", "js-edited") - defer testutils.RemoveDir(t, testDir) + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "js", "-n", "js-edited") // Test var noteCount, bookCount int @@ -341,17 +350,18 @@ func TestRemoveNote(t *testing.T) { for _, tc := range testCases { t.Run(fmt.Sprintf("--yes=%t", tc.yesFlag), func(t *testing.T) { + _, opts := setupTestEnv(t) + // Setup - db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) + db, dbPath := database.InitTestFileDB(t) testutils.Setup2(t, db) // Execute if tc.yesFlag { - testutils.RunDnoteCmd(t, opts, binaryName, "remove", "-y", "1") + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "remove", "-y", "1") } else { - testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveNote, binaryName, "remove", "1") + testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveNote, binaryName, "--dbPath", dbPath, "remove", "1") } - defer testutils.RemoveDir(t, testDir) // Test var noteCount, bookCount, jsNoteCount, linuxNoteCount int @@ -428,19 +438,19 @@ func TestRemoveBook(t *testing.T) { for _, tc := range testCases { t.Run(fmt.Sprintf("--yes=%t", tc.yesFlag), func(t *testing.T) { + _, opts := setupTestEnv(t) + // Setup - db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) + db, dbPath := database.InitTestFileDB(t) testutils.Setup2(t, db) // Execute if tc.yesFlag { - testutils.RunDnoteCmd(t, opts, binaryName, "remove", "-y", "js") + testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "remove", "-y", "js") } else { - testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveBook, binaryName, "remove", "js") + testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveBook, binaryName, "--dbPath", dbPath, "remove", "js") } - defer testutils.RemoveDir(t, testDir) - // Test var noteCount, bookCount, jsNoteCount, linuxNoteCount int database.MustScan(t, "counting books", db.QueryRow("SELECT count(*) FROM books"), &bookCount) @@ -537,17 +547,9 @@ func TestDBPathFlag(t *testing.T) { } // Setup - use two different custom database paths - customDBPath1 := "./tmp/custom-test1.db" - customDBPath2 := "./tmp/custom-test2.db" - defer testutils.RemoveDir(t, "./tmp") - - customOpts := testutils.RunDnoteCmdOptions{ - Env: []string{ - fmt.Sprintf("XDG_CONFIG_HOME=%s", testDir), - fmt.Sprintf("XDG_DATA_HOME=%s", testDir), - fmt.Sprintf("XDG_CACHE_HOME=%s", testDir), - }, - } + testDir, customOpts := setupTestEnv(t) + customDBPath1 := fmt.Sprintf("%s/custom-test1.db", testDir) + customDBPath2 := fmt.Sprintf("%s/custom-test2.db", testDir) // Execute - add different notes to each database testutils.RunDnoteCmd(t, customOpts, binaryName, "--dbPath", customDBPath1, "add", "db1-book", "-c", "content in db1") diff --git a/pkg/cli/migrate/fixtures/local-12-pre-schema.sql b/pkg/cli/migrate/fixtures/local-12-pre-schema.sql index c501a460..5560af3d 100644 --- a/pkg/cli/migrate/fixtures/local-12-pre-schema.sql +++ b/pkg/cli/migrate/fixtures/local-12-pre-schema.sql @@ -38,13 +38,5 @@ CREATE TRIGGER notes_after_update AFTER UPDATE ON notes BEGIN INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); END; -CREATE TABLE actions - ( - uuid text PRIMARY KEY, - schema integer NOT NULL, - type text NOT NULL, - data text NOT NULL, - timestamp integer NOT NULL - ); CREATE UNIQUE INDEX idx_notes_uuid ON notes(uuid); CREATE INDEX idx_notes_book_uuid ON notes(book_uuid); diff --git a/pkg/cli/migrate/fixtures/local-14-pre-schema.sql b/pkg/cli/migrate/fixtures/local-14-pre-schema.sql new file mode 100644 index 00000000..5560af3d --- /dev/null +++ b/pkg/cli/migrate/fixtures/local-14-pre-schema.sql @@ -0,0 +1,42 @@ +CREATE TABLE books + ( + uuid text PRIMARY KEY, + label text NOT NULL + , dirty bool DEFAULT false, usn int DEFAULT 0 NOT NULL, deleted bool DEFAULT false); +CREATE TABLE system + ( + key string NOT NULL, + value text NOT NULL + ); +CREATE UNIQUE INDEX idx_books_label ON books(label); +CREATE UNIQUE INDEX idx_books_uuid ON books(uuid); +CREATE TABLE IF NOT EXISTS "notes" + ( + uuid text NOT NULL, + book_uuid text NOT NULL, + body text NOT NULL, + added_on integer NOT NULL, + edited_on integer DEFAULT 0, + public bool DEFAULT false, + dirty bool DEFAULT false, + usn int DEFAULT 0 NOT NULL, + deleted bool DEFAULT false + ); +CREATE VIRTUAL TABLE note_fts USING fts5(content=notes, body, tokenize="porter unicode61 categories 'L* N* Co Ps Pe'") +/* note_fts(body) */; +CREATE TABLE IF NOT EXISTS 'note_fts_data'(id INTEGER PRIMARY KEY, block BLOB); +CREATE TABLE IF NOT EXISTS 'note_fts_idx'(segid, term, pgno, PRIMARY KEY(segid, term)) WITHOUT ROWID; +CREATE TABLE IF NOT EXISTS 'note_fts_docsize'(id INTEGER PRIMARY KEY, sz BLOB); +CREATE TABLE IF NOT EXISTS 'note_fts_config'(k PRIMARY KEY, v) WITHOUT ROWID; +CREATE TRIGGER notes_after_insert AFTER INSERT ON notes BEGIN + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; +CREATE TRIGGER notes_after_delete AFTER DELETE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + END; +CREATE TRIGGER notes_after_update AFTER UPDATE ON notes BEGIN + INSERT INTO note_fts(note_fts, rowid, body) VALUES ('delete', old.rowid, old.body); + INSERT INTO note_fts(rowid, body) VALUES (new.rowid, new.body); + END; +CREATE UNIQUE INDEX idx_notes_uuid ON notes(uuid); +CREATE INDEX idx_notes_book_uuid ON notes(book_uuid); diff --git a/pkg/cli/migrate/legacy_test.go b/pkg/cli/migrate/legacy_test.go index 00ebb7d7..4d1a1dc6 100644 --- a/pkg/cli/migrate/legacy_test.go +++ b/pkg/cli/migrate/legacy_test.go @@ -353,14 +353,18 @@ func TestMigrateToV7(t *testing.T) { } func TestMigrateToV8(t *testing.T) { - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-1-pre-schema.sql", SkipMigration: true} - db := database.InitTestDB(t, "../tmp/.dnote/dnote-test.db", &opts) - defer database.TeardownTestDB(t, db) + tmpDir := t.TempDir() + dnoteDir := tmpDir + "/.dnote" + if err := os.MkdirAll(dnoteDir, 0755); err != nil { + t.Fatal(errors.Wrap(err, "creating legacy dnote directory")) + } + + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") ctx := context.DnoteCtx{ Paths: context.Paths{ - Home: "../tmp", - LegacyDnote: "../tmp/.dnote", + Home: tmpDir, + LegacyDnote: dnoteDir, }, DB: db, } diff --git a/pkg/cli/migrate/migrate.go b/pkg/cli/migrate/migrate.go index b99cf7eb..eadfeda4 100644 --- a/pkg/cli/migrate/migrate.go +++ b/pkg/cli/migrate/migrate.go @@ -49,6 +49,7 @@ var LocalSequence = []migration{ lm11, lm12, lm13, + lm14, } // RemoteSequence is a list of remote migrations to be run diff --git a/pkg/cli/migrate/migrate_test.go b/pkg/cli/migrate/migrate_test.go index cd2619bd..591f1800 100644 --- a/pkg/cli/migrate/migrate_test.go +++ b/pkg/cli/migrate/migrate_test.go @@ -22,8 +22,8 @@ import ( "encoding/json" "fmt" "net/http" - "os" "net/http/httptest" + "os" "testing" "time" @@ -38,11 +38,13 @@ import ( "github.com/pkg/errors" ) -var paths context.Paths = context.Paths{ - Home: "../../tmp", - Cache: "../../tmp", - Config: "../../tmp", - Data: "../../tmp", +// initTestDBNoMigration initializes a test database with schema.sql but removes +// migration version data so tests can control the migration state themselves. +func initTestDBNoMigration(t *testing.T) *database.DB { + db := database.InitTestMemoryDBRaw(t, "") + // Remove migration versions from schema.sql so tests can set their own + database.MustExec(t, "clearing schema versions", db, "DELETE FROM system WHERE key IN (?, ?)", consts.SystemSchema, consts.SystemRemoteSchema) + return db } func TestExecute_bump_schema(t *testing.T) { @@ -60,11 +62,8 @@ func TestExecute_bump_schema(t *testing.T) { for _, tc := range testCases { func() { // set up - opts := database.TestDBOptions{SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := initTestDBNoMigration(t) + ctx := context.InitTestCtxWithDB(t, db) database.MustExec(t, "inserting a schema", db, "INSERT INTO system (key, value) VALUES (?, ?)", tc.schemaKey, 8) @@ -117,11 +116,8 @@ func TestRun_nonfresh(t *testing.T) { for _, tc := range testCases { func() { // set up - opts := database.TestDBOptions{SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := initTestDBNoMigration(t) + ctx := context.InitTestCtxWithDB(t, db) database.MustExec(t, "inserting a schema", db, "INSERT INTO system (key, value) VALUES (?, ?)", tc.schemaKey, 2) database.MustExec(t, "creating a temporary table for testing", db, "CREATE TABLE migrate_run_test ( name string )") @@ -197,11 +193,8 @@ func TestRun_fresh(t *testing.T) { for _, tc := range testCases { func() { // set up - opts := database.TestDBOptions{SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := initTestDBNoMigration(t) + ctx := context.InitTestCtxWithDB(t, db) database.MustExec(t, "creating a temporary table for testing", db, "CREATE TABLE migrate_run_test ( name string )") @@ -271,11 +264,8 @@ func TestRun_up_to_date(t *testing.T) { for _, tc := range testCases { func() { // set up - opts := database.TestDBOptions{SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := initTestDBNoMigration(t) + ctx := context.InitTestCtxWithDB(t, db) database.MustExec(t, "creating a temporary table for testing", db, "CREATE TABLE migrate_run_test ( name string )") @@ -326,11 +316,8 @@ func TestRun_up_to_date(t *testing.T) { func TestLocalMigration1(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-1-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) data := testutils.MustMarshalJSON(t, actions.AddBookDataV1{BookName: "js"}) a1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting action", db, @@ -404,11 +391,8 @@ func TestLocalMigration1(t *testing.T) { func TestLocalMigration2(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-1-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) c1 := "note 1 - v1" c2 := "note 1 - v2" css := "css" @@ -491,11 +475,8 @@ func TestLocalMigration2(t *testing.T) { func TestLocalMigration3(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-1-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) data := testutils.MustMarshalJSON(t, actions.AddNoteDataV2{NoteUUID: "note-1-uuid", BookName: "js", Content: "note 1", Public: false}) a1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting action", db, @@ -566,11 +547,8 @@ func TestLocalMigration3(t *testing.T) { func TestLocalMigration4(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-1-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "css") @@ -610,11 +588,8 @@ func TestLocalMigration4(t *testing.T) { func TestLocalMigration5(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-5-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-5-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "css") @@ -672,11 +647,8 @@ func TestLocalMigration5(t *testing.T) { func TestLocalMigration6(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-5-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-5-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) data := testutils.MustMarshalJSON(t, actions.AddBookDataV1{BookName: "js"}) a1UUID := testutils.MustGenerateUUID(t) @@ -705,11 +677,8 @@ func TestLocalMigration6(t *testing.T) { func TestLocalMigration7_trash(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-7-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-7-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting trash book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "trash") @@ -738,11 +707,8 @@ func TestLocalMigration7_trash(t *testing.T) { func TestLocalMigration7_conflicts(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-7-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-7-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "conflicts") @@ -771,11 +737,8 @@ func TestLocalMigration7_conflicts(t *testing.T) { func TestLocalMigration7_conflicts_dup(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-7-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-7-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "conflicts") @@ -809,11 +772,8 @@ func TestLocalMigration7_conflicts_dup(t *testing.T) { func TestLocalMigration8(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-8-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-8-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1") @@ -846,13 +806,13 @@ func TestLocalMigration8(t *testing.T) { var n1AddedOn, n1EditedOn int64 var n1USN int var n1Public, n1Dirty, n1Deleted bool - database.MustScan(t, "scanning n1", db.QueryRow("SELECT book_uuid, body, added_on, edited_on, usn, public, dirty, deleted FROM notes WHERE uuid = ?", n1UUID), &n1BookUUID, &n1Body, &n1AddedOn, &n1EditedOn, &n1USN, &n1Public, &n1Dirty, &n1Deleted) + database.MustScan(t, "scanning n1", db.QueryRow("SELECT book_uuid, body, added_on, edited_on, usn, public, dirty, deleted FROM notes WHERE uuid = ?", n1UUID), &n1BookUUID, &n1Body, &n1AddedOn, &n1EditedOn, &n1USN, &n1Public, &n1Dirty, &n1Deleted) var n2BookUUID, n2Body string var n2AddedOn, n2EditedOn int64 var n2USN int var n2Public, n2Dirty, n2Deleted bool - database.MustScan(t, "scanning n2", db.QueryRow("SELECT book_uuid, body, added_on, edited_on, usn, public, dirty, deleted FROM notes WHERE uuid = ?", n2UUID), &n2BookUUID, &n2Body, &n2AddedOn, &n2EditedOn, &n2USN, &n2Public, &n2Dirty, &n2Deleted) + database.MustScan(t, "scanning n2", db.QueryRow("SELECT book_uuid, body, added_on, edited_on, usn, public, dirty, deleted FROM notes WHERE uuid = ?", n2UUID), &n2BookUUID, &n2Body, &n2AddedOn, &n2EditedOn, &n2USN, &n2Public, &n2Dirty, &n2Deleted) assert.Equal(t, n1BookUUID, b1UUID, "n1 BookUUID mismatch") assert.Equal(t, n1Body, "n1 Body", "n1 Body mismatch") @@ -875,11 +835,8 @@ func TestLocalMigration8(t *testing.T) { func TestLocalMigration9(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-9-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-9-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1") @@ -921,11 +878,8 @@ func TestLocalMigration9(t *testing.T) { func TestLocalMigration10(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-10-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-10-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book ", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "123") @@ -993,11 +947,8 @@ func TestLocalMigration10(t *testing.T) { func TestLocalMigration11(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-11-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) - - db := ctx.DB + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-11-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "foo") @@ -1073,9 +1024,8 @@ func TestLocalMigration11(t *testing.T) { func TestLocalMigration12(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-12-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-12-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) data := []byte("editor: vim") path := fmt.Sprintf("%s/%s/dnoterc", ctx.Paths.Config, consts.DnoteDirName) @@ -1110,9 +1060,8 @@ func TestLocalMigration12(t *testing.T) { func TestLocalMigration13(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-12-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-12-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) data := []byte("editor: vim\napiEndpoint: https://test.com/api") @@ -1150,11 +1099,57 @@ func TestLocalMigration13(t *testing.T) { assert.Equal(t, cf.EnableUpgradeCheck, true, "enableUpgradeCheck mismatch") } +func TestLocalMigration14(t *testing.T) { + // set up + db := database.InitTestMemoryDBRaw(t, "./fixtures/local-14-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) + + b1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1") + + n1UUID := testutils.MustGenerateUUID(t) + database.MustExec(t, "inserting note", db, `INSERT INTO notes + (uuid, book_uuid, body, added_on, edited_on, public, dirty, usn, deleted) VALUES + (?, ?, ?, ?, ?, ?, ?, ?, ?)`, n1UUID, b1UUID, "test note", 1, 2, true, false, 0, false) + + // Execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction")) + } + + err = lm14.run(ctx, tx) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "failed to run")) + } + + tx.Commit() + + // Test - verify public column was dropped by checking column names + rows, err := db.Query("SELECT name FROM pragma_table_info('notes')") + if err != nil { + t.Fatal(errors.Wrap(err, "getting table info")) + } + defer rows.Close() + + for rows.Next() { + var name string + err := rows.Scan(&name) + if err != nil { + t.Fatal(errors.Wrap(err, "scanning column name")) + } + + if name == "public" { + t.Fatal("public column still exists after migration") + } + } +} + func TestRemoteMigration1(t *testing.T) { // set up - opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/remote-1-pre-schema.sql", SkipMigration: true} - ctx := context.InitTestCtx(t, paths, &opts) - defer context.TeardownTestCtx(t, ctx) + db := database.InitTestMemoryDBRaw(t, "./fixtures/remote-1-pre-schema.sql") + ctx := context.InitTestCtxWithDB(t, db) testutils.Login(t, &ctx) JSBookUUID := "existing-js-book-uuid" @@ -1194,7 +1189,6 @@ func TestRemoteMigration1(t *testing.T) { ctx.APIEndpoint = server.URL - db := ctx.DB database.MustExec(t, "inserting js book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", JSBookUUID, "js") database.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", CSSBookUUID, "css") database.MustExec(t, "inserting linux book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", linuxBookUUID, "linux") diff --git a/pkg/cli/migrate/migrations.go b/pkg/cli/migrate/migrations.go index af5ae86e..09b86afc 100644 --- a/pkg/cli/migrate/migrations.go +++ b/pkg/cli/migrate/migrations.go @@ -572,6 +572,18 @@ var lm13 = migration{ }, } +var lm14 = migration{ + name: "drop-public-from-notes", + run: func(ctx context.DnoteCtx, tx *database.DB) error { + _, err := tx.Exec(`ALTER TABLE notes DROP COLUMN public;`) + if err != nil { + return errors.Wrap(err, "dropping public column from notes") + } + + return nil + }, +} + var rm1 = migration{ name: "sync-book-uuids-from-server", run: func(ctx context.DnoteCtx, tx *database.DB) error { diff --git a/pkg/cli/testutils/main.go b/pkg/cli/testutils/main.go index 6c6caa64..cefa6323 100644 --- a/pkg/cli/testutils/main.go +++ b/pkg/cli/testutils/main.go @@ -48,12 +48,15 @@ const ( // Timeout for waiting for prompts in tests const promptTimeout = 10 * time.Second -// Login simulates a logged in user by inserting credentials in the local database -func Login(t *testing.T, ctx *context.DnoteCtx) { - db := ctx.DB - +// LoginDB sets up login credentials in the database for tests +func LoginDB(t *testing.T, db *database.DB) { database.MustExec(t, "inserting sessionKey", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, "someSessionKey") database.MustExec(t, "inserting sessionKeyExpiry", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, time.Now().Add(24*time.Hour).Unix()) +} + +// Login simulates a logged in user by inserting credentials in the local database +func Login(t *testing.T, ctx *context.DnoteCtx) { + LoginDB(t, ctx.DB) ctx.SessionKey = "someSessionKey" ctx.SessionKeyExpiry = time.Now().Add(24 * time.Hour).Unix() diff --git a/pkg/cli/ui/editor_test.go b/pkg/cli/ui/editor_test.go index c2834a09..718c5337 100644 --- a/pkg/cli/ui/editor_test.go +++ b/pkg/cli/ui/editor_test.go @@ -30,11 +30,7 @@ import ( func TestGetTmpContentPath(t *testing.T) { t.Run("no collision", func(t *testing.T) { - ctx := context.InitTestCtx(t, context.Paths{ - Data: "../tmp", - Cache: "../tmp", - }, nil) - defer context.TeardownTestCtx(t, ctx) + ctx := context.InitTestCtx(t) res, err := GetTmpContentPath(ctx) if err != nil { @@ -47,11 +43,7 @@ func TestGetTmpContentPath(t *testing.T) { t.Run("one existing session", func(t *testing.T) { // set up - ctx := context.InitTestCtx(t, context.Paths{ - Data: "../tmp2", - Cache: "../tmp2", - }, nil) - defer context.TeardownTestCtx(t, ctx) + ctx := context.InitTestCtx(t) p := fmt.Sprintf("%s/%s", ctx.Paths.Cache, "DNOTE_TMPCONTENT_0.md") if _, err := os.Create(p); err != nil { @@ -71,11 +63,7 @@ func TestGetTmpContentPath(t *testing.T) { t.Run("two existing sessions", func(t *testing.T) { // set up - ctx := context.InitTestCtx(t, context.Paths{ - Data: "../tmp3", - Cache: "../tmp3", - }, nil) - defer context.TeardownTestCtx(t, ctx) + ctx := context.InitTestCtx(t) p1 := fmt.Sprintf("%s/%s", ctx.Paths.Cache, "DNOTE_TMPCONTENT_0.md") if _, err := os.Create(p1); err != nil { diff --git a/pkg/cli/utils/files.go b/pkg/cli/utils/files.go index b4b2d1df..00e898ec 100644 --- a/pkg/cli/utils/files.go +++ b/pkg/cli/utils/files.go @@ -55,6 +55,24 @@ func FileExists(filepath string) (bool, error) { return false, errors.Wrap(err, "getting file info") } +// EnsureDir creates a directory if it doesn't exist. +// Returns nil if the directory already exists or was successfully created. +func EnsureDir(path string) error { + ok, err := FileExists(path) + if err != nil { + return errors.Wrapf(err, "checking if dir exists at %s", path) + } + if ok { + return nil + } + + if err := os.MkdirAll(path, 0755); err != nil { + return errors.Wrapf(err, "creating directory at %s", path) + } + + return nil +} + // CopyDir copies a directory from src to dest, recursively copying nested // directories func CopyDir(src, dest string) error { diff --git a/pkg/cli/cmd/sync/main_test.go b/pkg/cli/utils/files_test.go similarity index 55% rename from pkg/cli/cmd/sync/main_test.go rename to pkg/cli/utils/files_test.go index e7a620b0..3c7c92bd 100644 --- a/pkg/cli/cmd/sync/main_test.go +++ b/pkg/cli/utils/files_test.go @@ -16,20 +16,30 @@ * along with Dnote. If not, see . */ -package sync +package utils import ( - "github.com/dnote/dnote/pkg/cli/context" + "os" "path/filepath" + "testing" + + "github.com/dnote/dnote/pkg/assert" ) -var testDir = "../../tmp" +func TestEnsureDir(t *testing.T) { + tmpDir := t.TempDir() + testPath := filepath.Join(tmpDir, "test", "nested", "dir") -var paths context.Paths = context.Paths{ - Home: testDir, - Cache: testDir, - Config: testDir, - Data: testDir, + // Create directory + err := EnsureDir(testPath) + assert.Equal(t, err, nil, "EnsureDir should succeed") + + // Verify it exists + info, err := os.Stat(testPath) + assert.Equal(t, err, nil, "directory should exist") + assert.Equal(t, info.IsDir(), true, "should be a directory") + + // Call again on existing directory - should not error + err = EnsureDir(testPath) + assert.Equal(t, err, nil, "EnsureDir should succeed on existing directory") } - -var dbPath = filepath.Join(testDir, "test.db") diff --git a/pkg/clock/clock.go b/pkg/clock/clock.go index f421d428..dda84b74 100644 --- a/pkg/clock/clock.go +++ b/pkg/clock/clock.go @@ -20,11 +20,10 @@ package clock import ( + "sync" "time" ) -//TODO: use mutex to avoid race - // Clock is an interface to the standard library time. // It is used to implement a real or a mock clock. The latter is used in tests. type Clock interface { @@ -39,16 +38,21 @@ func (c *clock) Now() time.Time { // Mock is a mock instance of clock type Mock struct { + mu sync.RWMutex currentTime time.Time } // SetNow sets the current time for the mock clock func (c *Mock) SetNow(t time.Time) { + c.mu.Lock() + defer c.mu.Unlock() c.currentTime = t } // Now returns the current time func (c *Mock) Now() time.Time { + c.mu.RLock() + defer c.mu.RUnlock() return c.currentTime } diff --git a/pkg/e2e/sync_test.go b/pkg/e2e/sync_test.go index 73ea3b31..10df15c9 100644 --- a/pkg/e2e/sync_test.go +++ b/pkg/e2e/sync_test.go @@ -28,13 +28,13 @@ import ( "net/http/httptest" "os" "os/exec" + "path/filepath" "strings" "testing" "time" "github.com/dnote/dnote/pkg/assert" "github.com/dnote/dnote/pkg/cli/consts" - "github.com/dnote/dnote/pkg/cli/context" cliDatabase "github.com/dnote/dnote/pkg/cli/database" "github.com/dnote/dnote/pkg/cli/testutils" clitest "github.com/dnote/dnote/pkg/cli/testutils" @@ -49,43 +49,65 @@ import ( ) var cliBinaryName string -var server *httptest.Server -var serverDb *gorm.DB var serverTime = time.Date(2017, time.March, 14, 21, 15, 0, 0, time.UTC) -var tmpDirPath string -var dnoteCmdOpts clitest.RunDnoteCmdOptions -var paths context.Paths - var testDir = "./tmp/.dnote" func init() { - tmpDirPath = fmt.Sprintf("%s/tmp", testDir) cliBinaryName = fmt.Sprintf("%s/test/cli/test-cli", testDir) - dnoteCmdOpts = clitest.RunDnoteCmdOptions{ +} + +// testEnv holds the test environment for a single test +type testEnv struct { + DB *cliDatabase.DB + CmdOpts clitest.RunDnoteCmdOptions + Server *httptest.Server + ServerDB *gorm.DB + TmpDir string +} + +// setupTestEnv creates an isolated test environment with its own database and temp directory +func setupTestEnv(t *testing.T) testEnv { + tmpDir := t.TempDir() + + // Create .dnote directory + dnoteDir := filepath.Join(tmpDir, consts.DnoteDirName) + if err := os.MkdirAll(dnoteDir, 0755); err != nil { + t.Fatal(errors.Wrap(err, "creating dnote directory")) + } + + // Create database at the expected path + dbPath := filepath.Join(dnoteDir, consts.DnoteDBFileName) + db := cliDatabase.InitTestFileDBRaw(t, dbPath) + + // Create server + server, serverDB := setupNewServer(t) + + // Create config file with this server's endpoint + apiEndpoint := fmt.Sprintf("%s/api", server.URL) + updateConfigAPIEndpoint(t, tmpDir, apiEndpoint) + + // Create command options with XDG paths pointing to temp dir + cmdOpts := clitest.RunDnoteCmdOptions{ Env: []string{ - fmt.Sprintf("XDG_CONFIG_HOME=%s", tmpDirPath), - fmt.Sprintf("XDG_DATA_HOME=%s", tmpDirPath), - fmt.Sprintf("XDG_CACHE_HOME=%s", tmpDirPath), + fmt.Sprintf("XDG_CONFIG_HOME=%s", tmpDir), + fmt.Sprintf("XDG_DATA_HOME=%s", tmpDir), + fmt.Sprintf("XDG_CACHE_HOME=%s", tmpDir), }, } - paths = context.Paths{ - Data: tmpDirPath, - Cache: tmpDirPath, - Config: tmpDirPath, - } -} - -func clearTmp(t *testing.T) { - if err := os.RemoveAll(tmpDirPath); err != nil { - t.Fatal("cleaning tmp dir") + return testEnv{ + DB: db, + CmdOpts: cmdOpts, + Server: server, + ServerDB: serverDB, + TmpDir: tmpDir, } } // setupTestServer creates a test server with its own database -func setupTestServer(dbPath string, serverTime time.Time) (*httptest.Server, *gorm.DB, error) { - db := apitest.InitDB(dbPath) +func setupTestServer(t *testing.T, serverTime time.Time) (*httptest.Server, *gorm.DB, error) { + db := apitest.InitMemoryDB(t) mockClock := clock.NewMock() mockClock.SetNow(serverTime) @@ -104,23 +126,46 @@ func setupTestServer(dbPath string, serverTime time.Time) (*httptest.Server, *go return server, db, nil } -func TestMain(m *testing.M) { - // Set up server database - use file-based DB for e2e tests - dbPath := fmt.Sprintf("%s/server.db", testDir) - - var err error - server, serverDb, err = setupTestServer(dbPath, serverTime) +// setupNewServer creates a new server and returns the server and database. +// This is useful when a test needs to switch to a new empty server. +func setupNewServer(t *testing.T) (*httptest.Server, *gorm.DB) { + server, serverDB, err := setupTestServer(t, serverTime) if err != nil { - panic(err) + t.Fatal(errors.Wrap(err, "setting up new test server")) } + t.Cleanup(func() { server.Close() }) - defer server.Close() + return server, serverDB +} - // Build binaries - apiEndpoint := fmt.Sprintf("%s/api", server.URL) - ldflags := fmt.Sprintf("-X main.apiEndpoint=%s", apiEndpoint) +// updateConfigAPIEndpoint updates the config file with the given API endpoint +func updateConfigAPIEndpoint(t *testing.T, tmpDir string, apiEndpoint string) { + dnoteDir := filepath.Join(tmpDir, consts.DnoteDirName) + configPath := filepath.Join(dnoteDir, consts.ConfigFilename) + configContent := fmt.Sprintf("apiEndpoint: %s\n", apiEndpoint) + if err := os.WriteFile(configPath, []byte(configContent), 0644); err != nil { + t.Fatal(errors.Wrap(err, "writing config file")) + } +} - cmd := exec.Command("go", "build", "--tags", "fts5", "-o", cliBinaryName, "-ldflags", ldflags, "github.com/dnote/dnote/pkg/cli") +// switchToEmptyServer closes the current server and creates a new empty server, +// updating the config file to point to it. +func switchToEmptyServer(t *testing.T, env *testEnv) { + // Close old server + env.Server.Close() + + // Create new empty server + env.Server, env.ServerDB = setupNewServer(t) + + // Update config file to point to new server + apiEndpoint := fmt.Sprintf("%s/api", env.Server.URL) + updateConfigAPIEndpoint(t, env.TmpDir, apiEndpoint) +} + +func TestMain(m *testing.M) { + // Build CLI binary without hardcoded API endpoint + // Each test will create its own server and config file + cmd := exec.Command("go", "build", "--tags", "fts5", "-o", cliBinaryName, "github.com/dnote/dnote/pkg/cli") var stderr bytes.Buffer cmd.Stderr = &stderr @@ -135,29 +180,29 @@ func TestMain(m *testing.M) { } // helpers -func setupUser(t *testing.T, db *cliDatabase.DB) database.User { - user := apitest.SetupUserData(serverDb, "alice@example.com", "pass1234") +func setupUser(t *testing.T, env testEnv) database.User { + user := apitest.SetupUserData(env.ServerDB, "alice@example.com", "pass1234") return user } -func setupUserAndLogin(t *testing.T, db *cliDatabase.DB) database.User { - user := setupUser(t, db) - login(t, db, user) +func setupUserAndLogin(t *testing.T, env testEnv) database.User { + user := setupUser(t, env) + login(t, env.DB, env.ServerDB, user) return user } // log in the user in CLI -func login(t *testing.T, db *cliDatabase.DB, user database.User) { - session := apitest.SetupSession(serverDb, user) +func login(t *testing.T, db *cliDatabase.DB, serverDB *gorm.DB, user database.User) { + session := apitest.SetupSession(serverDB, user) cliDatabase.MustExec(t, "inserting session_key", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, session.Key) cliDatabase.MustExec(t, "inserting session_key_expiry", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, session.ExpiresAt.Unix()) } -func apiCreateBook(t *testing.T, user database.User, name, message string) string { - res := doHTTPReq(t, "POST", "/v3/books", fmt.Sprintf(`{"name": "%s"}`, name), message, user) +func apiCreateBook(t *testing.T, env testEnv, user database.User, name, message string) string { + res := doHTTPReq(t, env, "POST", "/v3/books", fmt.Sprintf(`{"name": "%s"}`, name), message, user) var resp controllers.CreateBookResp if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { @@ -168,16 +213,16 @@ func apiCreateBook(t *testing.T, user database.User, name, message string) strin return resp.Book.UUID } -func apiPatchBook(t *testing.T, user database.User, uuid, payload, message string) { - doHTTPReq(t, "PATCH", fmt.Sprintf("/v3/books/%s", uuid), payload, message, user) +func apiPatchBook(t *testing.T, env testEnv, user database.User, uuid, payload, message string) { + doHTTPReq(t, env, "PATCH", fmt.Sprintf("/v3/books/%s", uuid), payload, message, user) } -func apiDeleteBook(t *testing.T, user database.User, uuid, message string) { - doHTTPReq(t, "DELETE", fmt.Sprintf("/v3/books/%s", uuid), "", message, user) +func apiDeleteBook(t *testing.T, env testEnv, user database.User, uuid, message string) { + doHTTPReq(t, env, "DELETE", fmt.Sprintf("/v3/books/%s", uuid), "", message, user) } -func apiCreateNote(t *testing.T, user database.User, bookUUID, body, message string) string { - res := doHTTPReq(t, "POST", "/v3/notes", fmt.Sprintf(`{"book_uuid": "%s", "content": "%s"}`, bookUUID, body), message, user) +func apiCreateNote(t *testing.T, env testEnv, user database.User, bookUUID, body, message string) string { + res := doHTTPReq(t, env, "POST", "/v3/notes", fmt.Sprintf(`{"book_uuid": "%s", "content": "%s"}`, bookUUID, body), message, user) var resp controllers.CreateNoteResp if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { @@ -188,16 +233,16 @@ func apiCreateNote(t *testing.T, user database.User, bookUUID, body, message str return resp.Result.UUID } -func apiPatchNote(t *testing.T, user database.User, noteUUID, payload, message string) { - doHTTPReq(t, "PATCH", fmt.Sprintf("/v3/notes/%s", noteUUID), payload, message, user) +func apiPatchNote(t *testing.T, env testEnv, user database.User, noteUUID, payload, message string) { + doHTTPReq(t, env, "PATCH", fmt.Sprintf("/v3/notes/%s", noteUUID), payload, message, user) } -func apiDeleteNote(t *testing.T, user database.User, noteUUID, message string) { - doHTTPReq(t, "DELETE", fmt.Sprintf("/v3/notes/%s", noteUUID), "", message, user) +func apiDeleteNote(t *testing.T, env testEnv, user database.User, noteUUID, message string) { + doHTTPReq(t, env, "DELETE", fmt.Sprintf("/v3/notes/%s", noteUUID), "", message, user) } -func doHTTPReq(t *testing.T, method, path, payload, message string, user database.User) *http.Response { - apiEndpoint := fmt.Sprintf("%s/api", server.URL) +func doHTTPReq(t *testing.T, env testEnv, method, path, payload, message string, user database.User) *http.Response { + apiEndpoint := fmt.Sprintf("%s/api", env.Server.URL) endpoint := fmt.Sprintf("%s%s", apiEndpoint, path) req, err := http.NewRequest(method, endpoint, strings.NewReader(payload)) @@ -205,7 +250,7 @@ func doHTTPReq(t *testing.T, method, path, payload, message string, user databas panic(errors.Wrap(err, "constructing http request")) } - res := apitest.HTTPAuthDo(t, serverDb, req, user) + res := apitest.HTTPAuthDo(t, env.ServerDB, req, user) if res.StatusCode >= 400 { bs, err := io.ReadAll(res.Body) if err != nil { @@ -218,29 +263,22 @@ func doHTTPReq(t *testing.T, method, path, payload, message string, user databas return res } -type setupFunc func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string -type assertFunc func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) +type setupFunc func(t *testing.T, env testEnv, user database.User) map[string]string +type assertFunc func(t *testing.T, env testEnv, user database.User, ids map[string]string) func testSyncCmd(t *testing.T, fullSync bool, setup setupFunc, assert assertFunc) { - // clean up - apitest.ClearData(serverDb) - defer apitest.ClearData(serverDb) + env := setupTestEnv(t) - clearTmp(t) - - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - - user := setupUserAndLogin(t, ctx.DB) - ids := setup(t, ctx, user) + user := setupUserAndLogin(t, env) + ids := setup(t, env, user) if fullSync { - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") } else { - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") } - assert(t, ctx, user, ids) + assert(t, env, user, ids) } type systemState struct { @@ -254,11 +292,7 @@ type systemState struct { } // checkState compares the state of the client and the server with the given system state -func checkState(t *testing.T, ctx context.DnoteCtx, user database.User, expected systemState) { - checkStateWithDB(t, ctx.DB, user, serverDb, expected) -} - -func checkStateWithDB(t *testing.T, clientDB *cliDatabase.DB, user database.User, serverDB *gorm.DB, expected systemState) { +func checkState(t *testing.T, clientDB *cliDatabase.DB, user database.User, serverDB *gorm.DB, expected systemState) { var clientBookCount, clientNoteCount int cliDatabase.MustScan(t, "counting client notes", clientDB.QueryRow("SELECT count(*) FROM notes"), &clientNoteCount) cliDatabase.MustScan(t, "counting client books", clientDB.QueryRow("SELECT count(*) FROM books"), &clientBookCount) @@ -284,13 +318,13 @@ func checkStateWithDB(t *testing.T, clientDB *cliDatabase.DB, user database.User // tests func TestSync_Empty(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { return map[string]string{} } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { // Test - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 0, clientLastMaxUSN: 0, @@ -307,19 +341,19 @@ func TestSync_Empty(t *testing.T) { func TestSync_oneway(t *testing.T) { t.Run("cli to api only", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) { - apitest.MustExec(t, serverDb.Model(&user).Update("max_usn", 0), "updating user max_usn") + setup := func(t *testing.T, env testEnv, user database.User) { + apitest.MustExec(t, env.ServerDB.Model(&user).Update("max_usn", 0), "updating user max_usn") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js2") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User) { - cliDB := ctx.DB + assert := func(t *testing.T, env testEnv, user database.User) { + cliDB := env.DB // test client - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 3, clientBookCount: 2, clientLastMaxUSN: 5, @@ -359,11 +393,11 @@ func TestSync_oneway(t *testing.T) { // test server var apiBookJS, apiBookCSS database.Book var apiNote1JS, apiNote2JS, apiNote1CSS database.Note - apitest.MustExec(t, serverDb.Model(&database.Note{}).Where("uuid = ?", cliNote1JS.UUID).First(&apiNote1JS), "getting js1 note") - apitest.MustExec(t, serverDb.Model(&database.Note{}).Where("uuid = ?", cliNote2JS.UUID).First(&apiNote2JS), "getting js2 note") - apitest.MustExec(t, serverDb.Model(&database.Note{}).Where("uuid = ?", cliNote1CSS.UUID).First(&apiNote1CSS), "getting css1 note") - apitest.MustExec(t, serverDb.Model(&database.Book{}).Where("uuid = ?", cliBookJS.UUID).First(&apiBookJS), "getting js book") - apitest.MustExec(t, serverDb.Model(&database.Book{}).Where("uuid = ?", cliBookCSS.UUID).First(&apiBookCSS), "getting css book") + apitest.MustExec(t, env.ServerDB.Model(&database.Note{}).Where("uuid = ?", cliNote1JS.UUID).First(&apiNote1JS), "getting js1 note") + apitest.MustExec(t, env.ServerDB.Model(&database.Note{}).Where("uuid = ?", cliNote2JS.UUID).First(&apiNote2JS), "getting js2 note") + apitest.MustExec(t, env.ServerDB.Model(&database.Note{}).Where("uuid = ?", cliNote1CSS.UUID).First(&apiNote1CSS), "getting css1 note") + apitest.MustExec(t, env.ServerDB.Model(&database.Book{}).Where("uuid = ?", cliBookJS.UUID).First(&apiBookJS), "getting js book") + apitest.MustExec(t, env.ServerDB.Model(&database.Book{}).Where("uuid = ?", cliBookCSS.UUID).First(&apiBookCSS), "getting css book") // assert usn assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS usn mismatch") @@ -390,62 +424,56 @@ func TestSync_oneway(t *testing.T) { } t.Run("stepSync", func(t *testing.T) { - clearTmp(t) - defer apitest.ClearData(serverDb) - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - user := setupUserAndLogin(t, ctx.DB) - setup(t, ctx, user) + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + setup(t, env, user) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - assert(t, ctx, user) + assert(t, env, user) }) t.Run("fullSync", func(t *testing.T) { - clearTmp(t) - defer apitest.ClearData(serverDb) - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - user := setupUserAndLogin(t, ctx.DB) - setup(t, ctx, user) + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + setup(t, env, user) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") - assert(t, ctx, user) + assert(t, env, user) }) }) t.Run("cli to api with edit and delete", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) { - apiDB := serverDb + setup := func(t *testing.T, env testEnv, user database.User) { + apiDB := env.ServerDB apitest.MustExec(t, apiDB.Model(&user).Update("max_usn", 0), "updating user max_usn") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js2") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js3") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css2") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js3") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css2") var nid, nid2 string - cliDB := ctx.DB + cliDB := env.DB cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js3"), &nid) cliDatabase.MustScan(t, "getting id of note to delete", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "css2"), &nid2) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js3-edited") - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "css", nid2) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js3-edited") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "css", nid2) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css3") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css4") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css3") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css4") } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 6, clientBookCount: 2, clientLastMaxUSN: 8, @@ -546,62 +574,56 @@ func TestSync_oneway(t *testing.T) { } t.Run("stepSync", func(t *testing.T) { - clearTmp(t) - defer apitest.ClearData(serverDb) - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - user := setupUserAndLogin(t, ctx.DB) - setup(t, ctx, user) + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + setup(t, env, user) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - assert(t, ctx, user) + assert(t, env, user) }) t.Run("fullSync", func(t *testing.T) { - clearTmp(t) - defer apitest.ClearData(serverDb) - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - user := setupUserAndLogin(t, ctx.DB) - setup(t, ctx, user) + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + setup(t, env, user) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") - assert(t, ctx, user) + assert(t, env, user) }) }) t.Run("api to cli", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - apiDB := serverDb + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + apiDB := env.ServerDB apitest.MustExec(t, apiDB.Model(&user).Update("max_usn", 0), "updating user max_usn") - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") - cssBookUUID := apiCreateBook(t, user, "css", "adding css book") - cssNote1UUID := apiCreateNote(t, user, cssBookUUID, "css1", "adding css note 1") - jsNote2UUID := apiCreateNote(t, user, jsBookUUID, "js2", "adding js note 2") - cssNote2UUID := apiCreateNote(t, user, cssBookUUID, "css2", "adding css note 2") - linuxBookUUID := apiCreateBook(t, user, "linux", "adding linux book") - linuxNote1UUID := apiCreateNote(t, user, linuxBookUUID, "linux1", "adding linux note 1") - apiPatchNote(t, user, jsNote2UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, linuxBookUUID), "moving js note 2 to linux") - apiDeleteNote(t, user, jsNote1UUID, "deleting js note 1") - cssNote3UUID := apiCreateNote(t, user, cssBookUUID, "css3", "adding css note 3") - bashBookUUID := apiCreateBook(t, user, "bash", "adding bash book") - bashNote1UUID := apiCreateNote(t, user, bashBookUUID, "bash1", "adding bash note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") + cssNote1UUID := apiCreateNote(t, env, user, cssBookUUID, "css1", "adding css note 1") + jsNote2UUID := apiCreateNote(t, env, user, jsBookUUID, "js2", "adding js note 2") + cssNote2UUID := apiCreateNote(t, env, user, cssBookUUID, "css2", "adding css note 2") + linuxBookUUID := apiCreateBook(t, env, user, "linux", "adding linux book") + linuxNote1UUID := apiCreateNote(t, env, user, linuxBookUUID, "linux1", "adding linux note 1") + apiPatchNote(t, env, user, jsNote2UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, linuxBookUUID), "moving js note 2 to linux") + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + cssNote3UUID := apiCreateNote(t, env, user, cssBookUUID, "css3", "adding css note 3") + bashBookUUID := apiCreateBook(t, env, user, "bash", "adding bash book") + bashNote1UUID := apiCreateNote(t, env, user, bashBookUUID, "bash1", "adding bash note 1") // delete the linux book and its two notes - apiDeleteBook(t, user, linuxBookUUID, "deleting linux book") + apiDeleteBook(t, env, user, linuxBookUUID, "deleting linux book") - apiPatchNote(t, user, cssNote2UUID, fmt.Sprintf(`{"content": "%s"}`, "css2-edited"), "editing css 2 body") - bashNote2UUID := apiCreateNote(t, user, bashBookUUID, "bash2", "adding bash note 2") - linuxBook2UUID := apiCreateBook(t, user, "linux", "adding new linux book") - linux2Note1UUID := apiCreateNote(t, user, linuxBookUUID, "linux-new-1", "adding linux note 1") - apiDeleteBook(t, user, jsBookUUID, "deleting js book") + apiPatchNote(t, env, user, cssNote2UUID, fmt.Sprintf(`{"content": "%s"}`, "css2-edited"), "editing css 2 body") + bashNote2UUID := apiCreateNote(t, env, user, bashBookUUID, "bash2", "adding bash note 2") + linuxBook2UUID := apiCreateBook(t, env, user, "linux", "adding new linux book") + linux2Note1UUID := apiCreateNote(t, env, user, linuxBookUUID, "linux-new-1", "adding linux note 1") + apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -621,11 +643,11 @@ func TestSync_oneway(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 6, clientBookCount: 3, clientLastMaxUSN: 21, @@ -768,41 +790,41 @@ func TestSync_oneway(t *testing.T) { func TestSync_twoway(t *testing.T) { t.Run("once", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - cliDB := ctx.DB + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") - cssBookUUID := apiCreateBook(t, user, "css", "adding css book") - cssNote1UUID := apiCreateNote(t, user, cssBookUUID, "css1", "adding css note 1") - jsNote2UUID := apiCreateNote(t, user, jsBookUUID, "js2", "adding js note 2") - cssNote2UUID := apiCreateNote(t, user, cssBookUUID, "css2", "adding css note 2") - linuxBookUUID := apiCreateBook(t, user, "linux", "adding linux book") - linuxNote1UUID := apiCreateNote(t, user, linuxBookUUID, "linux1", "adding linux note 1") - apiPatchNote(t, user, jsNote2UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, linuxBookUUID), "moving js note 2 to linux") - apiDeleteNote(t, user, jsNote1UUID, "deleting js note 1") - cssNote3UUID := apiCreateNote(t, user, cssBookUUID, "css3", "adding css note 3") - bashBookUUID := apiCreateBook(t, user, "bash", "adding bash book") - bashNote1UUID := apiCreateNote(t, user, bashBookUUID, "bash1", "adding bash note 1") - apiDeleteBook(t, user, linuxBookUUID, "deleting linux book") - apiPatchNote(t, user, cssNote2UUID, fmt.Sprintf(`{"content": "%s"}`, "css2-edited"), "editing css 2 body") - bashNote2UUID := apiCreateNote(t, user, bashBookUUID, "bash2", "adding bash note 2") - linuxBook2UUID := apiCreateBook(t, user, "linux", "adding new linux book") - linux2Note1UUID := apiCreateNote(t, user, linuxBookUUID, "linux-new-1", "adding linux note 1") - apiDeleteBook(t, user, jsBookUUID, "deleting js book") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") + cssNote1UUID := apiCreateNote(t, env, user, cssBookUUID, "css1", "adding css note 1") + jsNote2UUID := apiCreateNote(t, env, user, jsBookUUID, "js2", "adding js note 2") + cssNote2UUID := apiCreateNote(t, env, user, cssBookUUID, "css2", "adding css note 2") + linuxBookUUID := apiCreateBook(t, env, user, "linux", "adding linux book") + linuxNote1UUID := apiCreateNote(t, env, user, linuxBookUUID, "linux1", "adding linux note 1") + apiPatchNote(t, env, user, jsNote2UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, linuxBookUUID), "moving js note 2 to linux") + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + cssNote3UUID := apiCreateNote(t, env, user, cssBookUUID, "css3", "adding css note 3") + bashBookUUID := apiCreateBook(t, env, user, "bash", "adding bash book") + bashNote1UUID := apiCreateNote(t, env, user, bashBookUUID, "bash1", "adding bash note 1") + apiDeleteBook(t, env, user, linuxBookUUID, "deleting linux book") + apiPatchNote(t, env, user, cssNote2UUID, fmt.Sprintf(`{"content": "%s"}`, "css2-edited"), "editing css 2 body") + bashNote2UUID := apiCreateNote(t, env, user, bashBookUUID, "bash2", "adding bash note 2") + linuxBook2UUID := apiCreateBook(t, env, user, "linux", "adding new linux book") + linux2Note1UUID := apiCreateNote(t, env, user, linuxBookUUID, "linux-new-1", "adding linux note 1") + apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js3") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js4") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms2") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "math", "-c", "math1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js3") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js4") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms2") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "math", "-c", "math1") var nid string cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js3"), &nid) - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "algorithms") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css4") - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "algorithms") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css4") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) return map[string]string{ "jsBookUUID": jsBookUUID, @@ -822,11 +844,11 @@ func TestSync_twoway(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 9, clientBookCount: 6, clientLastMaxUSN: 27, @@ -1002,43 +1024,43 @@ func TestSync_twoway(t *testing.T) { }) t.Run("twice", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") - cssBookUUID := apiCreateBook(t, user, "css", "adding css book") - cssNote1UUID := apiCreateNote(t, user, cssBookUUID, "css1", "adding css note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") + cssNote1UUID := apiCreateNote(t, env, user, cssBookUUID, "css1", "adding css note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js2") - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "math", "-c", "math1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "math", "-c", "math1") var nid string - cliDB := ctx.DB + cliDB := env.DB cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "math1"), &nid) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "math", nid, "-c", "math1-edited") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "math", nid, "-c", "math1-edited") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - scssBookUUID := apiCreateBook(t, user, "scss", "adding a scss book") - apiPatchNote(t, user, cssNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, scssBookUUID), "moving css note 1 to scss") + scssBookUUID := apiCreateBook(t, env, user, "scss", "adding a scss book") + apiPatchNote(t, env, user, cssNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, scssBookUUID), "moving css note 1 to scss") var n1UUID string cliDatabase.MustScan(t, "getting math1-edited note UUID", cliDB.QueryRow("SELECT uuid FROM notes WHERE body = ?", "math1-edited"), &n1UUID) - apiPatchNote(t, user, n1UUID, fmt.Sprintf(`{"content": "%s", "public": true}`, "math1-edited"), "editing math1 note") + apiPatchNote(t, env, user, n1UUID, fmt.Sprintf(`{"content": "%s", "public": true}`, "math1-edited"), "editing math1 note") - cssNote2UUID := apiCreateNote(t, user, cssBookUUID, "css2", "adding css note 2") - apiDeleteBook(t, user, cssBookUUID, "deleting css book") + cssNote2UUID := apiCreateNote(t, env, user, cssBookUUID, "css2", "adding css note 2") + apiDeleteBook(t, env, user, cssBookUUID, "deleting css book") - bashBookUUID := apiCreateBook(t, user, "bash", "adding a bash book") - algorithmsBookUUID := apiCreateBook(t, user, "algorithms", "adding a algorithms book") + bashBookUUID := apiCreateBook(t, env, user, "bash", "adding a bash book") + algorithmsBookUUID := apiCreateBook(t, env, user, "algorithms", "adding a algorithms book") // 4. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js3") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js3") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1052,11 +1074,11 @@ func TestSync_twoway(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - apiDB := serverDb - cliDB := ctx.DB + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB + cliDB := env.DB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 5, clientBookCount: 6, clientLastMaxUSN: 17, @@ -1182,21 +1204,21 @@ func TestSync_twoway(t *testing.T) { }) t.Run("three times", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - goBookUUID := apiCreateBook(t, user, "go", "adding a go book") - goNote1UUID := apiCreateNote(t, user, goBookUUID, "go1", "adding go note 1") + goBookUUID := apiCreateBook(t, env, user, "go", "adding a go book") + goNote1UUID := apiCreateNote(t, env, user, goBookUUID, "go1", "adding go note 1") // 4. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "html", "-c", "html1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "html", "-c", "html1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1206,11 +1228,11 @@ func TestSync_twoway(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 4, clientBookCount: 4, clientLastMaxUSN: 8, @@ -1299,17 +1321,17 @@ func TestSync_twoway(t *testing.T) { func TestSync(t *testing.T) { t.Run("client adds a book and a note", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") return map[string]string{} } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 2, @@ -1353,14 +1375,14 @@ func TestSync(t *testing.T) { }) t.Run("client deletes a book", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1368,10 +1390,10 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 0, clientLastMaxUSN: 5, @@ -1403,18 +1425,18 @@ func TestSync(t *testing.T) { }) t.Run("client deletes a note", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - cliDB := ctx.DB + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") var nid string cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1422,11 +1444,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 3, @@ -1469,19 +1491,19 @@ func TestSync(t *testing.T) { }) t.Run("client edits a note", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - cliDB := ctx.DB + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") var nid string cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1489,11 +1511,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 3, @@ -1540,14 +1562,14 @@ func TestSync(t *testing.T) { }) t.Run("client edits a book by renaming it", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1555,11 +1577,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 3, @@ -1611,19 +1633,19 @@ func TestSync(t *testing.T) { }) t.Run("server adds a book", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") return map[string]string{ "jsBookUUID": jsBookUUID, } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 1, @@ -1658,26 +1680,26 @@ func TestSync(t *testing.T) { }) t.Run("server edits a book by renaming it", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchBook(t, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-new-label"), "editing js book") + apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-new-label"), "editing js book") return map[string]string{ "jsBookUUID": jsBookUUID, } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 2, @@ -1712,25 +1734,25 @@ func TestSync(t *testing.T) { }) t.Run("server deletes a book", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteBook(t, user, jsBookUUID, "deleting js book") + apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") return map[string]string{ "jsBookUUID": jsBookUUID, } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 0, clientLastMaxUSN: 2, @@ -1757,10 +1779,10 @@ func TestSync(t *testing.T) { }) t.Run("server adds a note", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1768,11 +1790,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 2, @@ -1817,16 +1839,16 @@ func TestSync(t *testing.T) { }) t.Run("server edits a note body", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1834,11 +1856,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 3, @@ -1883,17 +1905,17 @@ func TestSync(t *testing.T) { }) t.Run("server moves a note to another book", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") - cssBookUUID := apiCreateBook(t, user, "css", "adding css book") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1902,11 +1924,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 2, clientLastMaxUSN: 4, @@ -1958,16 +1980,16 @@ func TestSync(t *testing.T) { }) t.Run("server deletes a note", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteNote(t, user, jsNote1UUID, "deleting js note 1") + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1975,11 +1997,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 3, @@ -2020,19 +2042,19 @@ func TestSync(t *testing.T) { }) t.Run("client and server deletes the same book", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteBook(t, user, jsBookUUID, "deleting js book") + apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") // 4. on cli - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2040,10 +2062,10 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 0, clientLastMaxUSN: 6, @@ -2076,23 +2098,23 @@ func TestSync(t *testing.T) { }) t.Run("client and server deletes the same note", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - cliDB := ctx.DB + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteNote(t, user, jsNote1UUID, "deleting js note 1") + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") // 4. on cli var nid string cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2100,11 +2122,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - apiDB := serverDb - cliDB := ctx.DB + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB + cliDB := env.DB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 4, @@ -2148,19 +2170,19 @@ func TestSync(t *testing.T) { }) t.Run("server and client adds a note with same body", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 4. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2168,11 +2190,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 1, clientLastMaxUSN: 3, @@ -2222,13 +2244,13 @@ func TestSync(t *testing.T) { }) t.Run("server and client adds a book with same label", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2236,11 +2258,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -2297,16 +2319,16 @@ func TestSync(t *testing.T) { }) t.Run("server and client adds two sets of books with same labels", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") - cssBookUUID := apiCreateBook(t, user, "css", "adding css book") - cssNote1UUID := apiCreateNote(t, user, cssBookUUID, "css1", "adding css note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") + cssNote1UUID := apiCreateNote(t, env, user, cssBookUUID, "css1", "adding css note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2316,11 +2338,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 4, clientBookCount: 4, clientLastMaxUSN: 8, @@ -2402,19 +2424,19 @@ func TestSync(t *testing.T) { }) t.Run("server and client adds notes to the same book", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 4. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js2") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2422,11 +2444,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 1, clientLastMaxUSN: 3, @@ -2476,13 +2498,13 @@ func TestSync(t *testing.T) { }) t.Run("server and client adds a book with the same label and notes in it", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js2") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2490,11 +2512,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -2550,22 +2572,22 @@ func TestSync(t *testing.T) { }) t.Run("client and server edits bodys of the same note", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - cliDB := ctx.DB + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") var nid string cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited-from-client") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited-from-client") // 3. on server - apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited-from-server"), "editing js note 1") + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited-from-server"), "editing js note 1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2573,13 +2595,13 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB resolvedBody := "<<<<<<< Local\njs1-edited-from-client\n=======\njs1-edited-from-server\n>>>>>>> Server\n" - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 4, @@ -2626,21 +2648,21 @@ func TestSync(t *testing.T) { }) t.Run("clients deletes a note and server edits its body", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - cliDB := ctx.DB + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") var nid string cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) // 3. on server - apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2648,11 +2670,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 3, @@ -2699,22 +2721,22 @@ func TestSync(t *testing.T) { }) t.Run("clients deletes a note and server moves it to another book", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - cliDB := ctx.DB + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") - cssBookUUID := apiCreateBook(t, user, "css", "adding css book") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding css book") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") var nid string cliDatabase.MustScan(t, "getting id of note to remove", cliDB.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", jsNote1UUID), &nid) - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) // 3. on server - apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2723,11 +2745,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 2, clientLastMaxUSN: 4, @@ -2783,23 +2805,23 @@ func TestSync(t *testing.T) { }) t.Run("server deletes a note and client edits it", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - cliDB := ctx.DB + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteNote(t, user, jsNote1UUID, "deleting js note 1") + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") // 4. on cli var nid string cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2807,11 +2829,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 4, @@ -2860,19 +2882,19 @@ func TestSync(t *testing.T) { }) t.Run("server deletes a book and client edits it by renaming it", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteNote(t, user, jsNote1UUID, "deleting js note 1") + apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") // 4. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2880,11 +2902,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 4, @@ -2928,23 +2950,23 @@ func TestSync(t *testing.T) { }) t.Run("server deletes a book and client edits a note in it", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - cliDB := ctx.DB + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + cliDB := env.DB // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteBook(t, user, jsBookUUID, "deleting js book") + apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") // 4. on cli var nid string cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2952,11 +2974,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 6, @@ -3005,17 +3027,17 @@ func TestSync(t *testing.T) { }) t.Run("client deletes a book and server edits it by renaming it", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") // 3. on server - apiPatchBook(t, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") + apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3023,11 +3045,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 5, @@ -3071,19 +3093,19 @@ func TestSync(t *testing.T) { }) t.Run("client deletes a book and server edits a note in it", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js1 note") + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js1 note") // 4. on cli - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3091,10 +3113,10 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 0, clientBookCount: 0, clientLastMaxUSN: 6, @@ -3127,17 +3149,17 @@ func TestSync(t *testing.T) { }) t.Run("client and server edit a book by renaming it to a same name", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") // 3. on server - apiPatchBook(t, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") + apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3145,11 +3167,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 4, @@ -3201,17 +3223,17 @@ func TestSync(t *testing.T) { }) t.Run("client and server edit a book by renaming it to different names", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited-client") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited-client") // 3. on server - apiPatchBook(t, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited-server"), "editing js book") + apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited-server"), "editing js book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3219,13 +3241,13 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { // In this case, server's change wins and overwrites that of client's - cliDB := ctx.DB - apiDB := serverDb + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 4, @@ -3277,17 +3299,17 @@ func TestSync(t *testing.T) { }) t.Run("client moves a note", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - cssBookUUID := apiCreateBook(t, user, "css", "adding a css book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding a css book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "1", "-b", "css") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "1", "-b", "css") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3296,11 +3318,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 2, clientLastMaxUSN: 4, @@ -3361,20 +3383,20 @@ func TestSync(t *testing.T) { }) t.Run("client and server each moves a note to a same book", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - cssBookUUID := apiCreateBook(t, user, "css", "adding a css book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding a css book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") // 3. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "1", "-b", "css") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "1", "-b", "css") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3383,11 +3405,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 2, clientLastMaxUSN: 5, @@ -3448,21 +3470,21 @@ func TestSync(t *testing.T) { }) t.Run("client and server each moves a note to different books", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - cssBookUUID := apiCreateBook(t, user, "css", "adding a css book") - linuxBookUUID := apiCreateBook(t, user, "linux", "adding a linux book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding a css book") + linuxBookUUID := apiCreateBook(t, env, user, "linux", "adding a linux book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") // 3. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "1", "-b", "linux") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "1", "-b", "linux") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3472,9 +3494,9 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB expectedNote1JSBody := `<<<<<<< Local Moved to the book linux @@ -3484,7 +3506,7 @@ Moved to the book css js1` - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 1, clientBookCount: 4, clientLastMaxUSN: 7, @@ -3563,20 +3585,20 @@ js1` }) t.Run("client adds a new book and moves a note into it", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") - cliDB := ctx.DB + cliDB := env.DB var nid string cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-b", "css") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-b", "css") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3584,11 +3606,11 @@ js1` } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 5, @@ -3661,23 +3683,23 @@ js1` }) t.Run("client adds a duplicate book and moves a note into it", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // 3. on server - cssBookUUID := apiCreateBook(t, user, "css", "adding a css book") + cssBookUUID := apiCreateBook(t, env, user, "css", "adding a css book") // 3. on cli - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") var nid string - cliDatabase.MustScan(t, "getting id of note to edit", ctx.DB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", nid, "-b", "css") + cliDatabase.MustScan(t, "getting id of note to edit", env.DB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "js1"), &nid) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", nid, "-b", "css") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3686,11 +3708,11 @@ js1` } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 3, clientLastMaxUSN: 6, @@ -3774,11 +3796,11 @@ js1` func TestFullSync(t *testing.T) { t.Run("consecutively with stepSync", func(t *testing.T) { - setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { - jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") + setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3786,11 +3808,11 @@ func TestFullSync(t *testing.T) { } } - assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { - cliDB := ctx.DB - apiDB := serverDb + assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + cliDB := env.DB + apiDB := env.ServerDB - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -3850,38 +3872,26 @@ func TestFullSync(t *testing.T) { } t.Run("stepSync then fullSync", func(t *testing.T) { - // clean up - os.RemoveAll(tmpDirPath) - apitest.ClearData(serverDb) - defer apitest.ClearData(serverDb) + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + ids := setup(t, env, user) - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - user := setupUserAndLogin(t, ctx.DB) - ids := setup(t, ctx, user) - - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - assert(t, ctx, user, ids) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") - assert(t, ctx, user, ids) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + assert(t, env, user, ids) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") + assert(t, env, user, ids) }) t.Run("fullSync then stepSync", func(t *testing.T) { - // clean up - os.RemoveAll(tmpDirPath) - apitest.ClearData(serverDb) - defer apitest.ClearData(serverDb) + env := setupTestEnv(t) - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) + user := setupUserAndLogin(t, env) + ids := setup(t, env, user) - user := setupUserAndLogin(t, ctx.DB) - ids := setup(t, ctx, user) - - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") - assert(t, ctx, user, ids) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - assert(t, ctx, user, ids) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") + assert(t, env, user, ids) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + assert(t, env, user, ids) }) }) } @@ -3891,24 +3901,17 @@ func TestSync_EmptyServer(t *testing.T) { // Test server data loss/wipe scenario (disaster recovery): // Verify empty server detection works when the server loses all its data - // clean up - apitest.ClearData(serverDb) - defer apitest.ClearData(serverDb) + env := setupTestEnv(t) - clearTmp(t) - - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - - user := setupUserAndLogin(t, ctx.DB) + user := setupUserAndLogin(t, env) // Step 1: Create local data and sync to server - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // Verify sync succeeded - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -3918,17 +3921,18 @@ func TestSync_EmptyServer(t *testing.T) { serverUserMaxUSN: 4, }) - // Step 2: Clear all server data to simulate switching to a completely new empty server - apitest.ClearData(serverDb) - // Recreate user and session (simulating a new server) - user = setupUserAndLogin(t, ctx.DB) + // Step 2: Switch to a completely new empty server + switchToEmptyServer(t, &env) + + // Recreate user and session on new server + user = setupUserAndLogin(t, env) // Step 3: Sync again - should detect empty server and prompt user // User confirms with "y" - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync") // Step 4: Verify data was uploaded to the empty server - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -3941,10 +3945,10 @@ func TestSync_EmptyServer(t *testing.T) { // Verify the content is correct on both client and server var cliNote1JS, cliNote1CSS cliDatabase.Note var cliBookJS, cliBookCSS cliDatabase.Book - cliDatabase.MustScan(t, "finding cliNote1JS", ctx.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body) - cliDatabase.MustScan(t, "finding cliNote1CSS", ctx.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body) - cliDatabase.MustScan(t, "finding cliBookJS", ctx.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label) - cliDatabase.MustScan(t, "finding cliBookCSS", ctx.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label) + cliDatabase.MustScan(t, "finding cliNote1JS", env.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body) + cliDatabase.MustScan(t, "finding cliNote1CSS", env.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body) + cliDatabase.MustScan(t, "finding cliBookJS", env.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label) + cliDatabase.MustScan(t, "finding cliBookCSS", env.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label) assert.Equal(t, cliNote1JS.Body, "js1", "js note body mismatch") assert.Equal(t, cliNote1CSS.Body, "css1", "css note body mismatch") @@ -3954,10 +3958,10 @@ func TestSync_EmptyServer(t *testing.T) { // Verify on server side var serverNoteJS, serverNoteCSS database.Note var serverBookJS, serverBookCSS database.Book - apitest.MustExec(t, serverDb.Where("body = ?", "js1").First(&serverNoteJS), "finding server note js1") - apitest.MustExec(t, serverDb.Where("body = ?", "css1").First(&serverNoteCSS), "finding server note css1") - apitest.MustExec(t, serverDb.Where("label = ?", "js").First(&serverBookJS), "finding server book js") - apitest.MustExec(t, serverDb.Where("label = ?", "css").First(&serverBookCSS), "finding server book css") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "js1").First(&serverNoteJS), "finding server note js1") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "css1").First(&serverNoteCSS), "finding server note css1") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js").First(&serverBookJS), "finding server book js") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css").First(&serverBookCSS), "finding server book css") assert.Equal(t, serverNoteJS.Body, "js1", "server js note body mismatch") assert.Equal(t, serverNoteCSS.Body, "css1", "server css note body mismatch") @@ -3966,24 +3970,17 @@ func TestSync_EmptyServer(t *testing.T) { }) t.Run("user cancels empty server prompt", func(t *testing.T) { - // clean up - apitest.ClearData(serverDb) - defer apitest.ClearData(serverDb) + env := setupTestEnv(t) - clearTmp(t) - - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - - user := setupUserAndLogin(t, ctx.DB) + user := setupUserAndLogin(t, env) // Step 1: Create local data and sync to server - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // Verify initial sync succeeded - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -3993,12 +3990,12 @@ func TestSync_EmptyServer(t *testing.T) { serverUserMaxUSN: 4, }) - // Step 2: Clear all server data - apitest.ClearData(serverDb) - user = setupUserAndLogin(t, ctx.DB) + // Step 2: Switch to empty server + switchToEmptyServer(t, &env) + user = setupUserAndLogin(t, env) // Step 3: Sync again but user cancels with "n" - output, err := clitest.WaitDnoteCmd(t, dnoteCmdOpts, clitest.UserCancelEmptyServerSync, cliBinaryName, "sync") + output, err := clitest.WaitDnoteCmd(t, env.CmdOpts, clitest.UserCancelEmptyServerSync, cliBinaryName, "sync") if err == nil { t.Fatal("Expected sync to fail when user cancels, but it succeeded") } @@ -4009,7 +4006,7 @@ func TestSync_EmptyServer(t *testing.T) { } // Step 4: Verify local state unchanged (transaction rolled back) - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4022,8 +4019,8 @@ func TestSync_EmptyServer(t *testing.T) { // Verify items still have original USN and dirty=false var book cliDatabase.Book var note cliDatabase.Note - cliDatabase.MustScan(t, "checking book state", ctx.DB.QueryRow("SELECT usn, dirty FROM books WHERE label = ?", "js"), &book.USN, &book.Dirty) - cliDatabase.MustScan(t, "checking note state", ctx.DB.QueryRow("SELECT usn, dirty FROM notes WHERE body = ?", "js1"), ¬e.USN, ¬e.Dirty) + cliDatabase.MustScan(t, "checking book state", env.DB.QueryRow("SELECT usn, dirty FROM books WHERE label = ?", "js"), &book.USN, &book.Dirty) + cliDatabase.MustScan(t, "checking note state", env.DB.QueryRow("SELECT usn, dirty FROM notes WHERE body = ?", "js1"), ¬e.USN, ¬e.Dirty) assert.NotEqual(t, book.USN, 0, "book USN should not be reset") assert.NotEqual(t, note.USN, 0, "note USN should not be reset") @@ -4035,24 +4032,17 @@ func TestSync_EmptyServer(t *testing.T) { // Test edge case: Server MaxUSN=0, local MaxUSN>0, but all items are deleted=true // Should NOT prompt because there's nothing to upload - // clean up - apitest.ClearData(serverDb) - defer apitest.ClearData(serverDb) + env := setupTestEnv(t) - clearTmp(t) - - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - - user := setupUserAndLogin(t, ctx.DB) + user := setupUserAndLogin(t, env) // Step 1: Create local data and sync to server - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // Verify initial sync succeeded - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4063,35 +4053,35 @@ func TestSync_EmptyServer(t *testing.T) { }) // Step 2: Delete all local notes and books (mark as deleted) - cliDatabase.MustExec(t, "marking all books deleted", ctx.DB, "UPDATE books SET deleted = 1") - cliDatabase.MustExec(t, "marking all notes deleted", ctx.DB, "UPDATE notes SET deleted = 1") + cliDatabase.MustExec(t, "marking all books deleted", env.DB, "UPDATE books SET deleted = 1") + cliDatabase.MustExec(t, "marking all notes deleted", env.DB, "UPDATE notes SET deleted = 1") - // Step 3: Clear server data to simulate switching to empty server - apitest.ClearData(serverDb) - user = setupUserAndLogin(t, ctx.DB) + // Step 3: Switch to empty server + switchToEmptyServer(t, &env) + user = setupUserAndLogin(t, env) // Step 4: Sync - should NOT prompt because bookCount=0 and noteCount=0 (counting only deleted=0) // This should complete without user interaction - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // Verify no data was uploaded (server still empty, but client still has deleted items) // Check server is empty var serverNoteCount, serverBookCount int64 - apitest.MustExec(t, serverDb.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") - apitest.MustExec(t, serverDb.Model(&database.Book{}).Count(&serverBookCount), "counting server books") + apitest.MustExec(t, env.ServerDB.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") + apitest.MustExec(t, env.ServerDB.Model(&database.Book{}).Count(&serverBookCount), "counting server books") assert.Equal(t, serverNoteCount, int64(0), "server should have no notes") assert.Equal(t, serverBookCount, int64(0), "server should have no books") // Check client still has the deleted items locally var clientNoteCount, clientBookCount int - cliDatabase.MustScan(t, "counting client notes", ctx.DB.QueryRow("SELECT count(*) FROM notes WHERE deleted = 1"), &clientNoteCount) - cliDatabase.MustScan(t, "counting client books", ctx.DB.QueryRow("SELECT count(*) FROM books WHERE deleted = 1"), &clientBookCount) + cliDatabase.MustScan(t, "counting client notes", env.DB.QueryRow("SELECT count(*) FROM notes WHERE deleted = 1"), &clientNoteCount) + cliDatabase.MustScan(t, "counting client books", env.DB.QueryRow("SELECT count(*) FROM books WHERE deleted = 1"), &clientBookCount) assert.Equal(t, clientNoteCount, 2, "client should still have 2 deleted notes") assert.Equal(t, clientBookCount, 2, "client should still have 2 deleted books") // Verify lastMaxUSN was reset to 0 var lastMaxUSN int - cliDatabase.MustScan(t, "getting lastMaxUSN", ctx.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + cliDatabase.MustScan(t, "getting lastMaxUSN", env.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) assert.Equal(t, lastMaxUSN, 0, "lastMaxUSN should be reset to 0") }) @@ -4113,23 +4103,17 @@ func TestSync_EmptyServer(t *testing.T) { // 4. Retrying sendChanges to upload the renamed books // - Result: Both clients' data is preserved (4 books total) - // Clean up - apitest.ClearData(serverDb) - defer apitest.ClearData(serverDb) - clearTmp(t) + env := setupTestEnv(t) - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - - user := setupUserAndLogin(t, ctx.DB) + user := setupUserAndLogin(t, env) // Step 1: Create local data and sync to establish lastMaxUSN > 0 - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // Verify initial sync succeeded - checkState(t, ctx, user, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4139,9 +4123,11 @@ func TestSync_EmptyServer(t *testing.T) { serverUserMaxUSN: 4, }) - // Step 2: Clear server to simulate switching to empty server - apitest.ClearData(serverDb) - user = setupUserAndLogin(t, ctx.DB) + // Step 2: Switch to new empty server to simulate switching to empty server + switchToEmptyServer(t, &env) + + // Create user on new server and login + user = setupUserAndLogin(t, env) // Step 3: Trigger sync which will detect empty server and prompt user // Inside the callback (before confirming), we simulate Client B uploading via API. @@ -4154,10 +4140,10 @@ func TestSync_EmptyServer(t *testing.T) { // Now Client B uploads the same data via API (after Client A got the sync state from the server // but before its sync decision) // This creates the race condition: Client A thinks server is empty, but Client B uploads data - jsBookUUID := apiCreateBook(t, user, "js", "client B creating js book") - cssBookUUID := apiCreateBook(t, user, "css", "client B creating css book") - apiCreateNote(t, user, jsBookUUID, "js1", "client B creating js note") - apiCreateNote(t, user, cssBookUUID, "css1", "client B creating css note") + jsBookUUID := apiCreateBook(t, env, user, "js", "client B creating js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "client B creating css book") + apiCreateNote(t, env, user, jsBookUUID, "js1", "client B creating js note") + apiCreateNote(t, env, user, cssBookUUID, "css1", "client B creating css note") // Now user confirms if _, err := io.WriteString(stdin, "y\n"); err != nil { @@ -4174,10 +4160,10 @@ func TestSync_EmptyServer(t *testing.T) { // - mergeBook renames Client A's books to js_2, css_2 // - Renamed books are uploaded // - Both clients' data is preserved. - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, raceCallback, cliBinaryName, "sync") + clitest.MustWaitDnoteCmd(t, env.CmdOpts, raceCallback, cliBinaryName, "sync") // Verify final state - both clients' data preserved - checkStateWithDB(t, ctx.DB, user, serverDb, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 4, // Both clients' notes clientBookCount: 4, // js, css, js_2, css_2 clientLastMaxUSN: 8, // 4 from Client B + 4 from Client A's renamed books/notes @@ -4189,10 +4175,10 @@ func TestSync_EmptyServer(t *testing.T) { // Verify server has both clients' books var svrBookJS, svrBookCSS, svrBookJS2, svrBookCSS2 database.Book - apitest.MustExec(t, serverDb.Where("label = ?", "js").First(&svrBookJS), "finding server book 'js'") - apitest.MustExec(t, serverDb.Where("label = ?", "css").First(&svrBookCSS), "finding server book 'css'") - apitest.MustExec(t, serverDb.Where("label = ?", "js_2").First(&svrBookJS2), "finding server book 'js_2'") - apitest.MustExec(t, serverDb.Where("label = ?", "css_2").First(&svrBookCSS2), "finding server book 'css_2'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js").First(&svrBookJS), "finding server book 'js'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css").First(&svrBookCSS), "finding server book 'css'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js_2").First(&svrBookJS2), "finding server book 'js_2'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css_2").First(&svrBookCSS2), "finding server book 'css_2'") assert.Equal(t, svrBookJS.Label, "js", "server should have book 'js' (Client B)") assert.Equal(t, svrBookCSS.Label, "css", "server should have book 'css' (Client B)") @@ -4201,10 +4187,10 @@ func TestSync_EmptyServer(t *testing.T) { // Verify client has all books var cliBookJS, cliBookCSS, cliBookJS2, cliBookCSS2 cliDatabase.Book - cliDatabase.MustScan(t, "finding client book 'js'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) - cliDatabase.MustScan(t, "finding client book 'css'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) - cliDatabase.MustScan(t, "finding client book 'js_2'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) - cliDatabase.MustScan(t, "finding client book 'css_2'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) + cliDatabase.MustScan(t, "finding client book 'js'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding client book 'css'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding client book 'js_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) + cliDatabase.MustScan(t, "finding client book 'css_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) // Verify client UUIDs match server assert.Equal(t, cliBookJS.UUID, svrBookJS.UUID, "client 'js' UUID should match server") @@ -4225,27 +4211,17 @@ func TestSync_EmptyServer(t *testing.T) { // 2. No false detection when switching back to non-empty servers // 3. Both servers maintain independent state across multiple switches - // Clean up - clearTmp(t) - - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) + env := setupTestEnv(t) // Create Server A with its own database - dbPathA := fmt.Sprintf("%s/serverA.db", testDir) - defer os.Remove(dbPathA) - - serverA, serverDbA, err := setupTestServer(dbPathA, serverTime) + serverA, serverDBA, err := setupTestServer(t, serverTime) if err != nil { t.Fatal(errors.Wrap(err, "setting up server A")) } defer serverA.Close() // Create Server B with its own database - dbPathB := fmt.Sprintf("%s/serverB.db", testDir) - defer os.Remove(dbPathB) - - serverB, serverDbB, err := setupTestServer(dbPathB, serverTime) + serverB, serverDBB, err := setupTestServer(t, serverTime) if err != nil { t.Fatal(errors.Wrap(err, "setting up server B")) } @@ -4254,17 +4230,17 @@ func TestSync_EmptyServer(t *testing.T) { // Step 1: Set up user on Server A and sync apiEndpointA := fmt.Sprintf("%s/api", serverA.URL) - userA := apitest.SetupUserData(serverDbA, "alice@example.com", "pass1234") - sessionA := apitest.SetupSession(serverDbA, userA) - cliDatabase.MustExec(t, "inserting session_key", ctx.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, sessionA.Key) - cliDatabase.MustExec(t, "inserting session_key_expiry", ctx.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, sessionA.ExpiresAt.Unix()) + userA := apitest.SetupUserData(serverDBA, "alice@example.com", "pass1234") + sessionA := apitest.SetupSession(serverDBA, userA) + cliDatabase.MustExec(t, "inserting session_key", env.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, sessionA.Key) + cliDatabase.MustExec(t, "inserting session_key_expiry", env.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, sessionA.ExpiresAt.Unix()) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) // Verify sync to Server A succeeded - checkStateWithDB(t, ctx.DB, userA, serverDbA, systemState{ + checkState(t, env.DB, userA, serverDBA, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4278,16 +4254,16 @@ func TestSync_EmptyServer(t *testing.T) { apiEndpointB := fmt.Sprintf("%s/api", serverB.URL) // Set up user on Server B - userB := apitest.SetupUserData(serverDbB, "alice@example.com", "pass1234") - sessionB := apitest.SetupSession(serverDbB, userB) - cliDatabase.MustExec(t, "updating session_key for B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) - cliDatabase.MustExec(t, "updating session_key_expiry for B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + userB := apitest.SetupUserData(serverDBB, "alice@example.com", "pass1234") + sessionB := apitest.SetupSession(serverDBB, userB) + cliDatabase.MustExec(t, "updating session_key for B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry for B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) // Should detect empty server and prompt - clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) // Verify Server B now has data - checkStateWithDB(t, ctx.DB, userB, serverDbB, systemState{ + checkState(t, env.DB, userB, serverDBB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4298,14 +4274,14 @@ func TestSync_EmptyServer(t *testing.T) { }) // Step 3: Switch back to Server A and sync - cliDatabase.MustExec(t, "updating session_key back to A", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.Key, consts.SystemSessionKey) - cliDatabase.MustExec(t, "updating session_key_expiry back to A", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + cliDatabase.MustExec(t, "updating session_key back to A", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry back to A", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) // Should NOT trigger empty server detection (Server A has MaxUSN > 0) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) // Verify Server A still has its data - checkStateWithDB(t, ctx.DB, userA, serverDbA, systemState{ + checkState(t, env.DB, userA, serverDBA, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4316,14 +4292,14 @@ func TestSync_EmptyServer(t *testing.T) { }) // Step 4: Switch back to Server B and sync again - cliDatabase.MustExec(t, "updating session_key back to B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) - cliDatabase.MustExec(t, "updating session_key_expiry back to B", ctx.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + cliDatabase.MustExec(t, "updating session_key back to B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry back to B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) // Should NOT trigger empty server detection (Server B now has MaxUSN > 0 from Step 2) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) // Verify both servers maintain independent state - checkStateWithDB(t, ctx.DB, userB, serverDbB, systemState{ + checkState(t, env.DB, userB, serverDBB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4347,33 +4323,27 @@ func TestSync_FreshClientConcurrent(t *testing.T) { // Expected: Client A should pull server data first, detect duplicate book names, // rename local books to avoid conflicts (js→js_2), then upload successfully. - // Clean up - apitest.ClearData(serverDb) - defer apitest.ClearData(serverDb) - clearTmp(t) + env := setupTestEnv(t) - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) - - user := setupUserAndLogin(t, ctx.DB) + user := setupUserAndLogin(t, env) // Client A: Create local data (never sync) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") // Client B: Upload same book names to server via API - jsBookUUID := apiCreateBook(t, user, "js", "client B creating js book") - cssBookUUID := apiCreateBook(t, user, "css", "client B creating css book") - apiCreateNote(t, user, jsBookUUID, "js2", "client B note") - apiCreateNote(t, user, cssBookUUID, "css2", "client B note") + jsBookUUID := apiCreateBook(t, env, user, "js", "client B creating js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "client B creating css book") + apiCreateNote(t, env, user, jsBookUUID, "js2", "client B note") + apiCreateNote(t, env, user, cssBookUUID, "css2", "client B note") // Client A syncs - should handle the conflict gracefully // Expected: pulls server data, renames local books to js_2/css_2, uploads successfully - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") // Verify: Should have 4 books and 4 notes on both client and server // USN breakdown: 2 books + 2 notes from Client B (USN 1-4), then 2 books + 2 notes from Client A (USN 5-8) - checkStateWithDB(t, ctx.DB, user, serverDb, systemState{ + checkState(t, env.DB, user, env.ServerDB, systemState{ clientNoteCount: 4, clientBookCount: 4, clientLastMaxUSN: 8, @@ -4385,10 +4355,10 @@ func TestSync_FreshClientConcurrent(t *testing.T) { // Verify server has all 4 books with correct names var svrBookJS, svrBookCSS, svrBookJS2, svrBookCSS2 database.Book - apitest.MustExec(t, serverDb.Where("label = ?", "js").First(&svrBookJS), "finding server book 'js'") - apitest.MustExec(t, serverDb.Where("label = ?", "css").First(&svrBookCSS), "finding server book 'css'") - apitest.MustExec(t, serverDb.Where("label = ?", "js_2").First(&svrBookJS2), "finding server book 'js_2'") - apitest.MustExec(t, serverDb.Where("label = ?", "css_2").First(&svrBookCSS2), "finding server book 'css_2'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js").First(&svrBookJS), "finding server book 'js'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css").First(&svrBookCSS), "finding server book 'css'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js_2").First(&svrBookJS2), "finding server book 'js_2'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css_2").First(&svrBookCSS2), "finding server book 'css_2'") assert.Equal(t, svrBookJS.Label, "js", "server should have book 'js' (Client B)") assert.Equal(t, svrBookCSS.Label, "css", "server should have book 'css' (Client B)") @@ -4397,10 +4367,10 @@ func TestSync_FreshClientConcurrent(t *testing.T) { // Verify server has all 4 notes with correct content var svrNoteJS1, svrNoteJS2, svrNoteCSS1, svrNoteCSS2 database.Note - apitest.MustExec(t, serverDb.Where("body = ?", "js1").First(&svrNoteJS1), "finding server note 'js1'") - apitest.MustExec(t, serverDb.Where("body = ?", "js2").First(&svrNoteJS2), "finding server note 'js2'") - apitest.MustExec(t, serverDb.Where("body = ?", "css1").First(&svrNoteCSS1), "finding server note 'css1'") - apitest.MustExec(t, serverDb.Where("body = ?", "css2").First(&svrNoteCSS2), "finding server note 'css2'") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "js1").First(&svrNoteJS1), "finding server note 'js1'") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "js2").First(&svrNoteJS2), "finding server note 'js2'") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "css1").First(&svrNoteCSS1), "finding server note 'css1'") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "css2").First(&svrNoteCSS2), "finding server note 'css2'") assert.Equal(t, svrNoteJS1.BookUUID, svrBookJS2.UUID, "note 'js1' should belong to book 'js_2' (Client A)") assert.Equal(t, svrNoteJS2.BookUUID, svrBookJS.UUID, "note 'js2' should belong to book 'js' (Client B)") @@ -4409,10 +4379,10 @@ func TestSync_FreshClientConcurrent(t *testing.T) { // Verify client has all 4 books var cliBookJS, cliBookCSS, cliBookJS2, cliBookCSS2 cliDatabase.Book - cliDatabase.MustScan(t, "finding client book 'js'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) - cliDatabase.MustScan(t, "finding client book 'css'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) - cliDatabase.MustScan(t, "finding client book 'js_2'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) - cliDatabase.MustScan(t, "finding client book 'css_2'", ctx.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) + cliDatabase.MustScan(t, "finding client book 'js'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding client book 'css'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding client book 'js_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) + cliDatabase.MustScan(t, "finding client book 'css_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) // Verify client UUIDs match server assert.Equal(t, cliBookJS.UUID, svrBookJS.UUID, "client 'js' UUID should match server") @@ -4428,10 +4398,10 @@ func TestSync_FreshClientConcurrent(t *testing.T) { // Verify client has all 4 notes var cliNoteJS1, cliNoteJS2, cliNoteCSS1, cliNoteCSS2 cliDatabase.Note - cliDatabase.MustScan(t, "finding client note 'js1'", ctx.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNoteJS1.UUID, &cliNoteJS1.Body, &cliNoteJS1.USN) - cliDatabase.MustScan(t, "finding client note 'js2'", ctx.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js2"), &cliNoteJS2.UUID, &cliNoteJS2.Body, &cliNoteJS2.USN) - cliDatabase.MustScan(t, "finding client note 'css1'", ctx.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliNoteCSS1.UUID, &cliNoteCSS1.Body, &cliNoteCSS1.USN) - cliDatabase.MustScan(t, "finding client note 'css2'", ctx.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css2"), &cliNoteCSS2.UUID, &cliNoteCSS2.Body, &cliNoteCSS2.USN) + cliDatabase.MustScan(t, "finding client note 'js1'", env.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js1"), &cliNoteJS1.UUID, &cliNoteJS1.Body, &cliNoteJS1.USN) + cliDatabase.MustScan(t, "finding client note 'js2'", env.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "js2"), &cliNoteJS2.UUID, &cliNoteJS2.Body, &cliNoteJS2.USN) + cliDatabase.MustScan(t, "finding client note 'css1'", env.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css1"), &cliNoteCSS1.UUID, &cliNoteCSS1.Body, &cliNoteCSS1.USN) + cliDatabase.MustScan(t, "finding client note 'css2'", env.DB.QueryRow("SELECT uuid, body, usn FROM notes WHERE body = ?", "css2"), &cliNoteCSS2.UUID, &cliNoteCSS2.Body, &cliNoteCSS2.USN) // Verify client note UUIDs match server assert.Equal(t, cliNoteJS1.UUID, svrNoteJS1.UUID, "client note 'js1' UUID should match server") @@ -4449,34 +4419,28 @@ func TestSync_FreshClientConcurrent(t *testing.T) { // TestSync_ConvergeSameBookNames tests that two clients don't enter an infinite sync loop if they // try to sync books with the same names. Books shouldn't get marked dirty when re-downloaded from server. func TestSync_ConvergeSameBookNames(t *testing.T) { - // Clean up and prepare server - apitest.ClearData(serverDb) - defer apitest.ClearData(serverDb) - - clearTmp(t) - - ctx := context.InitTestCtx(t, paths, nil) - defer context.TeardownTestCtx(t, ctx) + env := setupTestEnv(t) + tmpDir := t.TempDir() // Setup two separate client databases - client1DB := fmt.Sprintf("%s/client1.db", tmpDirPath) - client2DB := fmt.Sprintf("%s/client2.db", tmpDirPath) + client1DB := fmt.Sprintf("%s/client1.db", tmpDir) + client2DB := fmt.Sprintf("%s/client2.db", tmpDir) defer os.Remove(client1DB) defer os.Remove(client2DB) // Set up sessions - user := setupUser(t, ctx.DB) + user := setupUser(t, env) db1 := testutils.MustOpenDatabase(t, client1DB) db2 := testutils.MustOpenDatabase(t, client2DB) defer db1.Close() defer db2.Close() // Client 1: First sync to empty server - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "add", "testbook", "-c", "client1 note1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "add", "anotherbook", "-c", "client1 note2") - login(t, db1, user) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") - checkStateWithDB(t, db1, user, serverDb, systemState{ + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "add", "testbook", "-c", "client1 note1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "add", "anotherbook", "-c", "client1 note2") + login(t, db1, env.ServerDB, user) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + checkState(t, db1, user, env.ServerDB, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -4487,12 +4451,12 @@ func TestSync_ConvergeSameBookNames(t *testing.T) { }) // Client 2: Sync (downloads client 1's data, adds own notes) ===== - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client2DB, "add", "testbook", "-c", "client2 note1") - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client2DB, "add", "anotherbook", "-c", "client2 note2") - login(t, db2, user) - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client2DB, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DB, "add", "testbook", "-c", "client2 note1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DB, "add", "anotherbook", "-c", "client2 note2") + login(t, db2, env.ServerDB, user) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DB, "sync") // Verify state after client2 sync - checkStateWithDB(t, db2, user, serverDb, systemState{ + checkState(t, db2, user, env.ServerDB, systemState{ clientNoteCount: 4, clientBookCount: 2, clientLastMaxUSN: 8, @@ -4503,11 +4467,11 @@ func TestSync_ConvergeSameBookNames(t *testing.T) { }) // Client 1: Sync again. It downloads client2's changes (2 extra notes). - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") // Verify MaxUSN did not increase (client1 should only download, not upload) // Client1 still has: 2 original books + 4 notes (2 own + 2 from client2) - checkStateWithDB(t, db1, user, serverDb, systemState{ + checkState(t, db1, user, env.ServerDB, systemState{ clientNoteCount: 4, clientBookCount: 2, clientLastMaxUSN: 8, @@ -4521,10 +4485,10 @@ func TestSync_ConvergeSameBookNames(t *testing.T) { // Both clients should be able to sync without any changes (MaxUSN stays at 8) for range 3 { // Client 2 syncs - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client2DB, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DB, "sync") // Verify client2 state unchanged - checkStateWithDB(t, db2, user, serverDb, systemState{ + checkState(t, db2, user, env.ServerDB, systemState{ clientNoteCount: 4, clientBookCount: 2, clientLastMaxUSN: 8, @@ -4535,10 +4499,10 @@ func TestSync_ConvergeSameBookNames(t *testing.T) { }) // Client 1 syncs - clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") // Verify client1 state unchanged - checkStateWithDB(t, db1, user, serverDb, systemState{ + checkState(t, db1, user, env.ServerDB, systemState{ clientNoteCount: 4, clientBookCount: 2, clientLastMaxUSN: 8, diff --git a/pkg/server/.env.test b/pkg/server/.env.test deleted file mode 100644 index b9cf3101..00000000 --- a/pkg/server/.env.test +++ /dev/null @@ -1 +0,0 @@ -APP_ENV=TEST diff --git a/pkg/server/app/notes_test.go b/pkg/server/app/notes_test.go index 38195079..6ee55b8f 100644 --- a/pkg/server/app/notes_test.go +++ b/pkg/server/app/notes_test.go @@ -33,8 +33,6 @@ import ( func TestCreateNote(t *testing.T) { serverTime := time.Date(2017, time.March, 14, 21, 15, 0, 0, time.UTC) - mockClock := clock.NewMock() - mockClock.SetNow(serverTime) ts1 := time.Date(2018, time.November, 12, 10, 11, 0, 0, time.UTC).UnixNano() ts2 := time.Date(2018, time.November, 15, 0, 1, 10, 0, time.UTC).UnixNano() @@ -75,6 +73,10 @@ func TestCreateNote(t *testing.T) { for idx, tc := range testCases { func() { + // Create a new clock for each test case to avoid race conditions in parallel tests + mockClock := clock.NewMock() + mockClock.SetNow(serverTime) + db := testutils.InitMemoryDB(t) user := testutils.SetupUserData(db, "user@test.com", "password123") diff --git a/pkg/server/testutils/main.go b/pkg/server/testutils/main.go index 45c547d0..6b7c21b6 100644 --- a/pkg/server/testutils/main.go +++ b/pkg/server/testutils/main.go @@ -67,26 +67,6 @@ func InitMemoryDB(t *testing.T) *gorm.DB { return db } -// ClearData deletes all records from the database -func ClearData(db *gorm.DB) { - // Delete in order: child tables first, parent tables last - if err := db.Where("1 = 1").Delete(&database.Note{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear notes")) - } - if err := db.Where("1 = 1").Delete(&database.Book{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear books")) - } - if err := db.Where("1 = 1").Delete(&database.Token{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear tokens")) - } - if err := db.Where("1 = 1").Delete(&database.Session{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear sessions")) - } - if err := db.Where("1 = 1").Delete(&database.User{}).Error; err != nil { - panic(errors.Wrap(err, "Failed to clear users")) - } -} - // MustUUID generates a UUID and fails the test on error func MustUUID(t *testing.T) string { uuid, err := helpers.GenUUID() diff --git a/scripts/cli/test.sh b/scripts/cli/test.sh index e66db37a..42e0ad86 100755 --- a/scripts/cli/test.sh +++ b/scripts/cli/test.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash -# test.sh runs test files sequentially -# https://stackoverflow.com/questions/23715302/go-how-to-run-tests-for-multiple-packages +# test.sh runs tests for CLI packages set -eux dir=$(dirname "${BASH_SOURCE[0]}") @@ -8,7 +7,5 @@ pushd "$dir/../../pkg/cli" # clear tmp dir in case not properly torn down rm -rf "./tmp" -go test -a ./... \ - -p 1\ - --tags "fts5" +go test ./... --tags "fts5" popd diff --git a/scripts/e2e/test.sh b/scripts/e2e/test.sh index 8ff94364..8713bb89 100755 --- a/scripts/e2e/test.sh +++ b/scripts/e2e/test.sh @@ -4,10 +4,6 @@ set -eux dir=$(dirname "${BASH_SOURCE[0]}") basePath=$(realpath "$dir/../../") -set -a -source "$basePath/pkg/server/.env.test" -set +a - pushd "$basePath"/pkg/e2e -go test --tags "fts5" ./... -p 1 -v -timeout 5m +go test --tags "fts5" ./... -v -timeout 5m popd diff --git a/scripts/server/test-local.sh b/scripts/server/test-local.sh index ce50d7d6..504ef444 100755 --- a/scripts/server/test-local.sh +++ b/scripts/server/test-local.sh @@ -5,8 +5,4 @@ set -ex dir=$(dirname "${BASH_SOURCE[0]}") -set -a -source "$dir/../../pkg/server/.env.test" -set +a - "$dir/test.sh" "$1" From a46afb821f298a03e68bfa465f2219b4cb78b9d0 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 26 Oct 2025 11:43:17 -0700 Subject: [PATCH 22/33] Fix an edge case of repeated syncs due to orphaned note (#704) * Split sync test * Reproduce a bug * Fix a bug * Fix in a more correct way * Add debug logs --- pkg/cli/client/client.go | 4 +- pkg/cli/cmd/sync/sync.go | 196 +++++- pkg/cli/cmd/sync/sync_test.go | 147 +++- pkg/cli/infra/init.go | 2 +- pkg/cli/log/log.go | 19 +- pkg/cli/migrate/migrate.go | 2 +- pkg/e2e/{sync_test.go => sync/basic_test.go} | 703 +------------------ pkg/e2e/sync/edge_cases_test.go | 73 ++ pkg/e2e/sync/empty_server_test.go | 449 ++++++++++++ pkg/e2e/sync/main_test.go | 59 ++ pkg/e2e/sync/testutils.go | 300 ++++++++ pkg/server/controllers/notes.go | 2 +- 12 files changed, 1204 insertions(+), 752 deletions(-) rename pkg/e2e/{sync_test.go => sync/basic_test.go} (86%) create mode 100644 pkg/e2e/sync/edge_cases_test.go create mode 100644 pkg/e2e/sync/empty_server_test.go create mode 100644 pkg/e2e/sync/main_test.go create mode 100644 pkg/e2e/sync/testutils.go diff --git a/pkg/cli/client/client.go b/pkg/cli/client/client.go index 1e122a3d..3fea9d21 100644 --- a/pkg/cli/client/client.go +++ b/pkg/cli/client/client.go @@ -176,7 +176,7 @@ func doReq(ctx context.DnoteCtx, method, path, body string, options *requestOpti return nil, errors.Wrap(err, "getting request") } - log.Debug("HTTP request: %+v\n", req) + log.Debug("HTTP %s %s\n", method, path) hc := getHTTPClient(ctx, options) res, err := hc.Do(req) @@ -184,7 +184,7 @@ func doReq(ctx context.DnoteCtx, method, path, body string, options *requestOpti return res, errors.Wrap(err, "making http request") } - log.Debug("HTTP response: %+v\n", res) + log.Debug("HTTP %d %s\n", res.StatusCode, res.Status) if err = checkRespErr(res); err != nil { return res, errors.Wrap(err, "server responded with an error") diff --git a/pkg/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go index fd870751..fcfc31fd 100644 --- a/pkg/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -90,6 +90,7 @@ type syncList struct { ExpungedNotes map[string]bool ExpungedBooks map[string]bool MaxUSN int + UserMaxUSN int // Server's actual max USN (for distinguishing empty fragment vs empty server) MaxCurrentTime int64 } @@ -104,6 +105,7 @@ func processFragments(fragments []client.SyncFragment) (syncList, error) { expungedNotes := map[string]bool{} expungedBooks := map[string]bool{} var maxUSN int + var userMaxUSN int var maxCurrentTime int64 for _, fragment := range fragments { @@ -123,6 +125,9 @@ func processFragments(fragments []client.SyncFragment) (syncList, error) { if fragment.FragMaxUSN > maxUSN { maxUSN = fragment.FragMaxUSN } + if fragment.UserMaxUSN > userMaxUSN { + userMaxUSN = fragment.UserMaxUSN + } if fragment.CurrentTime > maxCurrentTime { maxCurrentTime = fragment.CurrentTime } @@ -134,6 +139,7 @@ func processFragments(fragments []client.SyncFragment) (syncList, error) { ExpungedNotes: expungedNotes, ExpungedBooks: expungedBooks, MaxUSN: maxUSN, + UserMaxUSN: userMaxUSN, MaxCurrentTime: maxCurrentTime, } @@ -180,11 +186,68 @@ func getSyncFragments(ctx context.DnoteCtx, afterUSN int) ([]client.SyncFragment } } - log.Debug("received sync fragments: %+v\n", buf) + log.Debug("received sync fragments: %+v\n", redactSyncFragments(buf)) return buf, nil } +// redactSyncFragments returns a deep copy of sync fragments with sensitive fields (note body, book label) removed for safe logging +func redactSyncFragments(fragments []client.SyncFragment) []client.SyncFragment { + redacted := make([]client.SyncFragment, len(fragments)) + for i, frag := range fragments { + // Create new notes with redacted bodies + notes := make([]client.SyncFragNote, len(frag.Notes)) + for j, note := range frag.Notes { + notes[j] = client.SyncFragNote{ + UUID: note.UUID, + BookUUID: note.BookUUID, + USN: note.USN, + CreatedAt: note.CreatedAt, + UpdatedAt: note.UpdatedAt, + AddedOn: note.AddedOn, + EditedOn: note.EditedOn, + Body: func() string { + if note.Body != "" { + return "" + } + return "" + }(), + Deleted: note.Deleted, + } + } + + // Create new books with redacted labels + books := make([]client.SyncFragBook, len(frag.Books)) + for j, book := range frag.Books { + books[j] = client.SyncFragBook{ + UUID: book.UUID, + USN: book.USN, + CreatedAt: book.CreatedAt, + UpdatedAt: book.UpdatedAt, + AddedOn: book.AddedOn, + Label: func() string { + if book.Label != "" { + return "" + } + return "" + }(), + Deleted: book.Deleted, + } + } + + redacted[i] = client.SyncFragment{ + FragMaxUSN: frag.FragMaxUSN, + UserMaxUSN: frag.UserMaxUSN, + CurrentTime: frag.CurrentTime, + Notes: notes, + Books: books, + ExpungedNotes: frag.ExpungedNotes, + ExpungedBooks: frag.ExpungedBooks, + } + } + return redacted +} + // resolveLabel resolves a book label conflict by repeatedly appending an increasing integer // to the label until it finds a unique label. It returns the first non-conflicting label. func resolveLabel(tx *database.DB, label string) (string, error) { @@ -540,6 +603,8 @@ func fullSync(ctx context.DnoteCtx, tx *database.DB) error { log.Debug("performing a full sync\n") log.Info("resolving delta.") + log.DebugNewline() + list, err := getSyncList(ctx, 0) if err != nil { return errors.Wrap(err, "getting sync list") @@ -547,6 +612,8 @@ func fullSync(ctx context.DnoteCtx, tx *database.DB) error { fmt.Printf(" (total %d).", list.getLength()) + log.DebugNewline() + // clean resources that are in erroneous states if err := cleanLocalNotes(tx, &list); err != nil { return errors.Wrap(err, "cleaning up local notes") @@ -577,7 +644,7 @@ func fullSync(ctx context.DnoteCtx, tx *database.DB) error { } } - err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN) + err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN, list.UserMaxUSN) if err != nil { return errors.Wrap(err, "saving sync state") } @@ -592,6 +659,8 @@ func stepSync(ctx context.DnoteCtx, tx *database.DB, afterUSN int) error { log.Info("resolving delta.") + log.DebugNewline() + list, err := getSyncList(ctx, afterUSN) if err != nil { return errors.Wrap(err, "getting sync list") @@ -621,7 +690,7 @@ func stepSync(ctx context.DnoteCtx, tx *database.DB, afterUSN int) error { } } - err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN) + err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN, list.UserMaxUSN) if err != nil { return errors.Wrap(err, "saving sync state") } @@ -677,13 +746,9 @@ func sendBooks(ctx context.DnoteCtx, tx *database.DB) (bool, error) { } else { resp, err := client.CreateBook(ctx, book.Label) if err != nil { - // If we get a 409 conflict, it means another client uploaded data. - if isConflictError(err) { - log.Debug("409 conflict creating book %s, will retry after sync\n", book.Label) - isBehind = true - continue - } - return isBehind, errors.Wrap(err, "creating a book") + log.Debug("error creating book (will retry after stepSync): %v\n", err) + isBehind = true + continue } _, err = tx.Exec("UPDATE notes SET book_uuid = ? WHERE book_uuid = ?", resp.Book.UUID, book.UUID) @@ -755,9 +820,91 @@ func sendBooks(ctx context.DnoteCtx, tx *database.DB) (bool, error) { return isBehind, nil } +// findOrphanedNotes returns a list of all orphaned notes +func findOrphanedNotes(db *database.DB) (int, []struct{ noteUUID, bookUUID string }, error) { + var orphanCount int + err := db.QueryRow(` + SELECT COUNT(*) FROM notes n + WHERE NOT EXISTS ( + SELECT 1 FROM books b + WHERE b.uuid = n.book_uuid + AND NOT b.deleted + ) + `).Scan(&orphanCount) + if err != nil { + return 0, nil, err + } + + if orphanCount == 0 { + return 0, nil, nil + } + + rows, err := db.Query(` + SELECT n.uuid, n.book_uuid + FROM notes n + WHERE NOT EXISTS ( + SELECT 1 FROM books b + WHERE b.uuid = n.book_uuid + AND NOT b.deleted + ) + `) + if err != nil { + return orphanCount, nil, err + } + defer rows.Close() + + var orphans []struct{ noteUUID, bookUUID string } + for rows.Next() { + var noteUUID, bookUUID string + if err := rows.Scan(¬eUUID, &bookUUID); err != nil { + continue + } + orphans = append(orphans, struct{ noteUUID, bookUUID string }{noteUUID, bookUUID}) + } + + return orphanCount, orphans, nil +} + +func warnOrphanedNotes(tx *database.DB) { + count, orphans, err := findOrphanedNotes(tx) + if err != nil { + log.Debug("error checking orphaned notes: %v\n", err) + return + } + + if count == 0 { + return + } + + log.Debug("Found %d orphaned notes (book doesn't exist locally):\n", count) + for _, o := range orphans { + log.Debug("note %s (book %s)\n", o.noteUUID, o.bookUUID) + } +} + +// checkPostSyncIntegrity checks for data integrity issues after sync and warns the user +func checkPostSyncIntegrity(db *database.DB) { + count, orphans, err := findOrphanedNotes(db) + if err != nil { + log.Debug("error checking orphaned notes: %v\n", err) + return + } + + if count == 0 { + return + } + + log.Warnf("Found %d orphaned notes (referencing non-existent or deleted books):\n", count) + for _, o := range orphans { + log.Plainf(" - note %s (missing book: %s)\n", o.noteUUID, o.bookUUID) + } +} + func sendNotes(ctx context.DnoteCtx, tx *database.DB) (bool, error) { isBehind := false + warnOrphanedNotes(tx) + rows, err := tx.Query("SELECT uuid, book_uuid, body, deleted, usn, added_on FROM notes WHERE dirty") if err != nil { return isBehind, errors.Wrap(err, "getting syncable notes") @@ -771,7 +918,7 @@ func sendNotes(ctx context.DnoteCtx, tx *database.DB) (bool, error) { return isBehind, errors.Wrap(err, "scanning a syncable note") } - log.Debug("sending note %s\n", note.UUID) + log.Debug("sending note %s (book: %s)\n", note.UUID, note.BookUUID) var respUSN int @@ -788,8 +935,7 @@ func sendNotes(ctx context.DnoteCtx, tx *database.DB) (bool, error) { } else { resp, err := client.CreateNote(ctx, note.BookUUID, note.Body) if err != nil { - // If we get a 409 conflict, it means another client uploaded data. - log.Debug("error creating note (will retry after sync): %v\n", err) + log.Debug("failed to create note %s (book: %s): %v\n", note.UUID, note.BookUUID, err) isBehind = true continue } @@ -866,6 +1012,8 @@ func sendChanges(ctx context.DnoteCtx, tx *database.DB) (bool, error) { fmt.Printf(" (total %d).", delta) + log.DebugNewline() + behind1, err := sendBooks(ctx, tx) if err != nil { return behind1, errors.Wrap(err, "sending books") @@ -899,10 +1047,24 @@ func updateLastSyncAt(tx *database.DB, val int64) error { return nil } -func saveSyncState(tx *database.DB, serverTime int64, serverMaxUSN int) error { - if err := updateLastMaxUSN(tx, serverMaxUSN); err != nil { - return errors.Wrap(err, "updating last max usn") +func saveSyncState(tx *database.DB, serverTime int64, serverMaxUSN int, userMaxUSN int) error { + // Handle last_max_usn update based on server state: + // - If serverMaxUSN > 0: we got data, update to serverMaxUSN + // - If serverMaxUSN == 0 && userMaxUSN > 0: empty fragment (caught up), preserve existing + // - If serverMaxUSN == 0 && userMaxUSN == 0: empty server, reset to 0 + if serverMaxUSN > 0 { + if err := updateLastMaxUSN(tx, serverMaxUSN); err != nil { + return errors.Wrap(err, "updating last max usn") + } + } else if userMaxUSN == 0 { + // Server is empty, reset to 0 + if err := updateLastMaxUSN(tx, 0); err != nil { + return errors.Wrap(err, "updating last max usn") + } } + // else: empty fragment but server has data, preserve existing last_max_usn + + // Always update last_sync_at (we did communicate with server) if err := updateLastSyncAt(tx, serverTime); err != nil { return errors.Wrap(err, "updating last sync at") } @@ -1065,6 +1227,8 @@ func newRun(ctx context.DnoteCtx) infra.RunEFunc { log.Success("success\n") + checkPostSyncIntegrity(ctx.DB) + if err := upgrade.Check(ctx); err != nil { log.Error(errors.Wrap(err, "automatically checking updates").Error()) } diff --git a/pkg/cli/cmd/sync/sync_test.go b/pkg/cli/cmd/sync/sync_test.go index 828179f5..6c22e926 100644 --- a/pkg/cli/cmd/sync/sync_test.go +++ b/pkg/cli/cmd/sync/sync_test.go @@ -36,7 +36,6 @@ import ( "github.com/pkg/errors" ) - func TestProcessFragments(t *testing.T) { fragments := []client.SyncFragment{ { @@ -98,6 +97,7 @@ func TestProcessFragments(t *testing.T) { ExpungedNotes: map[string]bool{}, ExpungedBooks: map[string]bool{}, MaxUSN: 10, + UserMaxUSN: 10, MaxCurrentTime: 1550436136, } @@ -1796,41 +1796,132 @@ func TestMergeBook(t *testing.T) { } func TestSaveServerState(t *testing.T) { - // set up - db := database.InitTestMemoryDB(t) - testutils.LoginDB(t, db) + t.Run("with data received", func(t *testing.T) { + // set up + db := database.InitTestMemoryDB(t) + testutils.LoginDB(t, db) - database.MustExec(t, "inserting last synced at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, int64(1231108742)) - database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 8) + database.MustExec(t, "inserting last synced at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, int64(1231108742)) + database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 8) - // execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) - } + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } - serverTime := int64(1541108743) - serverMaxUSN := 100 + serverTime := int64(1541108743) + serverMaxUSN := 100 + userMaxUSN := 100 - err = saveSyncState(tx, serverTime, serverMaxUSN) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "executing").Error()) - } + err = saveSyncState(tx, serverTime, serverMaxUSN, userMaxUSN) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } - tx.Commit() + tx.Commit() - // test - var lastSyncedAt int64 - var lastMaxUSN int + // test + var lastSyncedAt int64 + var lastMaxUSN int - database.MustScan(t, "getting system value", - db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &lastSyncedAt) - database.MustScan(t, "getting system value", - db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &lastSyncedAt) + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) - assert.Equal(t, lastSyncedAt, serverTime, "last synced at mismatch") - assert.Equal(t, lastMaxUSN, serverMaxUSN, "last max usn mismatch") + assert.Equal(t, lastSyncedAt, serverTime, "last synced at mismatch") + assert.Equal(t, lastMaxUSN, serverMaxUSN, "last max usn mismatch") + }) + + t.Run("with empty fragment but server has data - preserves last_max_usn", func(t *testing.T) { + // This tests the fix for the infinite sync bug where empty fragments + // would reset last_max_usn to 0, causing the client to re-download all data. + // When serverMaxUSN=0 (no data in fragment) but userMaxUSN>0 (server has data), + // we're caught up and should preserve the existing last_max_usn. + + // set up + db := database.InitTestMemoryDB(t) + testutils.LoginDB(t, db) + + existingLastMaxUSN := 100 + database.MustExec(t, "inserting last synced at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, int64(1231108742)) + database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, existingLastMaxUSN) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + serverTime := int64(1541108743) + serverMaxUSN := 0 // Empty fragment (no data in this sync) + userMaxUSN := 150 // Server's actual max USN (higher than ours) + + err = saveSyncState(tx, serverTime, serverMaxUSN, userMaxUSN) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var lastSyncedAt int64 + var lastMaxUSN int + + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &lastSyncedAt) + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + + assert.Equal(t, lastSyncedAt, serverTime, "last synced at should be updated") + // last_max_usn should NOT be updated to 0, it should preserve the existing value + assert.Equal(t, lastMaxUSN, existingLastMaxUSN, "last max usn should be preserved when fragment is empty but server has data") + }) + + t.Run("with empty server - resets last_max_usn to 0", func(t *testing.T) { + // When both serverMaxUSN=0 and userMaxUSN=0, the server is truly empty + // and we should reset last_max_usn to 0. + + // set up + db := database.InitTestMemoryDB(t) + testutils.LoginDB(t, db) + + database.MustExec(t, "inserting last synced at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, int64(1231108742)) + database.MustExec(t, "inserting last max usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 50) + + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } + + serverTime := int64(1541108743) + serverMaxUSN := 0 // Empty fragment + userMaxUSN := 0 // Server is actually empty + + err = saveSyncState(tx, serverTime, serverMaxUSN, userMaxUSN) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } + + tx.Commit() + + // test + var lastSyncedAt int64 + var lastMaxUSN int + + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &lastSyncedAt) + database.MustScan(t, "getting system value", + db.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + + assert.Equal(t, lastSyncedAt, serverTime, "last synced at should be updated") + assert.Equal(t, lastMaxUSN, 0, "last max usn should be reset to 0 when server is empty") + }) } // TestSendBooks tests that books are put to correct 'buckets' by running a test server and recording the diff --git a/pkg/cli/infra/init.go b/pkg/cli/infra/init.go index 1e572cf7..b87cfdd4 100644 --- a/pkg/cli/infra/init.go +++ b/pkg/cli/infra/init.go @@ -137,7 +137,7 @@ func Init(versionTag, apiEndpoint, dbPath string) (*context.DnoteCtx, error) { return nil, errors.Wrap(err, "setting up the context") } - log.Debug("Running with Dnote context: %+v\n", context.Redact(ctx)) + log.Debug("context: %+v\n", context.Redact(ctx)) return &ctx, nil } diff --git a/pkg/cli/log/log.go b/pkg/cli/log/log.go index 36c8cdd1..dc78e2b4 100644 --- a/pkg/cli/log/log.go +++ b/pkg/cli/log/log.go @@ -25,6 +25,11 @@ import ( "github.com/fatih/color" ) +const ( + debugEnvName = "DNOTE_DEBUG" + debugEnvValue = "1" +) + var ( // ColorRed is a red foreground color ColorRed = color.New(color.FgRed) @@ -105,9 +110,21 @@ func Askf(msg string, masked bool, v ...interface{}) { fmt.Fprintf(color.Output, "%s%s %s: ", indent, symbol, fmt.Sprintf(msg, v...)) } +// isDebug returns true if debug mode is enabled +func isDebug() bool { + return os.Getenv(debugEnvName) == debugEnvValue +} + // Debug prints to the console if DNOTE_DEBUG is set func Debug(msg string, v ...interface{}) { - if os.Getenv("DNOTE_DEBUG") == "1" { + if isDebug() { fmt.Fprintf(color.Output, "%s %s", ColorGray.Sprint("DEBUG:"), fmt.Sprintf(msg, v...)) } } + +// DebugNewline prints a newline only in debug mode +func DebugNewline() { + if isDebug() { + fmt.Println() + } +} diff --git a/pkg/cli/migrate/migrate.go b/pkg/cli/migrate/migrate.go index eadfeda4..d579ffb7 100644 --- a/pkg/cli/migrate/migrate.go +++ b/pkg/cli/migrate/migrate.go @@ -144,7 +144,7 @@ func Run(ctx context.DnoteCtx, migrations []migration, mode int) error { return errors.Wrap(err, "getting the current schema") } - log.Debug("current schema: %s %d of %d\n", consts.SystemSchema, schema, len(migrations)) + log.Debug("%s: %d of %d\n", schemaKey, schema, len(migrations)) toRun := migrations[schema:] diff --git a/pkg/e2e/sync_test.go b/pkg/e2e/sync/basic_test.go similarity index 86% rename from pkg/e2e/sync_test.go rename to pkg/e2e/sync/basic_test.go index 10df15c9..4986229a 100644 --- a/pkg/e2e/sync_test.go +++ b/pkg/e2e/sync/basic_test.go @@ -16,307 +16,21 @@ * along with Dnote. If not, see . */ -package main +package sync import ( - "bytes" - "encoding/json" "fmt" - "io" - "log" - "net/http" - "net/http/httptest" "os" - "os/exec" - "path/filepath" - "strings" "testing" - "time" "github.com/dnote/dnote/pkg/assert" - "github.com/dnote/dnote/pkg/cli/consts" cliDatabase "github.com/dnote/dnote/pkg/cli/database" "github.com/dnote/dnote/pkg/cli/testutils" clitest "github.com/dnote/dnote/pkg/cli/testutils" - "github.com/dnote/dnote/pkg/clock" - "github.com/dnote/dnote/pkg/server/app" - "github.com/dnote/dnote/pkg/server/controllers" "github.com/dnote/dnote/pkg/server/database" - "github.com/dnote/dnote/pkg/server/mailer" apitest "github.com/dnote/dnote/pkg/server/testutils" - "github.com/pkg/errors" - "gorm.io/gorm" ) -var cliBinaryName string -var serverTime = time.Date(2017, time.March, 14, 21, 15, 0, 0, time.UTC) - -var testDir = "./tmp/.dnote" - -func init() { - cliBinaryName = fmt.Sprintf("%s/test/cli/test-cli", testDir) -} - -// testEnv holds the test environment for a single test -type testEnv struct { - DB *cliDatabase.DB - CmdOpts clitest.RunDnoteCmdOptions - Server *httptest.Server - ServerDB *gorm.DB - TmpDir string -} - -// setupTestEnv creates an isolated test environment with its own database and temp directory -func setupTestEnv(t *testing.T) testEnv { - tmpDir := t.TempDir() - - // Create .dnote directory - dnoteDir := filepath.Join(tmpDir, consts.DnoteDirName) - if err := os.MkdirAll(dnoteDir, 0755); err != nil { - t.Fatal(errors.Wrap(err, "creating dnote directory")) - } - - // Create database at the expected path - dbPath := filepath.Join(dnoteDir, consts.DnoteDBFileName) - db := cliDatabase.InitTestFileDBRaw(t, dbPath) - - // Create server - server, serverDB := setupNewServer(t) - - // Create config file with this server's endpoint - apiEndpoint := fmt.Sprintf("%s/api", server.URL) - updateConfigAPIEndpoint(t, tmpDir, apiEndpoint) - - // Create command options with XDG paths pointing to temp dir - cmdOpts := clitest.RunDnoteCmdOptions{ - Env: []string{ - fmt.Sprintf("XDG_CONFIG_HOME=%s", tmpDir), - fmt.Sprintf("XDG_DATA_HOME=%s", tmpDir), - fmt.Sprintf("XDG_CACHE_HOME=%s", tmpDir), - }, - } - - return testEnv{ - DB: db, - CmdOpts: cmdOpts, - Server: server, - ServerDB: serverDB, - TmpDir: tmpDir, - } -} - -// setupTestServer creates a test server with its own database -func setupTestServer(t *testing.T, serverTime time.Time) (*httptest.Server, *gorm.DB, error) { - db := apitest.InitMemoryDB(t) - - mockClock := clock.NewMock() - mockClock.SetNow(serverTime) - - a := app.NewTest() - a.Clock = mockClock - a.EmailTemplates = mailer.Templates{} - a.EmailBackend = &apitest.MockEmailbackendImplementation{} - a.DB = db - - server, err := controllers.NewServer(&a) - if err != nil { - return nil, nil, errors.Wrap(err, "initializing server") - } - - return server, db, nil -} - -// setupNewServer creates a new server and returns the server and database. -// This is useful when a test needs to switch to a new empty server. -func setupNewServer(t *testing.T) (*httptest.Server, *gorm.DB) { - server, serverDB, err := setupTestServer(t, serverTime) - if err != nil { - t.Fatal(errors.Wrap(err, "setting up new test server")) - } - t.Cleanup(func() { server.Close() }) - - return server, serverDB -} - -// updateConfigAPIEndpoint updates the config file with the given API endpoint -func updateConfigAPIEndpoint(t *testing.T, tmpDir string, apiEndpoint string) { - dnoteDir := filepath.Join(tmpDir, consts.DnoteDirName) - configPath := filepath.Join(dnoteDir, consts.ConfigFilename) - configContent := fmt.Sprintf("apiEndpoint: %s\n", apiEndpoint) - if err := os.WriteFile(configPath, []byte(configContent), 0644); err != nil { - t.Fatal(errors.Wrap(err, "writing config file")) - } -} - -// switchToEmptyServer closes the current server and creates a new empty server, -// updating the config file to point to it. -func switchToEmptyServer(t *testing.T, env *testEnv) { - // Close old server - env.Server.Close() - - // Create new empty server - env.Server, env.ServerDB = setupNewServer(t) - - // Update config file to point to new server - apiEndpoint := fmt.Sprintf("%s/api", env.Server.URL) - updateConfigAPIEndpoint(t, env.TmpDir, apiEndpoint) -} - -func TestMain(m *testing.M) { - // Build CLI binary without hardcoded API endpoint - // Each test will create its own server and config file - cmd := exec.Command("go", "build", "--tags", "fts5", "-o", cliBinaryName, "github.com/dnote/dnote/pkg/cli") - - var stderr bytes.Buffer - cmd.Stderr = &stderr - - if err := cmd.Run(); err != nil { - log.Print(errors.Wrap(err, "building a CLI binary").Error()) - log.Print(stderr.String()) - os.Exit(1) - } - - os.Exit(m.Run()) -} - -// helpers -func setupUser(t *testing.T, env testEnv) database.User { - user := apitest.SetupUserData(env.ServerDB, "alice@example.com", "pass1234") - - return user -} - -func setupUserAndLogin(t *testing.T, env testEnv) database.User { - user := setupUser(t, env) - login(t, env.DB, env.ServerDB, user) - - return user -} - -// log in the user in CLI -func login(t *testing.T, db *cliDatabase.DB, serverDB *gorm.DB, user database.User) { - session := apitest.SetupSession(serverDB, user) - - cliDatabase.MustExec(t, "inserting session_key", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, session.Key) - cliDatabase.MustExec(t, "inserting session_key_expiry", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, session.ExpiresAt.Unix()) -} - -func apiCreateBook(t *testing.T, env testEnv, user database.User, name, message string) string { - res := doHTTPReq(t, env, "POST", "/v3/books", fmt.Sprintf(`{"name": "%s"}`, name), message, user) - - var resp controllers.CreateBookResp - if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { - t.Fatal(errors.Wrap(err, "decoding payload for adding book")) - return "" - } - - return resp.Book.UUID -} - -func apiPatchBook(t *testing.T, env testEnv, user database.User, uuid, payload, message string) { - doHTTPReq(t, env, "PATCH", fmt.Sprintf("/v3/books/%s", uuid), payload, message, user) -} - -func apiDeleteBook(t *testing.T, env testEnv, user database.User, uuid, message string) { - doHTTPReq(t, env, "DELETE", fmt.Sprintf("/v3/books/%s", uuid), "", message, user) -} - -func apiCreateNote(t *testing.T, env testEnv, user database.User, bookUUID, body, message string) string { - res := doHTTPReq(t, env, "POST", "/v3/notes", fmt.Sprintf(`{"book_uuid": "%s", "content": "%s"}`, bookUUID, body), message, user) - - var resp controllers.CreateNoteResp - if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { - t.Fatal(errors.Wrap(err, "decoding payload for adding note")) - return "" - } - - return resp.Result.UUID -} - -func apiPatchNote(t *testing.T, env testEnv, user database.User, noteUUID, payload, message string) { - doHTTPReq(t, env, "PATCH", fmt.Sprintf("/v3/notes/%s", noteUUID), payload, message, user) -} - -func apiDeleteNote(t *testing.T, env testEnv, user database.User, noteUUID, message string) { - doHTTPReq(t, env, "DELETE", fmt.Sprintf("/v3/notes/%s", noteUUID), "", message, user) -} - -func doHTTPReq(t *testing.T, env testEnv, method, path, payload, message string, user database.User) *http.Response { - apiEndpoint := fmt.Sprintf("%s/api", env.Server.URL) - endpoint := fmt.Sprintf("%s%s", apiEndpoint, path) - - req, err := http.NewRequest(method, endpoint, strings.NewReader(payload)) - if err != nil { - panic(errors.Wrap(err, "constructing http request")) - } - - res := apitest.HTTPAuthDo(t, env.ServerDB, req, user) - if res.StatusCode >= 400 { - bs, err := io.ReadAll(res.Body) - if err != nil { - panic(errors.Wrap(err, "parsing response body for error")) - } - - t.Errorf("%s. HTTP status %d. Message: %s", message, res.StatusCode, string(bs)) - } - - return res -} - -type setupFunc func(t *testing.T, env testEnv, user database.User) map[string]string -type assertFunc func(t *testing.T, env testEnv, user database.User, ids map[string]string) - -func testSyncCmd(t *testing.T, fullSync bool, setup setupFunc, assert assertFunc) { - env := setupTestEnv(t) - - user := setupUserAndLogin(t, env) - ids := setup(t, env, user) - - if fullSync { - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") - } else { - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - } - - assert(t, env, user, ids) -} - -type systemState struct { - clientNoteCount int - clientBookCount int - clientLastMaxUSN int - clientLastSyncAt int64 - serverNoteCount int64 - serverBookCount int64 - serverUserMaxUSN int -} - -// checkState compares the state of the client and the server with the given system state -func checkState(t *testing.T, clientDB *cliDatabase.DB, user database.User, serverDB *gorm.DB, expected systemState) { - var clientBookCount, clientNoteCount int - cliDatabase.MustScan(t, "counting client notes", clientDB.QueryRow("SELECT count(*) FROM notes"), &clientNoteCount) - cliDatabase.MustScan(t, "counting client books", clientDB.QueryRow("SELECT count(*) FROM books"), &clientBookCount) - assert.Equal(t, clientNoteCount, expected.clientNoteCount, "client note count mismatch") - assert.Equal(t, clientBookCount, expected.clientBookCount, "client book count mismatch") - - var clientLastMaxUSN int - var clientLastSyncAt int64 - cliDatabase.MustScan(t, "finding system last_max_usn", clientDB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &clientLastMaxUSN) - cliDatabase.MustScan(t, "finding system last_sync_at", clientDB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &clientLastSyncAt) - assert.Equal(t, clientLastMaxUSN, expected.clientLastMaxUSN, "client last_max_usn mismatch") - assert.Equal(t, clientLastSyncAt, expected.clientLastSyncAt, "client last_sync_at mismatch") - - var serverBookCount, serverNoteCount int64 - apitest.MustExec(t, serverDB.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") - apitest.MustExec(t, serverDB.Model(&database.Book{}).Count(&serverBookCount), "counting api notes") - assert.Equal(t, serverNoteCount, expected.serverNoteCount, "server note count mismatch") - assert.Equal(t, serverBookCount, expected.serverBookCount, "server book count mismatch") - var serverUser database.User - apitest.MustExec(t, serverDB.Where("id = ?", user.ID).First(&serverUser), "finding user") - assert.Equal(t, serverUser.MaxUSN, expected.serverUserMaxUSN, "user max_usn mismatch") -} - -// tests func TestSync_Empty(t *testing.T) { setup := func(t *testing.T, env testEnv, user database.User) map[string]string { return map[string]string{} @@ -3896,421 +3610,6 @@ func TestFullSync(t *testing.T) { }) } -func TestSync_EmptyServer(t *testing.T) { - t.Run("sync to empty server after syncing to non-empty server", func(t *testing.T) { - // Test server data loss/wipe scenario (disaster recovery): - // Verify empty server detection works when the server loses all its data - - env := setupTestEnv(t) - - user := setupUserAndLogin(t, env) - - // Step 1: Create local data and sync to server - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - - // Verify sync succeeded - checkState(t, env.DB, user, env.ServerDB, systemState{ - clientNoteCount: 2, - clientBookCount: 2, - clientLastMaxUSN: 4, - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 2, - serverBookCount: 2, - serverUserMaxUSN: 4, - }) - - // Step 2: Switch to a completely new empty server - switchToEmptyServer(t, &env) - - // Recreate user and session on new server - user = setupUserAndLogin(t, env) - - // Step 3: Sync again - should detect empty server and prompt user - // User confirms with "y" - clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync") - - // Step 4: Verify data was uploaded to the empty server - checkState(t, env.DB, user, env.ServerDB, systemState{ - clientNoteCount: 2, - clientBookCount: 2, - clientLastMaxUSN: 4, - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 2, - serverBookCount: 2, - serverUserMaxUSN: 4, - }) - - // Verify the content is correct on both client and server - var cliNote1JS, cliNote1CSS cliDatabase.Note - var cliBookJS, cliBookCSS cliDatabase.Book - cliDatabase.MustScan(t, "finding cliNote1JS", env.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body) - cliDatabase.MustScan(t, "finding cliNote1CSS", env.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body) - cliDatabase.MustScan(t, "finding cliBookJS", env.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label) - cliDatabase.MustScan(t, "finding cliBookCSS", env.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label) - - assert.Equal(t, cliNote1JS.Body, "js1", "js note body mismatch") - assert.Equal(t, cliNote1CSS.Body, "css1", "css note body mismatch") - assert.Equal(t, cliBookJS.Label, "js", "js book label mismatch") - assert.Equal(t, cliBookCSS.Label, "css", "css book label mismatch") - - // Verify on server side - var serverNoteJS, serverNoteCSS database.Note - var serverBookJS, serverBookCSS database.Book - apitest.MustExec(t, env.ServerDB.Where("body = ?", "js1").First(&serverNoteJS), "finding server note js1") - apitest.MustExec(t, env.ServerDB.Where("body = ?", "css1").First(&serverNoteCSS), "finding server note css1") - apitest.MustExec(t, env.ServerDB.Where("label = ?", "js").First(&serverBookJS), "finding server book js") - apitest.MustExec(t, env.ServerDB.Where("label = ?", "css").First(&serverBookCSS), "finding server book css") - - assert.Equal(t, serverNoteJS.Body, "js1", "server js note body mismatch") - assert.Equal(t, serverNoteCSS.Body, "css1", "server css note body mismatch") - assert.Equal(t, serverBookJS.Label, "js", "server js book label mismatch") - assert.Equal(t, serverBookCSS.Label, "css", "server css book label mismatch") - }) - - t.Run("user cancels empty server prompt", func(t *testing.T) { - env := setupTestEnv(t) - - user := setupUserAndLogin(t, env) - - // Step 1: Create local data and sync to server - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - - // Verify initial sync succeeded - checkState(t, env.DB, user, env.ServerDB, systemState{ - clientNoteCount: 2, - clientBookCount: 2, - clientLastMaxUSN: 4, - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 2, - serverBookCount: 2, - serverUserMaxUSN: 4, - }) - - // Step 2: Switch to empty server - switchToEmptyServer(t, &env) - user = setupUserAndLogin(t, env) - - // Step 3: Sync again but user cancels with "n" - output, err := clitest.WaitDnoteCmd(t, env.CmdOpts, clitest.UserCancelEmptyServerSync, cliBinaryName, "sync") - if err == nil { - t.Fatal("Expected sync to fail when user cancels, but it succeeded") - } - - // Verify the prompt appeared - if !strings.Contains(output, clitest.PromptEmptyServer) { - t.Fatalf("Expected empty server warning in output, got: %s", output) - } - - // Step 4: Verify local state unchanged (transaction rolled back) - checkState(t, env.DB, user, env.ServerDB, systemState{ - clientNoteCount: 2, - clientBookCount: 2, - clientLastMaxUSN: 4, - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 0, - serverBookCount: 0, - serverUserMaxUSN: 0, - }) - - // Verify items still have original USN and dirty=false - var book cliDatabase.Book - var note cliDatabase.Note - cliDatabase.MustScan(t, "checking book state", env.DB.QueryRow("SELECT usn, dirty FROM books WHERE label = ?", "js"), &book.USN, &book.Dirty) - cliDatabase.MustScan(t, "checking note state", env.DB.QueryRow("SELECT usn, dirty FROM notes WHERE body = ?", "js1"), ¬e.USN, ¬e.Dirty) - - assert.NotEqual(t, book.USN, 0, "book USN should not be reset") - assert.NotEqual(t, note.USN, 0, "note USN should not be reset") - assert.Equal(t, book.Dirty, false, "book should not be marked dirty") - assert.Equal(t, note.Dirty, false, "note should not be marked dirty") - }) - - t.Run("all local data is marked deleted - should not upload", func(t *testing.T) { - // Test edge case: Server MaxUSN=0, local MaxUSN>0, but all items are deleted=true - // Should NOT prompt because there's nothing to upload - - env := setupTestEnv(t) - - user := setupUserAndLogin(t, env) - - // Step 1: Create local data and sync to server - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - - // Verify initial sync succeeded - checkState(t, env.DB, user, env.ServerDB, systemState{ - clientNoteCount: 2, - clientBookCount: 2, - clientLastMaxUSN: 4, - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 2, - serverBookCount: 2, - serverUserMaxUSN: 4, - }) - - // Step 2: Delete all local notes and books (mark as deleted) - cliDatabase.MustExec(t, "marking all books deleted", env.DB, "UPDATE books SET deleted = 1") - cliDatabase.MustExec(t, "marking all notes deleted", env.DB, "UPDATE notes SET deleted = 1") - - // Step 3: Switch to empty server - switchToEmptyServer(t, &env) - user = setupUserAndLogin(t, env) - - // Step 4: Sync - should NOT prompt because bookCount=0 and noteCount=0 (counting only deleted=0) - // This should complete without user interaction - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - - // Verify no data was uploaded (server still empty, but client still has deleted items) - // Check server is empty - var serverNoteCount, serverBookCount int64 - apitest.MustExec(t, env.ServerDB.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") - apitest.MustExec(t, env.ServerDB.Model(&database.Book{}).Count(&serverBookCount), "counting server books") - assert.Equal(t, serverNoteCount, int64(0), "server should have no notes") - assert.Equal(t, serverBookCount, int64(0), "server should have no books") - - // Check client still has the deleted items locally - var clientNoteCount, clientBookCount int - cliDatabase.MustScan(t, "counting client notes", env.DB.QueryRow("SELECT count(*) FROM notes WHERE deleted = 1"), &clientNoteCount) - cliDatabase.MustScan(t, "counting client books", env.DB.QueryRow("SELECT count(*) FROM books WHERE deleted = 1"), &clientBookCount) - assert.Equal(t, clientNoteCount, 2, "client should still have 2 deleted notes") - assert.Equal(t, clientBookCount, 2, "client should still have 2 deleted books") - - // Verify lastMaxUSN was reset to 0 - var lastMaxUSN int - cliDatabase.MustScan(t, "getting lastMaxUSN", env.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) - assert.Equal(t, lastMaxUSN, 0, "lastMaxUSN should be reset to 0") - }) - - t.Run("race condition - other client uploads first", func(t *testing.T) { - // This test exercises a race condition that can occur during sync: - // While Client A is waiting for user input, Client B uploads data to the server. - // - // The empty server scenario is the natural place to test this because - // an empty server detection triggers a prompt, at which point the test - // can make client B upload data. We trigger the race condition deterministically. - // - // Test flow: - // - Client A detects empty server and prompts user - // - While waiting for confirmation, Client B uploads the same data via API - // - Client A continues and handles the 409 conflict gracefully by: - // 1. Detecting the 409 error when trying to CREATE books that already exist - // 2. Running stepSync to pull the server's books (js, css) - // 3. mergeBook renames local conflicts (js→js_2, css→css_2) - // 4. Retrying sendChanges to upload the renamed books - // - Result: Both clients' data is preserved (4 books total) - - env := setupTestEnv(t) - - user := setupUserAndLogin(t, env) - - // Step 1: Create local data and sync to establish lastMaxUSN > 0 - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - - // Verify initial sync succeeded - checkState(t, env.DB, user, env.ServerDB, systemState{ - clientNoteCount: 2, - clientBookCount: 2, - clientLastMaxUSN: 4, - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 2, - serverBookCount: 2, - serverUserMaxUSN: 4, - }) - - // Step 2: Switch to new empty server to simulate switching to empty server - switchToEmptyServer(t, &env) - - // Create user on new server and login - user = setupUserAndLogin(t, env) - - // Step 3: Trigger sync which will detect empty server and prompt user - // Inside the callback (before confirming), we simulate Client B uploading via API. - // We wait for the empty server prompt to ensure Client B uploads AFTER - // GetSyncState but BEFORE the sync decision, creating the race condition deterministically - raceCallback := func(stdout io.Reader, stdin io.WriteCloser) error { - // First, wait for the prompt to ensure Client A has obtained the sync state from the server. - clitest.MustWaitForPrompt(t, stdout, clitest.PromptEmptyServer) - - // Now Client B uploads the same data via API (after Client A got the sync state from the server - // but before its sync decision) - // This creates the race condition: Client A thinks server is empty, but Client B uploads data - jsBookUUID := apiCreateBook(t, env, user, "js", "client B creating js book") - cssBookUUID := apiCreateBook(t, env, user, "css", "client B creating css book") - apiCreateNote(t, env, user, jsBookUUID, "js1", "client B creating js note") - apiCreateNote(t, env, user, cssBookUUID, "css1", "client B creating css note") - - // Now user confirms - if _, err := io.WriteString(stdin, "y\n"); err != nil { - return errors.Wrap(err, "confirming sync") - } - - return nil - } - - // Step 4: Client A runs sync with race condition - // The 409 conflict is automatically handled: - // - When 409 is detected, isBehind flag is set - // - stepSync pulls Client B's data - // - mergeBook renames Client A's books to js_2, css_2 - // - Renamed books are uploaded - // - Both clients' data is preserved. - clitest.MustWaitDnoteCmd(t, env.CmdOpts, raceCallback, cliBinaryName, "sync") - - // Verify final state - both clients' data preserved - checkState(t, env.DB, user, env.ServerDB, systemState{ - clientNoteCount: 4, // Both clients' notes - clientBookCount: 4, // js, css, js_2, css_2 - clientLastMaxUSN: 8, // 4 from Client B + 4 from Client A's renamed books/notes - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 4, - serverBookCount: 4, - serverUserMaxUSN: 8, - }) - - // Verify server has both clients' books - var svrBookJS, svrBookCSS, svrBookJS2, svrBookCSS2 database.Book - apitest.MustExec(t, env.ServerDB.Where("label = ?", "js").First(&svrBookJS), "finding server book 'js'") - apitest.MustExec(t, env.ServerDB.Where("label = ?", "css").First(&svrBookCSS), "finding server book 'css'") - apitest.MustExec(t, env.ServerDB.Where("label = ?", "js_2").First(&svrBookJS2), "finding server book 'js_2'") - apitest.MustExec(t, env.ServerDB.Where("label = ?", "css_2").First(&svrBookCSS2), "finding server book 'css_2'") - - assert.Equal(t, svrBookJS.Label, "js", "server should have book 'js' (Client B)") - assert.Equal(t, svrBookCSS.Label, "css", "server should have book 'css' (Client B)") - assert.Equal(t, svrBookJS2.Label, "js_2", "server should have book 'js_2' (Client A renamed)") - assert.Equal(t, svrBookCSS2.Label, "css_2", "server should have book 'css_2' (Client A renamed)") - - // Verify client has all books - var cliBookJS, cliBookCSS, cliBookJS2, cliBookCSS2 cliDatabase.Book - cliDatabase.MustScan(t, "finding client book 'js'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) - cliDatabase.MustScan(t, "finding client book 'css'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) - cliDatabase.MustScan(t, "finding client book 'js_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) - cliDatabase.MustScan(t, "finding client book 'css_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) - - // Verify client UUIDs match server - assert.Equal(t, cliBookJS.UUID, svrBookJS.UUID, "client 'js' UUID should match server") - assert.Equal(t, cliBookCSS.UUID, svrBookCSS.UUID, "client 'css' UUID should match server") - assert.Equal(t, cliBookJS2.UUID, svrBookJS2.UUID, "client 'js_2' UUID should match server") - assert.Equal(t, cliBookCSS2.UUID, svrBookCSS2.UUID, "client 'css_2' UUID should match server") - - // Verify all items have non-zero USN (synced successfully) - assert.NotEqual(t, cliBookJS.USN, 0, "client 'js' should have non-zero USN") - assert.NotEqual(t, cliBookCSS.USN, 0, "client 'css' should have non-zero USN") - assert.NotEqual(t, cliBookJS2.USN, 0, "client 'js_2' should have non-zero USN") - assert.NotEqual(t, cliBookCSS2.USN, 0, "client 'css_2' should have non-zero USN") - }) - - t.Run("sync to server A, then B, then back to A, then back to B", func(t *testing.T) { - // Test switching between two actual servers to verify: - // 1. Empty server detection works when switching to empty server - // 2. No false detection when switching back to non-empty servers - // 3. Both servers maintain independent state across multiple switches - - env := setupTestEnv(t) - - // Create Server A with its own database - serverA, serverDBA, err := setupTestServer(t, serverTime) - if err != nil { - t.Fatal(errors.Wrap(err, "setting up server A")) - } - defer serverA.Close() - - // Create Server B with its own database - serverB, serverDBB, err := setupTestServer(t, serverTime) - if err != nil { - t.Fatal(errors.Wrap(err, "setting up server B")) - } - defer serverB.Close() - - // Step 1: Set up user on Server A and sync - apiEndpointA := fmt.Sprintf("%s/api", serverA.URL) - - userA := apitest.SetupUserData(serverDBA, "alice@example.com", "pass1234") - sessionA := apitest.SetupSession(serverDBA, userA) - cliDatabase.MustExec(t, "inserting session_key", env.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, sessionA.Key) - cliDatabase.MustExec(t, "inserting session_key_expiry", env.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, sessionA.ExpiresAt.Unix()) - - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) - - // Verify sync to Server A succeeded - checkState(t, env.DB, userA, serverDBA, systemState{ - clientNoteCount: 2, - clientBookCount: 2, - clientLastMaxUSN: 4, - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 2, - serverBookCount: 2, - serverUserMaxUSN: 4, - }) - - // Step 2: Switch to Server B (empty) and sync - apiEndpointB := fmt.Sprintf("%s/api", serverB.URL) - - // Set up user on Server B - userB := apitest.SetupUserData(serverDBB, "alice@example.com", "pass1234") - sessionB := apitest.SetupSession(serverDBB, userB) - cliDatabase.MustExec(t, "updating session_key for B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) - cliDatabase.MustExec(t, "updating session_key_expiry for B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) - - // Should detect empty server and prompt - clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) - - // Verify Server B now has data - checkState(t, env.DB, userB, serverDBB, systemState{ - clientNoteCount: 2, - clientBookCount: 2, - clientLastMaxUSN: 4, - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 2, - serverBookCount: 2, - serverUserMaxUSN: 4, - }) - - // Step 3: Switch back to Server A and sync - cliDatabase.MustExec(t, "updating session_key back to A", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.Key, consts.SystemSessionKey) - cliDatabase.MustExec(t, "updating session_key_expiry back to A", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) - - // Should NOT trigger empty server detection (Server A has MaxUSN > 0) - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) - - // Verify Server A still has its data - checkState(t, env.DB, userA, serverDBA, systemState{ - clientNoteCount: 2, - clientBookCount: 2, - clientLastMaxUSN: 4, - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 2, - serverBookCount: 2, - serverUserMaxUSN: 4, - }) - - // Step 4: Switch back to Server B and sync again - cliDatabase.MustExec(t, "updating session_key back to B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) - cliDatabase.MustExec(t, "updating session_key_expiry back to B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) - - // Should NOT trigger empty server detection (Server B now has MaxUSN > 0 from Step 2) - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) - - // Verify both servers maintain independent state - checkState(t, env.DB, userB, serverDBB, systemState{ - clientNoteCount: 2, - clientBookCount: 2, - clientLastMaxUSN: 4, - clientLastSyncAt: serverTime.Unix(), - serverNoteCount: 2, - serverBookCount: 2, - serverUserMaxUSN: 4, - }) - }) -} - func TestSync_FreshClientConcurrent(t *testing.T) { // Test the core issue: Fresh client (never synced, lastMaxUSN=0) syncing to a server // that already has data uploaded by another client. diff --git a/pkg/e2e/sync/edge_cases_test.go b/pkg/e2e/sync/edge_cases_test.go new file mode 100644 index 00000000..3f37c131 --- /dev/null +++ b/pkg/e2e/sync/edge_cases_test.go @@ -0,0 +1,73 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Dnote. If not, see . + */ + +package sync + +import ( + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" + cliDatabase "github.com/dnote/dnote/pkg/cli/database" + clitest "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/google/uuid" +) + +// TestSync_EmptyFragmentPreservesLastMaxUSN verifies that last_max_usn is not reset to 0 +// when sync receives an empty response from the server. +// +// Scenario: Client has orphaned note (references non-existent book). During sync: +// 1. Downloads data successfully (last_max_usn=3) +// 2. Upload fails (orphaned note -> 500 error, triggers retry stepSync) +// 3. Retry stepSync gets 0 fragments (already at latest USN) +// 4. last_max_usn should stay at 3, not reset to 0 +func TestSync_EmptyFragmentPreservesLastMaxUSN(t *testing.T) { + env := setupTestEnv(t) + user := setupUserAndLogin(t, env) + + // Create data on server (max_usn=3) + bookUUID := apiCreateBook(t, env, user, "javascript", "creating book via API") + apiCreateNote(t, env, user, bookUUID, "note1 content", "creating note1 via API") + apiCreateNote(t, env, user, bookUUID, "note2 content", "creating note2 via API") + + // Create orphaned note locally (will fail to upload) + orphanedNote := cliDatabase.Note{ + UUID: uuid.New().String(), + BookUUID: uuid.New().String(), // non-existent book + Body: "orphaned note content", + AddedOn: 1234567890, + EditedOn: 0, + USN: 0, + Deleted: false, + Dirty: true, + } + if err := orphanedNote.Insert(env.DB); err != nil { + t.Fatal(err) + } + + // Run sync (downloads data, upload fails, retry gets 0 fragments) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify last_max_usn is preserved at 3, not reset to 0 + var lastMaxUSN int + cliDatabase.MustScan(t, "finding system last_max_usn", + env.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), + &lastMaxUSN) + + assert.Equal(t, lastMaxUSN, 3, "last_max_usn should be 3 after syncing") +} diff --git a/pkg/e2e/sync/empty_server_test.go b/pkg/e2e/sync/empty_server_test.go new file mode 100644 index 00000000..a35086f9 --- /dev/null +++ b/pkg/e2e/sync/empty_server_test.go @@ -0,0 +1,449 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Dnote. If not, see . + */ + +package sync + +import ( + "fmt" + "io" + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" + cliDatabase "github.com/dnote/dnote/pkg/cli/database" + clitest "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/dnote/dnote/pkg/server/database" + apitest "github.com/dnote/dnote/pkg/server/testutils" + "github.com/pkg/errors" +) + +func TestSync_EmptyServer(t *testing.T) { + t.Run("sync to empty server after syncing to non-empty server", func(t *testing.T) { + // Test server data loss/wipe scenario (disaster recovery): + // Verify empty server detection works when the server loses all its data + + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Step 1: Create local data and sync to server + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify sync succeeded + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Switch to a completely new empty server + switchToEmptyServer(t, &env) + + // Recreate user and session on new server + user = setupUserAndLogin(t, env) + + // Step 3: Sync again - should detect empty server and prompt user + // User confirms with "y" + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync") + + // Step 4: Verify data was uploaded to the empty server + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Verify the content is correct on both client and server + var cliNote1JS, cliNote1CSS cliDatabase.Note + var cliBookJS, cliBookCSS cliDatabase.Book + cliDatabase.MustScan(t, "finding cliNote1JS", env.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "js1"), &cliNote1JS.UUID, &cliNote1JS.Body) + cliDatabase.MustScan(t, "finding cliNote1CSS", env.DB.QueryRow("SELECT uuid, body FROM notes WHERE body = ?", "css1"), &cliNote1CSS.UUID, &cliNote1CSS.Body) + cliDatabase.MustScan(t, "finding cliBookJS", env.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label) + cliDatabase.MustScan(t, "finding cliBookCSS", env.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label) + + assert.Equal(t, cliNote1JS.Body, "js1", "js note body mismatch") + assert.Equal(t, cliNote1CSS.Body, "css1", "css note body mismatch") + assert.Equal(t, cliBookJS.Label, "js", "js book label mismatch") + assert.Equal(t, cliBookCSS.Label, "css", "css book label mismatch") + + // Verify on server side + var serverNoteJS, serverNoteCSS database.Note + var serverBookJS, serverBookCSS database.Book + apitest.MustExec(t, env.ServerDB.Where("body = ?", "js1").First(&serverNoteJS), "finding server note js1") + apitest.MustExec(t, env.ServerDB.Where("body = ?", "css1").First(&serverNoteCSS), "finding server note css1") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js").First(&serverBookJS), "finding server book js") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css").First(&serverBookCSS), "finding server book css") + + assert.Equal(t, serverNoteJS.Body, "js1", "server js note body mismatch") + assert.Equal(t, serverNoteCSS.Body, "css1", "server css note body mismatch") + assert.Equal(t, serverBookJS.Label, "js", "server js book label mismatch") + assert.Equal(t, serverBookCSS.Label, "css", "server css book label mismatch") + }) + + t.Run("user cancels empty server prompt", func(t *testing.T) { + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Step 1: Create local data and sync to server + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify initial sync succeeded + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Switch to empty server + switchToEmptyServer(t, &env) + user = setupUserAndLogin(t, env) + + // Step 3: Sync again but user cancels with "n" + output, err := clitest.WaitDnoteCmd(t, env.CmdOpts, clitest.UserCancelEmptyServerSync, cliBinaryName, "sync") + if err == nil { + t.Fatal("Expected sync to fail when user cancels, but it succeeded") + } + + // Verify the prompt appeared + if !strings.Contains(output, clitest.PromptEmptyServer) { + t.Fatalf("Expected empty server warning in output, got: %s", output) + } + + // Step 4: Verify local state unchanged (transaction rolled back) + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 0, + serverBookCount: 0, + serverUserMaxUSN: 0, + }) + + // Verify items still have original USN and dirty=false + var book cliDatabase.Book + var note cliDatabase.Note + cliDatabase.MustScan(t, "checking book state", env.DB.QueryRow("SELECT usn, dirty FROM books WHERE label = ?", "js"), &book.USN, &book.Dirty) + cliDatabase.MustScan(t, "checking note state", env.DB.QueryRow("SELECT usn, dirty FROM notes WHERE body = ?", "js1"), ¬e.USN, ¬e.Dirty) + + assert.NotEqual(t, book.USN, 0, "book USN should not be reset") + assert.NotEqual(t, note.USN, 0, "note USN should not be reset") + assert.Equal(t, book.Dirty, false, "book should not be marked dirty") + assert.Equal(t, note.Dirty, false, "note should not be marked dirty") + }) + + t.Run("all local data is marked deleted - should not upload", func(t *testing.T) { + // Test edge case: Server MaxUSN=0, local MaxUSN>0, but all items are deleted=true + // Should NOT prompt because there's nothing to upload + + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Step 1: Create local data and sync to server + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify initial sync succeeded + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Delete all local notes and books (mark as deleted) + cliDatabase.MustExec(t, "marking all books deleted", env.DB, "UPDATE books SET deleted = 1") + cliDatabase.MustExec(t, "marking all notes deleted", env.DB, "UPDATE notes SET deleted = 1") + + // Step 3: Switch to empty server + switchToEmptyServer(t, &env) + user = setupUserAndLogin(t, env) + + // Step 4: Sync - should NOT prompt because bookCount=0 and noteCount=0 (counting only deleted=0) + // This should complete without user interaction + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify no data was uploaded (server still empty, but client still has deleted items) + // Check server is empty + var serverNoteCount, serverBookCount int64 + apitest.MustExec(t, env.ServerDB.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") + apitest.MustExec(t, env.ServerDB.Model(&database.Book{}).Count(&serverBookCount), "counting server books") + assert.Equal(t, serverNoteCount, int64(0), "server should have no notes") + assert.Equal(t, serverBookCount, int64(0), "server should have no books") + + // Check client still has the deleted items locally + var clientNoteCount, clientBookCount int + cliDatabase.MustScan(t, "counting client notes", env.DB.QueryRow("SELECT count(*) FROM notes WHERE deleted = 1"), &clientNoteCount) + cliDatabase.MustScan(t, "counting client books", env.DB.QueryRow("SELECT count(*) FROM books WHERE deleted = 1"), &clientBookCount) + assert.Equal(t, clientNoteCount, 2, "client should still have 2 deleted notes") + assert.Equal(t, clientBookCount, 2, "client should still have 2 deleted books") + + // Verify lastMaxUSN was reset to 0 + var lastMaxUSN int + cliDatabase.MustScan(t, "getting lastMaxUSN", env.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &lastMaxUSN) + assert.Equal(t, lastMaxUSN, 0, "lastMaxUSN should be reset to 0") + }) + + t.Run("race condition - other client uploads first", func(t *testing.T) { + // This test exercises a race condition that can occur during sync: + // While Client A is waiting for user input, Client B uploads data to the server. + // + // The empty server scenario is the natural place to test this because + // an empty server detection triggers a prompt, at which point the test + // can make client B upload data. We trigger the race condition deterministically. + // + // Test flow: + // - Client A detects empty server and prompts user + // - While waiting for confirmation, Client B uploads the same data via API + // - Client A continues and handles the 409 conflict gracefully by: + // 1. Detecting the 409 error when trying to CREATE books that already exist + // 2. Running stepSync to pull the server's books (js, css) + // 3. mergeBook renames local conflicts (js→js_2, css→css_2) + // 4. Retrying sendChanges to upload the renamed books + // - Result: Both clients' data is preserved (4 books total) + + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Step 1: Create local data and sync to establish lastMaxUSN > 0 + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + + // Verify initial sync succeeded + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Switch to new empty server to simulate switching to empty server + switchToEmptyServer(t, &env) + + // Create user on new server and login + user = setupUserAndLogin(t, env) + + // Step 3: Trigger sync which will detect empty server and prompt user + // Inside the callback (before confirming), we simulate Client B uploading via API. + // We wait for the empty server prompt to ensure Client B uploads AFTER + // GetSyncState but BEFORE the sync decision, creating the race condition deterministically + raceCallback := func(stdout io.Reader, stdin io.WriteCloser) error { + // First, wait for the prompt to ensure Client A has obtained the sync state from the server. + clitest.MustWaitForPrompt(t, stdout, clitest.PromptEmptyServer) + + // Now Client B uploads the same data via API (after Client A got the sync state from the server + // but before its sync decision) + // This creates the race condition: Client A thinks server is empty, but Client B uploads data + jsBookUUID := apiCreateBook(t, env, user, "js", "client B creating js book") + cssBookUUID := apiCreateBook(t, env, user, "css", "client B creating css book") + apiCreateNote(t, env, user, jsBookUUID, "js1", "client B creating js note") + apiCreateNote(t, env, user, cssBookUUID, "css1", "client B creating css note") + + // Now user confirms + if _, err := io.WriteString(stdin, "y\n"); err != nil { + return errors.Wrap(err, "confirming sync") + } + + return nil + } + + // Step 4: Client A runs sync with race condition + // The 409 conflict is automatically handled: + // - When 409 is detected, isBehind flag is set + // - stepSync pulls Client B's data + // - mergeBook renames Client A's books to js_2, css_2 + // - Renamed books are uploaded + // - Both clients' data is preserved. + clitest.MustWaitDnoteCmd(t, env.CmdOpts, raceCallback, cliBinaryName, "sync") + + // Verify final state - both clients' data preserved + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 4, // Both clients' notes + clientBookCount: 4, // js, css, js_2, css_2 + clientLastMaxUSN: 8, // 4 from Client B + 4 from Client A's renamed books/notes + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 4, + serverUserMaxUSN: 8, + }) + + // Verify server has both clients' books + var svrBookJS, svrBookCSS, svrBookJS2, svrBookCSS2 database.Book + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js").First(&svrBookJS), "finding server book 'js'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css").First(&svrBookCSS), "finding server book 'css'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "js_2").First(&svrBookJS2), "finding server book 'js_2'") + apitest.MustExec(t, env.ServerDB.Where("label = ?", "css_2").First(&svrBookCSS2), "finding server book 'css_2'") + + assert.Equal(t, svrBookJS.Label, "js", "server should have book 'js' (Client B)") + assert.Equal(t, svrBookCSS.Label, "css", "server should have book 'css' (Client B)") + assert.Equal(t, svrBookJS2.Label, "js_2", "server should have book 'js_2' (Client A renamed)") + assert.Equal(t, svrBookCSS2.Label, "css_2", "server should have book 'css_2' (Client A renamed)") + + // Verify client has all books + var cliBookJS, cliBookCSS, cliBookJS2, cliBookCSS2 cliDatabase.Book + cliDatabase.MustScan(t, "finding client book 'js'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js"), &cliBookJS.UUID, &cliBookJS.Label, &cliBookJS.USN) + cliDatabase.MustScan(t, "finding client book 'css'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css"), &cliBookCSS.UUID, &cliBookCSS.Label, &cliBookCSS.USN) + cliDatabase.MustScan(t, "finding client book 'js_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "js_2"), &cliBookJS2.UUID, &cliBookJS2.Label, &cliBookJS2.USN) + cliDatabase.MustScan(t, "finding client book 'css_2'", env.DB.QueryRow("SELECT uuid, label, usn FROM books WHERE label = ?", "css_2"), &cliBookCSS2.UUID, &cliBookCSS2.Label, &cliBookCSS2.USN) + + // Verify client UUIDs match server + assert.Equal(t, cliBookJS.UUID, svrBookJS.UUID, "client 'js' UUID should match server") + assert.Equal(t, cliBookCSS.UUID, svrBookCSS.UUID, "client 'css' UUID should match server") + assert.Equal(t, cliBookJS2.UUID, svrBookJS2.UUID, "client 'js_2' UUID should match server") + assert.Equal(t, cliBookCSS2.UUID, svrBookCSS2.UUID, "client 'css_2' UUID should match server") + + // Verify all items have non-zero USN (synced successfully) + assert.NotEqual(t, cliBookJS.USN, 0, "client 'js' should have non-zero USN") + assert.NotEqual(t, cliBookCSS.USN, 0, "client 'css' should have non-zero USN") + assert.NotEqual(t, cliBookJS2.USN, 0, "client 'js_2' should have non-zero USN") + assert.NotEqual(t, cliBookCSS2.USN, 0, "client 'css_2' should have non-zero USN") + }) + + t.Run("sync to server A, then B, then back to A, then back to B", func(t *testing.T) { + // Test switching between two actual servers to verify: + // 1. Empty server detection works when switching to empty server + // 2. No false detection when switching back to non-empty servers + // 3. Both servers maintain independent state across multiple switches + + env := setupTestEnv(t) + + // Create Server A with its own database + serverA, serverDBA, err := setupTestServer(t, serverTime) + if err != nil { + t.Fatal(errors.Wrap(err, "setting up server A")) + } + defer serverA.Close() + + // Create Server B with its own database + serverB, serverDBB, err := setupTestServer(t, serverTime) + if err != nil { + t.Fatal(errors.Wrap(err, "setting up server B")) + } + defer serverB.Close() + + // Step 1: Set up user on Server A and sync + apiEndpointA := fmt.Sprintf("%s/api", serverA.URL) + + userA := apitest.SetupUserData(serverDBA, "alice@example.com", "pass1234") + sessionA := apitest.SetupSession(serverDBA, userA) + cliDatabase.MustExec(t, "inserting session_key", env.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, sessionA.Key) + cliDatabase.MustExec(t, "inserting session_key_expiry", env.DB, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, sessionA.ExpiresAt.Unix()) + + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) + + // Verify sync to Server A succeeded + checkState(t, env.DB, userA, serverDBA, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 2: Switch to Server B (empty) and sync + apiEndpointB := fmt.Sprintf("%s/api", serverB.URL) + + // Set up user on Server B + userB := apitest.SetupUserData(serverDBB, "alice@example.com", "pass1234") + sessionB := apitest.SetupSession(serverDBB, userB) + cliDatabase.MustExec(t, "updating session_key for B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry for B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + + // Should detect empty server and prompt + clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) + + // Verify Server B now has data + checkState(t, env.DB, userB, serverDBB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 3: Switch back to Server A and sync + cliDatabase.MustExec(t, "updating session_key back to A", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry back to A", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionA.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + + // Should NOT trigger empty server detection (Server A has MaxUSN > 0) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointA) + + // Verify Server A still has its data + checkState(t, env.DB, userA, serverDBA, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + + // Step 4: Switch back to Server B and sync again + cliDatabase.MustExec(t, "updating session_key back to B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.Key, consts.SystemSessionKey) + cliDatabase.MustExec(t, "updating session_key_expiry back to B", env.DB, "UPDATE system SET value = ? WHERE key = ?", sessionB.ExpiresAt.Unix(), consts.SystemSessionKeyExpiry) + + // Should NOT trigger empty server detection (Server B now has MaxUSN > 0 from Step 2) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "--apiEndpoint", apiEndpointB) + + // Verify both servers maintain independent state + checkState(t, env.DB, userB, serverDBB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + }) + }) +} diff --git a/pkg/e2e/sync/main_test.go b/pkg/e2e/sync/main_test.go new file mode 100644 index 00000000..b5d517f5 --- /dev/null +++ b/pkg/e2e/sync/main_test.go @@ -0,0 +1,59 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Dnote. If not, see . + */ + +package sync + +import ( + "bytes" + "fmt" + "log" + "os" + "os/exec" + "testing" + "time" + + "github.com/pkg/errors" +) + +var cliBinaryName string +var serverTime = time.Date(2017, time.March, 14, 21, 15, 0, 0, time.UTC) + +var testDir = "./tmp/" + +func init() { + cliBinaryName = fmt.Sprintf("%s/test-cli", testDir) +} + +func TestMain(m *testing.M) { + // Build CLI binary without hardcoded API endpoint + // Each test will create its own server and config file + cmd := exec.Command("go", "build", "--tags", "fts5", "-o", cliBinaryName, "github.com/dnote/dnote/pkg/cli") + + var stderr bytes.Buffer + cmd.Stderr = &stderr + + if err := cmd.Run(); err != nil { + log.Print(errors.Wrap(err, "building a CLI binary").Error()) + log.Print(stderr.String()) + os.Exit(1) + } + + os.Exit(m.Run()) +} diff --git a/pkg/e2e/sync/testutils.go b/pkg/e2e/sync/testutils.go new file mode 100644 index 00000000..def7bc47 --- /dev/null +++ b/pkg/e2e/sync/testutils.go @@ -0,0 +1,300 @@ +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors + * + * This file is part of Dnote. + * + * Dnote is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Dnote 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Dnote. If not, see . + */ + +package sync + +import ( + "encoding/json" + "fmt" + "io" + "net/http" + "net/http/httptest" + "os" + "path/filepath" + "strings" + "testing" + "time" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/consts" + cliDatabase "github.com/dnote/dnote/pkg/cli/database" + clitest "github.com/dnote/dnote/pkg/cli/testutils" + "github.com/dnote/dnote/pkg/clock" + "github.com/dnote/dnote/pkg/server/app" + "github.com/dnote/dnote/pkg/server/controllers" + "github.com/dnote/dnote/pkg/server/database" + "github.com/dnote/dnote/pkg/server/mailer" + apitest "github.com/dnote/dnote/pkg/server/testutils" + "github.com/pkg/errors" + "gorm.io/gorm" +) + +// testEnv holds the test environment for a single test +type testEnv struct { + DB *cliDatabase.DB + CmdOpts clitest.RunDnoteCmdOptions + Server *httptest.Server + ServerDB *gorm.DB + TmpDir string +} + +// setupTestEnv creates an isolated test environment with its own database and temp directory +func setupTestEnv(t *testing.T) testEnv { + tmpDir := t.TempDir() + + // Create .dnote directory + dnoteDir := filepath.Join(tmpDir, consts.DnoteDirName) + if err := os.MkdirAll(dnoteDir, 0755); err != nil { + t.Fatal(errors.Wrap(err, "creating dnote directory")) + } + + // Create database at the expected path + dbPath := filepath.Join(dnoteDir, consts.DnoteDBFileName) + db := cliDatabase.InitTestFileDBRaw(t, dbPath) + + // Create server + server, serverDB := setupNewServer(t) + + // Create config file with this server's endpoint + apiEndpoint := fmt.Sprintf("%s/api", server.URL) + updateConfigAPIEndpoint(t, tmpDir, apiEndpoint) + + // Create command options with XDG paths pointing to temp dir + cmdOpts := clitest.RunDnoteCmdOptions{ + Env: []string{ + fmt.Sprintf("XDG_CONFIG_HOME=%s", tmpDir), + fmt.Sprintf("XDG_DATA_HOME=%s", tmpDir), + fmt.Sprintf("XDG_CACHE_HOME=%s", tmpDir), + }, + } + + return testEnv{ + DB: db, + CmdOpts: cmdOpts, + Server: server, + ServerDB: serverDB, + TmpDir: tmpDir, + } +} + +// setupTestServer creates a test server with its own database +func setupTestServer(t *testing.T, serverTime time.Time) (*httptest.Server, *gorm.DB, error) { + db := apitest.InitMemoryDB(t) + + mockClock := clock.NewMock() + mockClock.SetNow(serverTime) + + a := app.NewTest() + a.Clock = mockClock + a.EmailTemplates = mailer.Templates{} + a.EmailBackend = &apitest.MockEmailbackendImplementation{} + a.DB = db + + server, err := controllers.NewServer(&a) + if err != nil { + return nil, nil, errors.Wrap(err, "initializing server") + } + + return server, db, nil +} + +// setupNewServer creates a new server and returns the server and database. +// This is useful when a test needs to switch to a new empty server. +func setupNewServer(t *testing.T) (*httptest.Server, *gorm.DB) { + server, serverDB, err := setupTestServer(t, serverTime) + if err != nil { + t.Fatal(errors.Wrap(err, "setting up new test server")) + } + t.Cleanup(func() { server.Close() }) + + return server, serverDB +} + +// updateConfigAPIEndpoint updates the config file with the given API endpoint +func updateConfigAPIEndpoint(t *testing.T, tmpDir string, apiEndpoint string) { + dnoteDir := filepath.Join(tmpDir, consts.DnoteDirName) + configPath := filepath.Join(dnoteDir, consts.ConfigFilename) + configContent := fmt.Sprintf("apiEndpoint: %s\n", apiEndpoint) + if err := os.WriteFile(configPath, []byte(configContent), 0644); err != nil { + t.Fatal(errors.Wrap(err, "writing config file")) + } +} + +// switchToEmptyServer closes the current server and creates a new empty server, +// updating the config file to point to it. +func switchToEmptyServer(t *testing.T, env *testEnv) { + // Close old server + env.Server.Close() + + // Create new empty server + env.Server, env.ServerDB = setupNewServer(t) + + // Update config file to point to new server + apiEndpoint := fmt.Sprintf("%s/api", env.Server.URL) + updateConfigAPIEndpoint(t, env.TmpDir, apiEndpoint) +} + +// setupUser creates a test user in the server database +func setupUser(t *testing.T, env testEnv) database.User { + user := apitest.SetupUserData(env.ServerDB, "alice@example.com", "pass1234") + + return user +} + +// setupUserAndLogin creates a test user and logs them in on the CLI +func setupUserAndLogin(t *testing.T, env testEnv) database.User { + user := setupUser(t, env) + login(t, env.DB, env.ServerDB, user) + + return user +} + +// login logs in the user in CLI +func login(t *testing.T, db *cliDatabase.DB, serverDB *gorm.DB, user database.User) { + session := apitest.SetupSession(serverDB, user) + + cliDatabase.MustExec(t, "inserting session_key", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKey, session.Key) + cliDatabase.MustExec(t, "inserting session_key_expiry", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemSessionKeyExpiry, session.ExpiresAt.Unix()) +} + +// apiCreateBook creates a book via the API and returns its UUID +func apiCreateBook(t *testing.T, env testEnv, user database.User, name, message string) string { + res := doHTTPReq(t, env, "POST", "/v3/books", fmt.Sprintf(`{"name": "%s"}`, name), message, user) + + var resp controllers.CreateBookResp + if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { + t.Fatal(errors.Wrap(err, "decoding payload for adding book")) + return "" + } + + return resp.Book.UUID +} + +// apiPatchBook updates a book via the API +func apiPatchBook(t *testing.T, env testEnv, user database.User, uuid, payload, message string) { + doHTTPReq(t, env, "PATCH", fmt.Sprintf("/v3/books/%s", uuid), payload, message, user) +} + +// apiDeleteBook deletes a book via the API +func apiDeleteBook(t *testing.T, env testEnv, user database.User, uuid, message string) { + doHTTPReq(t, env, "DELETE", fmt.Sprintf("/v3/books/%s", uuid), "", message, user) +} + +// apiCreateNote creates a note via the API and returns its UUID +func apiCreateNote(t *testing.T, env testEnv, user database.User, bookUUID, body, message string) string { + res := doHTTPReq(t, env, "POST", "/v3/notes", fmt.Sprintf(`{"book_uuid": "%s", "content": "%s"}`, bookUUID, body), message, user) + + var resp controllers.CreateNoteResp + if err := json.NewDecoder(res.Body).Decode(&resp); err != nil { + t.Fatal(errors.Wrap(err, "decoding payload for adding note")) + return "" + } + + return resp.Result.UUID +} + +// apiPatchNote updates a note via the API +func apiPatchNote(t *testing.T, env testEnv, user database.User, noteUUID, payload, message string) { + doHTTPReq(t, env, "PATCH", fmt.Sprintf("/v3/notes/%s", noteUUID), payload, message, user) +} + +// apiDeleteNote deletes a note via the API +func apiDeleteNote(t *testing.T, env testEnv, user database.User, noteUUID, message string) { + doHTTPReq(t, env, "DELETE", fmt.Sprintf("/v3/notes/%s", noteUUID), "", message, user) +} + +// doHTTPReq performs an authenticated HTTP request and checks for errors +func doHTTPReq(t *testing.T, env testEnv, method, path, payload, message string, user database.User) *http.Response { + apiEndpoint := fmt.Sprintf("%s/api", env.Server.URL) + endpoint := fmt.Sprintf("%s%s", apiEndpoint, path) + + req, err := http.NewRequest(method, endpoint, strings.NewReader(payload)) + if err != nil { + panic(errors.Wrap(err, "constructing http request")) + } + + res := apitest.HTTPAuthDo(t, env.ServerDB, req, user) + if res.StatusCode >= 400 { + bs, err := io.ReadAll(res.Body) + if err != nil { + panic(errors.Wrap(err, "parsing response body for error")) + } + + t.Errorf("%s. HTTP status %d. Message: %s", message, res.StatusCode, string(bs)) + } + + return res +} + +// setupFunc is a function that sets up test data and returns IDs for assertions +type setupFunc func(t *testing.T, env testEnv, user database.User) map[string]string + +// assertFunc is a function that asserts the expected state after sync +type assertFunc func(t *testing.T, env testEnv, user database.User, ids map[string]string) + +// testSyncCmd is a test helper that sets up a test environment, runs setup, syncs, and asserts +func testSyncCmd(t *testing.T, fullSync bool, setup setupFunc, assert assertFunc) { + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + ids := setup(t, env, user) + + if fullSync { + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") + } else { + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + } + + assert(t, env, user, ids) +} + +// systemState represents the expected state of the sync system +type systemState struct { + clientNoteCount int + clientBookCount int + clientLastMaxUSN int + clientLastSyncAt int64 + serverNoteCount int64 + serverBookCount int64 + serverUserMaxUSN int +} + +// checkState compares the state of the client and the server with the given system state +func checkState(t *testing.T, clientDB *cliDatabase.DB, user database.User, serverDB *gorm.DB, expected systemState) { + var clientBookCount, clientNoteCount int + cliDatabase.MustScan(t, "counting client notes", clientDB.QueryRow("SELECT count(*) FROM notes"), &clientNoteCount) + cliDatabase.MustScan(t, "counting client books", clientDB.QueryRow("SELECT count(*) FROM books"), &clientBookCount) + assert.Equal(t, clientNoteCount, expected.clientNoteCount, "client note count mismatch") + assert.Equal(t, clientBookCount, expected.clientBookCount, "client book count mismatch") + + var clientLastMaxUSN int + var clientLastSyncAt int64 + cliDatabase.MustScan(t, "finding system last_max_usn", clientDB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), &clientLastMaxUSN) + cliDatabase.MustScan(t, "finding system last_sync_at", clientDB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), &clientLastSyncAt) + assert.Equal(t, clientLastMaxUSN, expected.clientLastMaxUSN, "client last_max_usn mismatch") + assert.Equal(t, clientLastSyncAt, expected.clientLastSyncAt, "client last_sync_at mismatch") + + var serverBookCount, serverNoteCount int64 + apitest.MustExec(t, serverDB.Model(&database.Note{}).Count(&serverNoteCount), "counting server notes") + apitest.MustExec(t, serverDB.Model(&database.Book{}).Count(&serverBookCount), "counting api notes") + assert.Equal(t, serverNoteCount, expected.serverNoteCount, "server note count mismatch") + assert.Equal(t, serverBookCount, expected.serverBookCount, "server book count mismatch") + var serverUser database.User + apitest.MustExec(t, serverDB.Where("id = ?", user.ID).First(&serverUser), "finding user") + assert.Equal(t, serverUser.MaxUSN, expected.serverUserMaxUSN, "user max_usn mismatch") +} diff --git a/pkg/server/controllers/notes.go b/pkg/server/controllers/notes.go index dd34a78d..4db709da 100644 --- a/pkg/server/controllers/notes.go +++ b/pkg/server/controllers/notes.go @@ -218,7 +218,7 @@ func (n *Notes) create(r *http.Request) (database.Note, error) { var book database.Book if err := n.app.DB.Where("uuid = ? AND user_id = ?", params.BookUUID, user.ID).First(&book).Error; err != nil { - return database.Note{}, errors.Wrap(err, "finding book") + return database.Note{}, errors.Wrapf(err, "finding book %s", params.BookUUID) } client := getClientType(r) From ae290a226fd7cc38acb41ea2d92268b6e94156f3 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 26 Oct 2025 16:59:53 -0700 Subject: [PATCH 23/33] Auto vacuum and manage connections (#705) * Test concurrent sync * Auto vacuum and manage connection --- pkg/cli/database/testutils.go | 3 +- pkg/e2e/sync/edge_cases_test.go | 93 +++++++++++++++++++++++++++++++++ pkg/server/app/books.go | 1 + pkg/server/app/notes.go | 1 + pkg/server/app/users.go | 2 + pkg/server/cmd/start.go | 8 +++ pkg/server/controllers/books.go | 5 ++ pkg/server/database/database.go | 63 ++++++++++++++++++++++ 8 files changed, 175 insertions(+), 1 deletion(-) diff --git a/pkg/cli/database/testutils.go b/pkg/cli/database/testutils.go index 16685686..59824034 100644 --- a/pkg/cli/database/testutils.go +++ b/pkg/cli/database/testutils.go @@ -63,7 +63,8 @@ func InitTestMemoryDB(t *testing.T) *DB { // InitTestFileDB initializes a file-based test database with the default schema. func InitTestFileDB(t *testing.T) (*DB, string) { - dbPath := filepath.Join(t.TempDir(), "dnote.db") + uuid := mustGenerateTestUUID(t) + dbPath := filepath.Join(t.TempDir(), fmt.Sprintf("dnote-%s.db", uuid)) db := InitTestFileDBRaw(t, dbPath) return db, dbPath } diff --git a/pkg/e2e/sync/edge_cases_test.go b/pkg/e2e/sync/edge_cases_test.go index 3f37c131..ef1e0923 100644 --- a/pkg/e2e/sync/edge_cases_test.go +++ b/pkg/e2e/sync/edge_cases_test.go @@ -19,6 +19,7 @@ package sync import ( + "io" "testing" "github.com/dnote/dnote/pkg/assert" @@ -26,6 +27,7 @@ import ( cliDatabase "github.com/dnote/dnote/pkg/cli/database" clitest "github.com/dnote/dnote/pkg/cli/testutils" "github.com/google/uuid" + "github.com/pkg/errors" ) // TestSync_EmptyFragmentPreservesLastMaxUSN verifies that last_max_usn is not reset to 0 @@ -71,3 +73,94 @@ func TestSync_EmptyFragmentPreservesLastMaxUSN(t *testing.T) { assert.Equal(t, lastMaxUSN, 3, "last_max_usn should be 3 after syncing") } + +// TestSync_ConcurrentInitialSync reproduces the issue where two clients with identical +// local data syncing simultaneously to an empty server results in 500 errors. +// +// This demonstrates the race condition: +// - Client1 starts sync to empty server, gets empty server state +// - Client2 syncs. +// - Client1 tries to create same books → 409 "duplicate" +// - Client1 tries to create notes with wrong UUIDs → 500 "record not found" +// - stepSync recovers by renaming local books with _2 suffix +func TestSync_ConcurrentInitialSync(t *testing.T) { + env := setupTestEnv(t) + + user := setupUserAndLogin(t, env) + + // Step 1: Create local data and sync + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "javascript", "-c", "js note from client1") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + checkState(t, env.DB, user, env.ServerDB, systemState{ + clientNoteCount: 1, + clientBookCount: 1, + clientLastMaxUSN: 2, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 1, + serverBookCount: 1, + serverUserMaxUSN: 2, + }) + + // Step 2: Switch to new empty server to simulate concurrent initial sync scenario + switchToEmptyServer(t, &env) + user = setupUserAndLogin(t, env) + + // Set up client2 with separate database + client2DB, client2DBPath := cliDatabase.InitTestFileDB(t) + login(t, client2DB, env.ServerDB, user) + client2DB.Close() // Close so CLI can access the database + + // Step 3: Client1 syncs to empty server, but during sync Client2 uploads same data + // This simulates the race condition deterministically + raceCallback := func(stdout io.Reader, stdin io.WriteCloser) error { + // Wait for empty server prompt to ensure Client1 has called GetSyncState + clitest.MustWaitForPrompt(t, stdout, clitest.PromptEmptyServer) + + // Now Client2 creates the same book and note via CLI (creating the race condition) + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DBPath, "add", "javascript", "-c", "js note from client2") + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DBPath, "sync") + + // User confirms sync + if _, err := io.WriteString(stdin, "y\n"); err != nil { + return errors.Wrap(err, "confirming sync") + } + + return nil + } + + // Client1 continues sync - will hit 409 conflict, then 500 error, then recover + clitest.MustWaitDnoteCmd(t, env.CmdOpts, raceCallback, cliBinaryName, "sync") + + // After sync: + // - Server has 2 books: "javascript" (from client2) and "javascript_2" (from client1 renamed) + // - Server has 2 notes + // - Both clients should converge to the same state + expectedState := systemState{ + clientNoteCount: 2, // both notes + clientBookCount: 2, // javascript and javascript_2 + clientLastMaxUSN: 4, // 2 books + 2 notes + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, + } + checkState(t, env.DB, user, env.ServerDB, expectedState) + + // Client2 syncs again to download client1's data + clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client2DBPath, "sync") + client2DB = clitest.MustOpenDatabase(t, client2DBPath) + defer client2DB.Close() + + // Client2 should have converged to the same state as client1 + checkState(t, client2DB, user, env.ServerDB, expectedState) + + // Verify no orphaned notes on server + var orphanedCount int + if err := env.ServerDB.Raw(` + SELECT COUNT(*) FROM notes + WHERE book_uuid NOT IN (SELECT uuid FROM books) + `).Scan(&orphanedCount).Error; err != nil { + t.Fatal(err) + } + assert.Equal(t, orphanedCount, 0, "server should have no orphaned notes after sync") +} diff --git a/pkg/server/app/books.go b/pkg/server/app/books.go index a476a0c4..ae7b355f 100644 --- a/pkg/server/app/books.go +++ b/pkg/server/app/books.go @@ -37,6 +37,7 @@ func (a *App) CreateBook(user database.User, name string) (database.Book, error) uuid, err := helpers.GenUUID() if err != nil { + tx.Rollback() return database.Book{}, err } diff --git a/pkg/server/app/notes.go b/pkg/server/app/notes.go index e9f6f60b..7f25123a 100644 --- a/pkg/server/app/notes.go +++ b/pkg/server/app/notes.go @@ -55,6 +55,7 @@ func (a *App) CreateNote(user database.User, bookUUID, content string, addedOn * uuid, err := helpers.GenUUID() if err != nil { + tx.Rollback() return database.Note{}, err } diff --git a/pkg/server/app/users.go b/pkg/server/app/users.go index 6e9535e7..eb53c5a4 100644 --- a/pkg/server/app/users.go +++ b/pkg/server/app/users.go @@ -66,9 +66,11 @@ func (a *App) CreateUser(email, password string, passwordConfirmation string) (d var count int64 if err := tx.Model(&database.User{}).Where("email = ?", email).Count(&count).Error; err != nil { + tx.Rollback() return database.User{}, pkgErrors.Wrap(err, "counting user") } if count > 0 { + tx.Rollback() return database.User{}, ErrDuplicateEmail } diff --git a/pkg/server/cmd/start.go b/pkg/server/cmd/start.go index cbbc60ed..dee5913c 100644 --- a/pkg/server/cmd/start.go +++ b/pkg/server/cmd/start.go @@ -22,10 +22,12 @@ import ( "fmt" "net/http" "os" + "time" "github.com/dnote/dnote/pkg/server/buildinfo" "github.com/dnote/dnote/pkg/server/config" "github.com/dnote/dnote/pkg/server/controllers" + "github.com/dnote/dnote/pkg/server/database" "github.com/dnote/dnote/pkg/server/log" "github.com/pkg/errors" ) @@ -67,6 +69,12 @@ func startCmd(args []string) { } }() + // Start WAL checkpointing to prevent WAL file from growing unbounded. + database.StartWALCheckpointing(app.DB, 5*time.Minute) + + // Start periodic VACUUM to reclaim space and defragment database. + database.StartPeriodicVacuum(app.DB, 24*time.Hour) + ctl := controllers.New(&app) rc := controllers.RouteConfig{ WebRoutes: controllers.NewWebRoutes(&app, ctl), diff --git a/pkg/server/controllers/books.go b/pkg/server/controllers/books.go index 1b4f3810..c721b594 100644 --- a/pkg/server/controllers/books.go +++ b/pkg/server/controllers/books.go @@ -203,11 +203,13 @@ func (b *Books) update(r *http.Request) (database.Book, error) { var book database.Book if err := tx.Where("user_id = ? AND uuid = ?", user.ID, uuid).First(&book).Error; err != nil { + tx.Rollback() return database.Book{}, pkgErrors.Wrap(err, "finding book") } var params updateBookPayload if err := parseRequestData(r, ¶ms); err != nil { + tx.Rollback() return database.Book{}, pkgErrors.Wrap(err, "decoding payload") } @@ -253,11 +255,13 @@ func (b *Books) del(r *http.Request) (database.Book, error) { var book database.Book if err := tx.Where("user_id = ? AND uuid = ?", user.ID, uuid).First(&book).Error; err != nil { + tx.Rollback() return database.Book{}, pkgErrors.Wrap(err, "finding a book") } var notes []database.Note if err := tx.Where("book_uuid = ? AND NOT deleted", uuid).Order("usn ASC").Find(¬es).Error; err != nil { + tx.Rollback() return database.Book{}, pkgErrors.Wrap(err, "finding notes for the book") } @@ -270,6 +274,7 @@ func (b *Books) del(r *http.Request) (database.Book, error) { book, err := b.app.DeleteBook(tx, *user, book) if err != nil { + tx.Rollback() return database.Book{}, pkgErrors.Wrap(err, "deleting the book") } diff --git a/pkg/server/database/database.go b/pkg/server/database/database.go index f73d45af..2c5241b4 100644 --- a/pkg/server/database/database.go +++ b/pkg/server/database/database.go @@ -21,6 +21,7 @@ package database import ( "os" "path/filepath" + "time" "github.com/pkg/errors" "gorm.io/driver/sqlite" @@ -58,5 +59,67 @@ func Open(dbPath string) *gorm.DB { panic(errors.Wrap(err, "opening database conection")) } + // Get underlying *sql.DB to configure connection pool + sqlDB, err := db.DB() + if err != nil { + panic(errors.Wrap(err, "getting underlying database connection")) + } + + // Configure connection pool for SQLite with WAL mode + sqlDB.SetMaxOpenConns(25) + sqlDB.SetMaxIdleConns(5) + sqlDB.SetConnMaxLifetime(0) // Doesn't expire. + + // Apply performance PRAGMAs + pragmas := []string{ + "PRAGMA journal_mode=WAL", // Enable WAL mode for better concurrency + "PRAGMA synchronous=NORMAL", // Balance between safety and speed + "PRAGMA cache_size=-64000", // 64MB cache (negative = KB) + "PRAGMA busy_timeout=5000", // Wait up to 5s for locks + "PRAGMA foreign_keys=ON", // Enforce foreign key constraints + "PRAGMA temp_store=MEMORY", // Store temp tables in memory + } + + for _, pragma := range pragmas { + if err := db.Exec(pragma).Error; err != nil { + panic(errors.Wrapf(err, "executing pragma: %s", pragma)) + } + } + return db } + +// StartWALCheckpointing starts a background goroutine that periodically +// checkpoints the WAL file to prevent it from growing unbounded +func StartWALCheckpointing(db *gorm.DB, interval time.Duration) { + go func() { + ticker := time.NewTicker(interval) + defer ticker.Stop() + + for range ticker.C { + // TRUNCATE mode removes the WAL file after checkpointing + if err := db.Exec("PRAGMA wal_checkpoint(TRUNCATE)").Error; err != nil { + // Log error but don't panic - this is a background maintenance task + // TODO: Use proper logging once available + _ = err + } + } + }() +} + +// StartPeriodicVacuum runs full VACUUM on a schedule to reclaim space and defragment. +// WARNING: VACUUM acquires an exclusive lock and blocks all database operations briefly. +func StartPeriodicVacuum(db *gorm.DB, interval time.Duration) { + go func() { + ticker := time.NewTicker(interval) + defer ticker.Stop() + + for range ticker.C { + if err := db.Exec("VACUUM").Error; err != nil { + // Log error but don't panic - this is a background maintenance task + // TODO: Use proper logging once available + _ = err + } + } + }() +} From 63147492638daf492c8814c6264845736775817c Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sun, 26 Oct 2025 17:54:24 -0700 Subject: [PATCH 24/33] Improve empty server sync when multiple clients exist (#706) * Fix dbPath * Require full sync when after another client uploads to an empty server * Avoid orphan notes with empty sync --- pkg/cli/client/client.go | 3 + pkg/cli/cmd/sync/sync.go | 22 +++ pkg/cli/main.go | 24 ++- pkg/e2e/sync/empty_server_test.go | 282 ++++++++++++++++++++++++++++++ pkg/server/app/helpers.go | 20 ++- pkg/server/controllers/sync.go | 2 +- pkg/server/database/models.go | 11 +- 7 files changed, 354 insertions(+), 10 deletions(-) diff --git a/pkg/cli/client/client.go b/pkg/cli/client/client.go index 3fea9d21..083b9392 100644 --- a/pkg/cli/client/client.go +++ b/pkg/cli/client/client.go @@ -285,6 +285,9 @@ func GetSyncFragment(ctx context.DnoteCtx, afterUSN int) (GetSyncFragmentResp, e path := fmt.Sprintf("/v3/sync/fragment?%s", queryStr) res, err := doAuthorizedReq(ctx, "GET", path, "", nil) + if err != nil { + return GetSyncFragmentResp{}, errors.Wrap(err, "making the request") + } body, err := io.ReadAll(res.Body) if err != nil { diff --git a/pkg/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go index fcfc31fd..f8f2aec0 100644 --- a/pkg/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -1173,6 +1173,28 @@ func newRun(ctx context.DnoteCtx) infra.RunEFunc { log.Debug("prepared empty server sync: marked %d books and %d notes as dirty\n", bookCount, noteCount) } + // If full sync will be triggered by FullSyncBefore (not manual --full flag), + // and client has more data than server, prepare local data for upload to avoid orphaning notes. + // The lastMaxUSN > syncState.MaxUSN check prevents duplicate uploads when switching + // back to a server that already has our data. + if !isFullSync && lastSyncAt < syncState.FullSyncBefore && lastMaxUSN > syncState.MaxUSN { + log.Debug("full sync triggered by FullSyncBefore: preparing local data for upload\n") + log.Debug("server.FullSyncBefore=%d, local.lastSyncAt=%d, local.MaxUSN=%d, server.MaxUSN=%d, books=%d, notes=%d\n", + syncState.FullSyncBefore, lastSyncAt, lastMaxUSN, syncState.MaxUSN, bookCount, noteCount) + + if err := prepareEmptyServerSync(tx); err != nil { + return errors.Wrap(err, "preparing local data for full sync") + } + + // Re-fetch lastMaxUSN after prepareEmptyServerSync + lastMaxUSN, err = getLastMaxUSN(tx) + if err != nil { + return errors.Wrap(err, "getting the last max_usn after prepare") + } + + log.Debug("prepared for full sync: marked %d books and %d notes as dirty\n", bookCount, noteCount) + } + var syncErr error if isFullSync || lastSyncAt < syncState.FullSyncBefore { syncErr = fullSync(ctx, tx) diff --git a/pkg/cli/main.go b/pkg/cli/main.go index 1ba97358..dfdac5a7 100644 --- a/pkg/cli/main.go +++ b/pkg/cli/main.go @@ -20,6 +20,7 @@ package main import ( "os" + "strings" "github.com/dnote/dnote/pkg/cli/infra" "github.com/dnote/dnote/pkg/cli/log" @@ -45,10 +46,29 @@ import ( var apiEndpoint string var versionTag = "master" +// parseDBPath extracts --dbPath flag value from command line arguments +// regardless of where it appears (before or after subcommand). +// Returns empty string if not found. +func parseDBPath(args []string) string { + for i, arg := range args { + // Handle --dbPath=value + if strings.HasPrefix(arg, "--dbPath=") { + return strings.TrimPrefix(arg, "--dbPath=") + } + // Handle --dbPath value + if arg == "--dbPath" && i+1 < len(args) { + return args[i+1] + } + } + return "" +} + func main() { // Parse flags early to get --dbPath before initializing database - root.GetRoot().ParseFlags(os.Args[1:]) - dbPath := root.GetDBPathFlag() + // We need to manually parse --dbPath because it can appear after the subcommand + // (e.g., "dnote sync --full --dbPath=./custom.db") and root.ParseFlags only + // parses flags before the subcommand. + dbPath := parseDBPath(os.Args[1:]) // Initialize context - defaultAPIEndpoint is used when creating new config file ctx, err := infra.Init(versionTag, apiEndpoint, dbPath) diff --git a/pkg/e2e/sync/empty_server_test.go b/pkg/e2e/sync/empty_server_test.go index a35086f9..ad7308e9 100644 --- a/pkg/e2e/sync/empty_server_test.go +++ b/pkg/e2e/sync/empty_server_test.go @@ -19,8 +19,11 @@ package sync import ( + "database/sql" "fmt" "io" + "os" + "strconv" "strings" "testing" @@ -446,4 +449,283 @@ func TestSync_EmptyServer(t *testing.T) { serverUserMaxUSN: 4, }) }) + + t.Run("two clients with identical copied database sync to empty server", func(t *testing.T) { + // Suppose we have two clients and server becomes empty (migration). + // After the first client sync to empty server, the second client should trigger full sync. + // Without the full sync, client2 will do step sync asking for changes after its stale USN, + // get nothing from server, and potentially orphan notes during full sync. + + // Step 1: Create client1 with data and sync to ORIGINAL server + env1 := setupTestEnv(t) + user := setupUserAndLogin(t, env1) + + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "sync") + // Add more data to create a higher USN + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "add", "go", "-c", "go1") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "add", "rust", "-c", "rust1") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "sync") + // Verify initial sync succeeded (now with 4 notes, 4 books, USN=8) + checkState(t, env1.DB, user, env1.ServerDB, systemState{ + clientNoteCount: 4, + clientBookCount: 4, + clientLastMaxUSN: 8, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 4, + serverBookCount: 4, + serverUserMaxUSN: 8, + }) + + // Step 2: Create client2 by copying client1's database (simulating same DB on two devices) + env2 := setupTestEnv(t) + // Copy the database file from client1 to client2 + dbPath1 := env1.DB.Filepath + dbPath2 := env2.DB.Filepath + // Close both DBs before copying + env1.DB.Close() + env2.DB.Close() + + // Copy the database file + input, err := os.ReadFile(dbPath1) + if err != nil { + t.Fatal(errors.Wrap(err, "reading client1 database")) + } + if err := os.WriteFile(dbPath2, input, 0644); err != nil { + t.Fatal(errors.Wrap(err, "writing client2 database")) + } + + // Reopen databases + env1.DB, err = cliDatabase.Open(dbPath1) + if err != nil { + t.Fatal(errors.Wrap(err, "reopening client1 database")) + } + env2.DB, err = cliDatabase.Open(dbPath2) + if err != nil { + t.Fatal(errors.Wrap(err, "reopening client2 database")) + } + + // Verify client2 has identical data and USN=8 (stale) - same as client1 + // Note: at this point there's no server to compare against, we just check counts + var client2MaxUSN, client2NoteCount, client2BookCount int + cliDatabase.MustScan(t, "getting client2 maxUSN", + env2.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), + &client2MaxUSN) + cliDatabase.MustScan(t, "counting client2 notes", + env2.DB.QueryRow("SELECT count(*) FROM notes WHERE deleted = 0"), + &client2NoteCount) + cliDatabase.MustScan(t, "counting client2 books", + env2.DB.QueryRow("SELECT count(*) FROM books WHERE deleted = 0"), + &client2BookCount) + + assert.Equal(t, client2MaxUSN, 8, "client2 should have same maxUSN=8 as client1") + assert.Equal(t, client2NoteCount, 4, "client2 should have 4 notes") + assert.Equal(t, client2BookCount, 4, "client2 should have 4 books") + + // Step 3: Switch client1 to new empty server + switchToEmptyServer(t, &env1) + + // Point client2 to the same new server + env2.Server = env1.Server + env2.ServerDB = env1.ServerDB + + // Update client2's API endpoint config to point to env1's server + apiEndpoint := fmt.Sprintf("%s/api", env1.Server.URL) + updateConfigAPIEndpoint(t, env2.TmpDir, apiEndpoint) + + // Create same user on new server + user = setupUserAndLogin(t, env1) + + // Setup session for client2 (same user, same server) + login(t, env2.DB, env2.ServerDB, user) + + // Step 4: Client1 syncs ONLY FIRST 2 BOOKS to empty server (simulates partial upload) + // This creates the stale USN scenario: client2 has maxUSN=8, but server will only have maxUSN=4 + clitest.MustWaitDnoteCmd(t, env1.CmdOpts, clitest.UserConfirmEmptyServerSync, + cliBinaryName, "sync") + + // Delete the last 2 books from client1 to prevent them being on server + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "remove", "go", "-y") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "remove", "rust", "-y") + + // Sync deletions to server + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "sync") + + // Verify server has 2 active books/notes (go/rust deleted) + var serverNoteCount, serverBookCount int64 + apitest.MustExec(t, env1.ServerDB.Model(&database.Note{}).Where("deleted = ?", false).Count(&serverNoteCount), "counting active server notes") + apitest.MustExec(t, env1.ServerDB.Model(&database.Book{}).Where("deleted = ?", false).Count(&serverBookCount), "counting active server books") + assert.Equal(t, int(serverNoteCount), 2, "server should have 2 active notes (go/rust deleted)") + assert.Equal(t, int(serverBookCount), 2, "server should have 2 active books (go/rust deleted)") + + // Step 5: Client2 syncs + // CRITICAL: Client2 has lastMaxUSN=8 (from copied DB), but server's max_usn is now ~8 but only has 2 books + // Client2 will ask for changes after USN=8, get nothing, then try to upload its 4 books + // This should trigger the orphaned notes scenario or require full sync + clitest.RunDnoteCmd(t, env2.CmdOpts, cliBinaryName, "sync") + + // Step 6: Verify client2 has all data and NO orphaned notes + var orphanedCount int + cliDatabase.MustScan(t, "checking for orphaned notes", + env2.DB.QueryRow(` + SELECT COUNT(*) FROM notes + WHERE deleted = 0 + AND book_uuid NOT IN (SELECT uuid FROM books WHERE deleted = 0) + `), &orphanedCount) + + assert.Equal(t, orphanedCount, 0, "client2 should have no orphaned notes") + + // Verify client2 converged with server state + // Note: checkState counts ALL records (including deleted ones) + // During full sync, cleanLocalBooks/cleanLocalNotes DELETE local records not on server + // So client2 ends up with only the 2 active books/notes + // Server has 4 total (2 active + 2 deleted) + var client2LastMaxUSN, client2LastSyncAt int + var serverUserMaxUSN int + cliDatabase.MustScan(t, "getting client2 lastMaxUSN", + env2.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastMaxUSN), + &client2LastMaxUSN) + var lastSyncAtStr string + cliDatabase.MustScan(t, "getting client2 lastSyncAt", + env2.DB.QueryRow("SELECT value FROM system WHERE key = ?", consts.SystemLastSyncAt), + &lastSyncAtStr) + lastSyncAtInt, _ := strconv.ParseInt(lastSyncAtStr, 10, 64) + client2LastSyncAt = int(lastSyncAtInt) + + apitest.MustExec(t, env2.ServerDB.Table("users").Select("max_usn").Where("id = ?", user.ID).Scan(&serverUserMaxUSN), "getting server user max_usn") + + checkState(t, env2.DB, user, env2.ServerDB, systemState{ + clientNoteCount: 2, // Only active notes (deleted ones removed by cleanLocalNotes) + clientBookCount: 2, // Only active books (deleted ones removed by cleanLocalBooks) + clientLastMaxUSN: client2LastMaxUSN, + clientLastSyncAt: int64(client2LastSyncAt), + serverNoteCount: 4, // 2 active + 2 deleted + serverBookCount: 4, // 2 active + 2 deleted + serverUserMaxUSN: serverUserMaxUSN, + }) + + // Verify both clients have the expected books (css, js only - go/rust deleted) + var client1BookCSS, client1BookJS, client2BookCSS, client2BookJS cliDatabase.Book + cliDatabase.MustScan(t, "finding client1 book 'css'", + env1.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "css"), + &client1BookCSS.UUID, &client1BookCSS.Label) + cliDatabase.MustScan(t, "finding client1 book 'js'", + env1.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "js"), + &client1BookJS.UUID, &client1BookJS.Label) + cliDatabase.MustScan(t, "finding client2 book 'css'", + env2.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "css"), + &client2BookCSS.UUID, &client2BookCSS.Label) + cliDatabase.MustScan(t, "finding client2 book 'js'", + env2.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "js"), + &client2BookJS.UUID, &client2BookJS.Label) + + assert.Equal(t, client1BookCSS.Label, "css", "client1 should have css book") + assert.Equal(t, client1BookJS.Label, "js", "client1 should have js book") + assert.Equal(t, client2BookCSS.Label, "css", "client2 should have css book") + assert.Equal(t, client2BookJS.Label, "js", "client2 should have js book") + + // Verify go and rust books are deleted/absent on both clients + var client2BookGo, client2BookRust cliDatabase.Book + errGo := env2.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "go").Scan(&client2BookGo.UUID, &client2BookGo.Label) + assert.Equal(t, errGo, sql.ErrNoRows, "client2 should not have non-deleted 'go' book") + errRust := env2.DB.QueryRow("SELECT uuid, label FROM books WHERE label = ? AND deleted = 0", "rust").Scan(&client2BookRust.UUID, &client2BookRust.Label) + assert.Equal(t, errRust, sql.ErrNoRows, "client2 should not have non-deleted 'rust' book") + }) + + t.Run("client with local data syncs after another client uploads to empty server - should not orphan notes", func(t *testing.T) { + // This test reproduces the scenario where: + // 1. Client1 has local data and syncs to original server + // 2. Client2 has DIFFERENT local data and syncs to SAME original server + // 3. Both clients switch to NEW empty server + // 4. Client1 uploads to the new empty server (sets FullSyncBefore) + // 5. Client2 syncs - should trigger full sync AND upload its local data + // WITHOUT orphaning notes due to cleanLocalBooks deleting them first + + // Step 1: Create client1 with local data on original server + env1 := setupTestEnv(t) + user := setupUserAndLogin(t, env1) + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "add", "client1-book", "-c", "client1-note") + clitest.RunDnoteCmd(t, env1.CmdOpts, cliBinaryName, "sync") + + // Step 2: Create client2 with DIFFERENT local data on SAME original server + env2 := setupTestEnv(t) + // Point env2 to env1's server (the original server) + env2.Server = env1.Server + env2.ServerDB = env1.ServerDB + apiEndpoint := fmt.Sprintf("%s/api", env1.Server.URL) + updateConfigAPIEndpoint(t, env2.TmpDir, apiEndpoint) + + // Login client2 to the same server + login(t, env2.DB, env2.ServerDB, user) + clitest.RunDnoteCmd(t, env2.CmdOpts, cliBinaryName, "add", "client2-book", "-c", "client2-note") + clitest.RunDnoteCmd(t, env2.CmdOpts, cliBinaryName, "sync") + + // Step 3: Both clients switch to NEW empty server + switchToEmptyServer(t, &env1) + env2.Server = env1.Server + env2.ServerDB = env1.ServerDB + apiEndpoint = fmt.Sprintf("%s/api", env1.Server.URL) + updateConfigAPIEndpoint(t, env2.TmpDir, apiEndpoint) + + // Create same user on new server + user = setupUserAndLogin(t, env1) + login(t, env2.DB, env2.ServerDB, user) + + // Step 4: Client1 uploads to empty server + clitest.MustWaitDnoteCmd(t, env1.CmdOpts, clitest.UserConfirmEmptyServerSync, cliBinaryName, "sync") + + // Verify server has client1's data and FullSyncBefore is set + var serverUser database.User + apitest.MustExec(t, env1.ServerDB.Where("id = ?", user.ID).First(&serverUser), "getting server user state") + assert.Equal(t, serverUser.MaxUSN > 0, true, "server should have data after client1 upload") + assert.Equal(t, serverUser.FullSyncBefore > 0, true, "server should have FullSyncBefore set") + + // Step 5: Client2 syncs - should trigger full sync due to FullSyncBefore + // CRITICAL: Client2 has local data (client2-book, client2-note) that should be uploaded + // Without the fix, cleanLocalBooks will delete client2-book before upload, orphaning client2-note + clitest.RunDnoteCmd(t, env2.CmdOpts, cliBinaryName, "sync") + + // Step 6: Verify NO orphaned notes on client2 + var orphanedCount int + cliDatabase.MustScan(t, "checking for orphaned notes on client2", + env2.DB.QueryRow(` + SELECT COUNT(*) FROM notes + WHERE deleted = 0 + AND book_uuid NOT IN (SELECT uuid FROM books WHERE deleted = 0) + `), &orphanedCount) + + assert.Equal(t, orphanedCount, 0, "client2 should have no orphaned notes after sync") + + // Step 7: Verify client2's data was uploaded to server + var client2BookOnServer database.Book + err := env2.ServerDB.Where("label = ? AND deleted = ?", "client2-book", false).First(&client2BookOnServer).Error + assert.Equal(t, err, nil, "client2-book should exist on server") + + var client2NoteOnServer database.Note + err = env2.ServerDB.Where("body = ? AND deleted = ?", "client2-note", false).First(&client2NoteOnServer).Error + assert.Equal(t, err, nil, "client2-note should exist on server") + + // Step 8: Verify server has data from BOTH clients + // Note: Both clients had synced to original server, so they each have 2 books + 2 notes locally. + // When switching to new empty server, client1 uploads 2 books + 2 notes (USN 1-4). + // Client2 then does full sync, downloads client1's uploads, marks its local data as dirty, + // and uploads its version of the same 2 books + 2 notes with potentially different UUIDs. + // The exact count depends on UUID conflict resolution, but we verify both original books exist. + var serverBookCount, serverNoteCount int64 + apitest.MustExec(t, env2.ServerDB.Model(&database.Book{}).Where("deleted = ?", false).Count(&serverBookCount), "counting active server books") + apitest.MustExec(t, env2.ServerDB.Model(&database.Note{}).Where("deleted = ?", false).Count(&serverNoteCount), "counting active server notes") + + // The main assertion: both original client books should exist + var client1BookExists, client2BookExists bool + err = env2.ServerDB.Model(&database.Book{}).Where("label = ? AND deleted = ?", "client1-book", false).First(&database.Book{}).Error + client1BookExists = (err == nil) + err = env2.ServerDB.Model(&database.Book{}).Where("label = ? AND deleted = ?", "client2-book", false).First(&database.Book{}).Error + client2BookExists = (err == nil) + + assert.Equal(t, client1BookExists, true, "server should have client1-book") + assert.Equal(t, client2BookExists, true, "server should have client2-book") + assert.Equal(t, serverBookCount >= 2, true, "server should have at least 2 books") + assert.Equal(t, serverNoteCount >= 2, true, "server should have at least 2 notes") + }) } diff --git a/pkg/server/app/helpers.go b/pkg/server/app/helpers.go index 3941b2cb..361db6cb 100644 --- a/pkg/server/app/helpers.go +++ b/pkg/server/app/helpers.go @@ -19,19 +19,35 @@ package app import ( + "time" + "github.com/dnote/dnote/pkg/server/database" - "gorm.io/gorm" "github.com/pkg/errors" + "gorm.io/gorm" ) // incrementUserUSN increment the given user's max_usn by 1 // and returns the new, incremented max_usn func incrementUserUSN(tx *gorm.DB, userID int) (int, error) { + // First, get the current max_usn to detect transition from empty server + var user database.User + if err := tx.Select("max_usn, full_sync_before").Where("id = ?", userID).First(&user).Error; err != nil { + return 0, errors.Wrap(err, "getting current user state") + } + + // If transitioning from empty server (MaxUSN=0) to non-empty (MaxUSN=1), + // set full_sync_before to current timestamp to force all other clients to full sync + if user.MaxUSN == 0 && user.FullSyncBefore == 0 { + currentTime := time.Now().Unix() + if err := tx.Table("users").Where("id = ?", userID).Update("full_sync_before", currentTime).Error; err != nil { + return 0, errors.Wrap(err, "setting full_sync_before on empty server transition") + } + } + if err := tx.Table("users").Where("id = ?", userID).Update("max_usn", gorm.Expr("max_usn + 1")).Error; err != nil { return 0, errors.Wrap(err, "incrementing user max_usn") } - var user database.User if err := tx.Select("max_usn").Where("id = ?", userID).First(&user).Error; err != nil { return 0, errors.Wrap(err, "getting the updated user max_usn") } diff --git a/pkg/server/controllers/sync.go b/pkg/server/controllers/sync.go index e93be7cd..3d7d2608 100644 --- a/pkg/server/controllers/sync.go +++ b/pkg/server/controllers/sync.go @@ -301,7 +301,7 @@ func (s *Sync) GetSyncState(w http.ResponseWriter, r *http.Request) { } response := GetSyncStateResp{ - FullSyncBefore: fullSyncBefore, + FullSyncBefore: int(user.FullSyncBefore), MaxUSN: user.MaxUSN, // TODO: exposing server time means we probably shouldn't seed random generator with time? CurrentTime: s.app.Clock.Now().Unix(), diff --git a/pkg/server/database/models.go b/pkg/server/database/models.go index 576dee7f..f21e8636 100644 --- a/pkg/server/database/models.go +++ b/pkg/server/database/models.go @@ -61,11 +61,12 @@ type Note struct { // User is a model for a user type User struct { Model - UUID string `json:"uuid" gorm:"type:text;index"` - Email NullString `gorm:"index"` - Password NullString `json:"-"` - LastLoginAt *time.Time `json:"-"` - MaxUSN int `json:"-" gorm:"default:0"` + UUID string `json:"uuid" gorm:"type:text;index"` + Email NullString `gorm:"index"` + Password NullString `json:"-"` + LastLoginAt *time.Time `json:"-"` + MaxUSN int `json:"-" gorm:"default:0"` + FullSyncBefore int64 `json:"-" gorm:"default:0"` } // Token is a model for a token From e0c4cb1545307978a3d6a8b362196553e05a3558 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Fri, 31 Oct 2025 23:41:21 -0700 Subject: [PATCH 25/33] Use Apache 2.0 license (#708) --- LICENSE | 209 +++++- licenses/AGPLv3.txt | 661 ----------------- licenses/GPLv3.txt | 674 ------------------ pkg/assert/assert.go | 23 +- pkg/assert/prompt.go | 23 +- pkg/cli/client/client.go | 23 +- pkg/cli/client/client_test.go | 23 +- pkg/cli/cmd/add/add.go | 23 +- pkg/cli/cmd/cat/cat.go | 23 +- pkg/cli/cmd/edit/book.go | 23 +- pkg/cli/cmd/edit/edit.go | 23 +- pkg/cli/cmd/edit/note.go | 23 +- pkg/cli/cmd/find/find.go | 23 +- pkg/cli/cmd/find/lexer.go | 23 +- pkg/cli/cmd/find/lexer_test.go | 23 +- pkg/cli/cmd/login/login.go | 23 +- pkg/cli/cmd/login/login_test.go | 23 +- pkg/cli/cmd/logout/logout.go | 23 +- pkg/cli/cmd/ls/ls.go | 23 +- pkg/cli/cmd/remove/remove.go | 23 +- pkg/cli/cmd/root/root.go | 23 +- pkg/cli/cmd/sync/merge.go | 23 +- pkg/cli/cmd/sync/merge_test.go | 23 +- pkg/cli/cmd/sync/sync.go | 23 +- pkg/cli/cmd/sync/sync_test.go | 23 +- pkg/cli/cmd/version/version.go | 23 +- pkg/cli/cmd/view/view.go | 23 +- pkg/cli/config/config.go | 23 +- pkg/cli/consts/consts.go | 23 +- pkg/cli/context/ctx.go | 23 +- pkg/cli/context/files.go | 23 +- pkg/cli/context/files_test.go | 23 +- pkg/cli/context/testutils.go | 23 +- pkg/cli/database/models.go | 23 +- pkg/cli/database/models_test.go | 23 +- pkg/cli/database/queries.go | 23 +- pkg/cli/database/queries_test.go | 23 +- pkg/cli/database/schema/main.go | 23 +- pkg/cli/database/schema/main_test.go | 23 +- pkg/cli/database/sql.go | 23 +- pkg/cli/database/testutils.go | 23 +- pkg/cli/infra/init.go | 23 +- pkg/cli/infra/init_test.go | 23 +- pkg/cli/log/log.go | 23 +- pkg/cli/main.go | 23 +- pkg/cli/main_test.go | 23 +- pkg/cli/migrate/legacy.go | 23 +- pkg/cli/migrate/legacy_test.go | 23 +- pkg/cli/migrate/migrate.go | 23 +- pkg/cli/migrate/migrate_test.go | 23 +- pkg/cli/migrate/migrations.go | 23 +- pkg/cli/output/output.go | 23 +- pkg/cli/testutils/main.go | 23 +- pkg/cli/testutils/setup.go | 23 +- pkg/cli/ui/editor.go | 23 +- pkg/cli/ui/editor_test.go | 23 +- pkg/cli/ui/terminal.go | 23 +- pkg/cli/upgrade/upgrade.go | 23 +- pkg/cli/upgrade/upgrade_test.go | 23 +- pkg/cli/utils/diff/diff.go | 23 +- pkg/cli/utils/diff/diff_test.go | 23 +- pkg/cli/utils/files.go | 23 +- pkg/cli/utils/files_test.go | 23 +- pkg/cli/utils/utils.go | 23 +- pkg/cli/validate/book_test.go | 23 +- pkg/cli/validate/books.go | 23 +- pkg/clock/clock.go | 23 +- pkg/dirs/dirs.go | 23 +- pkg/dirs/dirs_test.go | 23 +- pkg/dirs/dirs_unix.go | 23 +- pkg/dirs/dirs_unix_test.go | 23 +- pkg/dirs/dirs_windows.go | 23 +- pkg/dirs/dirs_windows_test.go | 23 +- pkg/e2e/server_test.go | 23 +- pkg/e2e/sync/basic_test.go | 23 +- pkg/e2e/sync/edge_cases_test.go | 23 +- pkg/e2e/sync/empty_server_test.go | 23 +- pkg/e2e/sync/main_test.go | 25 +- pkg/e2e/sync/testutils.go | 23 +- pkg/prompt/prompt.go | 23 +- pkg/prompt/prompt_test.go | 23 +- pkg/server/app/app.go | 23 +- pkg/server/app/books.go | 23 +- pkg/server/app/books_test.go | 23 +- pkg/server/app/doc.go | 23 +- pkg/server/app/email.go | 23 +- pkg/server/app/email_test.go | 23 +- pkg/server/app/errors.go | 23 +- pkg/server/app/helpers.go | 23 +- pkg/server/app/helpers_test.go | 23 +- pkg/server/app/notes.go | 23 +- pkg/server/app/notes_test.go | 23 +- pkg/server/app/sessions.go | 23 +- pkg/server/app/testutils.go | 23 +- pkg/server/app/users.go | 23 +- pkg/server/app/users_test.go | 23 +- pkg/server/assets/embed.go | 23 +- pkg/server/assets/js/src/main.js | 23 +- pkg/server/assets/package-lock.json | 2 +- pkg/server/assets/package.json | 2 +- pkg/server/assets/styles/src/_books.scss | 31 +- pkg/server/assets/styles/src/_bootstrap.scss | 23 +- pkg/server/assets/styles/src/_buttons.scss | 23 +- pkg/server/assets/styles/src/_font.scss | 23 +- pkg/server/assets/styles/src/_global.scss | 31 +- pkg/server/assets/styles/src/_grid.scss | 23 +- pkg/server/assets/styles/src/_header.scss | 23 +- pkg/server/assets/styles/src/_hljs.scss | 23 +- pkg/server/assets/styles/src/_home.scss | 23 +- pkg/server/assets/styles/src/_login.scss | 23 +- pkg/server/assets/styles/src/_markdown.scss | 23 +- pkg/server/assets/styles/src/_marker.scss | 23 +- pkg/server/assets/styles/src/_note.scss | 31 +- pkg/server/assets/styles/src/_reboot.scss | 23 +- pkg/server/assets/styles/src/_rem.scss | 31 +- pkg/server/assets/styles/src/_responsive.scss | 23 +- pkg/server/assets/styles/src/_select.scss | 23 +- pkg/server/assets/styles/src/_settings.scss | 23 +- pkg/server/assets/styles/src/_shared.scss | 23 +- pkg/server/assets/styles/src/_theme.scss | 25 +- pkg/server/assets/styles/src/_variables.scss | 23 +- pkg/server/assets/styles/src/main.scss | 23 +- pkg/server/buildinfo/info.go | 23 +- pkg/server/cmd/helpers.go | 23 +- pkg/server/cmd/root.go | 23 +- pkg/server/cmd/start.go | 23 +- pkg/server/cmd/user.go | 23 +- pkg/server/cmd/user_test.go | 23 +- pkg/server/cmd/version.go | 23 +- pkg/server/config/config.go | 23 +- pkg/server/config/config_test.go | 23 +- pkg/server/consts/consts.go | 23 +- pkg/server/context/user.go | 23 +- pkg/server/controllers/books.go | 23 +- pkg/server/controllers/books_test.go | 23 +- pkg/server/controllers/controllers.go | 23 +- pkg/server/controllers/health.go | 23 +- pkg/server/controllers/health_test.go | 23 +- pkg/server/controllers/helpers.go | 23 +- pkg/server/controllers/main_test.go | 23 +- pkg/server/controllers/notes.go | 23 +- pkg/server/controllers/notes_test.go | 23 +- pkg/server/controllers/routes.go | 23 +- pkg/server/controllers/routes_test.go | 23 +- pkg/server/controllers/static.go | 23 +- pkg/server/controllers/sync.go | 23 +- pkg/server/controllers/sync_test.go | 23 +- pkg/server/controllers/testutils.go | 23 +- pkg/server/controllers/users.go | 23 +- pkg/server/controllers/users_test.go | 23 +- pkg/server/crypt/crypt.go | 23 +- pkg/server/database/consts.go | 23 +- pkg/server/database/database.go | 23 +- pkg/server/database/errors.go | 23 +- pkg/server/database/migrate.go | 23 +- pkg/server/database/migrate_test.go | 23 +- pkg/server/database/migrations/embed.go | 23 +- pkg/server/database/models.go | 23 +- pkg/server/database/notes.go | 23 +- pkg/server/database/types.go | 23 +- pkg/server/helpers/const.go | 23 +- pkg/server/helpers/url.go | 23 +- pkg/server/helpers/url_test.go | 23 +- pkg/server/helpers/uuid.go | 23 +- pkg/server/log/log.go | 23 +- pkg/server/log/log_test.go | 23 +- pkg/server/mailer/backend.go | 23 +- pkg/server/mailer/backend_test.go | 23 +- pkg/server/mailer/mailer.go | 23 +- pkg/server/mailer/mailer_test.go | 23 +- pkg/server/mailer/templates/templates.go | 23 +- pkg/server/mailer/tokens.go | 23 +- pkg/server/mailer/tokens_test.go | 23 +- pkg/server/mailer/types.go | 23 +- pkg/server/main.go | 23 +- pkg/server/middleware/auth.go | 23 +- pkg/server/middleware/auth_test.go | 23 +- pkg/server/middleware/helpers.go | 23 +- pkg/server/middleware/helpers_test.go | 23 +- pkg/server/middleware/limit.go | 23 +- pkg/server/middleware/limit_test.go | 23 +- pkg/server/middleware/logging.go | 23 +- pkg/server/middleware/middleware.go | 23 +- pkg/server/operations/doc.go | 23 +- pkg/server/operations/notes.go | 23 +- pkg/server/operations/notes_test.go | 23 +- pkg/server/permissions/permissions.go | 23 +- pkg/server/permissions/permissions_test.go | 23 +- pkg/server/presenters/book.go | 23 +- pkg/server/presenters/book_test.go | 23 +- pkg/server/presenters/helpers.go | 23 +- pkg/server/presenters/helpers_test.go | 23 +- pkg/server/presenters/note.go | 23 +- pkg/server/presenters/note_test.go | 23 +- pkg/server/session/session.go | 23 +- pkg/server/session/session_test.go | 23 +- pkg/server/testutils/main.go | 23 +- pkg/server/token/token.go | 23 +- pkg/server/token/token_test.go | 23 +- pkg/server/views/data.go | 23 +- pkg/server/views/embed.go | 23 +- pkg/server/views/engine.go | 23 +- pkg/server/views/helpers.go | 23 +- pkg/server/views/helpers_test.go | 23 +- pkg/server/views/time.go | 23 +- pkg/server/views/view.go | 23 +- pkg/watcher/main.go | 23 +- scripts/cli/build.sh | 2 +- scripts/license.sh | 65 +- scripts/server/build.sh | 2 +- 210 files changed, 2261 insertions(+), 4038 deletions(-) delete mode 100644 licenses/AGPLv3.txt delete mode 100644 licenses/GPLv3.txt diff --git a/LICENSE b/LICENSE index fb388417..6b0b1270 100644 --- a/LICENSE +++ b/LICENSE @@ -1,8 +1,203 @@ -Source code in this repository is variously licensed under the GNU Affero General Public -License v3.0 (GNU AGPLv3), and GNU General Public License v3.0 (GNU GPLv3). A copy of each -license can be found in the licenses directory. The Source code for the cli is licensed under -GNU GPLv3. The source code for the server and the web is licensed under GNU AGPLv3. Unless -otherwise noted, source code in a given file is licensed under the GNU AGPLv3. -Unless otherwise noted at the beginning of the file, the copyright belongs to -Dnote contributors + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/licenses/AGPLv3.txt b/licenses/AGPLv3.txt deleted file mode 100644 index 0ad25db4..00000000 --- a/licenses/AGPLv3.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero 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 - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/licenses/GPLv3.txt b/licenses/GPLv3.txt deleted file mode 100644 index f288702d..00000000 --- a/licenses/GPLv3.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/pkg/assert/assert.go b/pkg/assert/assert.go index 000d7b48..bb98fce0 100644 --- a/pkg/assert/assert.go +++ b/pkg/assert/assert.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package assert provides functions to assert a condition in tests diff --git a/pkg/assert/prompt.go b/pkg/assert/prompt.go index d4ec5d25..c21e6a42 100644 --- a/pkg/assert/prompt.go +++ b/pkg/assert/prompt.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package assert diff --git a/pkg/cli/client/client.go b/pkg/cli/client/client.go index 083b9392..2be0006d 100644 --- a/pkg/cli/client/client.go +++ b/pkg/cli/client/client.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package client provides interfaces for interacting with the Dnote server diff --git a/pkg/cli/client/client_test.go b/pkg/cli/client/client_test.go index 3bb99e93..f83a0e6f 100644 --- a/pkg/cli/client/client_test.go +++ b/pkg/cli/client/client_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package client diff --git a/pkg/cli/cmd/add/add.go b/pkg/cli/cmd/add/add.go index 2d6591a2..be89b829 100644 --- a/pkg/cli/cmd/add/add.go +++ b/pkg/cli/cmd/add/add.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package add diff --git a/pkg/cli/cmd/cat/cat.go b/pkg/cli/cmd/cat/cat.go index 4961ce33..c32eb687 100644 --- a/pkg/cli/cmd/cat/cat.go +++ b/pkg/cli/cmd/cat/cat.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package cat diff --git a/pkg/cli/cmd/edit/book.go b/pkg/cli/cmd/edit/book.go index 5b85f98b..ab326e7f 100644 --- a/pkg/cli/cmd/edit/book.go +++ b/pkg/cli/cmd/edit/book.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package edit diff --git a/pkg/cli/cmd/edit/edit.go b/pkg/cli/cmd/edit/edit.go index 12a80dce..16a7c413 100644 --- a/pkg/cli/cmd/edit/edit.go +++ b/pkg/cli/cmd/edit/edit.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package edit diff --git a/pkg/cli/cmd/edit/note.go b/pkg/cli/cmd/edit/note.go index f6019778..84a631f4 100644 --- a/pkg/cli/cmd/edit/note.go +++ b/pkg/cli/cmd/edit/note.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package edit diff --git a/pkg/cli/cmd/find/find.go b/pkg/cli/cmd/find/find.go index e3007c9b..4723bcb4 100644 --- a/pkg/cli/cmd/find/find.go +++ b/pkg/cli/cmd/find/find.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package find diff --git a/pkg/cli/cmd/find/lexer.go b/pkg/cli/cmd/find/lexer.go index b5bc8ce8..6115becc 100644 --- a/pkg/cli/cmd/find/lexer.go +++ b/pkg/cli/cmd/find/lexer.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package find diff --git a/pkg/cli/cmd/find/lexer_test.go b/pkg/cli/cmd/find/lexer_test.go index 288d71fc..3a74ad5a 100644 --- a/pkg/cli/cmd/find/lexer_test.go +++ b/pkg/cli/cmd/find/lexer_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package find diff --git a/pkg/cli/cmd/login/login.go b/pkg/cli/cmd/login/login.go index 4d8ee392..c9b1dfd5 100644 --- a/pkg/cli/cmd/login/login.go +++ b/pkg/cli/cmd/login/login.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package login diff --git a/pkg/cli/cmd/login/login_test.go b/pkg/cli/cmd/login/login_test.go index c208fa5d..6d5917cc 100644 --- a/pkg/cli/cmd/login/login_test.go +++ b/pkg/cli/cmd/login/login_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package login diff --git a/pkg/cli/cmd/logout/logout.go b/pkg/cli/cmd/logout/logout.go index 008c9652..98cd69eb 100644 --- a/pkg/cli/cmd/logout/logout.go +++ b/pkg/cli/cmd/logout/logout.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package logout diff --git a/pkg/cli/cmd/ls/ls.go b/pkg/cli/cmd/ls/ls.go index dbf4deb4..f0ddd047 100644 --- a/pkg/cli/cmd/ls/ls.go +++ b/pkg/cli/cmd/ls/ls.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package ls diff --git a/pkg/cli/cmd/remove/remove.go b/pkg/cli/cmd/remove/remove.go index 443e4867..89d44b78 100644 --- a/pkg/cli/cmd/remove/remove.go +++ b/pkg/cli/cmd/remove/remove.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package remove diff --git a/pkg/cli/cmd/root/root.go b/pkg/cli/cmd/root/root.go index 604f7682..6da096bf 100644 --- a/pkg/cli/cmd/root/root.go +++ b/pkg/cli/cmd/root/root.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package root diff --git a/pkg/cli/cmd/sync/merge.go b/pkg/cli/cmd/sync/merge.go index 2b70d095..0e4d15be 100644 --- a/pkg/cli/cmd/sync/merge.go +++ b/pkg/cli/cmd/sync/merge.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sync diff --git a/pkg/cli/cmd/sync/merge_test.go b/pkg/cli/cmd/sync/merge_test.go index 3134e13c..e6f4839e 100644 --- a/pkg/cli/cmd/sync/merge_test.go +++ b/pkg/cli/cmd/sync/merge_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sync diff --git a/pkg/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go index f8f2aec0..6cb506ae 100644 --- a/pkg/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sync diff --git a/pkg/cli/cmd/sync/sync_test.go b/pkg/cli/cmd/sync/sync_test.go index 6c22e926..ae3b94ff 100644 --- a/pkg/cli/cmd/sync/sync_test.go +++ b/pkg/cli/cmd/sync/sync_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sync diff --git a/pkg/cli/cmd/version/version.go b/pkg/cli/cmd/version/version.go index f508ee6e..79892204 100644 --- a/pkg/cli/cmd/version/version.go +++ b/pkg/cli/cmd/version/version.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package version diff --git a/pkg/cli/cmd/view/view.go b/pkg/cli/cmd/view/view.go index dde41fa5..62f50a53 100644 --- a/pkg/cli/cmd/view/view.go +++ b/pkg/cli/cmd/view/view.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package view diff --git a/pkg/cli/config/config.go b/pkg/cli/config/config.go index b0faa9cf..065100c0 100644 --- a/pkg/cli/config/config.go +++ b/pkg/cli/config/config.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package config diff --git a/pkg/cli/consts/consts.go b/pkg/cli/consts/consts.go index dec8d456..0f49c152 100644 --- a/pkg/cli/consts/consts.go +++ b/pkg/cli/consts/consts.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package consts provides definitions of constants diff --git a/pkg/cli/context/ctx.go b/pkg/cli/context/ctx.go index 61cd5be8..971d9145 100644 --- a/pkg/cli/context/ctx.go +++ b/pkg/cli/context/ctx.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package context defines dnote context diff --git a/pkg/cli/context/files.go b/pkg/cli/context/files.go index 098b2cd5..1abbcd47 100644 --- a/pkg/cli/context/files.go +++ b/pkg/cli/context/files.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package context diff --git a/pkg/cli/context/files_test.go b/pkg/cli/context/files_test.go index 2422a795..49d62dc9 100644 --- a/pkg/cli/context/files_test.go +++ b/pkg/cli/context/files_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package context diff --git a/pkg/cli/context/testutils.go b/pkg/cli/context/testutils.go index 62fed833..cb477475 100644 --- a/pkg/cli/context/testutils.go +++ b/pkg/cli/context/testutils.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package context diff --git a/pkg/cli/database/models.go b/pkg/cli/database/models.go index b26a6b5a..e8e463bb 100644 --- a/pkg/cli/database/models.go +++ b/pkg/cli/database/models.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/cli/database/models_test.go b/pkg/cli/database/models_test.go index 53565d7b..6d0a45f0 100644 --- a/pkg/cli/database/models_test.go +++ b/pkg/cli/database/models_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/cli/database/queries.go b/pkg/cli/database/queries.go index e8ec5ce5..2209c8f3 100644 --- a/pkg/cli/database/queries.go +++ b/pkg/cli/database/queries.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/cli/database/queries_test.go b/pkg/cli/database/queries_test.go index cccc697f..e394fe95 100644 --- a/pkg/cli/database/queries_test.go +++ b/pkg/cli/database/queries_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/cli/database/schema/main.go b/pkg/cli/database/schema/main.go index 2596c84a..6c75e4d0 100644 --- a/pkg/cli/database/schema/main.go +++ b/pkg/cli/database/schema/main.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Command schema generates the CLI database schema.sql file. diff --git a/pkg/cli/database/schema/main_test.go b/pkg/cli/database/schema/main_test.go index 24bd9fc0..26898ef3 100644 --- a/pkg/cli/database/schema/main_test.go +++ b/pkg/cli/database/schema/main_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package main diff --git a/pkg/cli/database/sql.go b/pkg/cli/database/sql.go index 19271606..0af3c7fd 100644 --- a/pkg/cli/database/sql.go +++ b/pkg/cli/database/sql.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/cli/database/testutils.go b/pkg/cli/database/testutils.go index 59824034..23633d53 100644 --- a/pkg/cli/database/testutils.go +++ b/pkg/cli/database/testutils.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/cli/infra/init.go b/pkg/cli/infra/init.go index b87cfdd4..a6cbd1aa 100644 --- a/pkg/cli/infra/init.go +++ b/pkg/cli/infra/init.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package infra provides operations and definitions for the diff --git a/pkg/cli/infra/init_test.go b/pkg/cli/infra/init_test.go index 6ac0d5cf..8c698624 100644 --- a/pkg/cli/infra/init_test.go +++ b/pkg/cli/infra/init_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package infra diff --git a/pkg/cli/log/log.go b/pkg/cli/log/log.go index dc78e2b4..0bc569b6 100644 --- a/pkg/cli/log/log.go +++ b/pkg/cli/log/log.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package log diff --git a/pkg/cli/main.go b/pkg/cli/main.go index dfdac5a7..2afbaf36 100644 --- a/pkg/cli/main.go +++ b/pkg/cli/main.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package main diff --git a/pkg/cli/main_test.go b/pkg/cli/main_test.go index 0d9ad71a..5da1915e 100644 --- a/pkg/cli/main_test.go +++ b/pkg/cli/main_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package main diff --git a/pkg/cli/migrate/legacy.go b/pkg/cli/migrate/legacy.go index dc5441c7..4399f7fb 100644 --- a/pkg/cli/migrate/legacy.go +++ b/pkg/cli/migrate/legacy.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package migrate provides migration logic for both sqlite and diff --git a/pkg/cli/migrate/legacy_test.go b/pkg/cli/migrate/legacy_test.go index 4d1a1dc6..73d8b063 100644 --- a/pkg/cli/migrate/legacy_test.go +++ b/pkg/cli/migrate/legacy_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package migrate diff --git a/pkg/cli/migrate/migrate.go b/pkg/cli/migrate/migrate.go index d579ffb7..9b4b0f50 100644 --- a/pkg/cli/migrate/migrate.go +++ b/pkg/cli/migrate/migrate.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package migrate diff --git a/pkg/cli/migrate/migrate_test.go b/pkg/cli/migrate/migrate_test.go index 591f1800..7b31a91e 100644 --- a/pkg/cli/migrate/migrate_test.go +++ b/pkg/cli/migrate/migrate_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package migrate diff --git a/pkg/cli/migrate/migrations.go b/pkg/cli/migrate/migrations.go index 09b86afc..197a2b03 100644 --- a/pkg/cli/migrate/migrations.go +++ b/pkg/cli/migrate/migrations.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package migrate diff --git a/pkg/cli/output/output.go b/pkg/cli/output/output.go index ef35b4fb..fe6e3c87 100644 --- a/pkg/cli/output/output.go +++ b/pkg/cli/output/output.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package output provides functions to print informations on the terminal diff --git a/pkg/cli/testutils/main.go b/pkg/cli/testutils/main.go index cefa6323..581cbd7f 100644 --- a/pkg/cli/testutils/main.go +++ b/pkg/cli/testutils/main.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package testutils provides utilities used in tests diff --git a/pkg/cli/testutils/setup.go b/pkg/cli/testutils/setup.go index 12c8b8ae..d88afd2d 100644 --- a/pkg/cli/testutils/setup.go +++ b/pkg/cli/testutils/setup.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package testutils diff --git a/pkg/cli/ui/editor.go b/pkg/cli/ui/editor.go index 3501e7ae..a6c165f4 100644 --- a/pkg/cli/ui/editor.go +++ b/pkg/cli/ui/editor.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package ui provides the user interface for the program diff --git a/pkg/cli/ui/editor_test.go b/pkg/cli/ui/editor_test.go index 718c5337..54538c49 100644 --- a/pkg/cli/ui/editor_test.go +++ b/pkg/cli/ui/editor_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package ui diff --git a/pkg/cli/ui/terminal.go b/pkg/cli/ui/terminal.go index 899060c7..6a255766 100644 --- a/pkg/cli/ui/terminal.go +++ b/pkg/cli/ui/terminal.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package ui diff --git a/pkg/cli/upgrade/upgrade.go b/pkg/cli/upgrade/upgrade.go index aabfb916..7c24a86d 100644 --- a/pkg/cli/upgrade/upgrade.go +++ b/pkg/cli/upgrade/upgrade.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package upgrade diff --git a/pkg/cli/upgrade/upgrade_test.go b/pkg/cli/upgrade/upgrade_test.go index 6b8e089c..917e6754 100644 --- a/pkg/cli/upgrade/upgrade_test.go +++ b/pkg/cli/upgrade/upgrade_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package upgrade diff --git a/pkg/cli/utils/diff/diff.go b/pkg/cli/utils/diff/diff.go index 68dd5eb1..ff7e3384 100644 --- a/pkg/cli/utils/diff/diff.go +++ b/pkg/cli/utils/diff/diff.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package diff provides line-by-line diff feature by wrapping diff --git a/pkg/cli/utils/diff/diff_test.go b/pkg/cli/utils/diff/diff_test.go index 84794d0c..f777f26c 100644 --- a/pkg/cli/utils/diff/diff_test.go +++ b/pkg/cli/utils/diff/diff_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package diff diff --git a/pkg/cli/utils/files.go b/pkg/cli/utils/files.go index 00e898ec..60f57de6 100644 --- a/pkg/cli/utils/files.go +++ b/pkg/cli/utils/files.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package utils diff --git a/pkg/cli/utils/files_test.go b/pkg/cli/utils/files_test.go index 3c7c92bd..7f26e19c 100644 --- a/pkg/cli/utils/files_test.go +++ b/pkg/cli/utils/files_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package utils diff --git a/pkg/cli/utils/utils.go b/pkg/cli/utils/utils.go index 5eed196f..417963ce 100644 --- a/pkg/cli/utils/utils.go +++ b/pkg/cli/utils/utils.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package utils diff --git a/pkg/cli/validate/book_test.go b/pkg/cli/validate/book_test.go index 29c410a4..97a384fc 100644 --- a/pkg/cli/validate/book_test.go +++ b/pkg/cli/validate/book_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package validate diff --git a/pkg/cli/validate/books.go b/pkg/cli/validate/books.go index 55b03675..b0e4c0ed 100644 --- a/pkg/cli/validate/books.go +++ b/pkg/cli/validate/books.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package validate diff --git a/pkg/clock/clock.go b/pkg/clock/clock.go index dda84b74..061bb1a3 100644 --- a/pkg/clock/clock.go +++ b/pkg/clock/clock.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package clock provides an abstract layer over the standard time package diff --git a/pkg/dirs/dirs.go b/pkg/dirs/dirs.go index 439cfde8..3eb57a7f 100644 --- a/pkg/dirs/dirs.go +++ b/pkg/dirs/dirs.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package dirs provides base directory definitions for the system diff --git a/pkg/dirs/dirs_test.go b/pkg/dirs/dirs_test.go index 6fe3d1e0..0c1ecb1f 100644 --- a/pkg/dirs/dirs_test.go +++ b/pkg/dirs/dirs_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package dirs diff --git a/pkg/dirs/dirs_unix.go b/pkg/dirs/dirs_unix.go index 59420c0e..6c7696c6 100644 --- a/pkg/dirs/dirs_unix.go +++ b/pkg/dirs/dirs_unix.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ //go:build linux || darwin || freebsd diff --git a/pkg/dirs/dirs_unix_test.go b/pkg/dirs/dirs_unix_test.go index 0ab63ad8..9ea5805a 100644 --- a/pkg/dirs/dirs_unix_test.go +++ b/pkg/dirs/dirs_unix_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ //go:build linux || darwin || freebsd diff --git a/pkg/dirs/dirs_windows.go b/pkg/dirs/dirs_windows.go index fb7bccf6..7159ae8d 100644 --- a/pkg/dirs/dirs_windows.go +++ b/pkg/dirs/dirs_windows.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ //go:build windows diff --git a/pkg/dirs/dirs_windows_test.go b/pkg/dirs/dirs_windows_test.go index 85be4a3f..101071f5 100644 --- a/pkg/dirs/dirs_windows_test.go +++ b/pkg/dirs/dirs_windows_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ //go:build windows diff --git a/pkg/e2e/server_test.go b/pkg/e2e/server_test.go index 39da46de..f94347ac 100644 --- a/pkg/e2e/server_test.go +++ b/pkg/e2e/server_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package main diff --git a/pkg/e2e/sync/basic_test.go b/pkg/e2e/sync/basic_test.go index 4986229a..d49b0cd9 100644 --- a/pkg/e2e/sync/basic_test.go +++ b/pkg/e2e/sync/basic_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sync diff --git a/pkg/e2e/sync/edge_cases_test.go b/pkg/e2e/sync/edge_cases_test.go index ef1e0923..f833cadc 100644 --- a/pkg/e2e/sync/edge_cases_test.go +++ b/pkg/e2e/sync/edge_cases_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sync diff --git a/pkg/e2e/sync/empty_server_test.go b/pkg/e2e/sync/empty_server_test.go index ad7308e9..31756ed2 100644 --- a/pkg/e2e/sync/empty_server_test.go +++ b/pkg/e2e/sync/empty_server_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sync diff --git a/pkg/e2e/sync/main_test.go b/pkg/e2e/sync/main_test.go index b5d517f5..188e3a99 100644 --- a/pkg/e2e/sync/main_test.go +++ b/pkg/e2e/sync/main_test.go @@ -1,21 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This file is part of Dnote. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sync diff --git a/pkg/e2e/sync/testutils.go b/pkg/e2e/sync/testutils.go index def7bc47..0a09d963 100644 --- a/pkg/e2e/sync/testutils.go +++ b/pkg/e2e/sync/testutils.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package sync diff --git a/pkg/prompt/prompt.go b/pkg/prompt/prompt.go index 1d413a27..262685e9 100644 --- a/pkg/prompt/prompt.go +++ b/pkg/prompt/prompt.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package prompt provides utilities for interactive yes/no prompts diff --git a/pkg/prompt/prompt_test.go b/pkg/prompt/prompt_test.go index f0df9480..6d5eb597 100644 --- a/pkg/prompt/prompt_test.go +++ b/pkg/prompt/prompt_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package prompt diff --git a/pkg/server/app/app.go b/pkg/server/app/app.go index 96717eea..80754fbe 100644 --- a/pkg/server/app/app.go +++ b/pkg/server/app/app.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/books.go b/pkg/server/app/books.go index ae7b355f..f222b816 100644 --- a/pkg/server/app/books.go +++ b/pkg/server/app/books.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/books_test.go b/pkg/server/app/books_test.go index 66a27077..8953c613 100644 --- a/pkg/server/app/books_test.go +++ b/pkg/server/app/books_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/doc.go b/pkg/server/app/doc.go index 502939ff..2a3f3695 100644 --- a/pkg/server/app/doc.go +++ b/pkg/server/app/doc.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /* diff --git a/pkg/server/app/email.go b/pkg/server/app/email.go index 2f721a6f..14d3ec38 100644 --- a/pkg/server/app/email.go +++ b/pkg/server/app/email.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/email_test.go b/pkg/server/app/email_test.go index 56270604..31d284e7 100644 --- a/pkg/server/app/email_test.go +++ b/pkg/server/app/email_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/errors.go b/pkg/server/app/errors.go index 48f193b9..9d41ca38 100644 --- a/pkg/server/app/errors.go +++ b/pkg/server/app/errors.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/helpers.go b/pkg/server/app/helpers.go index 361db6cb..437ca9ae 100644 --- a/pkg/server/app/helpers.go +++ b/pkg/server/app/helpers.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/helpers_test.go b/pkg/server/app/helpers_test.go index ad309514..93486ecd 100644 --- a/pkg/server/app/helpers_test.go +++ b/pkg/server/app/helpers_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/notes.go b/pkg/server/app/notes.go index 7f25123a..4bdeaaf6 100644 --- a/pkg/server/app/notes.go +++ b/pkg/server/app/notes.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/notes_test.go b/pkg/server/app/notes_test.go index 6ee55b8f..a165312d 100644 --- a/pkg/server/app/notes_test.go +++ b/pkg/server/app/notes_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/sessions.go b/pkg/server/app/sessions.go index a240e036..e3a574b7 100644 --- a/pkg/server/app/sessions.go +++ b/pkg/server/app/sessions.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/testutils.go b/pkg/server/app/testutils.go index 45dbd5bb..8ea6980d 100644 --- a/pkg/server/app/testutils.go +++ b/pkg/server/app/testutils.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/users.go b/pkg/server/app/users.go index eb53c5a4..760b3354 100644 --- a/pkg/server/app/users.go +++ b/pkg/server/app/users.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/app/users_test.go b/pkg/server/app/users_test.go index 90184fec..f345b217 100644 --- a/pkg/server/app/users_test.go +++ b/pkg/server/app/users_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package app diff --git a/pkg/server/assets/embed.go b/pkg/server/assets/embed.go index abe8c04f..e0272d95 100644 --- a/pkg/server/assets/embed.go +++ b/pkg/server/assets/embed.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package assets diff --git a/pkg/server/assets/js/src/main.js b/pkg/server/assets/js/src/main.js index e63a8fb3..9e58d92a 100644 --- a/pkg/server/assets/js/src/main.js +++ b/pkg/server/assets/js/src/main.js @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ var getNextSibling = function (el, selector) { diff --git a/pkg/server/assets/package-lock.json b/pkg/server/assets/package-lock.json index ec63082c..610d8eb4 100644 --- a/pkg/server/assets/package-lock.json +++ b/pkg/server/assets/package-lock.json @@ -7,7 +7,7 @@ "": { "name": "assets", "version": "1.0.0", - "license": "AGPL-3.0-or-later", + "license": "Apache-2.0", "devDependencies": { "sass": "^1.50.1" } diff --git a/pkg/server/assets/package.json b/pkg/server/assets/package.json index 0edcd180..1561f6da 100644 --- a/pkg/server/assets/package.json +++ b/pkg/server/assets/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": {}, "author": "Dnote", - "license": "AGPL-3.0-or-later", + "license": "Apache-2.0", "devDependencies": { "sass": "^1.50.1" } diff --git a/pkg/server/assets/styles/src/_books.scss b/pkg/server/assets/styles/src/_books.scss index c94c4347..10f9a8aa 100644 --- a/pkg/server/assets/styles/src/_books.scss +++ b/pkg/server/assets/styles/src/_books.scss @@ -1,23 +1,20 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ @use "rem"; @use "theme"; -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ .books-page { .books-content { diff --git a/pkg/server/assets/styles/src/_bootstrap.scss b/pkg/server/assets/styles/src/_bootstrap.scss index e306a4b0..9ccc9a78 100644 --- a/pkg/server/assets/styles/src/_bootstrap.scss +++ b/pkg/server/assets/styles/src/_bootstrap.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // From Bootstrap <4.3.1 diff --git a/pkg/server/assets/styles/src/_buttons.scss b/pkg/server/assets/styles/src/_buttons.scss index 16059864..e734b003 100644 --- a/pkg/server/assets/styles/src/_buttons.scss +++ b/pkg/server/assets/styles/src/_buttons.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @use "sass:color"; diff --git a/pkg/server/assets/styles/src/_font.scss b/pkg/server/assets/styles/src/_font.scss index 37bc3163..4818014a 100644 --- a/pkg/server/assets/styles/src/_font.scss +++ b/pkg/server/assets/styles/src/_font.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @use 'responsive'; diff --git a/pkg/server/assets/styles/src/_global.scss b/pkg/server/assets/styles/src/_global.scss index 8c497658..7bad7d58 100644 --- a/pkg/server/assets/styles/src/_global.scss +++ b/pkg/server/assets/styles/src/_global.scss @@ -1,26 +1,23 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ @use "font"; @use "rem"; @use "responsive"; @use "theme"; @use "variables"; -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ .main { position: relative; diff --git a/pkg/server/assets/styles/src/_grid.scss b/pkg/server/assets/styles/src/_grid.scss index 362946be..9e527582 100644 --- a/pkg/server/assets/styles/src/_grid.scss +++ b/pkg/server/assets/styles/src/_grid.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /*! diff --git a/pkg/server/assets/styles/src/_header.scss b/pkg/server/assets/styles/src/_header.scss index c952599e..28374fb7 100644 --- a/pkg/server/assets/styles/src/_header.scss +++ b/pkg/server/assets/styles/src/_header.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @use "sass:color"; diff --git a/pkg/server/assets/styles/src/_hljs.scss b/pkg/server/assets/styles/src/_hljs.scss index 3f05190d..4decc572 100644 --- a/pkg/server/assets/styles/src/_hljs.scss +++ b/pkg/server/assets/styles/src/_hljs.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /* diff --git a/pkg/server/assets/styles/src/_home.scss b/pkg/server/assets/styles/src/_home.scss index ce72a9f3..6ec13eaa 100644 --- a/pkg/server/assets/styles/src/_home.scss +++ b/pkg/server/assets/styles/src/_home.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @use 'theme'; diff --git a/pkg/server/assets/styles/src/_login.scss b/pkg/server/assets/styles/src/_login.scss index 9200a911..1b8bfa97 100644 --- a/pkg/server/assets/styles/src/_login.scss +++ b/pkg/server/assets/styles/src/_login.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @use 'theme'; diff --git a/pkg/server/assets/styles/src/_markdown.scss b/pkg/server/assets/styles/src/_markdown.scss index 949ee46a..e1621ffa 100644 --- a/pkg/server/assets/styles/src/_markdown.scss +++ b/pkg/server/assets/styles/src/_markdown.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /* diff --git a/pkg/server/assets/styles/src/_marker.scss b/pkg/server/assets/styles/src/_marker.scss index 6de64210..db583dd2 100644 --- a/pkg/server/assets/styles/src/_marker.scss +++ b/pkg/server/assets/styles/src/_marker.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ .marker { diff --git a/pkg/server/assets/styles/src/_note.scss b/pkg/server/assets/styles/src/_note.scss index edc83a34..87f6e790 100644 --- a/pkg/server/assets/styles/src/_note.scss +++ b/pkg/server/assets/styles/src/_note.scss @@ -1,25 +1,22 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ @use "font"; @use "rem"; @use "responsive"; @use "theme"; -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ .note-page { // min-height: calc(100vh - 57px); diff --git a/pkg/server/assets/styles/src/_reboot.scss b/pkg/server/assets/styles/src/_reboot.scss index 04587120..369cf5de 100644 --- a/pkg/server/assets/styles/src/_reboot.scss +++ b/pkg/server/assets/styles/src/_reboot.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /*! diff --git a/pkg/server/assets/styles/src/_rem.scss b/pkg/server/assets/styles/src/_rem.scss index cd736925..c2b914ff 100644 --- a/pkg/server/assets/styles/src/_rem.scss +++ b/pkg/server/assets/styles/src/_rem.scss @@ -1,23 +1,20 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ @use "sass:list"; @use "sass:map"; @use "sass:meta"; -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ /* MIT License diff --git a/pkg/server/assets/styles/src/_responsive.scss b/pkg/server/assets/styles/src/_responsive.scss index 9aaf9a7f..2ebbf0ab 100644 --- a/pkg/server/assets/styles/src/_responsive.scss +++ b/pkg/server/assets/styles/src/_responsive.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @use 'variables'; diff --git a/pkg/server/assets/styles/src/_select.scss b/pkg/server/assets/styles/src/_select.scss index 9a0abb60..a0dc5d8c 100644 --- a/pkg/server/assets/styles/src/_select.scss +++ b/pkg/server/assets/styles/src/_select.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /** diff --git a/pkg/server/assets/styles/src/_settings.scss b/pkg/server/assets/styles/src/_settings.scss index 2f5d439d..a965ecbb 100644 --- a/pkg/server/assets/styles/src/_settings.scss +++ b/pkg/server/assets/styles/src/_settings.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @use 'theme'; diff --git a/pkg/server/assets/styles/src/_shared.scss b/pkg/server/assets/styles/src/_shared.scss index 1b7697c1..3dcbcbe4 100644 --- a/pkg/server/assets/styles/src/_shared.scss +++ b/pkg/server/assets/styles/src/_shared.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @use 'font'; diff --git a/pkg/server/assets/styles/src/_theme.scss b/pkg/server/assets/styles/src/_theme.scss index f37d81a5..5654cb7a 100644 --- a/pkg/server/assets/styles/src/_theme.scss +++ b/pkg/server/assets/styles/src/_theme.scss @@ -1,21 +1,18 @@ -@use "sass:color"; -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +@use "sass:color"; // basic colors $black: #2a2a2a; diff --git a/pkg/server/assets/styles/src/_variables.scss b/pkg/server/assets/styles/src/_variables.scss index c54cd062..490d9dbb 100644 --- a/pkg/server/assets/styles/src/_variables.scss +++ b/pkg/server/assets/styles/src/_variables.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ $header-height: 60px; diff --git a/pkg/server/assets/styles/src/main.scss b/pkg/server/assets/styles/src/main.scss index 4a5a7379..9afa9f6d 100644 --- a/pkg/server/assets/styles/src/main.scss +++ b/pkg/server/assets/styles/src/main.scss @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ @use 'reboot'; diff --git a/pkg/server/buildinfo/info.go b/pkg/server/buildinfo/info.go index 09bcdb9d..4e6661f8 100644 --- a/pkg/server/buildinfo/info.go +++ b/pkg/server/buildinfo/info.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package buildinfo diff --git a/pkg/server/cmd/helpers.go b/pkg/server/cmd/helpers.go index eb58c318..3b981dc5 100644 --- a/pkg/server/cmd/helpers.go +++ b/pkg/server/cmd/helpers.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package cmd diff --git a/pkg/server/cmd/root.go b/pkg/server/cmd/root.go index 1ed2129f..106ab2d9 100644 --- a/pkg/server/cmd/root.go +++ b/pkg/server/cmd/root.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package cmd diff --git a/pkg/server/cmd/start.go b/pkg/server/cmd/start.go index dee5913c..c65ac398 100644 --- a/pkg/server/cmd/start.go +++ b/pkg/server/cmd/start.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package cmd diff --git a/pkg/server/cmd/user.go b/pkg/server/cmd/user.go index ec5b4ea2..01b753b1 100644 --- a/pkg/server/cmd/user.go +++ b/pkg/server/cmd/user.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package cmd diff --git a/pkg/server/cmd/user_test.go b/pkg/server/cmd/user_test.go index ea81832a..834ae3bd 100644 --- a/pkg/server/cmd/user_test.go +++ b/pkg/server/cmd/user_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package cmd diff --git a/pkg/server/cmd/version.go b/pkg/server/cmd/version.go index 99c68429..c36405d4 100644 --- a/pkg/server/cmd/version.go +++ b/pkg/server/cmd/version.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package cmd diff --git a/pkg/server/config/config.go b/pkg/server/config/config.go index e941a9a5..0fbb3617 100644 --- a/pkg/server/config/config.go +++ b/pkg/server/config/config.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package config diff --git a/pkg/server/config/config_test.go b/pkg/server/config/config_test.go index 802a3add..8b76c07b 100644 --- a/pkg/server/config/config_test.go +++ b/pkg/server/config/config_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package config diff --git a/pkg/server/consts/consts.go b/pkg/server/consts/consts.go index 948d7631..1f464951 100644 --- a/pkg/server/consts/consts.go +++ b/pkg/server/consts/consts.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package consts diff --git a/pkg/server/context/user.go b/pkg/server/context/user.go index 64171df7..b58d40e9 100644 --- a/pkg/server/context/user.go +++ b/pkg/server/context/user.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package context diff --git a/pkg/server/controllers/books.go b/pkg/server/controllers/books.go index c721b594..c20ea679 100644 --- a/pkg/server/controllers/books.go +++ b/pkg/server/controllers/books.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/books_test.go b/pkg/server/controllers/books_test.go index e2302f22..af6ba42d 100644 --- a/pkg/server/controllers/books_test.go +++ b/pkg/server/controllers/books_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/controllers.go b/pkg/server/controllers/controllers.go index b0cbe550..4ab9980d 100644 --- a/pkg/server/controllers/controllers.go +++ b/pkg/server/controllers/controllers.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/health.go b/pkg/server/controllers/health.go index fb12033d..85d8e048 100644 --- a/pkg/server/controllers/health.go +++ b/pkg/server/controllers/health.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/health_test.go b/pkg/server/controllers/health_test.go index cec8d35a..56fe9778 100644 --- a/pkg/server/controllers/health_test.go +++ b/pkg/server/controllers/health_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/helpers.go b/pkg/server/controllers/helpers.go index 72100c8b..c17e83a1 100644 --- a/pkg/server/controllers/helpers.go +++ b/pkg/server/controllers/helpers.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/main_test.go b/pkg/server/controllers/main_test.go index 35eef6da..cc0383b3 100644 --- a/pkg/server/controllers/main_test.go +++ b/pkg/server/controllers/main_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/notes.go b/pkg/server/controllers/notes.go index 4db709da..964a608f 100644 --- a/pkg/server/controllers/notes.go +++ b/pkg/server/controllers/notes.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/notes_test.go b/pkg/server/controllers/notes_test.go index b69f7c1e..afbca59b 100644 --- a/pkg/server/controllers/notes_test.go +++ b/pkg/server/controllers/notes_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/routes.go b/pkg/server/controllers/routes.go index ff7be403..3552d081 100644 --- a/pkg/server/controllers/routes.go +++ b/pkg/server/controllers/routes.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/routes_test.go b/pkg/server/controllers/routes_test.go index d3084aa3..0d146fe6 100644 --- a/pkg/server/controllers/routes_test.go +++ b/pkg/server/controllers/routes_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/static.go b/pkg/server/controllers/static.go index 5590daec..42872438 100644 --- a/pkg/server/controllers/static.go +++ b/pkg/server/controllers/static.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/sync.go b/pkg/server/controllers/sync.go index 3d7d2608..7cda4316 100644 --- a/pkg/server/controllers/sync.go +++ b/pkg/server/controllers/sync.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/sync_test.go b/pkg/server/controllers/sync_test.go index ab33956a..e97ecb50 100644 --- a/pkg/server/controllers/sync_test.go +++ b/pkg/server/controllers/sync_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/testutils.go b/pkg/server/controllers/testutils.go index 03a097c8..5da11a41 100644 --- a/pkg/server/controllers/testutils.go +++ b/pkg/server/controllers/testutils.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/users.go b/pkg/server/controllers/users.go index bf1e6384..26881668 100644 --- a/pkg/server/controllers/users.go +++ b/pkg/server/controllers/users.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/controllers/users_test.go b/pkg/server/controllers/users_test.go index 03f6c53e..f5ddf5b5 100644 --- a/pkg/server/controllers/users_test.go +++ b/pkg/server/controllers/users_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package controllers diff --git a/pkg/server/crypt/crypt.go b/pkg/server/crypt/crypt.go index 1be220dd..fb0edd26 100644 --- a/pkg/server/crypt/crypt.go +++ b/pkg/server/crypt/crypt.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package crypt diff --git a/pkg/server/database/consts.go b/pkg/server/database/consts.go index 6a9abc0c..4406ee5c 100644 --- a/pkg/server/database/consts.go +++ b/pkg/server/database/consts.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/server/database/database.go b/pkg/server/database/database.go index 2c5241b4..c5804880 100644 --- a/pkg/server/database/database.go +++ b/pkg/server/database/database.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/server/database/errors.go b/pkg/server/database/errors.go index 6e0faeb6..ada00a6d 100644 --- a/pkg/server/database/errors.go +++ b/pkg/server/database/errors.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/server/database/migrate.go b/pkg/server/database/migrate.go index 4250fd80..59e4c820 100644 --- a/pkg/server/database/migrate.go +++ b/pkg/server/database/migrate.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/server/database/migrate_test.go b/pkg/server/database/migrate_test.go index 31853730..4ee93627 100644 --- a/pkg/server/database/migrate_test.go +++ b/pkg/server/database/migrate_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/server/database/migrations/embed.go b/pkg/server/database/migrations/embed.go index 152d9e14..1c644d57 100644 --- a/pkg/server/database/migrations/embed.go +++ b/pkg/server/database/migrations/embed.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package migrations diff --git a/pkg/server/database/models.go b/pkg/server/database/models.go index f21e8636..6ee4d3a7 100644 --- a/pkg/server/database/models.go +++ b/pkg/server/database/models.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/server/database/notes.go b/pkg/server/database/notes.go index 680c53db..b8cb8450 100644 --- a/pkg/server/database/notes.go +++ b/pkg/server/database/notes.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/server/database/types.go b/pkg/server/database/types.go index da3b4d6f..60544c29 100644 --- a/pkg/server/database/types.go +++ b/pkg/server/database/types.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package database diff --git a/pkg/server/helpers/const.go b/pkg/server/helpers/const.go index e0967cc7..3a634d09 100644 --- a/pkg/server/helpers/const.go +++ b/pkg/server/helpers/const.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package helpers diff --git a/pkg/server/helpers/url.go b/pkg/server/helpers/url.go index 73c489fe..0d935754 100644 --- a/pkg/server/helpers/url.go +++ b/pkg/server/helpers/url.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package helpers diff --git a/pkg/server/helpers/url_test.go b/pkg/server/helpers/url_test.go index 55bb2fcc..78142b29 100644 --- a/pkg/server/helpers/url_test.go +++ b/pkg/server/helpers/url_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package helpers diff --git a/pkg/server/helpers/uuid.go b/pkg/server/helpers/uuid.go index 572ea6be..ed1090d4 100644 --- a/pkg/server/helpers/uuid.go +++ b/pkg/server/helpers/uuid.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package helpers diff --git a/pkg/server/log/log.go b/pkg/server/log/log.go index 89eeb719..60543acf 100644 --- a/pkg/server/log/log.go +++ b/pkg/server/log/log.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package log provides interfaces to write structured logs diff --git a/pkg/server/log/log_test.go b/pkg/server/log/log_test.go index 3df63b3a..488e3725 100644 --- a/pkg/server/log/log_test.go +++ b/pkg/server/log/log_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package log diff --git a/pkg/server/mailer/backend.go b/pkg/server/mailer/backend.go index 0abe51d8..e282e03c 100644 --- a/pkg/server/mailer/backend.go +++ b/pkg/server/mailer/backend.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package mailer diff --git a/pkg/server/mailer/backend_test.go b/pkg/server/mailer/backend_test.go index 5ef0a355..2838a19d 100644 --- a/pkg/server/mailer/backend_test.go +++ b/pkg/server/mailer/backend_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package mailer diff --git a/pkg/server/mailer/mailer.go b/pkg/server/mailer/mailer.go index 1cf786a7..10457252 100644 --- a/pkg/server/mailer/mailer.go +++ b/pkg/server/mailer/mailer.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package mailer provides a functionality to send emails diff --git a/pkg/server/mailer/mailer_test.go b/pkg/server/mailer/mailer_test.go index 5837192a..e08c9c55 100644 --- a/pkg/server/mailer/mailer_test.go +++ b/pkg/server/mailer/mailer_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package mailer diff --git a/pkg/server/mailer/templates/templates.go b/pkg/server/mailer/templates/templates.go index c59d3a14..78fedd07 100644 --- a/pkg/server/mailer/templates/templates.go +++ b/pkg/server/mailer/templates/templates.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package mailer provides a functionality to send emails diff --git a/pkg/server/mailer/tokens.go b/pkg/server/mailer/tokens.go index 0f751a4e..669c4820 100644 --- a/pkg/server/mailer/tokens.go +++ b/pkg/server/mailer/tokens.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package mailer diff --git a/pkg/server/mailer/tokens_test.go b/pkg/server/mailer/tokens_test.go index 72a85fc6..4f4fa73d 100644 --- a/pkg/server/mailer/tokens_test.go +++ b/pkg/server/mailer/tokens_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package mailer diff --git a/pkg/server/mailer/types.go b/pkg/server/mailer/types.go index 6ad862de..17363398 100644 --- a/pkg/server/mailer/types.go +++ b/pkg/server/mailer/types.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package mailer diff --git a/pkg/server/main.go b/pkg/server/main.go index 701912ea..737cc7a6 100644 --- a/pkg/server/main.go +++ b/pkg/server/main.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package main diff --git a/pkg/server/middleware/auth.go b/pkg/server/middleware/auth.go index daf92dc3..9383d33d 100644 --- a/pkg/server/middleware/auth.go +++ b/pkg/server/middleware/auth.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package middleware diff --git a/pkg/server/middleware/auth_test.go b/pkg/server/middleware/auth_test.go index 95c935a2..c6d0ead4 100644 --- a/pkg/server/middleware/auth_test.go +++ b/pkg/server/middleware/auth_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package middleware diff --git a/pkg/server/middleware/helpers.go b/pkg/server/middleware/helpers.go index f43d0abb..580efa7f 100644 --- a/pkg/server/middleware/helpers.go +++ b/pkg/server/middleware/helpers.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package middleware diff --git a/pkg/server/middleware/helpers_test.go b/pkg/server/middleware/helpers_test.go index 623ec818..3142326f 100644 --- a/pkg/server/middleware/helpers_test.go +++ b/pkg/server/middleware/helpers_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package middleware diff --git a/pkg/server/middleware/limit.go b/pkg/server/middleware/limit.go index 2f737613..6985809e 100644 --- a/pkg/server/middleware/limit.go +++ b/pkg/server/middleware/limit.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package middleware diff --git a/pkg/server/middleware/limit_test.go b/pkg/server/middleware/limit_test.go index 1d5743ee..594d0a94 100644 --- a/pkg/server/middleware/limit_test.go +++ b/pkg/server/middleware/limit_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package middleware diff --git a/pkg/server/middleware/logging.go b/pkg/server/middleware/logging.go index 05cdd2cb..13c9a9c9 100644 --- a/pkg/server/middleware/logging.go +++ b/pkg/server/middleware/logging.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package middleware diff --git a/pkg/server/middleware/middleware.go b/pkg/server/middleware/middleware.go index 582e8046..e509c169 100644 --- a/pkg/server/middleware/middleware.go +++ b/pkg/server/middleware/middleware.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package middleware diff --git a/pkg/server/operations/doc.go b/pkg/server/operations/doc.go index 981c9f5c..7a4fe7c8 100644 --- a/pkg/server/operations/doc.go +++ b/pkg/server/operations/doc.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /* diff --git a/pkg/server/operations/notes.go b/pkg/server/operations/notes.go index ee6dd9af..74b279e4 100644 --- a/pkg/server/operations/notes.go +++ b/pkg/server/operations/notes.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package operations diff --git a/pkg/server/operations/notes_test.go b/pkg/server/operations/notes_test.go index a2ccb023..a09c1c28 100644 --- a/pkg/server/operations/notes_test.go +++ b/pkg/server/operations/notes_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package operations diff --git a/pkg/server/permissions/permissions.go b/pkg/server/permissions/permissions.go index d9d017d9..54427acf 100644 --- a/pkg/server/permissions/permissions.go +++ b/pkg/server/permissions/permissions.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package permissions diff --git a/pkg/server/permissions/permissions_test.go b/pkg/server/permissions/permissions_test.go index 13f13f97..2a5daca1 100644 --- a/pkg/server/permissions/permissions_test.go +++ b/pkg/server/permissions/permissions_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package permissions diff --git a/pkg/server/presenters/book.go b/pkg/server/presenters/book.go index 85242b26..9c117726 100644 --- a/pkg/server/presenters/book.go +++ b/pkg/server/presenters/book.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package presenters diff --git a/pkg/server/presenters/book_test.go b/pkg/server/presenters/book_test.go index 98155769..bf8a1b48 100644 --- a/pkg/server/presenters/book_test.go +++ b/pkg/server/presenters/book_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package presenters diff --git a/pkg/server/presenters/helpers.go b/pkg/server/presenters/helpers.go index 491e575e..3cce728c 100644 --- a/pkg/server/presenters/helpers.go +++ b/pkg/server/presenters/helpers.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package presenters diff --git a/pkg/server/presenters/helpers_test.go b/pkg/server/presenters/helpers_test.go index c48c90ea..33b0ed2e 100644 --- a/pkg/server/presenters/helpers_test.go +++ b/pkg/server/presenters/helpers_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package presenters diff --git a/pkg/server/presenters/note.go b/pkg/server/presenters/note.go index a20bb879..267717da 100644 --- a/pkg/server/presenters/note.go +++ b/pkg/server/presenters/note.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package presenters diff --git a/pkg/server/presenters/note_test.go b/pkg/server/presenters/note_test.go index 878acf67..ee2fe78d 100644 --- a/pkg/server/presenters/note_test.go +++ b/pkg/server/presenters/note_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package presenters diff --git a/pkg/server/session/session.go b/pkg/server/session/session.go index d7c3d0d8..b9ae62d4 100644 --- a/pkg/server/session/session.go +++ b/pkg/server/session/session.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package session diff --git a/pkg/server/session/session_test.go b/pkg/server/session/session_test.go index dddfa18b..081a82de 100644 --- a/pkg/server/session/session_test.go +++ b/pkg/server/session/session_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package session diff --git a/pkg/server/testutils/main.go b/pkg/server/testutils/main.go index 6b7c21b6..dd10941e 100644 --- a/pkg/server/testutils/main.go +++ b/pkg/server/testutils/main.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ // Package testutils provides utilities used in tests diff --git a/pkg/server/token/token.go b/pkg/server/token/token.go index f482d2aa..af1feda5 100644 --- a/pkg/server/token/token.go +++ b/pkg/server/token/token.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package token diff --git a/pkg/server/token/token_test.go b/pkg/server/token/token_test.go index c7469d4f..5daed181 100644 --- a/pkg/server/token/token_test.go +++ b/pkg/server/token/token_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package token diff --git a/pkg/server/views/data.go b/pkg/server/views/data.go index 98444364..87fd2a90 100644 --- a/pkg/server/views/data.go +++ b/pkg/server/views/data.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package views diff --git a/pkg/server/views/embed.go b/pkg/server/views/embed.go index b3a070a0..1fcb7d19 100644 --- a/pkg/server/views/embed.go +++ b/pkg/server/views/embed.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package views diff --git a/pkg/server/views/engine.go b/pkg/server/views/engine.go index b8127b03..fbad7979 100644 --- a/pkg/server/views/engine.go +++ b/pkg/server/views/engine.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package views diff --git a/pkg/server/views/helpers.go b/pkg/server/views/helpers.go index ac4546f7..3e8f1d56 100644 --- a/pkg/server/views/helpers.go +++ b/pkg/server/views/helpers.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package views diff --git a/pkg/server/views/helpers_test.go b/pkg/server/views/helpers_test.go index 56bb7912..af39b48c 100644 --- a/pkg/server/views/helpers_test.go +++ b/pkg/server/views/helpers_test.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package views diff --git a/pkg/server/views/time.go b/pkg/server/views/time.go index e99d36c9..88c71169 100644 --- a/pkg/server/views/time.go +++ b/pkg/server/views/time.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package views diff --git a/pkg/server/views/view.go b/pkg/server/views/view.go index 438735a1..53315334 100644 --- a/pkg/server/views/view.go +++ b/pkg/server/views/view.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package views diff --git a/pkg/watcher/main.go b/pkg/watcher/main.go index a548aafe..7509fb90 100644 --- a/pkg/watcher/main.go +++ b/pkg/watcher/main.go @@ -1,19 +1,16 @@ -/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors +/* Copyright 2025 Dnote Authors * - * This file is part of Dnote. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Dnote 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package main diff --git a/scripts/cli/build.sh b/scripts/cli/build.sh index c5c6043c..d17cb477 100755 --- a/scripts/cli/build.sh +++ b/scripts/cli/build.sh @@ -98,7 +98,7 @@ build() { tarballName="dnote_${version}_${platform}_${arch}.tar.gz" tarballPath="$outputDir/$tarballName" - cp "$projectDir/licenses/GPLv3.txt" "$destDir" + cp "$projectDir/LICENSE" "$destDir" cp "$basedir/README.md" "$destDir" tar -C "$destDir" -zcvf "$tarballPath" "." rm -rf "$destDir" diff --git a/scripts/license.sh b/scripts/license.sh index d75b656b..4f96780c 100755 --- a/scripts/license.sh +++ b/scripts/license.sh @@ -2,74 +2,45 @@ set -eux function remove_notice { - sed -i -e '/\/\* Copyright/,/\*\//d' "$1" - - # remove leading newline - sed -i '/./,$!d' "$1" + # Remove old copyright notice - matches /* Copyright ... */ including the trailing newline + # The 's' flag makes . match newlines, allowing multi-line matching + # The \n? matches an optional newline after the closing */ + perl -i -0pe 's/\/\* Copyright.*?\*\/\n?//s' "$1" } function add_notice { ed "$1" <. - */" - -agpl="/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote 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 - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an \"AS IS\" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */" dir=$(dirname "${BASH_SOURCE[0]}") basedir="$dir/.." pkgPath="$basedir/pkg" -serverPath="$basedir/pkg/server" -gplFiles=$(find "$pkgPath" -type f \( -name "*.go" -o -name "*.js" -o -name "*.ts" -o -name "*.tsx" -o -name "*.scss" -o -name "*.css" \) ! -path "**/vendor/*" ! -path "**/node_modules/*" ! -path "$serverPath/*") +# Apply license to all source files +allFiles=$(find "$pkgPath" -type f \( -name "*.go" -o -name "*.js" -o -name "*.ts" -o -name "*.tsx" -o -name "*.scss" -o -name "*.css" \) ! -path "**/vendor/*" ! -path "**/node_modules/*" ! -path "**/dist/*") -for file in $gplFiles; do +for file in $allFiles; do remove_notice "$file" - add_notice "$file" "$gpl" -done - -agplFiles=$(find "$serverPath" -type f \( -name "*.go" -o -name "*.js" -o -name "*.ts" -o -name "*.tsx" -o -name "*.scss" -o -name "*.css" \) ! -path "**/vendor/*" ! -path "**/node_modules/*" ! -path "**/dist/*") - -for file in $agplFiles; do - remove_notice "$file" - add_notice "$file" "$agpl" + add_notice "$file" "$license" done diff --git a/scripts/server/build.sh b/scripts/server/build.sh index f9c6428e..09bc16e3 100755 --- a/scripts/server/build.sh +++ b/scripts/server/build.sh @@ -57,7 +57,7 @@ build() { tarballName="dnote_server_${version}_${platform}_${arch}.tar.gz" tarballPath="$outputDir/$tarballName" - cp "$projectDir/licenses/AGPLv3.txt" "$destDir" + cp "$projectDir/LICENSE" "$destDir" cp "$basedir/README.md" "$destDir" tar -C "$destDir" -zcvf "$tarballPath" "." rm -rf "$destDir" From e72322f847d4d0dbd4dbba5a0db2975eeb7788c0 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sat, 1 Nov 2025 00:54:27 -0700 Subject: [PATCH 26/33] Simplify email backend and remove --appEnv (#710) * Improve logging * Remove AppEnv * Simplify email backend --- pkg/e2e/server_test.go | 3 -- pkg/e2e/sync/testutils.go | 2 - pkg/server/.env.dev | 2 - pkg/server/app/app.go | 7 ---- pkg/server/app/email.go | 53 +++++++++++-------------- pkg/server/app/errors.go | 2 +- pkg/server/app/sessions.go | 2 +- pkg/server/app/testutils.go | 3 -- pkg/server/cmd/helpers.go | 21 +++++----- pkg/server/cmd/start.go | 2 - pkg/server/config/config.go | 10 ----- pkg/server/database/database.go | 32 +++++++++++---- pkg/server/log/log.go | 5 +++ pkg/server/mailer/backend.go | 66 +++++++++++++++++++++++-------- pkg/server/mailer/backend_test.go | 59 ++++++++++++++------------- pkg/server/mailer/mailer.go | 43 ++++++++++++-------- pkg/server/mailer/mailer_test.go | 15 +++++-- pkg/server/middleware/limit.go | 3 +- pkg/server/testutils/main.go | 20 +++++----- scripts/server/dev.sh | 7 +--- 20 files changed, 196 insertions(+), 161 deletions(-) delete mode 100644 pkg/server/.env.dev diff --git a/pkg/e2e/server_test.go b/pkg/e2e/server_test.go index f94347ac..b7a17b2d 100644 --- a/pkg/e2e/server_test.go +++ b/pkg/e2e/server_test.go @@ -50,8 +50,6 @@ func TestServerStart(t *testing.T) { cmd := exec.Command(testServerBinary, "start", "--port", port) cmd.Env = append(os.Environ(), "DBPath="+tmpDB, - "WebURL=http://localhost:"+port, - "APP_ENV=PRODUCTION", ) if err := cmd.Start(); err != nil { @@ -140,7 +138,6 @@ func TestServerStartHelp(t *testing.T) { outputStr := string(output) assert.Equal(t, strings.Contains(outputStr, "dnote-server start [flags]"), true, "output should contain usage") - assert.Equal(t, strings.Contains(outputStr, "--appEnv"), true, "output should contain appEnv flag") assert.Equal(t, strings.Contains(outputStr, "--port"), true, "output should contain port flag") assert.Equal(t, strings.Contains(outputStr, "--webUrl"), true, "output should contain webUrl flag") assert.Equal(t, strings.Contains(outputStr, "--dbPath"), true, "output should contain dbPath flag") diff --git a/pkg/e2e/sync/testutils.go b/pkg/e2e/sync/testutils.go index 0a09d963..a5dfdf87 100644 --- a/pkg/e2e/sync/testutils.go +++ b/pkg/e2e/sync/testutils.go @@ -35,7 +35,6 @@ import ( "github.com/dnote/dnote/pkg/server/app" "github.com/dnote/dnote/pkg/server/controllers" "github.com/dnote/dnote/pkg/server/database" - "github.com/dnote/dnote/pkg/server/mailer" apitest "github.com/dnote/dnote/pkg/server/testutils" "github.com/pkg/errors" "gorm.io/gorm" @@ -98,7 +97,6 @@ func setupTestServer(t *testing.T, serverTime time.Time) (*httptest.Server, *gor a := app.NewTest() a.Clock = mockClock - a.EmailTemplates = mailer.Templates{} a.EmailBackend = &apitest.MockEmailbackendImplementation{} a.DB = db diff --git a/pkg/server/.env.dev b/pkg/server/.env.dev deleted file mode 100644 index c78a6704..00000000 --- a/pkg/server/.env.dev +++ /dev/null @@ -1,2 +0,0 @@ -APP_ENV=DEVELOPMENT -DBPath=../../dev-server.db diff --git a/pkg/server/app/app.go b/pkg/server/app/app.go index 80754fbe..6a8c5d14 100644 --- a/pkg/server/app/app.go +++ b/pkg/server/app/app.go @@ -29,8 +29,6 @@ var ( ErrEmptyClock = errors.New("No clock was provided") // ErrEmptyWebURL is an error for missing WebURL content in the app configuration ErrEmptyWebURL = errors.New("No WebURL was provided") - // ErrEmptyEmailTemplates is an error for missing EmailTemplates content in the app configuration - ErrEmptyEmailTemplates = errors.New("No EmailTemplate store was provided") // ErrEmptyEmailBackend is an error for missing EmailBackend content in the app configuration ErrEmptyEmailBackend = errors.New("No EmailBackend was provided") // ErrEmptyHTTP500Page is an error for missing HTTP 500 page content @@ -41,11 +39,9 @@ var ( type App struct { DB *gorm.DB Clock clock.Clock - EmailTemplates mailer.Templates EmailBackend mailer.Backend Files map[string][]byte HTTP500Page []byte - AppEnv string WebURL string DisableRegistration bool Port string @@ -61,9 +57,6 @@ func (a *App) Validate() error { if a.Clock == nil { return ErrEmptyClock } - if a.EmailTemplates == nil { - return ErrEmptyEmailTemplates - } if a.EmailBackend == nil { return ErrEmptyEmailBackend } diff --git a/pkg/server/app/email.go b/pkg/server/app/email.go index 14d3ec38..1b78f722 100644 --- a/pkg/server/app/email.go +++ b/pkg/server/app/email.go @@ -64,21 +64,18 @@ func getNoreplySender(webURL string) (string, error) { // SendWelcomeEmail sends welcome email func (a *App) SendWelcomeEmail(email string) error { - body, err := a.EmailTemplates.Execute(mailer.EmailTypeWelcome, mailer.EmailKindText, mailer.WelcomeTmplData{ - AccountEmail: email, - WebURL: a.WebURL, - }) - if err != nil { - return errors.Wrapf(err, "executing reset verification template for %s", email) - } - from, err := GetSenderEmail(a.WebURL, defaultSender) if err != nil { return errors.Wrap(err, "getting the sender email") } - if err := a.EmailBackend.Queue("Welcome to Dnote!", from, []string{email}, mailer.EmailKindText, body); err != nil { - return errors.Wrapf(err, "queueing email for %s", email) + data := mailer.WelcomeTmplData{ + AccountEmail: email, + WebURL: a.WebURL, + } + + if err := a.EmailBackend.SendEmail(mailer.EmailTypeWelcome, from, []string{email}, data); err != nil { + return errors.Wrapf(err, "sending welcome email for %s", email) } return nil @@ -90,26 +87,23 @@ func (a *App) SendPasswordResetEmail(email, tokenValue string) error { return ErrEmailRequired } - body, err := a.EmailTemplates.Execute(mailer.EmailTypeResetPassword, mailer.EmailKindText, mailer.EmailResetPasswordTmplData{ - AccountEmail: email, - Token: tokenValue, - WebURL: a.WebURL, - }) - if err != nil { - return errors.Wrapf(err, "executing reset password template for %s", email) - } - from, err := GetSenderEmail(a.WebURL, defaultSender) if err != nil { return errors.Wrap(err, "getting the sender email") } - if err := a.EmailBackend.Queue("Reset your password", from, []string{email}, mailer.EmailKindText, body); err != nil { + data := mailer.EmailResetPasswordTmplData{ + AccountEmail: email, + Token: tokenValue, + WebURL: a.WebURL, + } + + if err := a.EmailBackend.SendEmail(mailer.EmailTypeResetPassword, from, []string{email}, data); err != nil { if errors.Cause(err) == mailer.ErrSMTPNotConfigured { return ErrInvalidSMTPConfig } - return errors.Wrapf(err, "queueing email for %s", email) + return errors.Wrapf(err, "sending password reset email for %s", email) } return nil @@ -117,21 +111,18 @@ func (a *App) SendPasswordResetEmail(email, tokenValue string) error { // SendPasswordResetAlertEmail sends email that notifies users of a password change func (a *App) SendPasswordResetAlertEmail(email string) error { - body, err := a.EmailTemplates.Execute(mailer.EmailTypeResetPasswordAlert, mailer.EmailKindText, mailer.EmailResetPasswordAlertTmplData{ - AccountEmail: email, - WebURL: a.WebURL, - }) - if err != nil { - return errors.Wrapf(err, "executing reset password alert template for %s", email) - } - from, err := GetSenderEmail(a.WebURL, defaultSender) if err != nil { return errors.Wrap(err, "getting the sender email") } - if err := a.EmailBackend.Queue("Dnote password changed", from, []string{email}, mailer.EmailKindText, body); err != nil { - return errors.Wrapf(err, "queueing email for %s", email) + data := mailer.EmailResetPasswordAlertTmplData{ + AccountEmail: email, + WebURL: a.WebURL, + } + + if err := a.EmailBackend.SendEmail(mailer.EmailTypeResetPasswordAlert, from, []string{email}, data); err != nil { + return errors.Wrapf(err, "sending password reset alert email for %s", email) } return nil diff --git a/pkg/server/app/errors.go b/pkg/server/app/errors.go index 9d41ca38..67635b23 100644 --- a/pkg/server/app/errors.go +++ b/pkg/server/app/errors.go @@ -73,7 +73,7 @@ var ( // ErrInvalidPasswordChangeInput is an error for changing password ErrInvalidPasswordChangeInput appError = "Both current and new passwords are required to change the password." - ErrInvalidPassword appError = "Invalid currnet password." + ErrInvalidPassword appError = "Invalid current password." // ErrEmailTooLong is an error for email length exceeding the limit ErrEmailTooLong appError = "Email is too long." diff --git a/pkg/server/app/sessions.go b/pkg/server/app/sessions.go index e3a574b7..6c230d76 100644 --- a/pkg/server/app/sessions.go +++ b/pkg/server/app/sessions.go @@ -48,7 +48,7 @@ func (a *App) CreateSession(userID int) (database.Session, error) { // DeleteUserSessions deletes all existing sessions for the given user. It effectively // invalidates all existing sessions. func (a *App) DeleteUserSessions(db *gorm.DB, userID int) error { - if err := db.Debug().Where("user_id = ?", userID).Delete(&database.Session{}).Error; err != nil { + if err := db.Where("user_id = ?", userID).Delete(&database.Session{}).Error; err != nil { return errors.Wrap(err, "deleting sessions") } diff --git a/pkg/server/app/testutils.go b/pkg/server/app/testutils.go index 8ea6980d..48896cdc 100644 --- a/pkg/server/app/testutils.go +++ b/pkg/server/app/testutils.go @@ -18,7 +18,6 @@ package app import ( "github.com/dnote/dnote/pkg/clock" "github.com/dnote/dnote/pkg/server/assets" - "github.com/dnote/dnote/pkg/server/mailer" "github.com/dnote/dnote/pkg/server/testutils" ) @@ -26,10 +25,8 @@ import ( func NewTest() App { return App{ Clock: clock.NewMock(), - EmailTemplates: mailer.NewTemplates(), EmailBackend: &testutils.MockEmailbackendImplementation{}, HTTP500Page: assets.MustGetHTTP500ErrorPage(), - AppEnv: "TEST", WebURL: "http://127.0.0.0.1", Port: "3000", DisableRegistration: false, diff --git a/pkg/server/cmd/helpers.go b/pkg/server/cmd/helpers.go index 3b981dc5..3c135372 100644 --- a/pkg/server/cmd/helpers.go +++ b/pkg/server/cmd/helpers.go @@ -37,23 +37,26 @@ func initDB(dbPath string) *gorm.DB { return db } +func getEmailBackend() mailer.Backend { + defaultBackend, err := mailer.NewDefaultBackend() + if err != nil { + log.Debug("SMTP not configured, using StdoutBackend for emails") + return mailer.NewStdoutBackend() + } + + log.Debug("Email backend configured") + return defaultBackend +} + func initApp(cfg config.Config) app.App { db := initDB(cfg.DBPath) - - emailBackend, err := mailer.NewDefaultBackend(cfg.IsProd()) - if err != nil { - emailBackend = &mailer.DefaultBackend{Enabled: false} - } else { - log.Info("Email backend configured") - } + emailBackend := getEmailBackend() return app.App{ DB: db, Clock: clock.New(), - EmailTemplates: mailer.NewTemplates(), EmailBackend: emailBackend, HTTP500Page: cfg.HTTP500Page, - AppEnv: cfg.AppEnv, WebURL: cfg.WebURL, DisableRegistration: cfg.DisableRegistration, Port: cfg.Port, diff --git a/pkg/server/cmd/start.go b/pkg/server/cmd/start.go index c65ac398..465f41ce 100644 --- a/pkg/server/cmd/start.go +++ b/pkg/server/cmd/start.go @@ -32,7 +32,6 @@ import ( func startCmd(args []string) { fs := setupFlagSet("start", "dnote-server start") - appEnv := fs.String("appEnv", "", "Application environment (env: APP_ENV, default: PRODUCTION)") port := fs.String("port", "", "Server port (env: PORT, default: 3001)") webURL := fs.String("webUrl", "", "Full URL to server without trailing slash (env: WebURL, default: http://localhost:3001)") dbPath := fs.String("dbPath", "", "Path to SQLite database file (env: DBPath, default: $XDG_DATA_HOME/dnote/server.db)") @@ -42,7 +41,6 @@ func startCmd(args []string) { fs.Parse(args) cfg, err := config.New(config.Params{ - AppEnv: *appEnv, Port: *port, WebURL: *webURL, DBPath: *dbPath, diff --git a/pkg/server/config/config.go b/pkg/server/config/config.go index 0fbb3617..88b604bc 100644 --- a/pkg/server/config/config.go +++ b/pkg/server/config/config.go @@ -26,8 +26,6 @@ import ( ) const ( - // AppEnvProduction represents an app environment for production. - AppEnvProduction string = "PRODUCTION" // DefaultDBDir is the default directory name for Dnote data DefaultDBDir = "dnote" // DefaultDBFilename is the default database filename @@ -65,7 +63,6 @@ func getOrEnv(value, envKey, defaultVal string) string { // Config is an application configuration type Config struct { - AppEnv string WebURL string DisableRegistration bool Port string @@ -77,7 +74,6 @@ type Config struct { // Params are the configuration parameters for creating a new Config type Params struct { - AppEnv string Port string WebURL string DBPath string @@ -89,7 +85,6 @@ type Params struct { // Empty string params will fall back to environment variables and defaults. func New(p Params) (Config, error) { c := Config{ - AppEnv: getOrEnv(p.AppEnv, "APP_ENV", AppEnvProduction), Port: getOrEnv(p.Port, "PORT", "3001"), WebURL: getOrEnv(p.WebURL, "WebURL", "http://localhost:3001"), DBPath: getOrEnv(p.DBPath, "DBPath", DefaultDBPath), @@ -106,11 +101,6 @@ func New(p Params) (Config, error) { return c, nil } -// IsProd checks if the app environment is configured to be production. -func (c Config) IsProd() bool { - return c.AppEnv == AppEnvProduction -} - func validate(c Config) error { if _, err := url.ParseRequestURI(c.WebURL); err != nil { return errors.Wrapf(ErrWebURLInvalid, "'%s'", c.WebURL) diff --git a/pkg/server/database/database.go b/pkg/server/database/database.go index c5804880..cfb18ab7 100644 --- a/pkg/server/database/database.go +++ b/pkg/server/database/database.go @@ -20,9 +20,11 @@ import ( "path/filepath" "time" + "github.com/dnote/dnote/pkg/server/log" "github.com/pkg/errors" "gorm.io/driver/sqlite" "gorm.io/gorm" + "gorm.io/gorm/logger" ) var ( @@ -30,6 +32,22 @@ var ( MigrationTableName = "migrations" ) +// getDBLogLevel converts application log level to GORM log level +func getDBLogLevel(level string) logger.LogLevel { + switch level { + case log.LevelDebug: + return logger.Info + case log.LevelInfo: + return logger.Info + case log.LevelWarn: + return logger.Warn + case log.LevelError: + return logger.Error + default: + return logger.Error + } +} + // InitSchema migrates database schema to reflect the latest model definition func InitSchema(db *gorm.DB) { if err := db.AutoMigrate( @@ -51,7 +69,9 @@ func Open(dbPath string) *gorm.DB { panic(errors.Wrapf(err, "creating database directory at %s", dir)) } - db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{}) + db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{ + Logger: logger.Default.LogMode(getDBLogLevel(log.GetLevel())), + }) if err != nil { panic(errors.Wrap(err, "opening database conection")) } @@ -96,16 +116,14 @@ func StartWALCheckpointing(db *gorm.DB, interval time.Duration) { for range ticker.C { // TRUNCATE mode removes the WAL file after checkpointing if err := db.Exec("PRAGMA wal_checkpoint(TRUNCATE)").Error; err != nil { - // Log error but don't panic - this is a background maintenance task - // TODO: Use proper logging once available - _ = err + log.ErrorWrap(err, "WAL checkpoint failed") } } }() } // StartPeriodicVacuum runs full VACUUM on a schedule to reclaim space and defragment. -// WARNING: VACUUM acquires an exclusive lock and blocks all database operations briefly. +// VACUUM acquires an exclusive lock and blocks all database operations briefly. func StartPeriodicVacuum(db *gorm.DB, interval time.Duration) { go func() { ticker := time.NewTicker(interval) @@ -113,9 +131,7 @@ func StartPeriodicVacuum(db *gorm.DB, interval time.Duration) { for range ticker.C { if err := db.Exec("VACUUM").Error; err != nil { - // Log error but don't panic - this is a background maintenance task - // TODO: Use proper logging once available - _ = err + log.ErrorWrap(err, "VACUUM failed") } } }() diff --git a/pkg/server/log/log.go b/pkg/server/log/log.go index 60543acf..d8b43c8b 100644 --- a/pkg/server/log/log.go +++ b/pkg/server/log/log.go @@ -70,6 +70,11 @@ func SetLevel(level string) { currentLevel = level } +// GetLevel returns the current global log level +func GetLevel() string { + return currentLevel +} + // levelPriority returns a numeric priority for comparison func levelPriority(level string) int { switch level { diff --git a/pkg/server/mailer/backend.go b/pkg/server/mailer/backend.go index e282e03c..a09cf2e6 100644 --- a/pkg/server/mailer/backend.go +++ b/pkg/server/mailer/backend.go @@ -29,7 +29,7 @@ var ErrSMTPNotConfigured = errors.New("SMTP is not configured") // Backend is an interface for sending emails. type Backend interface { - Queue(subject, from string, to []string, contentType, body string) error + SendEmail(templateType, from string, to []string, data interface{}) error } // EmailDialer is an interface for sending email messages @@ -44,9 +44,10 @@ type gomailDialer struct { // DefaultBackend is an implementation of the Backend // that sends an email without queueing. +// This backend is always enabled and will send emails via SMTP. type DefaultBackend struct { - Dialer EmailDialer - Enabled bool + Dialer EmailDialer + Templates Templates } type dialerParams struct { @@ -82,7 +83,7 @@ func getSMTPParams() (*dialerParams, error) { } // NewDefaultBackend creates a default backend -func NewDefaultBackend(enabled bool) (*DefaultBackend, error) { +func NewDefaultBackend() (*DefaultBackend, error) { p, err := getSMTPParams() if err != nil { return nil, err @@ -91,24 +92,24 @@ func NewDefaultBackend(enabled bool) (*DefaultBackend, error) { d := gomail.NewDialer(p.Host, p.Port, p.Username, p.Password) return &DefaultBackend{ - Dialer: &gomailDialer{Dialer: d}, - Enabled: enabled, + Dialer: &gomailDialer{Dialer: d}, + Templates: NewTemplates(), }, nil } -// Queue is an implementation of Backend.Queue. -func (b *DefaultBackend) Queue(subject, from string, to []string, contentType, body string) error { - // If not enabled, just log the email - if !b.Enabled { - log.WithFields(log.Fields{ - "subject": subject, - "to": to, - "from": from, - "body": body, - }).Info("Not sending email because email backend is not configured.") - return nil +// SendEmail is an implementation of Backend.SendEmail. +// It renders the template and sends the email immediately via SMTP. +func (b *DefaultBackend) SendEmail(templateType, from string, to []string, data interface{}) error { + subject, body, err := b.Templates.Execute(templateType, EmailKindText, data) + if err != nil { + return errors.Wrap(err, "executing template") } + return b.queue(subject, from, to, EmailKindText, body) +} + +// queue sends the email immediately via SMTP. +func (b *DefaultBackend) queue(subject, from string, to []string, contentType, body string) error { m := gomail.NewMessage() m.SetHeader("From", from) m.SetHeader("To", to...) @@ -121,3 +122,34 @@ func (b *DefaultBackend) Queue(subject, from string, to []string, contentType, b return nil } + +// StdoutBackend is an implementation of the Backend +// that prints emails to stdout instead of sending them. +// This is useful for development and testing. +type StdoutBackend struct { + Templates Templates +} + +// NewStdoutBackend creates a stdout backend +func NewStdoutBackend() *StdoutBackend { + return &StdoutBackend{ + Templates: NewTemplates(), + } +} + +// SendEmail is an implementation of Backend.SendEmail. +// It renders the template and logs the email to stdout instead of sending it. +func (b *StdoutBackend) SendEmail(templateType, from string, to []string, data interface{}) error { + subject, body, err := b.Templates.Execute(templateType, EmailKindText, data) + if err != nil { + return errors.Wrap(err, "executing template") + } + + log.WithFields(log.Fields{ + "subject": subject, + "to": to, + "from": from, + "body": body, + }).Info("Email (not sent, using StdoutBackend)") + return nil +} diff --git a/pkg/server/mailer/backend_test.go b/pkg/server/mailer/backend_test.go index 2838a19d..2e4e27a7 100644 --- a/pkg/server/mailer/backend_test.go +++ b/pkg/server/mailer/backend_test.go @@ -31,40 +31,28 @@ func (m *mockDialer) DialAndSend(msgs ...*gomail.Message) error { return m.err } -func TestDefaultBackendQueue(t *testing.T) { - t.Run("enabled sends email", func(t *testing.T) { +func TestDefaultBackendSendEmail(t *testing.T) { + t.Run("sends email", func(t *testing.T) { mock := &mockDialer{} backend := &DefaultBackend{ - Dialer: mock, - Enabled: true, + Dialer: mock, + Templates: NewTemplates(), } - err := backend.Queue("Test Subject", "alice@example.com", []string{"bob@example.com"}, "text/plain", "Test body") + data := WelcomeTmplData{ + AccountEmail: "bob@example.com", + WebURL: "https://example.com", + } + + err := backend.SendEmail(EmailTypeWelcome, "alice@example.com", []string{"bob@example.com"}, data) if err != nil { - t.Fatalf("Queue failed: %v", err) + t.Fatalf("SendEmail failed: %v", err) } if len(mock.sentMessages) != 1 { t.Errorf("expected 1 message sent, got %d", len(mock.sentMessages)) } }) - - t.Run("disabled does not send email", func(t *testing.T) { - mock := &mockDialer{} - backend := &DefaultBackend{ - Dialer: mock, - Enabled: false, - } - - err := backend.Queue("Test Subject", "alice@example.com", []string{"bob@example.com"}, "text/plain", "Test body") - if err != nil { - t.Fatalf("Queue failed: %v", err) - } - - if len(mock.sentMessages) != 0 { - t.Errorf("expected 0 messages sent when disabled, got %d", len(mock.sentMessages)) - } - }) } func TestNewDefaultBackend(t *testing.T) { @@ -74,14 +62,11 @@ func TestNewDefaultBackend(t *testing.T) { t.Setenv("SmtpUsername", "user@example.com") t.Setenv("SmtpPassword", "secret") - backend, err := NewDefaultBackend(true) + backend, err := NewDefaultBackend() if err != nil { t.Fatalf("NewDefaultBackend failed: %v", err) } - if backend.Enabled != true { - t.Errorf("expected Enabled to be true, got %v", backend.Enabled) - } if backend.Dialer == nil { t.Error("expected Dialer to be set") } @@ -93,7 +78,7 @@ func TestNewDefaultBackend(t *testing.T) { t.Setenv("SmtpUsername", "") t.Setenv("SmtpPassword", "") - _, err := NewDefaultBackend(true) + _, err := NewDefaultBackend() if err == nil { t.Error("expected error when SMTP not configured") } @@ -102,3 +87,21 @@ func TestNewDefaultBackend(t *testing.T) { } }) } + +func TestStdoutBackendSendEmail(t *testing.T) { + t.Run("logs email without sending", func(t *testing.T) { + backend := NewStdoutBackend() + + data := WelcomeTmplData{ + AccountEmail: "bob@example.com", + WebURL: "https://example.com", + } + + err := backend.SendEmail(EmailTypeWelcome, "alice@example.com", []string{"bob@example.com"}, data) + if err != nil { + t.Fatalf("SendEmail failed: %v", err) + } + + // StdoutBackend should never return an error, just log + }) +} diff --git a/pkg/server/mailer/mailer.go b/pkg/server/mailer/mailer.go index 10457252..18887cf5 100644 --- a/pkg/server/mailer/mailer.go +++ b/pkg/server/mailer/mailer.go @@ -40,13 +40,19 @@ var ( EmailKindText = "text/plain" ) -// template is the common interface shared between Template from +// tmpl is the common interface shared between Template from // html/template and text/template -type template interface { +type tmpl interface { Execute(wr io.Writer, data interface{}) error } -// Templates holds the parsed email templates +// template wraps a template with its subject line +type template struct { + tmpl tmpl + subject string +} + +// Templates holds the parsed email templates with their subjects type Templates map[string]template func getTemplateKey(name, kind string) string { @@ -56,16 +62,19 @@ func getTemplateKey(name, kind string) string { func (tmpl Templates) get(name, kind string) (template, error) { key := getTemplateKey(name, kind) t := tmpl[key] - if t == nil { - return nil, errors.Errorf("unsupported template '%s' with type '%s'", name, kind) + if t.tmpl == nil { + return template{}, errors.Errorf("unsupported template '%s' with type '%s'", name, kind) } return t, nil } -func (tmpl Templates) set(name, kind string, t template) { +func (tmpl Templates) set(name, kind string, t tmpl, subject string) { key := getTemplateKey(name, kind) - tmpl[key] = t + tmpl[key] = template{ + tmpl: t, + subject: subject, + } } // NewTemplates initializes templates @@ -84,15 +93,15 @@ func NewTemplates() Templates { } T := Templates{} - T.set(EmailTypeResetPassword, EmailKindText, passwordResetText) - T.set(EmailTypeResetPasswordAlert, EmailKindText, passwordResetAlertText) - T.set(EmailTypeWelcome, EmailKindText, welcomeText) + T.set(EmailTypeResetPassword, EmailKindText, passwordResetText, "Reset your Dnote password") + T.set(EmailTypeResetPasswordAlert, EmailKindText, passwordResetAlertText, "Your Dnote password was changed") + T.set(EmailTypeWelcome, EmailKindText, welcomeText, "Welcome to Dnote!") return T } // initTextTmpl returns a template instance by parsing the template with the given name -func initTextTmpl(templateName string) (template, error) { +func initTextTmpl(templateName string) (tmpl, error) { filename := fmt.Sprintf("%s.txt", templateName) content, err := templates.Files.ReadFile(filename) @@ -108,17 +117,17 @@ func initTextTmpl(templateName string) (template, error) { return t, nil } -// Execute executes the template with the given name with the givn data -func (tmpl Templates) Execute(name, kind string, data any) (string, error) { +// Execute executes the template and returns the subject, body, and any error +func (tmpl Templates) Execute(name, kind string, data any) (subject, body string, err error) { t, err := tmpl.get(name, kind) if err != nil { - return "", errors.Wrap(err, "getting template") + return "", "", errors.Wrap(err, "getting template") } buf := new(bytes.Buffer) - if err := t.Execute(buf, data); err != nil { - return "", errors.Wrap(err, "executing the template") + if err := t.tmpl.Execute(buf, data); err != nil { + return "", "", errors.Wrap(err, "executing the template") } - return buf.String(), nil + return t.subject, buf.String(), nil } diff --git a/pkg/server/mailer/mailer_test.go b/pkg/server/mailer/mailer_test.go index e08c9c55..7f8ab383 100644 --- a/pkg/server/mailer/mailer_test.go +++ b/pkg/server/mailer/mailer_test.go @@ -65,11 +65,14 @@ func TestResetPasswordEmail(t *testing.T) { Token: tc.token, WebURL: tc.webURL, } - body, err := tmpl.Execute(EmailTypeResetPassword, EmailKindText, dat) + subject, body, err := tmpl.Execute(EmailTypeResetPassword, EmailKindText, dat) if err != nil { t.Fatal(errors.Wrap(err, "executing")) } + if subject != "Reset your Dnote password" { + t.Errorf("expected subject 'Reset your Dnote password', got '%s'", subject) + } if ok := strings.Contains(body, tc.webURL); !ok { t.Errorf("email body did not contain %s", tc.webURL) } @@ -103,11 +106,14 @@ func TestWelcomeEmail(t *testing.T) { AccountEmail: tc.accountEmail, WebURL: tc.webURL, } - body, err := tmpl.Execute(EmailTypeWelcome, EmailKindText, dat) + subject, body, err := tmpl.Execute(EmailTypeWelcome, EmailKindText, dat) if err != nil { t.Fatal(errors.Wrap(err, "executing")) } + if subject != "Welcome to Dnote!" { + t.Errorf("expected subject 'Welcome to Dnote!', got '%s'", subject) + } if ok := strings.Contains(body, tc.webURL); !ok { t.Errorf("email body did not contain %s", tc.webURL) } @@ -141,11 +147,14 @@ func TestResetPasswordAlertEmail(t *testing.T) { AccountEmail: tc.accountEmail, WebURL: tc.webURL, } - body, err := tmpl.Execute(EmailTypeResetPasswordAlert, EmailKindText, dat) + subject, body, err := tmpl.Execute(EmailTypeResetPasswordAlert, EmailKindText, dat) if err != nil { t.Fatal(errors.Wrap(err, "executing")) } + if subject != "Your Dnote password was changed" { + t.Errorf("expected subject 'Your Dnote password was changed', got '%s'", subject) + } if ok := strings.Contains(body, tc.webURL); !ok { t.Errorf("email body did not contain %s", tc.webURL) } diff --git a/pkg/server/middleware/limit.go b/pkg/server/middleware/limit.go index 6985809e..bc26664f 100644 --- a/pkg/server/middleware/limit.go +++ b/pkg/server/middleware/limit.go @@ -17,7 +17,6 @@ package middleware import ( "net/http" - "os" "strings" "sync" "time" @@ -143,7 +142,7 @@ func (rl *RateLimiter) Limit(next http.Handler) http.HandlerFunc { func ApplyLimit(h http.HandlerFunc, rateLimit bool) http.Handler { ret := h - if rateLimit && os.Getenv("APP_ENV") != "TEST" { + if rateLimit { ret = defaultLimiter.Limit(ret) } diff --git a/pkg/server/testutils/main.go b/pkg/server/testutils/main.go index dd10941e..8fce9ebf 100644 --- a/pkg/server/testutils/main.go +++ b/pkg/server/testutils/main.go @@ -210,10 +210,10 @@ func MustRespondJSON(t *testing.T, w http.ResponseWriter, i interface{}, message // MockEmail is a mock email data type MockEmail struct { - Subject string - From string - To []string - Body string + TemplateType string + From string + To []string + Data interface{} } // MockEmailbackendImplementation is an email backend that simply discards the emails @@ -230,16 +230,16 @@ func (b *MockEmailbackendImplementation) Clear() { b.Emails = []MockEmail{} } -// Queue is an implementation of Backend.Queue. -func (b *MockEmailbackendImplementation) Queue(subject, from string, to []string, contentType, body string) error { +// SendEmail is an implementation of Backend.SendEmail. +func (b *MockEmailbackendImplementation) SendEmail(templateType, from string, to []string, data interface{}) error { b.mu.Lock() defer b.mu.Unlock() b.Emails = append(b.Emails, MockEmail{ - Subject: subject, - From: from, - To: to, - Body: body, + TemplateType: templateType, + From: from, + To: to, + Data: data, }) return nil diff --git a/scripts/server/dev.sh b/scripts/server/dev.sh index 7e1fe80e..3786f270 100755 --- a/scripts/server/dev.sh +++ b/scripts/server/dev.sh @@ -7,11 +7,8 @@ dir=$(dirname "${BASH_SOURCE[0]}") basePath="$dir/../.." serverPath="$basePath/pkg/server" -# load env -set -a -dotenvPath="$serverPath/.env.dev" -source "$dotenvPath" -set +a +# Set env +DBPath=../../dev-server.db # copy assets mkdir -p "$basePath/pkg/server/static" From ce5c9b242aae1428d5cec579ad70e04afa376d5c Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sat, 1 Nov 2025 00:57:37 -0700 Subject: [PATCH 27/33] Rename webUrl to baseUrl (#711) --- pkg/e2e/server_test.go | 10 ++-- pkg/server/app/app.go | 10 ++-- pkg/server/app/email.go | 22 ++++---- pkg/server/app/email_test.go | 12 ++--- pkg/server/app/testutils.go | 2 +- pkg/server/cmd/helpers.go | 2 +- pkg/server/cmd/start.go | 4 +- pkg/server/config/config.go | 14 +++--- pkg/server/config/config_test.go | 18 +++---- pkg/server/mailer/backend_test.go | 4 +- pkg/server/mailer/mailer_test.go | 50 +++++++++---------- .../mailer/templates/reset_password.txt | 2 +- .../mailer/templates/reset_password_alert.txt | 2 +- pkg/server/mailer/templates/welcome.txt | 4 +- pkg/server/mailer/types.go | 6 +-- 15 files changed, 81 insertions(+), 81 deletions(-) diff --git a/pkg/e2e/server_test.go b/pkg/e2e/server_test.go index b7a17b2d..7c646e8d 100644 --- a/pkg/e2e/server_test.go +++ b/pkg/e2e/server_test.go @@ -139,15 +139,15 @@ func TestServerStartHelp(t *testing.T) { outputStr := string(output) assert.Equal(t, strings.Contains(outputStr, "dnote-server start [flags]"), true, "output should contain usage") assert.Equal(t, strings.Contains(outputStr, "--port"), true, "output should contain port flag") - assert.Equal(t, strings.Contains(outputStr, "--webUrl"), true, "output should contain webUrl flag") + assert.Equal(t, strings.Contains(outputStr, "--baseUrl"), true, "output should contain baseUrl flag") assert.Equal(t, strings.Contains(outputStr, "--dbPath"), true, "output should contain dbPath flag") assert.Equal(t, strings.Contains(outputStr, "--disableRegistration"), true, "output should contain disableRegistration flag") } func TestServerStartInvalidConfig(t *testing.T) { cmd := exec.Command(testServerBinary, "start") - // Set invalid WebURL to trigger validation failure - cmd.Env = []string{"WebURL=not-a-valid-url"} + // Set invalid BaseURL to trigger validation failure + cmd.Env = []string{"BaseURL=not-a-valid-url"} output, err := cmd.CombinedOutput() @@ -158,9 +158,9 @@ func TestServerStartInvalidConfig(t *testing.T) { outputStr := string(output) assert.Equal(t, strings.Contains(outputStr, "Error:"), true, "output should contain error message") - assert.Equal(t, strings.Contains(outputStr, "Invalid WebURL"), true, "output should mention invalid WebURL") + assert.Equal(t, strings.Contains(outputStr, "Invalid BaseURL"), true, "output should mention invalid BaseURL") assert.Equal(t, strings.Contains(outputStr, "dnote-server start [flags]"), true, "output should show usage") - assert.Equal(t, strings.Contains(outputStr, "--webUrl"), true, "output should show flags") + assert.Equal(t, strings.Contains(outputStr, "--baseUrl"), true, "output should show flags") } func TestServerUnknownCommand(t *testing.T) { diff --git a/pkg/server/app/app.go b/pkg/server/app/app.go index 6a8c5d14..cfaaf319 100644 --- a/pkg/server/app/app.go +++ b/pkg/server/app/app.go @@ -27,8 +27,8 @@ var ( ErrEmptyDB = errors.New("No database connection was provided") // ErrEmptyClock is an error for missing clock in the app configuration ErrEmptyClock = errors.New("No clock was provided") - // ErrEmptyWebURL is an error for missing WebURL content in the app configuration - ErrEmptyWebURL = errors.New("No WebURL was provided") + // ErrEmptyBaseURL is an error for missing BaseURL content in the app configuration + ErrEmptyBaseURL = errors.New("No BaseURL was provided") // ErrEmptyEmailBackend is an error for missing EmailBackend content in the app configuration ErrEmptyEmailBackend = errors.New("No EmailBackend was provided") // ErrEmptyHTTP500Page is an error for missing HTTP 500 page content @@ -42,7 +42,7 @@ type App struct { EmailBackend mailer.Backend Files map[string][]byte HTTP500Page []byte - WebURL string + BaseURL string DisableRegistration bool Port string DBPath string @@ -51,8 +51,8 @@ type App struct { // Validate validates the app configuration func (a *App) Validate() error { - if a.WebURL == "" { - return ErrEmptyWebURL + if a.BaseURL == "" { + return ErrEmptyBaseURL } if a.Clock == nil { return ErrEmptyClock diff --git a/pkg/server/app/email.go b/pkg/server/app/email.go index 1b78f722..fc86cda9 100644 --- a/pkg/server/app/email.go +++ b/pkg/server/app/email.go @@ -27,8 +27,8 @@ import ( var defaultSender = "admin@getdnote.com" // GetSenderEmail returns the sender email -func GetSenderEmail(webURL, want string) (string, error) { - addr, err := getNoreplySender(webURL) +func GetSenderEmail(baseURL, want string) (string, error) { + addr, err := getNoreplySender(baseURL) if err != nil { return "", errors.Wrap(err, "getting sender email address") } @@ -52,10 +52,10 @@ func getDomainFromURL(rawURL string) (string, error) { return domain, nil } -func getNoreplySender(webURL string) (string, error) { - domain, err := getDomainFromURL(webURL) +func getNoreplySender(baseURL string) (string, error) { + domain, err := getDomainFromURL(baseURL) if err != nil { - return "", errors.Wrap(err, "parsing web url") + return "", errors.Wrap(err, "parsing base url") } addr := fmt.Sprintf("noreply@%s", domain) @@ -64,14 +64,14 @@ func getNoreplySender(webURL string) (string, error) { // SendWelcomeEmail sends welcome email func (a *App) SendWelcomeEmail(email string) error { - from, err := GetSenderEmail(a.WebURL, defaultSender) + from, err := GetSenderEmail(a.BaseURL, defaultSender) if err != nil { return errors.Wrap(err, "getting the sender email") } data := mailer.WelcomeTmplData{ AccountEmail: email, - WebURL: a.WebURL, + BaseURL: a.BaseURL, } if err := a.EmailBackend.SendEmail(mailer.EmailTypeWelcome, from, []string{email}, data); err != nil { @@ -87,7 +87,7 @@ func (a *App) SendPasswordResetEmail(email, tokenValue string) error { return ErrEmailRequired } - from, err := GetSenderEmail(a.WebURL, defaultSender) + from, err := GetSenderEmail(a.BaseURL, defaultSender) if err != nil { return errors.Wrap(err, "getting the sender email") } @@ -95,7 +95,7 @@ func (a *App) SendPasswordResetEmail(email, tokenValue string) error { data := mailer.EmailResetPasswordTmplData{ AccountEmail: email, Token: tokenValue, - WebURL: a.WebURL, + BaseURL: a.BaseURL, } if err := a.EmailBackend.SendEmail(mailer.EmailTypeResetPassword, from, []string{email}, data); err != nil { @@ -111,14 +111,14 @@ func (a *App) SendPasswordResetEmail(email, tokenValue string) error { // SendPasswordResetAlertEmail sends email that notifies users of a password change func (a *App) SendPasswordResetAlertEmail(email string) error { - from, err := GetSenderEmail(a.WebURL, defaultSender) + from, err := GetSenderEmail(a.BaseURL, defaultSender) if err != nil { return errors.Wrap(err, "getting the sender email") } data := mailer.EmailResetPasswordAlertTmplData{ AccountEmail: email, - WebURL: a.WebURL, + BaseURL: a.BaseURL, } if err := a.EmailBackend.SendEmail(mailer.EmailTypeResetPasswordAlert, from, []string{email}, data); err != nil { diff --git a/pkg/server/app/email_test.go b/pkg/server/app/email_test.go index 31d284e7..e0a73aef 100644 --- a/pkg/server/app/email_test.go +++ b/pkg/server/app/email_test.go @@ -27,7 +27,7 @@ func TestSendWelcomeEmail(t *testing.T) { emailBackend := testutils.MockEmailbackendImplementation{} a := NewTest() a.EmailBackend = &emailBackend - a.WebURL = "http://example.com" + a.BaseURL = "http://example.com" if err := a.SendWelcomeEmail("alice@example.com"); err != nil { t.Fatal(err, "failed to perform") @@ -43,7 +43,7 @@ func TestSendPasswordResetEmail(t *testing.T) { emailBackend := testutils.MockEmailbackendImplementation{} a := NewTest() a.EmailBackend = &emailBackend - a.WebURL = "http://example.com" + a.BaseURL = "http://example.com" if err := a.SendPasswordResetEmail("alice@example.com", "mockTokenValue"); err != nil { t.Fatal(err, "failed to perform") @@ -57,21 +57,21 @@ func TestSendPasswordResetEmail(t *testing.T) { func TestGetSenderEmail(t *testing.T) { testCases := []struct { - webURL string + baseURL string expectedSender string }{ { - webURL: "https://www.example.com", + baseURL: "https://www.example.com", expectedSender: "noreply@example.com", }, { - webURL: "https://www.example2.com", + baseURL: "https://www.example2.com", expectedSender: "alice@example2.com", }, } for _, tc := range testCases { - t.Run(fmt.Sprintf("web url %s", tc.webURL), func(t *testing.T) { + t.Run(fmt.Sprintf("base url %s", tc.baseURL), func(t *testing.T) { }) } } diff --git a/pkg/server/app/testutils.go b/pkg/server/app/testutils.go index 48896cdc..248f4784 100644 --- a/pkg/server/app/testutils.go +++ b/pkg/server/app/testutils.go @@ -27,7 +27,7 @@ func NewTest() App { Clock: clock.NewMock(), EmailBackend: &testutils.MockEmailbackendImplementation{}, HTTP500Page: assets.MustGetHTTP500ErrorPage(), - WebURL: "http://127.0.0.0.1", + BaseURL: "http://127.0.0.0.1", Port: "3000", DisableRegistration: false, DBPath: "", diff --git a/pkg/server/cmd/helpers.go b/pkg/server/cmd/helpers.go index 3c135372..2a322476 100644 --- a/pkg/server/cmd/helpers.go +++ b/pkg/server/cmd/helpers.go @@ -57,7 +57,7 @@ func initApp(cfg config.Config) app.App { Clock: clock.New(), EmailBackend: emailBackend, HTTP500Page: cfg.HTTP500Page, - WebURL: cfg.WebURL, + BaseURL: cfg.BaseURL, DisableRegistration: cfg.DisableRegistration, Port: cfg.Port, DBPath: cfg.DBPath, diff --git a/pkg/server/cmd/start.go b/pkg/server/cmd/start.go index 465f41ce..0a4e5292 100644 --- a/pkg/server/cmd/start.go +++ b/pkg/server/cmd/start.go @@ -33,7 +33,7 @@ func startCmd(args []string) { fs := setupFlagSet("start", "dnote-server start") port := fs.String("port", "", "Server port (env: PORT, default: 3001)") - webURL := fs.String("webUrl", "", "Full URL to server without trailing slash (env: WebURL, default: http://localhost:3001)") + baseURL := fs.String("baseUrl", "", "Full URL to server without trailing slash (env: BaseURL, default: http://localhost:3001)") dbPath := fs.String("dbPath", "", "Path to SQLite database file (env: DBPath, default: $XDG_DATA_HOME/dnote/server.db)") disableRegistration := fs.Bool("disableRegistration", false, "Disable user registration (env: DisableRegistration, default: false)") logLevel := fs.String("logLevel", "", "Log level: debug, info, warn, or error (env: LOG_LEVEL, default: info)") @@ -42,7 +42,7 @@ func startCmd(args []string) { cfg, err := config.New(config.Params{ Port: *port, - WebURL: *webURL, + BaseURL: *baseURL, DBPath: *dbPath, DisableRegistration: *disableRegistration, LogLevel: *logLevel, diff --git a/pkg/server/config/config.go b/pkg/server/config/config.go index 88b604bc..19ee45f2 100644 --- a/pkg/server/config/config.go +++ b/pkg/server/config/config.go @@ -40,8 +40,8 @@ var ( var ( // ErrDBMissingPath is an error for an incomplete configuration missing the database path ErrDBMissingPath = errors.New("DB Path is empty") - // ErrWebURLInvalid is an error for an incomplete configuration with invalid web url - ErrWebURLInvalid = errors.New("Invalid WebURL") + // ErrBaseURLInvalid is an error for an incomplete configuration with invalid base url + ErrBaseURLInvalid = errors.New("Invalid BaseURL") // ErrPortInvalid is an error for an incomplete configuration with invalid port ErrPortInvalid = errors.New("Invalid Port") ) @@ -63,7 +63,7 @@ func getOrEnv(value, envKey, defaultVal string) string { // Config is an application configuration type Config struct { - WebURL string + BaseURL string DisableRegistration bool Port string DBPath string @@ -75,7 +75,7 @@ type Config struct { // Params are the configuration parameters for creating a new Config type Params struct { Port string - WebURL string + BaseURL string DBPath string DisableRegistration bool LogLevel string @@ -86,7 +86,7 @@ type Params struct { func New(p Params) (Config, error) { c := Config{ Port: getOrEnv(p.Port, "PORT", "3001"), - WebURL: getOrEnv(p.WebURL, "WebURL", "http://localhost:3001"), + BaseURL: getOrEnv(p.BaseURL, "BaseURL", "http://localhost:3001"), DBPath: getOrEnv(p.DBPath, "DBPath", DefaultDBPath), DisableRegistration: p.DisableRegistration || readBoolEnv("DisableRegistration"), LogLevel: getOrEnv(p.LogLevel, "LOG_LEVEL", "info"), @@ -102,8 +102,8 @@ func New(p Params) (Config, error) { } func validate(c Config) error { - if _, err := url.ParseRequestURI(c.WebURL); err != nil { - return errors.Wrapf(ErrWebURLInvalid, "'%s'", c.WebURL) + if _, err := url.ParseRequestURI(c.BaseURL); err != nil { + return errors.Wrapf(ErrBaseURLInvalid, "'%s'", c.BaseURL) } if c.Port == "" { return ErrPortInvalid diff --git a/pkg/server/config/config_test.go b/pkg/server/config/config_test.go index 8b76c07b..9c3c1baa 100644 --- a/pkg/server/config/config_test.go +++ b/pkg/server/config/config_test.go @@ -30,17 +30,17 @@ func TestValidate(t *testing.T) { }{ { config: Config{ - DBPath: "test.db", - WebURL: "http://mock.url", - Port: "3000", + DBPath: "test.db", + BaseURL: "http://mock.url", + Port: "3000", }, expectedErr: nil, }, { config: Config{ - DBPath: "", - WebURL: "http://mock.url", - Port: "3000", + DBPath: "", + BaseURL: "http://mock.url", + Port: "3000", }, expectedErr: ErrDBMissingPath, }, @@ -48,12 +48,12 @@ func TestValidate(t *testing.T) { config: Config{ DBPath: "test.db", }, - expectedErr: ErrWebURLInvalid, + expectedErr: ErrBaseURLInvalid, }, { config: Config{ - DBPath: "test.db", - WebURL: "http://mock.url", + DBPath: "test.db", + BaseURL: "http://mock.url", }, expectedErr: ErrPortInvalid, }, diff --git a/pkg/server/mailer/backend_test.go b/pkg/server/mailer/backend_test.go index 2e4e27a7..2388c16b 100644 --- a/pkg/server/mailer/backend_test.go +++ b/pkg/server/mailer/backend_test.go @@ -41,7 +41,7 @@ func TestDefaultBackendSendEmail(t *testing.T) { data := WelcomeTmplData{ AccountEmail: "bob@example.com", - WebURL: "https://example.com", + BaseURL: "https://example.com", } err := backend.SendEmail(EmailTypeWelcome, "alice@example.com", []string{"bob@example.com"}, data) @@ -94,7 +94,7 @@ func TestStdoutBackendSendEmail(t *testing.T) { data := WelcomeTmplData{ AccountEmail: "bob@example.com", - WebURL: "https://example.com", + BaseURL: "https://example.com", } err := backend.SendEmail(EmailTypeWelcome, "alice@example.com", []string{"bob@example.com"}, data) diff --git a/pkg/server/mailer/mailer_test.go b/pkg/server/mailer/mailer_test.go index 7f8ab383..71b48209 100644 --- a/pkg/server/mailer/mailer_test.go +++ b/pkg/server/mailer/mailer_test.go @@ -44,26 +44,26 @@ func TestAllTemplatesInitialized(t *testing.T) { func TestResetPasswordEmail(t *testing.T) { testCases := []struct { - token string - webURL string + token string + baseURL string }{ { - token: "someRandomToken1", - webURL: "http://localhost:3000", + token: "someRandomToken1", + baseURL: "http://localhost:3000", }, { - token: "someRandomToken2", - webURL: "http://localhost:3001", + token: "someRandomToken2", + baseURL: "http://localhost:3001", }, } tmpl := NewTemplates() for _, tc := range testCases { - t.Run(fmt.Sprintf("with WebURL %s", tc.webURL), func(t *testing.T) { + t.Run(fmt.Sprintf("with BaseURL %s", tc.baseURL), func(t *testing.T) { dat := EmailResetPasswordTmplData{ - Token: tc.token, - WebURL: tc.webURL, + Token: tc.token, + BaseURL: tc.baseURL, } subject, body, err := tmpl.Execute(EmailTypeResetPassword, EmailKindText, dat) if err != nil { @@ -73,8 +73,8 @@ func TestResetPasswordEmail(t *testing.T) { if subject != "Reset your Dnote password" { t.Errorf("expected subject 'Reset your Dnote password', got '%s'", subject) } - if ok := strings.Contains(body, tc.webURL); !ok { - t.Errorf("email body did not contain %s", tc.webURL) + if ok := strings.Contains(body, tc.baseURL); !ok { + t.Errorf("email body did not contain %s", tc.baseURL) } if ok := strings.Contains(body, tc.token); !ok { t.Errorf("email body did not contain %s", tc.token) @@ -86,25 +86,25 @@ func TestResetPasswordEmail(t *testing.T) { func TestWelcomeEmail(t *testing.T) { testCases := []struct { accountEmail string - webURL string + baseURL string }{ { accountEmail: "test@example.com", - webURL: "http://localhost:3000", + baseURL: "http://localhost:3000", }, { accountEmail: "user@example.org", - webURL: "http://localhost:3001", + baseURL: "http://localhost:3001", }, } tmpl := NewTemplates() for _, tc := range testCases { - t.Run(fmt.Sprintf("with WebURL %s and email %s", tc.webURL, tc.accountEmail), func(t *testing.T) { + t.Run(fmt.Sprintf("with BaseURL %s and email %s", tc.baseURL, tc.accountEmail), func(t *testing.T) { dat := WelcomeTmplData{ AccountEmail: tc.accountEmail, - WebURL: tc.webURL, + BaseURL: tc.baseURL, } subject, body, err := tmpl.Execute(EmailTypeWelcome, EmailKindText, dat) if err != nil { @@ -114,8 +114,8 @@ func TestWelcomeEmail(t *testing.T) { if subject != "Welcome to Dnote!" { t.Errorf("expected subject 'Welcome to Dnote!', got '%s'", subject) } - if ok := strings.Contains(body, tc.webURL); !ok { - t.Errorf("email body did not contain %s", tc.webURL) + if ok := strings.Contains(body, tc.baseURL); !ok { + t.Errorf("email body did not contain %s", tc.baseURL) } if ok := strings.Contains(body, tc.accountEmail); !ok { t.Errorf("email body did not contain %s", tc.accountEmail) @@ -127,25 +127,25 @@ func TestWelcomeEmail(t *testing.T) { func TestResetPasswordAlertEmail(t *testing.T) { testCases := []struct { accountEmail string - webURL string + baseURL string }{ { accountEmail: "test@example.com", - webURL: "http://localhost:3000", + baseURL: "http://localhost:3000", }, { accountEmail: "user@example.org", - webURL: "http://localhost:3001", + baseURL: "http://localhost:3001", }, } tmpl := NewTemplates() for _, tc := range testCases { - t.Run(fmt.Sprintf("with WebURL %s and email %s", tc.webURL, tc.accountEmail), func(t *testing.T) { + t.Run(fmt.Sprintf("with BaseURL %s and email %s", tc.baseURL, tc.accountEmail), func(t *testing.T) { dat := EmailResetPasswordAlertTmplData{ AccountEmail: tc.accountEmail, - WebURL: tc.webURL, + BaseURL: tc.baseURL, } subject, body, err := tmpl.Execute(EmailTypeResetPasswordAlert, EmailKindText, dat) if err != nil { @@ -155,8 +155,8 @@ func TestResetPasswordAlertEmail(t *testing.T) { if subject != "Your Dnote password was changed" { t.Errorf("expected subject 'Your Dnote password was changed', got '%s'", subject) } - if ok := strings.Contains(body, tc.webURL); !ok { - t.Errorf("email body did not contain %s", tc.webURL) + if ok := strings.Contains(body, tc.baseURL); !ok { + t.Errorf("email body did not contain %s", tc.baseURL) } if ok := strings.Contains(body, tc.accountEmail); !ok { t.Errorf("email body did not contain %s", tc.accountEmail) diff --git a/pkg/server/mailer/templates/reset_password.txt b/pkg/server/mailer/templates/reset_password.txt index 9053a493..9d31d605 100644 --- a/pkg/server/mailer/templates/reset_password.txt +++ b/pkg/server/mailer/templates/reset_password.txt @@ -2,4 +2,4 @@ You are receiving this because you requested to reset the password of the '{{ .A Please click on the following link, or paste this into your browser to complete the process: - {{ .WebURL }}/password-reset/{{ .Token }} + {{ .BaseURL }}/password-reset/{{ .Token }} diff --git a/pkg/server/mailer/templates/reset_password_alert.txt b/pkg/server/mailer/templates/reset_password_alert.txt index 16957375..ea67dce3 100644 --- a/pkg/server/mailer/templates/reset_password_alert.txt +++ b/pkg/server/mailer/templates/reset_password_alert.txt @@ -2,7 +2,7 @@ Hi, This email is to notify you that the password for your Dnote account "{{ .AccountEmail }}" has changed. -If you did not initiate this password change, reset your password at {{ .WebURL }}/password-reset. +If you did not initiate this password change, reset your password at {{ .BaseURL }}/password-reset. Thanks. diff --git a/pkg/server/mailer/templates/welcome.txt b/pkg/server/mailer/templates/welcome.txt index 72d0fdf0..cced536c 100644 --- a/pkg/server/mailer/templates/welcome.txt +++ b/pkg/server/mailer/templates/welcome.txt @@ -4,8 +4,8 @@ Dnote is a simple command-line notebook. YOUR ACCOUNT -Your {{ .WebURL }} account is "{{ .AccountEmail }}". Log in at {{ .WebURL }}/login -If you ever forget your password, you can reset it at {{ .WebURL }}/password-reset +Your {{ .BaseURL }} account is "{{ .AccountEmail }}". Log in at {{ .BaseURL }}/login +If you ever forget your password, you can reset it at {{ .BaseURL }}/password-reset SOURCE CODE diff --git a/pkg/server/mailer/types.go b/pkg/server/mailer/types.go index 17363398..40468b84 100644 --- a/pkg/server/mailer/types.go +++ b/pkg/server/mailer/types.go @@ -19,17 +19,17 @@ package mailer type EmailResetPasswordTmplData struct { AccountEmail string Token string - WebURL string + BaseURL string } // EmailResetPasswordAlertTmplData is a template data for reset password emails type EmailResetPasswordAlertTmplData struct { AccountEmail string - WebURL string + BaseURL string } // WelcomeTmplData is a template data for welcome emails type WelcomeTmplData struct { AccountEmail string - WebURL string + BaseURL string } From f1d7123596f0b3f67643c01db742adaa3e8dd265 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sat, 1 Nov 2025 14:06:33 -0700 Subject: [PATCH 28/33] Fix log level (#712) --- README.md | 10 +++- pkg/server/database/database.go | 4 +- pkg/server/database/database_test.go | 70 ++++++++++++++++++++++++++++ pkg/server/log/log.go | 46 +++++++++++------- pkg/server/log/log_test.go | 44 +++++++++++++++++ scripts/license.sh | 16 +++---- 6 files changed, 160 insertions(+), 30 deletions(-) create mode 100644 pkg/server/database/database_test.go diff --git a/README.md b/README.md index fbe46e26..7ab0063f 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ Or [download binary](https://github.com/dnote/dnote/releases). ## Server (Optional) -Just run a binary. No database setup required. +Server is a binary with SQLite embedded. No database setup is required. -Run with Docker Compose using [compose.yml](./host/docker/compose.yml): +If using docker, create a compose.yml: ```yaml services: @@ -51,6 +51,12 @@ services: restart: unless-stopped ``` +Then run: + +```bash +docker-compose up -d +``` + Or see the [guide](https://www.getdnote.com/docs/server/manual) for binary installation. ## Documentation diff --git a/pkg/server/database/database.go b/pkg/server/database/database.go index cfb18ab7..bd7869bc 100644 --- a/pkg/server/database/database.go +++ b/pkg/server/database/database.go @@ -38,13 +38,13 @@ func getDBLogLevel(level string) logger.LogLevel { case log.LevelDebug: return logger.Info case log.LevelInfo: - return logger.Info + return logger.Silent case log.LevelWarn: return logger.Warn case log.LevelError: return logger.Error default: - return logger.Error + return logger.Silent } } diff --git a/pkg/server/database/database_test.go b/pkg/server/database/database_test.go new file mode 100644 index 00000000..3d3f5b92 --- /dev/null +++ b/pkg/server/database/database_test.go @@ -0,0 +1,70 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package database + +import ( + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/server/log" + "gorm.io/gorm/logger" +) + +func TestGetDBLogLevel(t *testing.T) { + testCases := []struct { + name string + level string + expected logger.LogLevel + }{ + { + name: "debug level maps to Info", + level: log.LevelDebug, + expected: logger.Info, + }, + { + name: "info level maps to Silent", + level: log.LevelInfo, + expected: logger.Silent, + }, + { + name: "warn level maps to Warn", + level: log.LevelWarn, + expected: logger.Warn, + }, + { + name: "error level maps to Error", + level: log.LevelError, + expected: logger.Error, + }, + { + name: "unknown level maps to Silent", + level: "unknown", + expected: logger.Silent, + }, + { + name: "empty string maps to Silent", + level: "", + expected: logger.Silent, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + result := getDBLogLevel(tc.level) + assert.Equal(t, result, tc.expected, "log level mismatch") + }) + } +} diff --git a/pkg/server/log/log.go b/pkg/server/log/log.go index d8b43c8b..172255ba 100644 --- a/pkg/server/log/log.go +++ b/pkg/server/log/log.go @@ -75,25 +75,35 @@ func GetLevel() string { return currentLevel } -// levelPriority returns a numeric priority for comparison -func levelPriority(level string) int { - switch level { - case LevelDebug: - return 0 - case LevelInfo: - return 1 - case LevelWarn: - return 2 - case LevelError: - return 3 - default: - return 1 - } -} - -// shouldLog returns true if the given level should be logged based on currentLevel +// shouldLog returns true if the given level should be logged based on currentLevel. +// +// Log level behavior (hierarchical): +// - LevelDebug: shows all messages (debug, info, warn, error) +// - LevelInfo: shows info, warn, and error messages +// - LevelWarn: shows warn and error messages +// - LevelError: shows only error messages func shouldLog(level string) bool { - return levelPriority(level) >= levelPriority(currentLevel) + // Debug level shows everything + if currentLevel == LevelDebug { + return true + } + + // Info level shows info + warn + error + if currentLevel == LevelInfo { + return level == LevelInfo || level == LevelWarn || level == LevelError + } + + // Warn level shows warn + error + if currentLevel == LevelWarn { + return level == LevelWarn || level == LevelError + } + + // Error level shows only error + if currentLevel == LevelError { + return level == LevelError + } + + return false } // Debug logs the given entry at a debug level diff --git a/pkg/server/log/log_test.go b/pkg/server/log/log_test.go index 488e3725..dd98c685 100644 --- a/pkg/server/log/log_test.go +++ b/pkg/server/log/log_test.go @@ -33,3 +33,47 @@ func TestSetLevel(t *testing.T) { t.Errorf("Expected level %s, got %s", LevelError, currentLevel) } } + +func TestShouldLog(t *testing.T) { + // Reset to default after test + defer SetLevel(LevelInfo) + + testCases := []struct { + currentLevel string + logLevel string + expected bool + description string + }{ + // Debug level shows everything + {LevelDebug, LevelDebug, true, "debug level should show debug"}, + {LevelDebug, LevelInfo, true, "debug level should show info"}, + {LevelDebug, LevelWarn, true, "debug level should show warn"}, + {LevelDebug, LevelError, true, "debug level should show error"}, + + // Info level shows info + warn + error + {LevelInfo, LevelDebug, false, "info level should not show debug"}, + {LevelInfo, LevelInfo, true, "info level should show info"}, + {LevelInfo, LevelWarn, true, "info level should show warn"}, + {LevelInfo, LevelError, true, "info level should show error"}, + + // Warn level shows warn + error + {LevelWarn, LevelDebug, false, "warn level should not show debug"}, + {LevelWarn, LevelInfo, false, "warn level should not show info"}, + {LevelWarn, LevelWarn, true, "warn level should show warn"}, + {LevelWarn, LevelError, true, "warn level should show error"}, + + // Error level shows only error + {LevelError, LevelDebug, false, "error level should not show debug"}, + {LevelError, LevelInfo, false, "error level should not show info"}, + {LevelError, LevelWarn, false, "error level should not show warn"}, + {LevelError, LevelError, true, "error level should show error"}, + } + + for _, tc := range testCases { + SetLevel(tc.currentLevel) + result := shouldLog(tc.logLevel) + if result != tc.expected { + t.Errorf("%s: expected %v, got %v", tc.description, tc.expected, result) + } + } +} diff --git a/scripts/license.sh b/scripts/license.sh index 4f96780c..4f7788e4 100755 --- a/scripts/license.sh +++ b/scripts/license.sh @@ -1,11 +1,9 @@ #!/usr/bin/env bash set -eux -function remove_notice { - # Remove old copyright notice - matches /* Copyright ... */ including the trailing newline - # The 's' flag makes . match newlines, allowing multi-line matching - # The \n? matches an optional newline after the closing */ - perl -i -0pe 's/\/\* Copyright.*?\*\/\n?//s' "$1" +function has_license { + # Check if file already has a copyright notice + grep -q "Copyright.*Dnote Authors" "$1" } function add_notice { @@ -18,7 +16,8 @@ q END } -license="/* Copyright 2025 Dnote Authors +year=$(date +%Y) +license="/* Copyright $year Dnote Authors * * Licensed under the Apache License, Version 2.0 (the \"License\"); * you may not use this file except in compliance with the License. @@ -41,6 +40,7 @@ pkgPath="$basedir/pkg" allFiles=$(find "$pkgPath" -type f \( -name "*.go" -o -name "*.js" -o -name "*.ts" -o -name "*.tsx" -o -name "*.scss" -o -name "*.css" \) ! -path "**/vendor/*" ! -path "**/node_modules/*" ! -path "**/dist/*") for file in $allFiles; do - remove_notice "$file" - add_notice "$file" "$license" + if ! has_license "$file"; then + add_notice "$file" "$license" + fi done From d5e11c23f6010708dde32d7774956fe31030a201 Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sat, 1 Nov 2025 19:20:18 -0700 Subject: [PATCH 29/33] Update self-hosting doc (#713) --- SELF_HOSTING.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/SELF_HOSTING.md b/SELF_HOSTING.md index 3638cb01..e67df891 100644 --- a/SELF_HOSTING.md +++ b/SELF_HOSTING.md @@ -6,27 +6,28 @@ Please see the [doc](https://www.getdnote.com/docs/server) for more. 1. Install [Docker](https://docs.docker.com/install/). 2. Install Docker [Compose plugin](https://docs.docker.com/compose/install/linux/). -3. Download the [compose.yml](https://raw.githubusercontent.com/dnote/dnote/master/host/docker/compose.yml) file by running: +3. Create a `compose.yml` file with the following content: -``` -curl https://raw.githubusercontent.com/dnote/dnote/master/host/docker/compose.yml > compose.yml +```yaml +services: + dnote: + image: dnote/dnote:latest + container_name: dnote + ports: + - 3001:3001 + volumes: + - ./dnote_data:/data + restart: unless-stopped ``` -4. Run the following to download the images and run the containers +4. Run the following to download the image and start the container ``` -docker compose pull docker compose up -d ``` Visit http://localhost:3001 in your browser to see Dnote running. -### Supported platform - -Currently, the official Docker image for Dnote supports Linux running AMD64 CPU architecture. - -If you run ARM64, please install Dnote server by downloading a binary distribution (see below). - ## Manual Installation Download from [releases](https://github.com/dnote/dnote/releases), extract, and run: @@ -34,7 +35,7 @@ Download from [releases](https://github.com/dnote/dnote/releases), extract, and ```bash tar -xzf dnote-server-$version-$os.tar.gz mv ./dnote-server /usr/local/bin -dnote-server start --webUrl=https://your.server +dnote-server start --baseUrl=https://your.server ``` You're up and running. Database: `~/.local/share/dnote/server.db` (customize with `--dbPath`). Run `dnote-server start --help` for options. From 5c416e3a327e55d9b20b987611e6cd032243008b Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Sat, 1 Nov 2025 19:59:51 -0700 Subject: [PATCH 30/33] Add user list command (#714) --- pkg/e2e/server_test.go | 20 +++++++++++ pkg/server/app/users.go | 11 ++++++ pkg/server/app/users_test.go | 66 ++++++++++++++++++++++++++++++++++++ pkg/server/cmd/helpers.go | 4 +-- pkg/server/cmd/user.go | 31 +++++++++++++++-- pkg/server/cmd/user_test.go | 49 ++++++++++++++++++++++++++ 6 files changed, 176 insertions(+), 5 deletions(-) diff --git a/pkg/e2e/server_test.go b/pkg/e2e/server_test.go index 7c646e8d..e8ca3da6 100644 --- a/pkg/e2e/server_test.go +++ b/pkg/e2e/server_test.go @@ -331,3 +331,23 @@ func TestServerUserCreateHelp(t *testing.T) { assert.Equal(t, strings.Contains(outputStr, "--password"), true, "help should show --password (double dash)") assert.Equal(t, strings.Contains(outputStr, "--dbPath"), true, "help should show --dbPath (double dash)") } + +func TestServerUserList(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Create two users + exec.Command(testServerBinary, "user", "create", "--dbPath", tmpDB, "--email", "alice@example.com", "--password", "password123").CombinedOutput() + exec.Command(testServerBinary, "user", "create", "--dbPath", tmpDB, "--email", "bob@example.com", "--password", "password123").CombinedOutput() + + // List users + listCmd := exec.Command(testServerBinary, "user", "list", "--dbPath", tmpDB) + output, err := listCmd.CombinedOutput() + + if err != nil { + t.Fatalf("user list failed: %v\nOutput: %s", err, output) + } + + outputStr := string(output) + assert.Equal(t, strings.Contains(outputStr, "alice@example.com"), true, "output should have alice") + assert.Equal(t, strings.Contains(outputStr, "bob@example.com"), true, "output should have bob") +} diff --git a/pkg/server/app/users.go b/pkg/server/app/users.go index 760b3354..9c167b69 100644 --- a/pkg/server/app/users.go +++ b/pkg/server/app/users.go @@ -116,6 +116,17 @@ func (a *App) GetUserByEmail(email string) (*database.User, error) { return &user, nil } +// GetAllUsers retrieves all users from the database +func (a *App) GetAllUsers() ([]database.User, error) { + var users []database.User + err := a.DB.Find(&users).Error + if err != nil { + return nil, pkgErrors.Wrap(err, "finding users") + } + + return users, nil +} + // Authenticate authenticates a user func (a *App) Authenticate(email, password string) (*database.User, error) { user, err := a.GetUserByEmail(email) diff --git a/pkg/server/app/users_test.go b/pkg/server/app/users_test.go index f345b217..52183520 100644 --- a/pkg/server/app/users_test.go +++ b/pkg/server/app/users_test.go @@ -108,6 +108,72 @@ func TestGetUserByEmail(t *testing.T) { }) } +func TestGetAllUsers(t *testing.T) { + t.Run("success with multiple users", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user1 := testutils.SetupUserData(db, "alice@example.com", "password123") + user2 := testutils.SetupUserData(db, "bob@example.com", "password123") + user3 := testutils.SetupUserData(db, "charlie@example.com", "password123") + + a := NewTest() + a.DB = db + + users, err := a.GetAllUsers() + + assert.Equal(t, err, nil, "should not error") + assert.Equal(t, len(users), 3, "should return 3 users") + + // Verify all users are returned + emails := make(map[string]bool) + for _, user := range users { + emails[user.Email.String] = true + } + assert.Equal(t, emails["alice@example.com"], true, "alice should be in results") + assert.Equal(t, emails["bob@example.com"], true, "bob should be in results") + assert.Equal(t, emails["charlie@example.com"], true, "charlie should be in results") + + // Verify user details match + for _, user := range users { + if user.Email.String == "alice@example.com" { + assert.Equal(t, user.ID, user1.ID, "alice ID mismatch") + } else if user.Email.String == "bob@example.com" { + assert.Equal(t, user.ID, user2.ID, "bob ID mismatch") + } else if user.Email.String == "charlie@example.com" { + assert.Equal(t, user.ID, user3.ID, "charlie ID mismatch") + } + } + }) + + t.Run("empty database", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + a := NewTest() + a.DB = db + + users, err := a.GetAllUsers() + + assert.Equal(t, err, nil, "should not error") + assert.Equal(t, len(users), 0, "should return 0 users") + }) + + t.Run("single user", func(t *testing.T) { + db := testutils.InitMemoryDB(t) + + user := testutils.SetupUserData(db, "alice@example.com", "password123") + + a := NewTest() + a.DB = db + + users, err := a.GetAllUsers() + + assert.Equal(t, err, nil, "should not error") + assert.Equal(t, len(users), 1, "should return 1 user") + assert.Equal(t, users[0].Email.String, "alice@example.com", "email mismatch") + assert.Equal(t, users[0].ID, user.ID, "user ID mismatch") + }) +} + func TestCreateUser(t *testing.T) { t.Run("success", func(t *testing.T) { db := testutils.InitMemoryDB(t) diff --git a/pkg/server/cmd/helpers.go b/pkg/server/cmd/helpers.go index 2a322476..ba90a7ce 100644 --- a/pkg/server/cmd/helpers.go +++ b/pkg/server/cmd/helpers.go @@ -111,8 +111,8 @@ func requireString(fs *flag.FlagSet, value, fieldName string) { } } -// setupAppWithDB creates config, initializes app, and returns cleanup function -func setupAppWithDB(fs *flag.FlagSet, dbPath string) (*app.App, func()) { +// createApp creates config, initializes app, and returns cleanup function +func createApp(fs *flag.FlagSet, dbPath string) (*app.App, func()) { cfg, err := config.New(config.Params{ DBPath: dbPath, }) diff --git a/pkg/server/cmd/user.go b/pkg/server/cmd/user.go index 01b753b1..7a98344d 100644 --- a/pkg/server/cmd/user.go +++ b/pkg/server/cmd/user.go @@ -51,7 +51,7 @@ func userCreateCmd(args []string) { requireString(fs, *email, "email") requireString(fs, *password, "password") - a, cleanup := setupAppWithDB(fs, *dbPath) + a, cleanup := createApp(fs, *dbPath) defer cleanup() _, err := a.CreateUser(*email, *password, *password) @@ -74,7 +74,7 @@ func userRemoveCmd(args []string, stdin io.Reader) { requireString(fs, *email, "email") - a, cleanup := setupAppWithDB(fs, *dbPath) + a, cleanup := createApp(fs, *dbPath) defer cleanup() // Check if user exists first @@ -127,7 +127,7 @@ func userResetPasswordCmd(args []string) { requireString(fs, *email, "email") requireString(fs, *password, "password") - a, cleanup := setupAppWithDB(fs, *dbPath) + a, cleanup := createApp(fs, *dbPath) defer cleanup() // Find the user @@ -151,6 +151,27 @@ func userResetPasswordCmd(args []string) { fmt.Printf("Email: %s\n", *email) } +func userListCmd(args []string, output io.Writer) { + fs := setupFlagSet("list", "dnote-server user list") + + dbPath := fs.String("dbPath", "", "Path to SQLite database file (env: DBPath, default: $XDG_DATA_HOME/dnote/server.db)") + + fs.Parse(args) + + a, cleanup := createApp(fs, *dbPath) + defer cleanup() + + users, err := a.GetAllUsers() + if err != nil { + log.ErrorWrap(err, "listing users") + os.Exit(1) + } + + for _, user := range users { + fmt.Fprintf(output, "%s,%s,%s\n", user.UUID, user.Email.String, user.CreatedAt.UTC().Format("2006-01-02T15:04:05Z")) + } +} + func userCmd(args []string) { if len(args) < 1 { fmt.Println(`Usage: @@ -158,6 +179,7 @@ func userCmd(args []string) { Available commands: create: Create a new user + list: List all users remove: Remove a user reset-password: Reset a user's password`) os.Exit(1) @@ -172,6 +194,8 @@ Available commands: switch subcommand { case "create": userCreateCmd(subArgs) + case "list": + userListCmd(subArgs, os.Stdout) case "remove": userRemoveCmd(subArgs, os.Stdin) case "reset-password": @@ -180,6 +204,7 @@ Available commands: fmt.Printf("Unknown subcommand: %s\n\n", subcommand) fmt.Println(`Available commands: create: Create a new user + list: List all users remove: Remove a user (only if they have no notes or books) reset-password: Reset a user's password`) os.Exit(1) diff --git a/pkg/server/cmd/user_test.go b/pkg/server/cmd/user_test.go index 834ae3bd..84e5f4de 100644 --- a/pkg/server/cmd/user_test.go +++ b/pkg/server/cmd/user_test.go @@ -16,6 +16,8 @@ package cmd import ( + "bytes" + "fmt" "strings" "testing" @@ -107,3 +109,50 @@ func TestUserResetPasswordCmd(t *testing.T) { err = bcrypt.CompareHashAndPassword([]byte(updatedUser.Password.String), []byte("oldpassword123")) assert.Equal(t, err != nil, true, "old password should not match") } + +func TestUserListCmd(t *testing.T) { + t.Run("multiple users", func(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Create multiple users + db := testutils.InitDB(tmpDB) + user1 := testutils.SetupUserData(db, "alice@example.com", "password123") + user2 := testutils.SetupUserData(db, "bob@example.com", "password123") + user3 := testutils.SetupUserData(db, "charlie@example.com", "password123") + sqlDB, _ := db.DB() + sqlDB.Close() + + // Capture output + var buf bytes.Buffer + userListCmd([]string{"--dbPath", tmpDB}, &buf) + + // Verify output matches expected format + output := strings.TrimSpace(buf.String()) + lines := strings.Split(output, "\n") + + expectedLine1 := fmt.Sprintf("%s,alice@example.com,%s", user1.UUID, user1.CreatedAt.UTC().Format("2006-01-02T15:04:05Z")) + expectedLine2 := fmt.Sprintf("%s,bob@example.com,%s", user2.UUID, user2.CreatedAt.UTC().Format("2006-01-02T15:04:05Z")) + expectedLine3 := fmt.Sprintf("%s,charlie@example.com,%s", user3.UUID, user3.CreatedAt.UTC().Format("2006-01-02T15:04:05Z")) + + assert.Equal(t, lines[0], expectedLine1, "line 1 should match") + assert.Equal(t, lines[1], expectedLine2, "line 2 should match") + assert.Equal(t, lines[2], expectedLine3, "line 3 should match") + }) + + t.Run("empty database", func(t *testing.T) { + tmpDB := t.TempDir() + "/test.db" + + // Initialize empty database + db := testutils.InitDB(tmpDB) + sqlDB, _ := db.DB() + sqlDB.Close() + + // Capture output + var buf bytes.Buffer + userListCmd([]string{"--dbPath", tmpDB}, &buf) + + // Verify no output + output := buf.String() + assert.Equal(t, output, "", "should have no output for empty database") + }) +} From 8f37d34df6712295bd57f9711189abd143d4765b Mon Sep 17 00:00:00 2001 From: Sung <8265228+sungwoncho@users.noreply.github.com> Date: Fri, 7 Nov 2025 23:53:41 -0800 Subject: [PATCH 31/33] Remove ls and cat commands (#715) --- pkg/cli/cmd/add/add.go | 2 +- pkg/cli/cmd/cat/cat.go | 95 ------------- pkg/cli/cmd/edit/note.go | 2 +- pkg/cli/cmd/remove/remove.go | 3 +- pkg/cli/cmd/{ls/ls.go => view/book.go} | 89 ++---------- pkg/cli/cmd/view/book_test.go | 184 +++++++++++++++++++++++++ pkg/cli/cmd/view/note.go | 47 +++++++ pkg/cli/cmd/view/note_test.go | 90 ++++++++++++ pkg/cli/cmd/view/view.go | 26 ++-- pkg/cli/main.go | 4 - pkg/cli/main_test.go | 63 +++++++++ pkg/cli/output/output.go | 13 +- pkg/cli/testutils/main.go | 4 +- 13 files changed, 425 insertions(+), 197 deletions(-) delete mode 100644 pkg/cli/cmd/cat/cat.go rename pkg/cli/cmd/{ls/ls.go => view/book.go} (63%) create mode 100644 pkg/cli/cmd/view/book_test.go create mode 100644 pkg/cli/cmd/view/note.go create mode 100644 pkg/cli/cmd/view/note_test.go diff --git a/pkg/cli/cmd/add/add.go b/pkg/cli/cmd/add/add.go index be89b829..3e6d089d 100644 --- a/pkg/cli/cmd/add/add.go +++ b/pkg/cli/cmd/add/add.go @@ -131,7 +131,7 @@ func newRun(ctx context.DnoteCtx) infra.RunEFunc { return err } - output.NoteInfo(info) + output.NoteInfo(os.Stdout, info) if err := upgrade.Check(ctx); err != nil { log.Error(errors.Wrap(err, "automatically checking updates").Error()) diff --git a/pkg/cli/cmd/cat/cat.go b/pkg/cli/cmd/cat/cat.go deleted file mode 100644 index c32eb687..00000000 --- a/pkg/cli/cmd/cat/cat.go +++ /dev/null @@ -1,95 +0,0 @@ -/* Copyright 2025 Dnote Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cat - -import ( - "strconv" - - "github.com/dnote/dnote/pkg/cli/context" - "github.com/dnote/dnote/pkg/cli/database" - "github.com/dnote/dnote/pkg/cli/infra" - "github.com/dnote/dnote/pkg/cli/log" - "github.com/dnote/dnote/pkg/cli/output" - "github.com/pkg/errors" - "github.com/spf13/cobra" -) - -var example = ` - * See the notes with index 2 from a book 'javascript' - dnote cat javascript 2 - ` - -var deprecationWarning = `and "view" will replace it in the future version. - - Run "dnote view --help" for more information. -` - -func preRun(cmd *cobra.Command, args []string) error { - if len(args) != 2 { - return errors.New("Incorrect number of arguments") - } - - return nil -} - -// NewCmd returns a new cat command -func NewCmd(ctx context.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "cat ", - Aliases: []string{"c"}, - Short: "See a note", - Example: example, - RunE: NewRun(ctx, false), - PreRunE: preRun, - Deprecated: deprecationWarning, - } - - return cmd -} - -// NewRun returns a new run function -func NewRun(ctx context.DnoteCtx, contentOnly bool) infra.RunEFunc { - return func(cmd *cobra.Command, args []string) error { - var noteRowIDArg string - - if len(args) == 2 { - log.Plain(log.ColorYellow.Sprintf("DEPRECATED: you no longer need to pass book name to the view command. e.g. `dnote view 123`.\n\n")) - - noteRowIDArg = args[1] - } else { - noteRowIDArg = args[0] - } - - noteRowID, err := strconv.Atoi(noteRowIDArg) - if err != nil { - return errors.Wrap(err, "invalid rowid") - } - - db := ctx.DB - info, err := database.GetNoteInfo(db, noteRowID) - if err != nil { - return err - } - - if contentOnly { - output.NoteContent(info) - } else { - output.NoteInfo(info) - } - - return nil - } -} diff --git a/pkg/cli/cmd/edit/note.go b/pkg/cli/cmd/edit/note.go index 84a631f4..cb837e11 100644 --- a/pkg/cli/cmd/edit/note.go +++ b/pkg/cli/cmd/edit/note.go @@ -166,7 +166,7 @@ func runNote(ctx context.DnoteCtx, rowIDArg string) error { } log.Success("edited the note\n") - output.NoteInfo(noteInfo) + output.NoteInfo(os.Stdout, noteInfo) return nil } diff --git a/pkg/cli/cmd/remove/remove.go b/pkg/cli/cmd/remove/remove.go index 89d44b78..18224c0f 100644 --- a/pkg/cli/cmd/remove/remove.go +++ b/pkg/cli/cmd/remove/remove.go @@ -17,6 +17,7 @@ package remove import ( "fmt" + "os" "strconv" "github.com/dnote/dnote/pkg/cli/context" @@ -129,7 +130,7 @@ func runNote(ctx context.DnoteCtx, rowIDArg string) error { return err } - output.NoteInfo(noteInfo) + output.NoteInfo(os.Stdout, noteInfo) ok, err := maybeConfirm("remove this note?", false) if err != nil { diff --git a/pkg/cli/cmd/ls/ls.go b/pkg/cli/cmd/view/book.go similarity index 63% rename from pkg/cli/cmd/ls/ls.go rename to pkg/cli/cmd/view/book.go index f0ddd047..698a7de5 100644 --- a/pkg/cli/cmd/ls/ls.go +++ b/pkg/cli/cmd/view/book.go @@ -13,76 +13,19 @@ * limitations under the License. */ -package ls +package view import ( "database/sql" "fmt" + "io" "strings" "github.com/dnote/dnote/pkg/cli/context" - "github.com/dnote/dnote/pkg/cli/infra" "github.com/dnote/dnote/pkg/cli/log" "github.com/pkg/errors" - "github.com/spf13/cobra" ) -var example = ` - * List all books - dnote ls - - * List notes in a book - dnote ls javascript - ` - -var deprecationWarning = `and "view" will replace it in the future version. - -Run "dnote view --help" for more information. -` - -func preRun(cmd *cobra.Command, args []string) error { - if len(args) > 1 { - return errors.New("Incorrect number of argument") - } - - return nil -} - -// NewCmd returns a new ls command -func NewCmd(ctx context.DnoteCtx) *cobra.Command { - cmd := &cobra.Command{ - Use: "ls ", - Aliases: []string{"l", "notes"}, - Short: "List all notes", - Example: example, - RunE: NewRun(ctx, false), - PreRunE: preRun, - Deprecated: deprecationWarning, - } - - return cmd -} - -// NewRun returns a new run function for ls -func NewRun(ctx context.DnoteCtx, nameOnly bool) infra.RunEFunc { - return func(cmd *cobra.Command, args []string) error { - if len(args) == 0 { - if err := printBooks(ctx, nameOnly); err != nil { - return errors.Wrap(err, "viewing books") - } - - return nil - } - - bookName := args[0] - if err := printNotes(ctx, bookName); err != nil { - return errors.Wrapf(err, "viewing book '%s'", bookName) - } - - return nil - } -} - // bookInfo is an information about the book to be printed on screen type bookInfo struct { BookLabel string @@ -97,15 +40,13 @@ type noteInfo struct { // getNewlineIdx returns the index of newline character in a string func getNewlineIdx(str string) int { - var ret int - - ret = strings.Index(str, "\n") - - if ret == -1 { - ret = strings.Index(str, "\r\n") + // Check for \r\n first + if idx := strings.Index(str, "\r\n"); idx != -1 { + return idx } - return ret + // Then check for \n + return strings.Index(str, "\n") } // formatBody returns an excerpt of the given raw note content and a boolean @@ -123,15 +64,15 @@ func formatBody(noteBody string) (string, bool) { return strings.Trim(trimmed, " "), false } -func printBookLine(info bookInfo, nameOnly bool) { +func printBookLine(w io.Writer, info bookInfo, nameOnly bool) { if nameOnly { - fmt.Println(info.BookLabel) + fmt.Fprintln(w, info.BookLabel) } else { - log.Printf("%s %s\n", info.BookLabel, log.ColorYellow.Sprintf("(%d)", info.NoteCount)) + fmt.Fprintf(w, "%s %s\n", info.BookLabel, log.ColorYellow.Sprintf("(%d)", info.NoteCount)) } } -func printBooks(ctx context.DnoteCtx, nameOnly bool) error { +func listBooks(ctx context.DnoteCtx, w io.Writer, nameOnly bool) error { db := ctx.DB rows, err := db.Query(`SELECT books.label, count(notes.uuid) note_count @@ -157,13 +98,13 @@ func printBooks(ctx context.DnoteCtx, nameOnly bool) error { } for _, info := range infos { - printBookLine(info, nameOnly) + printBookLine(w, info, nameOnly) } return nil } -func printNotes(ctx context.DnoteCtx, bookName string) error { +func listNotes(ctx context.DnoteCtx, w io.Writer, bookName string) error { db := ctx.DB var bookUUID string @@ -191,7 +132,7 @@ func printNotes(ctx context.DnoteCtx, bookName string) error { infos = append(infos, info) } - log.Infof("on book %s\n", bookName) + fmt.Fprintf(w, "on book %s\n", bookName) for _, info := range infos { body, isExcerpt := formatBody(info.Body) @@ -201,7 +142,7 @@ func printNotes(ctx context.DnoteCtx, bookName string) error { body = fmt.Sprintf("%s %s", body, log.ColorYellow.Sprintf("[---More---]")) } - log.Plainf("%s %s\n", rowid, body) + fmt.Fprintf(w, "%s %s\n", rowid, body) } return nil diff --git a/pkg/cli/cmd/view/book_test.go b/pkg/cli/cmd/view/book_test.go new file mode 100644 index 00000000..226d5d04 --- /dev/null +++ b/pkg/cli/cmd/view/book_test.go @@ -0,0 +1,184 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package view + +import ( + "bytes" + "fmt" + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" +) + +func TestGetNewlineIdx(t *testing.T) { + testCases := []struct { + input string + expected int + }{ + { + input: "hello\nworld", + expected: 5, + }, + { + input: "hello\r\nworld", + expected: 5, + }, + { + input: "no newline here", + expected: -1, + }, + { + input: "", + expected: -1, + }, + { + input: "\n", + expected: 0, + }, + { + input: "\r\n", + expected: 0, + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("input: %q", tc.input), func(t *testing.T) { + got := getNewlineIdx(tc.input) + assert.Equal(t, got, tc.expected, "newline index mismatch") + }) + } +} + +func TestFormatBody(t *testing.T) { + testCases := []struct { + input string + expectedBody string + expectedExcerpt bool + }{ + { + input: "single line", + expectedBody: "single line", + expectedExcerpt: false, + }, + { + input: "first line\nsecond line", + expectedBody: "first line", + expectedExcerpt: true, + }, + { + input: "first line\r\nsecond line", + expectedBody: "first line", + expectedExcerpt: true, + }, + { + input: " spaced line ", + expectedBody: "spaced line", + expectedExcerpt: false, + }, + { + input: " first line \nsecond line", + expectedBody: "first line", + expectedExcerpt: true, + }, + { + input: "", + expectedBody: "", + expectedExcerpt: false, + }, + { + input: "line with trailing newline\n", + expectedBody: "line with trailing newline", + expectedExcerpt: false, + }, + { + input: "line with trailing newlines\n\n", + expectedBody: "line with trailing newlines", + expectedExcerpt: false, + }, + } + + for _, tc := range testCases { + t.Run(fmt.Sprintf("input: %q", tc.input), func(t *testing.T) { + gotBody, gotExcerpt := formatBody(tc.input) + assert.Equal(t, gotBody, tc.expectedBody, "formatted body mismatch") + assert.Equal(t, gotExcerpt, tc.expectedExcerpt, "excerpt flag mismatch") + }) + } +} + +func TestListNotes(t *testing.T) { + // Setup + db := database.InitTestMemoryDB(t) + defer db.Close() + + bookUUID := "js-book-uuid" + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", bookUUID, "javascript") + database.MustExec(t, "inserting note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "note-1", bookUUID, "first note", 1515199943) + database.MustExec(t, "inserting note 2", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "note-2", bookUUID, "multiline note\nwith second line", 1515199945) + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + // Execute + err := listNotes(ctx, &buf, "javascript") + if err != nil { + t.Fatal(err) + } + + got := buf.String() + + // Verify output + assert.Equal(t, strings.Contains(got, "on book javascript"), true, "should show book name") + assert.Equal(t, strings.Contains(got, "first note"), true, "should contain first note") + assert.Equal(t, strings.Contains(got, "multiline note"), true, "should show first line of multiline note") + assert.Equal(t, strings.Contains(got, "[---More---]"), true, "should show more indicator for multiline note") + assert.Equal(t, strings.Contains(got, "with second line"), false, "should not show second line of multiline note") +} + +func TestListBooks(t *testing.T) { + // Setup + db := database.InitTestMemoryDB(t) + defer db.Close() + + b1UUID := "js-book-uuid" + b2UUID := "linux-book-uuid" + + database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "javascript") + database.MustExec(t, "inserting book 2", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b2UUID, "linux") + + // Add notes to test count + database.MustExec(t, "inserting note 1", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "note-1", b1UUID, "note body 1", 1515199943) + database.MustExec(t, "inserting note 2", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", "note-2", b1UUID, "note body 2", 1515199944) + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + // Execute + err := listBooks(ctx, &buf, false) + if err != nil { + t.Fatal(err) + } + + got := buf.String() + + // Verify output + assert.Equal(t, strings.Contains(got, "javascript"), true, "should contain javascript book") + assert.Equal(t, strings.Contains(got, "linux"), true, "should contain linux book") + assert.Equal(t, strings.Contains(got, "(2)"), true, "should show 2 notes for javascript") +} diff --git a/pkg/cli/cmd/view/note.go b/pkg/cli/cmd/view/note.go new file mode 100644 index 00000000..f853dd9a --- /dev/null +++ b/pkg/cli/cmd/view/note.go @@ -0,0 +1,47 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package view + +import ( + "io" + "strconv" + + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" + "github.com/dnote/dnote/pkg/cli/output" + "github.com/pkg/errors" +) + +func viewNote(ctx context.DnoteCtx, w io.Writer, noteRowIDArg string, contentOnly bool) error { + noteRowID, err := strconv.Atoi(noteRowIDArg) + if err != nil { + return errors.Wrap(err, "invalid rowid") + } + + db := ctx.DB + info, err := database.GetNoteInfo(db, noteRowID) + if err != nil { + return err + } + + if contentOnly { + output.NoteContent(w, info) + } else { + output.NoteInfo(w, info) + } + + return nil +} diff --git a/pkg/cli/cmd/view/note_test.go b/pkg/cli/cmd/view/note_test.go new file mode 100644 index 00000000..36e9aa84 --- /dev/null +++ b/pkg/cli/cmd/view/note_test.go @@ -0,0 +1,90 @@ +/* Copyright 2025 Dnote Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package view + +import ( + "bytes" + "strings" + "testing" + + "github.com/dnote/dnote/pkg/assert" + "github.com/dnote/dnote/pkg/cli/context" + "github.com/dnote/dnote/pkg/cli/database" +) + +func TestViewNote(t *testing.T) { + db := database.InitTestMemoryDB(t) + defer db.Close() + + bookUUID := "test-book-uuid" + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", bookUUID, "golang") + database.MustExec(t, "inserting note", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", + "note-uuid", bookUUID, "test note content", 1515199943000000000) + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + err := viewNote(ctx, &buf, "1", false) + if err != nil { + t.Fatal(err) + } + + got := buf.String() + assert.Equal(t, strings.Contains(got, "test note content"), true, "should contain note content") +} + +func TestViewNoteContentOnly(t *testing.T) { + db := database.InitTestMemoryDB(t) + defer db.Close() + + bookUUID := "test-book-uuid" + database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", bookUUID, "golang") + database.MustExec(t, "inserting note", db, "INSERT INTO notes (uuid, book_uuid, body, added_on) VALUES (?, ?, ?, ?)", + "note-uuid", bookUUID, "test note content", 1515199943000000000) + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + err := viewNote(ctx, &buf, "1", true) + if err != nil { + t.Fatal(err) + } + + got := buf.String() + assert.Equal(t, got, "test note content", "should contain only note content") +} + +func TestViewNoteInvalidRowID(t *testing.T) { + db := database.InitTestMemoryDB(t) + defer db.Close() + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + err := viewNote(ctx, &buf, "not-a-number", false) + assert.NotEqual(t, err, nil, "should return error for invalid rowid") +} + +func TestViewNoteNotFound(t *testing.T) { + db := database.InitTestMemoryDB(t) + defer db.Close() + + ctx := context.DnoteCtx{DB: db} + var buf bytes.Buffer + + err := viewNote(ctx, &buf, "999", false) + assert.NotEqual(t, err, nil, "should return error for non-existent note") +} diff --git a/pkg/cli/cmd/view/view.go b/pkg/cli/cmd/view/view.go index 62f50a53..57b17dbd 100644 --- a/pkg/cli/cmd/view/view.go +++ b/pkg/cli/cmd/view/view.go @@ -16,14 +16,13 @@ package view import ( + "os" + "github.com/dnote/dnote/pkg/cli/context" "github.com/dnote/dnote/pkg/cli/infra" + "github.com/dnote/dnote/pkg/cli/utils" "github.com/pkg/errors" "github.com/spf13/cobra" - - "github.com/dnote/dnote/pkg/cli/cmd/cat" - "github.com/dnote/dnote/pkg/cli/cmd/ls" - "github.com/dnote/dnote/pkg/cli/utils" ) var example = ` @@ -68,27 +67,26 @@ func NewCmd(ctx context.DnoteCtx) *cobra.Command { func newRun(ctx context.DnoteCtx) infra.RunEFunc { return func(cmd *cobra.Command, args []string) error { - var run infra.RunEFunc - if len(args) == 0 { - run = ls.NewRun(ctx, nameOnly) + // List all books + return listBooks(ctx, os.Stdout, nameOnly) } else if len(args) == 1 { if nameOnly { return errors.New("--name-only flag is only valid when viewing books") } if utils.IsNumber(args[0]) { - run = cat.NewRun(ctx, contentOnly) + // View a note by index + return viewNote(ctx, os.Stdout, args[0], contentOnly) } else { - run = ls.NewRun(ctx, false) + // List notes in a book + return listNotes(ctx, os.Stdout, args[0]) } } else if len(args) == 2 { - // DEPRECATED: passing book name to view command is deprecated - run = cat.NewRun(ctx, false) - } else { - return errors.New("Incorrect number of arguments") + // View a note in a book (book name + note index) + return viewNote(ctx, os.Stdout, args[1], contentOnly) } - return run(cmd, args) + return errors.New("Incorrect number of arguments") } } diff --git a/pkg/cli/main.go b/pkg/cli/main.go index 2afbaf36..2fb1c564 100644 --- a/pkg/cli/main.go +++ b/pkg/cli/main.go @@ -26,12 +26,10 @@ import ( // commands "github.com/dnote/dnote/pkg/cli/cmd/add" - "github.com/dnote/dnote/pkg/cli/cmd/cat" "github.com/dnote/dnote/pkg/cli/cmd/edit" "github.com/dnote/dnote/pkg/cli/cmd/find" "github.com/dnote/dnote/pkg/cli/cmd/login" "github.com/dnote/dnote/pkg/cli/cmd/logout" - "github.com/dnote/dnote/pkg/cli/cmd/ls" "github.com/dnote/dnote/pkg/cli/cmd/remove" "github.com/dnote/dnote/pkg/cli/cmd/root" "github.com/dnote/dnote/pkg/cli/cmd/sync" @@ -79,10 +77,8 @@ func main() { root.Register(login.NewCmd(*ctx)) root.Register(logout.NewCmd(*ctx)) root.Register(add.NewCmd(*ctx)) - root.Register(ls.NewCmd(*ctx)) root.Register(sync.NewCmd(*ctx)) root.Register(version.NewCmd(*ctx)) - root.Register(cat.NewCmd(*ctx)) root.Register(view.NewCmd(*ctx)) root.Register(find.NewCmd(*ctx)) diff --git a/pkg/cli/main_test.go b/pkg/cli/main_test.go index 5da1915e..727a5c3e 100644 --- a/pkg/cli/main_test.go +++ b/pkg/cli/main_test.go @@ -20,6 +20,7 @@ import ( "log" "os" "os/exec" + "strings" "testing" "github.com/dnote/dnote/pkg/assert" @@ -568,3 +569,65 @@ func TestDBPathFlag(t *testing.T) { db2.QueryRow("SELECT count(*) FROM books WHERE label = ?", "db1-book").Scan(&db2HasDB1Book) assert.Equal(t, db2HasDB1Book, 0, "db2 should not have db1's book") } + +func TestView(t *testing.T) { + t.Run("view note by rowid", func(t *testing.T) { + _, opts := setupTestEnv(t) + + db, dbPath := database.InitTestFileDB(t) + testutils.Setup4(t, db) + + output := testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "view", "1") + + assert.Equal(t, strings.Contains(output, "Booleans have toString()"), true, "should contain note content") + assert.Equal(t, strings.Contains(output, "book name"), true, "should show metadata") + }) + + t.Run("view note content only", func(t *testing.T) { + _, opts := setupTestEnv(t) + + db, dbPath := database.InitTestFileDB(t) + testutils.Setup4(t, db) + + output := testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "view", "1", "--content-only") + + assert.Equal(t, strings.Contains(output, "Booleans have toString()"), true, "should contain note content") + assert.Equal(t, strings.Contains(output, "book name"), false, "should not show metadata") + }) + + t.Run("list books", func(t *testing.T) { + _, opts := setupTestEnv(t) + + db, dbPath := database.InitTestFileDB(t) + testutils.Setup1(t, db) + + output := testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "view") + + assert.Equal(t, strings.Contains(output, "js"), true, "should list js book") + assert.Equal(t, strings.Contains(output, "linux"), true, "should list linux book") + }) + + t.Run("list notes in book", func(t *testing.T) { + _, opts := setupTestEnv(t) + + db, dbPath := database.InitTestFileDB(t) + testutils.Setup2(t, db) + + output := testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "view", "js") + + assert.Equal(t, strings.Contains(output, "n1 body"), true, "should list note 1") + assert.Equal(t, strings.Contains(output, "n2 body"), true, "should list note 2") + }) + + t.Run("view note by book name and rowid", func(t *testing.T) { + _, opts := setupTestEnv(t) + + db, dbPath := database.InitTestFileDB(t) + testutils.Setup4(t, db) + + output := testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "view", "js", "2") + + assert.Equal(t, strings.Contains(output, "Date object implements mathematical comparisons"), true, "should contain note content") + assert.Equal(t, strings.Contains(output, "book name"), true, "should show metadata") + }) +} diff --git a/pkg/cli/output/output.go b/pkg/cli/output/output.go index fe6e3c87..d272ba88 100644 --- a/pkg/cli/output/output.go +++ b/pkg/cli/output/output.go @@ -19,6 +19,7 @@ package output import ( "fmt" + "io" "time" "github.com/dnote/dnote/pkg/cli/database" @@ -26,7 +27,7 @@ import ( ) // NoteInfo prints a note information -func NoteInfo(info database.NoteInfo) { +func NoteInfo(w io.Writer, info database.NoteInfo) { log.Infof("book name: %s\n", info.BookLabel) log.Infof("created at: %s\n", time.Unix(0, info.AddedOn).Format("Jan 2, 2006 3:04pm (MST)")) if info.EditedOn != 0 { @@ -35,13 +36,13 @@ func NoteInfo(info database.NoteInfo) { log.Infof("note id: %d\n", info.RowID) log.Infof("note uuid: %s\n", info.UUID) - fmt.Printf("\n------------------------content------------------------\n") - fmt.Printf("%s", info.Content) - fmt.Printf("\n-------------------------------------------------------\n") + fmt.Fprintf(w, "\n------------------------content------------------------\n") + fmt.Fprintf(w, "%s", info.Content) + fmt.Fprintf(w, "\n-------------------------------------------------------\n") } -func NoteContent(info database.NoteInfo) { - fmt.Printf("%s", info.Content) +func NoteContent(w io.Writer, info database.NoteInfo) { + fmt.Fprintf(w, "%s", info.Content) } // BookInfo prints a note information diff --git a/pkg/cli/testutils/main.go b/pkg/cli/testutils/main.go index 581cbd7f..db3282d7 100644 --- a/pkg/cli/testutils/main.go +++ b/pkg/cli/testutils/main.go @@ -144,7 +144,7 @@ type RunDnoteCmdOptions struct { } // RunDnoteCmd runs a dnote command -func RunDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, binaryName string, arg ...string) { +func RunDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, binaryName string, arg ...string) string { t.Logf("running: %s %s", binaryName, strings.Join(arg, " ")) cmd, stderr, stdout, err := NewDnoteCmd(opts, binaryName, arg...) @@ -162,6 +162,8 @@ func RunDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, binaryName string, arg . // Print stdout if and only if test fails later t.Logf("\n%s", stdout) + + return stdout.String() } // WaitDnoteCmd runs a dnote command and passes stdout to the callback. From 9fa312e3fc6139788533ca6cd1ada8c16a10519c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 12 Dec 2025 21:48:59 -0800 Subject: [PATCH 32/33] Bump golang.org/x/crypto from 0.42.0 to 0.45.0 (#716) Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.42.0 to 0.45.0. - [Commits](https://github.com/golang/crypto/compare/v0.42.0...v0.45.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.45.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 9 ++++----- go.sum | 18 ++++++++---------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 3b87c5ec..48dfc85c 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,9 @@ require ( github.com/mattn/go-sqlite3 v1.14.32 github.com/pkg/errors v0.9.1 github.com/radovskyb/watcher v1.0.7 - github.com/robfig/cron v1.2.0 github.com/sergi/go-diff v1.3.1 github.com/spf13/cobra v1.10.1 - golang.org/x/crypto v0.42.0 + golang.org/x/crypto v0.45.0 golang.org/x/time v0.13.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/yaml.v2 v2.4.0 @@ -36,9 +35,9 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/spf13/pflag v1.0.10 // indirect github.com/stretchr/testify v1.8.1 // indirect - golang.org/x/sys v0.36.0 // indirect - golang.org/x/term v0.35.0 // indirect - golang.org/x/text v0.29.0 // indirect + golang.org/x/sys v0.38.0 // indirect + golang.org/x/term v0.37.0 // indirect + golang.org/x/text v0.31.0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect ) diff --git a/go.sum b/go.sum index e175da0d..8b3c653a 100644 --- a/go.sum +++ b/go.sum @@ -53,8 +53,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/radovskyb/watcher v1.0.7 h1:AYePLih6dpmS32vlHfhCeli8127LzkIgwJGcwwe8tUE= github.com/radovskyb/watcher v1.0.7/go.mod h1:78okwvY5wPdzcb1UYnip1pvrZNIVEIh/Cm+ZuvsUYIg= -github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= -github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -73,15 +71,15 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= -golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= +golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= +golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= -golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ= -golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= -golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= -golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= +golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= +golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= +golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI= golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From f34a96abbe47e8b516ea7cac2bdec06c64c01493 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Mar 2026 22:11:45 -0800 Subject: [PATCH 33/33] Bump immutable from 5.1.3 to 5.1.5 in /pkg/server/assets (#718) Bumps [immutable](https://github.com/immutable-js/immutable-js) from 5.1.3 to 5.1.5. - [Release notes](https://github.com/immutable-js/immutable-js/releases) - [Changelog](https://github.com/immutable-js/immutable-js/blob/main/CHANGELOG.md) - [Commits](https://github.com/immutable-js/immutable-js/compare/v5.1.3...v5.1.5) --- updated-dependencies: - dependency-name: immutable dependency-version: 5.1.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pkg/server/assets/package-lock.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/server/assets/package-lock.json b/pkg/server/assets/package-lock.json index 610d8eb4..7eb1c411 100644 --- a/pkg/server/assets/package-lock.json +++ b/pkg/server/assets/package-lock.json @@ -363,10 +363,11 @@ } }, "node_modules/immutable": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz", - "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==", - "dev": true + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.5.tgz", + "integrity": "sha512-t7xcm2siw+hlUM68I+UEOK+z84RzmN59as9DZ7P1l0994DKUWV7UXBMQZVxaoMSRQ+PBZbHCOoBt7a2wxOMt+A==", + "dev": true, + "license": "MIT" }, "node_modules/is-extglob": { "version": "2.1.1",