diff --git a/LICENSE b/LICENSE index 6b0b1270..fb388417 100644 --- a/LICENSE +++ b/LICENSE @@ -1,203 +1,8 @@ +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. - 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. - +Unless otherwise noted at the beginning of the file, the copyright belongs to +Dnote contributors diff --git a/Makefile b/Makefile index c38819c0..5037c408 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ endif test: test-cli test-api test-e2e .PHONY: test -test-cli: generate-cli-schema +test-cli: @echo "==> running CLI test" @(${currentDir}/scripts/cli/test.sh) .PHONY: test-cli @@ -76,14 +76,7 @@ endif @(cd ${currentDir}/host/docker && ./build.sh $(version) $(platform)) .PHONY: build-server-docker -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 +build-cli: ifeq ($(debug), true) @echo "==> building cli in dev mode" @${currentDir}/scripts/cli/dev.sh diff --git a/README.md b/README.md index 7ab0063f..fbe46e26 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ Or [download binary](https://github.com/dnote/dnote/releases). ## Server (Optional) -Server is a binary with SQLite embedded. No database setup is required. +Just run a binary. No database setup required. -If using docker, create a compose.yml: +Run with Docker Compose using [compose.yml](./host/docker/compose.yml): ```yaml services: @@ -51,12 +51,6 @@ 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/SELF_HOSTING.md b/SELF_HOSTING.md index e67df891..3638cb01 100644 --- a/SELF_HOSTING.md +++ b/SELF_HOSTING.md @@ -6,28 +6,27 @@ 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. Create a `compose.yml` file with the following content: - -```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 image and start the container +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: @@ -35,7 +34,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 --baseUrl=https://your.server +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. diff --git a/go.mod b/go.mod index 48dfc85c..3b87c5ec 100644 --- a/go.mod +++ b/go.mod @@ -14,9 +14,10 @@ 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.45.0 + golang.org/x/crypto v0.42.0 golang.org/x/time v0.13.0 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/yaml.v2 v2.4.0 @@ -35,9 +36,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.38.0 // indirect - golang.org/x/term v0.37.0 // indirect - golang.org/x/text v0.31.0 // 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 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 8b3c653a..e175da0d 100644 --- a/go.sum +++ b/go.sum @@ -53,6 +53,8 @@ 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= @@ -71,15 +73,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.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= -golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= +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/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -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/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/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= diff --git a/host/docker/Dockerfile b/host/docker/Dockerfile index 71b3d1fa..e67da318 100644 --- a/host/docker/Dockerfile +++ b/host/docker/Dockerfile @@ -26,9 +26,6 @@ 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"] diff --git a/licenses/AGPLv3.txt b/licenses/AGPLv3.txt new file mode 100644 index 00000000..0ad25db4 --- /dev/null +++ b/licenses/AGPLv3.txt @@ -0,0 +1,661 @@ + 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 new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/licenses/GPLv3.txt @@ -0,0 +1,674 @@ + 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 bb98fce0..000d7b48 100644 --- a/pkg/assert/assert.go +++ b/pkg/assert/assert.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 provides functions to assert a condition in tests diff --git a/pkg/assert/prompt.go b/pkg/assert/prompt.go index c21e6a42..d4ec5d25 100644 --- a/pkg/assert/prompt.go +++ b/pkg/assert/prompt.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 diff --git a/pkg/cli/COMMANDS.md b/pkg/cli/COMMANDS.md index c3402152..73d34007 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. +Sync notes with Dnote server. All your data is encrypted before being sent to the server. ## dnote login diff --git a/pkg/cli/client/client.go b/pkg/cli/client/client.go index 2be0006d..86df4374 100644 --- a/pkg/cli/client/client.go +++ b/pkg/cli/client/client.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 client provides interfaces for interacting with the Dnote server @@ -173,7 +176,7 @@ func doReq(ctx context.DnoteCtx, method, path, body string, options *requestOpti return nil, errors.Wrap(err, "getting request") } - log.Debug("HTTP %s %s\n", method, path) + log.Debug("HTTP request: %+v\n", req) hc := getHTTPClient(ctx, options) res, err := hc.Do(req) @@ -181,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 %d %s\n", res.StatusCode, res.Status) + log.Debug("HTTP response: %+v\n", res) if err = checkRespErr(res); err != nil { return res, errors.Wrap(err, "server responded with an error") @@ -243,6 +246,7 @@ 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"` } @@ -282,9 +286,6 @@ 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 { @@ -457,6 +458,7 @@ 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 @@ -466,10 +468,11 @@ type UpdateNoteResp struct { } // UpdateNote updates a note in the server -func UpdateNote(ctx context.DnoteCtx, uuid, bookUUID, content string) (UpdateNoteResp, error) { +func UpdateNote(ctx context.DnoteCtx, uuid, bookUUID, content string, public bool) (UpdateNoteResp, error) { payload := updateNotePayload{ BookUUID: &bookUUID, Body: &content, + Public: &public, } b, err := json.Marshal(payload) if err != nil { diff --git a/pkg/cli/client/client_test.go b/pkg/cli/client/client_test.go index f83a0e6f..3bb99e93 100644 --- a/pkg/cli/client/client_test.go +++ b/pkg/cli/client/client_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 client diff --git a/pkg/cli/cmd/add/add.go b/pkg/cli/cmd/add/add.go index 3e6d089d..aa8c8453 100644 --- a/pkg/cli/cmd/add/add.go +++ b/pkg/cli/cmd/add/add.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 add @@ -131,7 +134,7 @@ func newRun(ctx context.DnoteCtx) infra.RunEFunc { return err } - output.NoteInfo(os.Stdout, info) + output.NoteInfo(info) if err := upgrade.Check(ctx); err != nil { log.Error(errors.Wrap(err, "automatically checking updates").Error()) @@ -170,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, true) + n := database.NewNote(noteUUID, bookUUID, content, ts, 0, 0, false, false, true) err = n.Insert(tx) if err != nil { diff --git a/pkg/cli/cmd/cat/cat.go b/pkg/cli/cmd/cat/cat.go new file mode 100644 index 00000000..4961ce33 --- /dev/null +++ b/pkg/cli/cmd/cat/cat.go @@ -0,0 +1,98 @@ +/* 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 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/book.go b/pkg/cli/cmd/edit/book.go index ab326e7f..5b85f98b 100644 --- a/pkg/cli/cmd/edit/book.go +++ b/pkg/cli/cmd/edit/book.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 edit diff --git a/pkg/cli/cmd/edit/edit.go b/pkg/cli/cmd/edit/edit.go index 16a7c413..12a80dce 100644 --- a/pkg/cli/cmd/edit/edit.go +++ b/pkg/cli/cmd/edit/edit.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 edit diff --git a/pkg/cli/cmd/edit/note.go b/pkg/cli/cmd/edit/note.go index cb837e11..f6019778 100644 --- a/pkg/cli/cmd/edit/note.go +++ b/pkg/cli/cmd/edit/note.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 edit @@ -166,7 +169,7 @@ func runNote(ctx context.DnoteCtx, rowIDArg string) error { } log.Success("edited the note\n") - output.NoteInfo(os.Stdout, noteInfo) + output.NoteInfo(noteInfo) return nil } diff --git a/pkg/cli/cmd/find/find.go b/pkg/cli/cmd/find/find.go index 4723bcb4..e3007c9b 100644 --- a/pkg/cli/cmd/find/find.go +++ b/pkg/cli/cmd/find/find.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 find diff --git a/pkg/cli/cmd/find/lexer.go b/pkg/cli/cmd/find/lexer.go index 6115becc..b5bc8ce8 100644 --- a/pkg/cli/cmd/find/lexer.go +++ b/pkg/cli/cmd/find/lexer.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 find diff --git a/pkg/cli/cmd/find/lexer_test.go b/pkg/cli/cmd/find/lexer_test.go index 3a74ad5a..288d71fc 100644 --- a/pkg/cli/cmd/find/lexer_test.go +++ b/pkg/cli/cmd/find/lexer_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 find diff --git a/pkg/cli/cmd/login/login.go b/pkg/cli/cmd/login/login.go index c9b1dfd5..4d8ee392 100644 --- a/pkg/cli/cmd/login/login.go +++ b/pkg/cli/cmd/login/login.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 login diff --git a/pkg/cli/cmd/login/login_test.go b/pkg/cli/cmd/login/login_test.go index 6d5917cc..c208fa5d 100644 --- a/pkg/cli/cmd/login/login_test.go +++ b/pkg/cli/cmd/login/login_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 login diff --git a/pkg/cli/cmd/logout/logout.go b/pkg/cli/cmd/logout/logout.go index 98cd69eb..008c9652 100644 --- a/pkg/cli/cmd/logout/logout.go +++ b/pkg/cli/cmd/logout/logout.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 logout diff --git a/pkg/cli/cmd/view/book.go b/pkg/cli/cmd/ls/ls.go similarity index 50% rename from pkg/cli/cmd/view/book.go rename to pkg/cli/cmd/ls/ls.go index 698a7de5..dbf4deb4 100644 --- a/pkg/cli/cmd/view/book.go +++ b/pkg/cli/cmd/ls/ls.go @@ -1,31 +1,91 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 view +package ls 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 @@ -40,13 +100,15 @@ type noteInfo struct { // getNewlineIdx returns the index of newline character in a string func getNewlineIdx(str string) int { - // Check for \r\n first - if idx := strings.Index(str, "\r\n"); idx != -1 { - return idx + var ret int + + ret = strings.Index(str, "\n") + + if ret == -1 { + ret = strings.Index(str, "\r\n") } - // Then check for \n - return strings.Index(str, "\n") + return ret } // formatBody returns an excerpt of the given raw note content and a boolean @@ -64,15 +126,15 @@ func formatBody(noteBody string) (string, bool) { return strings.Trim(trimmed, " "), false } -func printBookLine(w io.Writer, info bookInfo, nameOnly bool) { +func printBookLine(info bookInfo, nameOnly bool) { if nameOnly { - fmt.Fprintln(w, info.BookLabel) + fmt.Println(info.BookLabel) } else { - fmt.Fprintf(w, "%s %s\n", info.BookLabel, log.ColorYellow.Sprintf("(%d)", info.NoteCount)) + log.Printf("%s %s\n", info.BookLabel, log.ColorYellow.Sprintf("(%d)", info.NoteCount)) } } -func listBooks(ctx context.DnoteCtx, w io.Writer, nameOnly bool) error { +func printBooks(ctx context.DnoteCtx, nameOnly bool) error { db := ctx.DB rows, err := db.Query(`SELECT books.label, count(notes.uuid) note_count @@ -98,13 +160,13 @@ func listBooks(ctx context.DnoteCtx, w io.Writer, nameOnly bool) error { } for _, info := range infos { - printBookLine(w, info, nameOnly) + printBookLine(info, nameOnly) } return nil } -func listNotes(ctx context.DnoteCtx, w io.Writer, bookName string) error { +func printNotes(ctx context.DnoteCtx, bookName string) error { db := ctx.DB var bookUUID string @@ -132,7 +194,7 @@ func listNotes(ctx context.DnoteCtx, w io.Writer, bookName string) error { infos = append(infos, info) } - fmt.Fprintf(w, "on book %s\n", bookName) + log.Infof("on book %s\n", bookName) for _, info := range infos { body, isExcerpt := formatBody(info.Body) @@ -142,7 +204,7 @@ func listNotes(ctx context.DnoteCtx, w io.Writer, bookName string) error { body = fmt.Sprintf("%s %s", body, log.ColorYellow.Sprintf("[---More---]")) } - fmt.Fprintf(w, "%s %s\n", rowid, body) + log.Plainf("%s %s\n", rowid, body) } return nil diff --git a/pkg/cli/cmd/remove/remove.go b/pkg/cli/cmd/remove/remove.go index 18224c0f..443e4867 100644 --- a/pkg/cli/cmd/remove/remove.go +++ b/pkg/cli/cmd/remove/remove.go @@ -1,23 +1,25 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 remove import ( "fmt" - "os" "strconv" "github.com/dnote/dnote/pkg/cli/context" @@ -130,7 +132,7 @@ func runNote(ctx context.DnoteCtx, rowIDArg string) error { return err } - output.NoteInfo(os.Stdout, noteInfo) + output.NoteInfo(noteInfo) ok, err := maybeConfirm("remove this note?", false) if err != nil { diff --git a/pkg/cli/cmd/root/root.go b/pkg/cli/cmd/root/root.go index 6da096bf..604f7682 100644 --- a/pkg/cli/cmd/root/root.go +++ b/pkg/cli/cmd/root/root.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 root diff --git a/pkg/cli/cmd/sync/main_test.go b/pkg/cli/cmd/sync/main_test.go new file mode 100644 index 00000000..e7a620b0 --- /dev/null +++ b/pkg/cli/cmd/sync/main_test.go @@ -0,0 +1,35 @@ +/* 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 ( + "github.com/dnote/dnote/pkg/cli/context" + "path/filepath" +) + +var testDir = "../../tmp" + +var paths context.Paths = context.Paths{ + Home: testDir, + Cache: testDir, + Config: testDir, + Data: testDir, +} + +var dbPath = filepath.Join(testDir, "test.db") diff --git a/pkg/cli/cmd/sync/merge.go b/pkg/cli/cmd/sync/merge.go index 0e4d15be..2b70d095 100644 --- a/pkg/cli/cmd/sync/merge.go +++ b/pkg/cli/cmd/sync/merge.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 diff --git a/pkg/cli/cmd/sync/merge_test.go b/pkg/cli/cmd/sync/merge_test.go index e6f4839e..3134e13c 100644 --- a/pkg/cli/cmd/sync/merge_test.go +++ b/pkg/cli/cmd/sync/merge_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 diff --git a/pkg/cli/cmd/sync/sync.go b/pkg/cli/cmd/sync/sync.go index 6cb506ae..28ec71a7 100644 --- a/pkg/cli/cmd/sync/sync.go +++ b/pkg/cli/cmd/sync/sync.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 @@ -87,7 +90,6 @@ 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 } @@ -95,14 +97,14 @@ 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. +// processFragments categorizes items in sync fragments into a sync list. It also decrypts any +// encrypted data in sync fragments. func processFragments(fragments []client.SyncFragment) (syncList, error) { notes := map[string]client.SyncFragNote{} books := map[string]client.SyncFragBook{} expungedNotes := map[string]bool{} expungedBooks := map[string]bool{} var maxUSN int - var userMaxUSN int var maxCurrentTime int64 for _, fragment := range fragments { @@ -122,9 +124,6 @@ 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 } @@ -136,7 +135,6 @@ func processFragments(fragments []client.SyncFragment) (syncList, error) { ExpungedNotes: expungedNotes, ExpungedBooks: expungedBooks, MaxUSN: maxUSN, - UserMaxUSN: userMaxUSN, MaxCurrentTime: maxCurrentTime, } @@ -183,68 +181,11 @@ func getSyncFragments(ctx context.DnoteCtx, afterUSN int) ([]client.SyncFragment } } - log.Debug("received sync fragments: %+v\n", redactSyncFragments(buf)) + log.Debug("received sync fragments: %+v\n", 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) { @@ -340,8 +281,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 = ?, dirty = ? WHERE uuid = ?", - serverNote.USN, serverNote.BookUUID, serverNote.Body, serverNote.EditedOn, serverNote.Deleted, false, serverNote.UUID); err != nil { + 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 { return errors.Wrapf(err, "updating local note %s", serverNote.UUID) } @@ -371,7 +312,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.Deleted, false) + note := database.NewNote(n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Public, n.Deleted, false) if err := note.Insert(tx); err != nil { return errors.Wrapf(err, "inserting note with uuid %s", n.UUID) @@ -395,7 +336,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.Deleted, false) + note := database.NewNote(n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Public, n.Deleted, false) if err := note.Insert(tx); err != nil { return errors.Wrapf(err, "inserting note with uuid %s", n.UUID) @@ -600,8 +541,6 @@ 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") @@ -609,8 +548,6 @@ 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") @@ -641,7 +578,7 @@ func fullSync(ctx context.DnoteCtx, tx *database.DB) error { } } - err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN, list.UserMaxUSN) + err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN) if err != nil { return errors.Wrap(err, "saving sync state") } @@ -656,8 +593,6 @@ 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") @@ -687,7 +622,7 @@ func stepSync(ctx context.DnoteCtx, tx *database.DB, afterUSN int) error { } } - err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN, list.UserMaxUSN) + err = saveSyncState(tx, list.MaxCurrentTime, list.MaxUSN) if err != nil { return errors.Wrap(err, "saving sync state") } @@ -743,9 +678,13 @@ func sendBooks(ctx context.DnoteCtx, tx *database.DB) (bool, error) { } else { resp, err := client.CreateBook(ctx, book.Label) if err != nil { - log.Debug("error creating book (will retry after stepSync): %v\n", err) - isBehind = true - continue + // 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") } _, err = tx.Exec("UPDATE notes SET book_uuid = ? WHERE book_uuid = ?", resp.Book.UUID, book.UUID) @@ -817,92 +756,10 @@ 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") + rows, err := tx.Query("SELECT uuid, book_uuid, body, public, deleted, usn, added_on FROM notes WHERE dirty") if err != nil { return isBehind, errors.Wrap(err, "getting syncable notes") } @@ -911,11 +768,11 @@ 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.Deleted, ¬e.USN, ¬e.AddedOn); err != nil { + if err = rows.Scan(¬e.UUID, ¬e.BookUUID, ¬e.Body, ¬e.Public, ¬e.Deleted, ¬e.USN, ¬e.AddedOn); err != nil { return isBehind, errors.Wrap(err, "scanning a syncable note") } - log.Debug("sending note %s (book: %s)\n", note.UUID, note.BookUUID) + log.Debug("sending note %s\n", note.UUID) var respUSN int @@ -932,7 +789,8 @@ func sendNotes(ctx context.DnoteCtx, tx *database.DB) (bool, error) { } else { resp, err := client.CreateNote(ctx, note.BookUUID, note.Body) if err != nil { - log.Debug("failed to create note %s (book: %s): %v\n", note.UUID, note.BookUUID, err) + // 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 } @@ -965,7 +823,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) + resp, err := client.UpdateNote(ctx, note.UUID, note.BookUUID, note.Body, note.Public) if err != nil { return isBehind, errors.Wrap(err, "updating a note") } @@ -1009,8 +867,6 @@ 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") @@ -1044,24 +900,10 @@ func updateLastSyncAt(tx *database.DB, val int64) error { return nil } -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") - } +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") } - // 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") } @@ -1170,28 +1012,6 @@ 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) @@ -1246,8 +1066,6 @@ 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 ae3b94ff..34f0c9df 100644 --- a/pkg/cli/cmd/sync/sync_test.go +++ b/pkg/cli/cmd/sync/sync_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 @@ -94,7 +97,6 @@ func TestProcessFragments(t *testing.T) { ExpungedNotes: map[string]bool{}, ExpungedBooks: map[string]bool{}, MaxUSN: 10, - UserMaxUSN: 10, MaxCurrentTime: 1550436136, } @@ -104,7 +106,8 @@ func TestProcessFragments(t *testing.T) { func TestGetLastSyncAt(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, "../../tmp/.dnote", nil) + defer database.TeardownTestDB(t, db) database.MustExec(t, "setting up last_sync_at", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastSyncAt, 1541108743) // exec @@ -126,7 +129,8 @@ func TestGetLastSyncAt(t *testing.T) { func TestGetLastMaxUSN(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, "../../tmp/.dnote", nil) + defer database.TeardownTestDB(t, db) database.MustExec(t, "setting up last_max_usn", db, "INSERT INTO system (key, value) VALUES (?, ?)", consts.SystemLastMaxUSN, 20001) // exec @@ -172,7 +176,8 @@ func TestResolveLabel(t *testing.T) { for idx, tc := range testCases { func() { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, "../../tmp/.dnote", nil) + defer database.TeardownTestDB(t, db) 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") @@ -201,7 +206,8 @@ func TestResolveLabel(t *testing.T) { func TestSyncDeleteNote(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) // execute tx, err := db.Begin() @@ -229,7 +235,8 @@ func TestSyncDeleteNote(t *testing.T) { b1UUID := testutils.MustGenerateUUID(t) // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -298,7 +305,8 @@ func TestSyncDeleteNote(t *testing.T) { b1UUID := testutils.MustGenerateUUID(t) // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -353,7 +361,8 @@ func TestSyncDeleteNote(t *testing.T) { func TestSyncDeleteBook(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) database.MustExec(t, "inserting b1 for test case %d", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", "b1-uuid", "b1-label") var b1 database.Book @@ -397,7 +406,8 @@ func TestSyncDeleteBook(t *testing.T) { b1UUID := testutils.MustGenerateUUID(t) // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -462,7 +472,8 @@ func TestSyncDeleteBook(t *testing.T) { b2UUID := testutils.MustGenerateUUID(t) // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -527,7 +538,8 @@ func TestSyncDeleteBook(t *testing.T) { b1UUID := testutils.MustGenerateUUID(t) // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -578,7 +590,8 @@ func TestSyncDeleteBook(t *testing.T) { func TestFullSyncNote(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") @@ -809,7 +822,8 @@ n1 body edited for idx, tc := range testCases { func() { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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") @@ -870,7 +884,8 @@ n1 body edited func TestFullSyncBook(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -1008,7 +1023,8 @@ func TestFullSyncBook(t *testing.T) { for idx, tc := range testCases { func() { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -1060,7 +1076,8 @@ func TestFullSyncBook(t *testing.T) { func TestStepSyncNote(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1-label") @@ -1217,7 +1234,8 @@ n1 body edited for idx, tc := range testCases { func() { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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") @@ -1278,7 +1296,8 @@ n1 body edited func TestStepSyncBook(t *testing.T) { t.Run("exists on server only", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -1400,7 +1419,8 @@ func TestStepSyncBook(t *testing.T) { for idx, tc := range testCases { func() { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -1463,7 +1483,8 @@ func TestStepSyncBook(t *testing.T) { func TestMergeBook(t *testing.T) { t.Run("insert, no duplicates", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) // test tx, err := db.Begin() @@ -1506,7 +1527,8 @@ func TestMergeBook(t *testing.T) { t.Run("insert, 1 duplicate", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, usn, label, dirty, deleted) VALUES (?, ?, ?, ?, ?)", "b1-uuid", 1, "foo", false, false) // test @@ -1557,7 +1579,8 @@ func TestMergeBook(t *testing.T) { t.Run("insert, 3 duplicates", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -1625,7 +1648,8 @@ func TestMergeBook(t *testing.T) { t.Run("update, no duplicates", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) // test tx, err := db.Begin() @@ -1671,7 +1695,8 @@ func TestMergeBook(t *testing.T) { t.Run("update, 1 duplicate", func(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -1724,7 +1749,8 @@ func TestMergeBook(t *testing.T) { t.Run("update, 3 duplicate", func(t *testing.T) { // set uj - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, dbPath, nil) + defer database.TeardownTestDB(t, db) 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) @@ -1793,132 +1819,44 @@ func TestMergeBook(t *testing.T) { } func TestSaveServerState(t *testing.T) { - t.Run("with data received", func(t *testing.T) { - // set up - db := database.InitTestMemoryDB(t) - testutils.LoginDB(t, db) + // set up + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + testutils.Login(t, &ctx) - 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) + db := ctx.DB - // execute - tx, err := db.Begin() - if err != nil { - t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) - } + 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) - serverTime := int64(1541108743) - serverMaxUSN := 100 - userMaxUSN := 100 + // execute + tx, err := db.Begin() + if err != nil { + t.Fatal(errors.Wrap(err, "beginning a transaction").Error()) + } - err = saveSyncState(tx, serverTime, serverMaxUSN, userMaxUSN) - if err != nil { - tx.Rollback() - t.Fatal(errors.Wrap(err, "executing").Error()) - } + serverTime := int64(1541108743) + serverMaxUSN := 100 - tx.Commit() + err = saveSyncState(tx, serverTime, serverMaxUSN) + if err != nil { + tx.Rollback() + t.Fatal(errors.Wrap(err, "executing").Error()) + } - // test - var lastSyncedAt int64 - var lastMaxUSN int + tx.Commit() - 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) + // test + var lastSyncedAt int64 + var lastMaxUSN int - assert.Equal(t, lastSyncedAt, serverTime, "last synced at mismatch") - assert.Equal(t, lastMaxUSN, serverMaxUSN, "last max usn mismatch") - }) + 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) - 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") - }) + assert.Equal(t, lastSyncedAt, serverTime, "last synced at mismatch") + assert.Equal(t, lastMaxUSN, serverMaxUSN, "last max usn mismatch") } // TestSendBooks tests that books are put to correct 'buckets' by running a test server and recording the @@ -1926,7 +1864,8 @@ func TestSaveServerState(t *testing.T) { // are updated accordingly based on the server response. func TestSendBooks(t *testing.T) { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) db := ctx.DB @@ -1961,7 +1900,7 @@ func TestSendBooks(t *testing.T) { var updatesUUIDs []string var deletedUUIDs []string - // fire up a test server + // fire up a test server. It decrypts the payload for test purposes. 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 @@ -2028,7 +1967,7 @@ func TestSendBooks(t *testing.T) { // test - // First, sort data so that they can be asserted + // First, decrypt data so that they can be asserted sort.SliceStable(createdLabels, func(i, j int) bool { return strings.Compare(createdLabels[i], createdLabels[j]) < 0 }) @@ -2158,8 +2097,9 @@ func TestSendBooks_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, paths, nil) ctx.APIEndpoint = ts.URL + defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) db := ctx.DB @@ -2205,8 +2145,9 @@ func TestSendBooks_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, paths, nil) ctx.APIEndpoint = ts.URL + defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) db := ctx.DB @@ -2252,8 +2193,9 @@ func TestSendBooks_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, paths, nil) ctx.APIEndpoint = ts.URL + defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) db := ctx.DB @@ -2286,7 +2228,8 @@ func TestSendBooks_isBehind(t *testing.T) { // uuid from the incoming data. func TestSendNotes(t *testing.T) { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) db := ctx.DB @@ -2321,7 +2264,7 @@ func TestSendNotes(t *testing.T) { var updatedUUIDs []string var deletedUUIDs []string - // fire up a test server + // fire up a test server. It decrypts the payload for test purposes. 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 @@ -2438,7 +2381,8 @@ func TestSendNotes(t *testing.T) { func TestSendNotes_addedOn(t *testing.T) { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) db := ctx.DB @@ -2449,7 +2393,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 + // fire up a test server. It decrypts the payload for test purposes. ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.String() == "/v3/notes" && r.Method == "POST" { resp := client.CreateNoteResp{ @@ -2569,7 +2513,8 @@ func TestSendNotes_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) ctx.APIEndpoint = ts.URL @@ -2617,7 +2562,8 @@ func TestSendNotes_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) ctx.APIEndpoint = ts.URL @@ -2665,7 +2611,8 @@ func TestSendNotes_isBehind(t *testing.T) { for idx, tc := range testCases { func() { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) ctx.APIEndpoint = ts.URL @@ -2830,7 +2777,8 @@ n1 body edited for idx, tc := range testCases { func() { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, "../../tmp/.dnote", nil) + defer database.TeardownTestDB(t, db) 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) @@ -2911,7 +2859,8 @@ n1 body edited func TestCheckBookPristine(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, "../../tmp/.dnote", nil) + defer database.TeardownTestDB(t, db) 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) @@ -3084,7 +3033,8 @@ func TestCheckBookInList(t *testing.T) { func TestCleanLocalNotes(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, "../../tmp/.dnote", nil) + defer database.TeardownTestDB(t, db) list := syncList{ Notes: map[string]client.SyncFragNote{ @@ -3155,7 +3105,8 @@ func TestCleanLocalNotes(t *testing.T) { func TestCleanLocalBooks(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, "../../tmp/.dnote", nil) + defer database.TeardownTestDB(t, db) list := syncList{ Notes: map[string]client.SyncFragNote{ @@ -3222,7 +3173,8 @@ func TestCleanLocalBooks(t *testing.T) { func TestPrepareEmptyServerSync(t *testing.T) { // set up - db := database.InitTestMemoryDB(t) + 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) diff --git a/pkg/cli/cmd/version/version.go b/pkg/cli/cmd/version/version.go index 79892204..f508ee6e 100644 --- a/pkg/cli/cmd/version/version.go +++ b/pkg/cli/cmd/version/version.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 version diff --git a/pkg/cli/cmd/view/book_test.go b/pkg/cli/cmd/view/book_test.go deleted file mode 100644 index 226d5d04..00000000 --- a/pkg/cli/cmd/view/book_test.go +++ /dev/null @@ -1,184 +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 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 deleted file mode 100644 index f853dd9a..00000000 --- a/pkg/cli/cmd/view/note.go +++ /dev/null @@ -1,47 +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 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 deleted file mode 100644 index 36e9aa84..00000000 --- a/pkg/cli/cmd/view/note_test.go +++ /dev/null @@ -1,90 +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 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 57b17dbd..dde41fa5 100644 --- a/pkg/cli/cmd/view/view.go +++ b/pkg/cli/cmd/view/view.go @@ -1,28 +1,32 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 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 = ` @@ -67,26 +71,27 @@ 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 { - // List all books - return listBooks(ctx, os.Stdout, nameOnly) + run = ls.NewRun(ctx, 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]) { - // View a note by index - return viewNote(ctx, os.Stdout, args[0], contentOnly) + run = cat.NewRun(ctx, contentOnly) } else { - // List notes in a book - return listNotes(ctx, os.Stdout, args[0]) + run = ls.NewRun(ctx, false) } } else if len(args) == 2 { - // View a note in a book (book name + note index) - return viewNote(ctx, os.Stdout, args[1], contentOnly) + // DEPRECATED: passing book name to view command is deprecated + run = cat.NewRun(ctx, false) + } else { + return errors.New("Incorrect number of arguments") } - return errors.New("Incorrect number of arguments") + return run(cmd, args) } } diff --git a/pkg/cli/config/config.go b/pkg/cli/config/config.go index 065100c0..b0faa9cf 100644 --- a/pkg/cli/config/config.go +++ b/pkg/cli/config/config.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 config diff --git a/pkg/cli/consts/consts.go b/pkg/cli/consts/consts.go index 0f49c152..dec8d456 100644 --- a/pkg/cli/consts/consts.go +++ b/pkg/cli/consts/consts.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 consts provides definitions of constants diff --git a/pkg/cli/context/ctx.go b/pkg/cli/context/ctx.go index 971d9145..61cd5be8 100644 --- a/pkg/cli/context/ctx.go +++ b/pkg/cli/context/ctx.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 defines dnote context diff --git a/pkg/cli/context/files.go b/pkg/cli/context/files.go deleted file mode 100644 index 1abbcd47..00000000 --- a/pkg/cli/context/files.go +++ /dev/null @@ -1,48 +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 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 deleted file mode 100644 index 49d62dc9..00000000 --- a/pkg/cli/context/files_test.go +++ /dev/null @@ -1,62 +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 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 cb477475..8453dd3a 100644 --- a/pkg/cli/context/testutils.go +++ b/pkg/cli/context/testutils.go @@ -1,22 +1,26 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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" + "fmt" + "os" "testing" "github.com/dnote/dnote/pkg/cli/consts" @@ -25,27 +29,11 @@ import ( "github.com/pkg/errors" ) -// 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, - } -} +// 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) - -// 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")) - } + db := database.InitTestDB(t, dbPath, dbOpts) return DnoteCtx{ DB: db, @@ -54,47 +42,17 @@ func InitTestCtx(t *testing.T) DnoteCtx { } } -// 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) +// TeardownTestCtx cleans up the test context +func TeardownTestCtx(t *testing.T, ctx DnoteCtx) { + database.TeardownTestDB(t, ctx.DB) - if err := InitDnoteDirs(paths); err != nil { - t.Fatal(errors.Wrap(err, "creating test directories")) + if err := os.RemoveAll(ctx.Paths.Data); err != nil { + t.Fatal(errors.Wrap(err, "removing test data 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 + 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")) } } diff --git a/pkg/cli/crypt/crypto.go b/pkg/cli/crypt/crypto.go new file mode 100644 index 00000000..3637c7ca --- /dev/null +++ b/pkg/cli/crypt/crypto.go @@ -0,0 +1,123 @@ +/* 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 new file mode 100644 index 00000000..805e2724 --- /dev/null +++ b/pkg/cli/crypt/crypto_test.go @@ -0,0 +1,118 @@ +/* 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/cli/database/models.go b/pkg/cli/database/models.go index e8e463bb..05dd2f06 100644 --- a/pkg/cli/database/models.go +++ b/pkg/cli/database/models.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 database @@ -38,12 +41,13 @@ 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, deleted, dirty bool) Note { +func NewNote(uuid, bookUUID, body string, addedOn, editedOn int64, usn int, public, deleted, dirty bool) Note { return Note{ UUID: uuid, BookUUID: bookUUID, @@ -51,6 +55,7 @@ func NewNote(uuid, bookUUID, body string, addedOn, editedOn int64, usn int, dele AddedOn: addedOn, EditedOn: editedOn, USN: usn, + Public: public, Deleted: deleted, Dirty: dirty, } @@ -58,8 +63,8 @@ func NewNote(uuid, bookUUID, body string, addedOn, editedOn int64, usn int, dele // 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, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", - n.UUID, n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Deleted, n.Dirty) + _, 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) if err != nil { return errors.Wrapf(err, "inserting note with uuid %s", n.UUID) @@ -70,8 +75,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 = ?, deleted = ?, dirty = ? WHERE uuid = ?", - n.BookUUID, n.Body, n.AddedOn, n.EditedOn, n.USN, n.Deleted, n.Dirty, n.UUID) + _, 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) 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 6d0a45f0..197937fc 100644 --- a/pkg/cli/database/models_test.go +++ b/pkg/cli/database/models_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 database @@ -31,6 +34,7 @@ func TestNewNote(t *testing.T) { addedOn int64 editedOn int64 usn int + public bool deleted bool dirty bool }{ @@ -41,6 +45,7 @@ func TestNewNote(t *testing.T) { addedOn: 1542058875, editedOn: 0, usn: 0, + public: false, deleted: false, dirty: false, }, @@ -51,13 +56,14 @@ 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.deleted, tc.dirty) + got := NewNote(tc.uuid, tc.bookUUID, tc.body, tc.addedOn, tc.editedOn, tc.usn, tc.public, 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)) @@ -65,6 +71,7 @@ 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)) } @@ -78,6 +85,7 @@ func TestNoteInsert(t *testing.T) { addedOn int64 editedOn int64 usn int + public bool deleted bool dirty bool }{ @@ -88,6 +96,7 @@ func TestNoteInsert(t *testing.T) { addedOn: 1542058875, editedOn: 0, usn: 0, + public: false, deleted: false, dirty: false, }, @@ -98,6 +107,7 @@ func TestNoteInsert(t *testing.T) { addedOn: 1542058875, editedOn: 1542058876, usn: 1008, + public: true, deleted: true, dirty: true, }, @@ -106,7 +116,8 @@ func TestNoteInsert(t *testing.T) { for idx, tc := range testCases { func() { // Setup - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) n := Note{ UUID: tc.uuid, @@ -115,6 +126,7 @@ func TestNoteInsert(t *testing.T) { AddedOn: tc.addedOn, EditedOn: tc.editedOn, USN: tc.usn, + Public: tc.public, Deleted: tc.deleted, Dirty: tc.dirty, } @@ -136,10 +148,10 @@ func TestNoteInsert(t *testing.T) { var uuid, bookUUID, body string var addedOn, editedOn int64 var usn int - var deleted, dirty bool + var public, deleted, dirty bool MustScan(t, "getting n1", - 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) + 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) 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)) @@ -147,6 +159,7 @@ 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)) }() @@ -161,12 +174,14 @@ 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 }{ @@ -177,12 +192,14 @@ 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, }, @@ -193,12 +210,14 @@ 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, }, @@ -209,12 +228,14 @@ 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, }, @@ -225,12 +246,14 @@ 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, }, @@ -239,7 +262,8 @@ func TestNoteUpdate(t *testing.T) { for idx, tc := range testCases { func() { // Setup - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) n1 := Note{ UUID: tc.uuid, @@ -248,6 +272,7 @@ func TestNoteUpdate(t *testing.T) { AddedOn: tc.addedOn, EditedOn: tc.editedOn, USN: tc.usn, + Public: tc.public, Deleted: tc.deleted, Dirty: tc.dirty, } @@ -258,12 +283,13 @@ 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, 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) + 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) // execute tx, err := db.Begin() @@ -275,6 +301,7 @@ 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 @@ -288,11 +315,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, deleted, dirty FROM notes WHERE uuid = ?", tc.uuid), - &n1Record.UUID, &n1Record.BookUUID, &n1Record.Body, &n1Record.AddedOn, &n1Record.EditedOn, &n1Record.USN, &n1Record.Deleted, &n1Record.Dirty) + 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) MustScan(t, "getting n2", - 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) + 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) 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)) @@ -300,6 +327,7 @@ 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)) @@ -309,6 +337,7 @@ 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)) }() @@ -330,7 +359,8 @@ func TestNoteUpdateUUID(t *testing.T) { for idx, tc := range testCases { t.Run(fmt.Sprintf("testCase%d", idx), func(t *testing.T) { // Setup - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) n1 := Note{ UUID: "n1-uuid", @@ -384,7 +414,8 @@ func TestNoteUpdateUUID(t *testing.T) { func TestNoteExpunge(t *testing.T) { // Setup - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) n1 := Note{ UUID: "n1-uuid", @@ -393,6 +424,7 @@ func TestNoteExpunge(t *testing.T) { AddedOn: 1542058874, EditedOn: 0, USN: 22, + Public: false, Deleted: false, Dirty: false, } @@ -403,12 +435,13 @@ 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, 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) + 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) // execute tx, err := db.Begin() @@ -431,8 +464,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, deleted, dirty FROM notes WHERE uuid = ?", n2.UUID), - &n2Record.UUID, &n2Record.BookUUID, &n2Record.Body, &n2Record.AddedOn, &n2Record.EditedOn, &n2Record.USN, &n2Record.Deleted, &n2Record.Dirty) + 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) assert.Equal(t, n2Record.UUID, n2.UUID, "n2 uuid mismatch") assert.Equal(t, n2Record.BookUUID, n2.BookUUID, "n2 bookUUID mismatch") @@ -440,6 +473,7 @@ 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") } @@ -506,7 +540,8 @@ func TestBookInsert(t *testing.T) { for idx, tc := range testCases { func() { // Setup - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) b := Book{ UUID: tc.uuid, @@ -586,7 +621,8 @@ func TestBookUpdate(t *testing.T) { for idx, tc := range testCases { func() { // Setup - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) b1 := Book{ UUID: "b1-uuid", @@ -664,7 +700,8 @@ func TestBookUpdateUUID(t *testing.T) { t.Run(fmt.Sprintf("testCase%d", idx), func(t *testing.T) { // Setup - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) b1 := Book{ UUID: "b1-uuid", @@ -714,7 +751,8 @@ func TestBookUpdateUUID(t *testing.T) { func TestBookExpunge(t *testing.T) { // Setup - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) b1 := Book{ UUID: "b1-uuid", @@ -768,7 +806,8 @@ 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 := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) // execute - insert n := Note{ @@ -778,6 +817,7 @@ 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 2209c8f3..fe0884bc 100644 --- a/pkg/cli/database/queries.go +++ b/pkg/cli/database/queries.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 database @@ -167,6 +170,7 @@ 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( @@ -177,6 +181,7 @@ 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 e394fe95..cbfc71f2 100644 --- a/pkg/cli/database/queries_test.go +++ b/pkg/cli/database/queries_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 database @@ -44,7 +47,8 @@ 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 := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) // execute tx, err := db.Begin() @@ -91,7 +95,8 @@ 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 := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "baz", "quz") @@ -129,7 +134,8 @@ func TestUpsertSystem(t *testing.T) { func TestGetSystem(t *testing.T) { t.Run(fmt.Sprintf("get string value"), func(t *testing.T) { // Setup - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) // execute MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", "bar") @@ -151,7 +157,8 @@ func TestGetSystem(t *testing.T) { t.Run(fmt.Sprintf("get int64 value"), func(t *testing.T) { // Setup - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) // execute MustExec(t, "inserting a system configuration", db, "INSERT INTO system (key, value) VALUES (?, ?)", "foo", 1234) @@ -191,7 +198,8 @@ 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 := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) 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") @@ -230,10 +238,11 @@ func TestUpdateSystem(t *testing.T) { func TestGetActiveNote(t *testing.T) { t.Run("not deleted", func(t *testing.T) { // set up - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) n1UUID := "n1-uuid" - 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) + 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) var n1RowID int MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", n1UUID), &n1RowID) @@ -252,16 +261,18 @@ 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 := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) n1UUID := "n1-uuid" - 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) + 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) var n1RowID int MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", n1UUID), &n1RowID) @@ -281,10 +292,11 @@ func TestGetActiveNote(t *testing.T) { func TestUpdateNoteContent(t *testing.T) { // set up - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) uuid := "n1-uuid" - 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) + 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) var rowid int MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", uuid), &rowid) @@ -312,7 +324,8 @@ func TestUpdateNoteContent(t *testing.T) { func TestUpdateNoteBook(t *testing.T) { // set up - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) b1UUID := "b1-uuid" b2UUID := "b2-uuid" @@ -320,7 +333,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, deleted, dirty) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", uuid, b1UUID, "n1 content", 1542058875, 0, 1, false, false) + 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) var rowid int MustScan(t, "getting rowid", db.QueryRow("SELECT rowid FROM notes WHERE uuid = ?", uuid), &rowid) @@ -348,7 +361,8 @@ func TestUpdateNoteBook(t *testing.T) { func TestUpdateBookName(t *testing.T) { // set up - db := InitTestMemoryDB(t) + db := InitTestDB(t, "../tmp/dnote-test.db", nil) + defer TeardownTestDB(t, db) 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 deleted file mode 100644 index 9a9de094..00000000 --- a/pkg/cli/database/schema.sql +++ /dev/null @@ -1,40 +0,0 @@ --- 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 deleted file mode 100644 index 6c75e4d0..00000000 --- a/pkg/cli/database/schema/main.go +++ /dev/null @@ -1,163 +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. - */ - -// 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 deleted file mode 100644 index 26898ef3..00000000 --- a/pkg/cli/database/schema/main_test.go +++ /dev/null @@ -1,81 +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 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/sql.go b/pkg/cli/database/sql.go index 0af3c7fd..19271606 100644 --- a/pkg/cli/database/sql.go +++ b/pkg/cli/database/sql.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 database diff --git a/pkg/cli/database/testutils.go b/pkg/cli/database/testutils.go index 23633d53..28fd7067 100644 --- a/pkg/cli/database/testutils.go +++ b/pkg/cli/database/testutils.go @@ -1,24 +1,27 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 database import ( "database/sql" - _ "embed" "fmt" + "os" "path/filepath" "testing" @@ -27,13 +30,56 @@ import ( "github.com/pkg/errors" ) -//go:embed schema.sql -var defaultSchemaSQL string - -// GetDefaultSchemaSQL returns the default schema SQL for tests -func GetDefaultSchemaSQL() string { - return defaultSchemaSQL -} +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);` // 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{}) { @@ -53,48 +99,29 @@ func MustExec(t *testing.T, message string, db *DB, query string, args ...interf return result } -// InitTestMemoryDB initializes an in-memory test database with the default schema. -func InitTestMemoryDB(t *testing.T) *DB { - return InitTestMemoryDBRaw(t, "") +// TestDBOptions contains options for test database +type TestDBOptions struct { + SchemaSQLPath string + SkipMigration bool } -// InitTestFileDB initializes a file-based test database with the default schema. -func InitTestFileDB(t *testing.T) (*DB, string) { - uuid := mustGenerateTestUUID(t) - dbPath := filepath.Join(t.TempDir(), fmt.Sprintf("dnote-%s.db", uuid)) - 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 { +// InitTestDB initializes a test database and opens connection to it +func InitTestDB(t *testing.T, dbPath string, options *TestDBOptions) *DB { db, err := Open(dbPath) if err != nil { - t.Fatal(errors.Wrap(err, "opening database")) + t.Fatal(errors.Wrap(err, "opening database connection")) } - 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) + dir, _ := filepath.Split(dbPath) + err = os.MkdirAll(dir, 0777) if err != nil { - t.Fatal(errors.Wrap(err, "opening in-memory database")) + t.Fatal(errors.Wrap(err, "creating the directory for test database file")) } var schemaSQL string - if schemaPath != "" { - schemaSQL = string(utils.ReadFileAbs(schemaPath)) + if options != nil && options.SchemaSQLPath != "" { + b := utils.ReadFileAbs(options.SchemaSQLPath) + schemaSQL = string(b) } else { schemaSQL = defaultSchemaSQL } @@ -103,10 +130,24 @@ func InitTestMemoryDBRaw(t *testing.T, schemaPath string) *DB { t.Fatal(errors.Wrap(err, "running schema sql")) } - t.Cleanup(func() { db.Close() }) + if options == nil || !options.SkipMigration { + MarkMigrationComplete(t, db) + } + 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 { @@ -119,11 +160,12 @@ func OpenTestDB(t *testing.T, dnoteDir string) *DB { return db } -// 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")) +// 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")) } - return uuid } diff --git a/pkg/cli/infra/init.go b/pkg/cli/infra/init.go index a6cbd1aa..4bbaae6e 100644 --- a/pkg/cli/infra/init.go +++ b/pkg/cli/infra/init.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 infra provides operations and definitions for the @@ -21,6 +24,7 @@ import ( "database/sql" "fmt" "os" + "path/filepath" "strconv" "time" @@ -134,7 +138,7 @@ func Init(versionTag, apiEndpoint, dbPath string) (*context.DnoteCtx, error) { return nil, errors.Wrap(err, "setting up the context") } - log.Debug("context: %+v\n", context.Redact(ctx)) + log.Debug("Running with Dnote context: %+v\n", context.Redact(ctx)) return &ctx, nil } @@ -325,6 +329,36 @@ 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 { @@ -360,7 +394,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 := context.InitDnoteDirs(ctx.Paths); err != nil { + if err := initDnoteDir(ctx); 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 8c698624..546baab0 100644 --- a/pkg/cli/infra/init_test.go +++ b/pkg/cli/infra/init_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 infra @@ -29,7 +32,8 @@ import ( func TestInitSystemKV(t *testing.T) { // Setup - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, "../tmp/dnote-test.db", nil) + defer database.TeardownTestDB(t, db) var originalCount int database.MustScan(t, "counting system configs", db.QueryRow("SELECT count(*) FROM system"), &originalCount) @@ -60,7 +64,8 @@ func TestInitSystemKV(t *testing.T) { func TestInitSystemKV_existing(t *testing.T) { // Setup - db := database.InitTestMemoryDB(t) + db := database.InitTestDB(t, "../tmp/dnote-test.db", nil) + defer database.TeardownTestDB(t, db) database.MustExec(t, "inserting a system config", db, "INSERT INTO system (key, value) VALUES (?, ?)", "testKey", "testVal") diff --git a/pkg/cli/log/log.go b/pkg/cli/log/log.go index 0bc569b6..36c8cdd1 100644 --- a/pkg/cli/log/log.go +++ b/pkg/cli/log/log.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 log @@ -22,11 +25,6 @@ import ( "github.com/fatih/color" ) -const ( - debugEnvName = "DNOTE_DEBUG" - debugEnvValue = "1" -) - var ( // ColorRed is a red foreground color ColorRed = color.New(color.FgRed) @@ -107,21 +105,9 @@ 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 isDebug() { + if os.Getenv("DNOTE_DEBUG") == "1" { 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/main.go b/pkg/cli/main.go index 2fb1c564..1ba97358 100644 --- a/pkg/cli/main.go +++ b/pkg/cli/main.go @@ -1,23 +1,25 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 ( "os" - "strings" "github.com/dnote/dnote/pkg/cli/infra" "github.com/dnote/dnote/pkg/cli/log" @@ -26,10 +28,12 @@ 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" @@ -41,29 +45,10 @@ 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 - // 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:]) + root.GetRoot().ParseFlags(os.Args[1:]) + dbPath := root.GetDBPathFlag() // Initialize context - defaultAPIEndpoint is used when creating new config file ctx, err := infra.Init(versionTag, apiEndpoint, dbPath) @@ -77,8 +62,10 @@ 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 727a5c3e..63a95d87 100644 --- a/pkg/cli/main_test.go +++ b/pkg/cli/main_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 @@ -20,7 +23,6 @@ import ( "log" "os" "os/exec" - "strings" "testing" "github.com/dnote/dnote/pkg/assert" @@ -33,17 +35,14 @@ import ( var binaryName = "test-dnote" -// 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 +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), + }, } func TestMain(m *testing.M) { @@ -56,11 +55,10 @@ 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) @@ -109,12 +107,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 @@ -140,14 +138,13 @@ func TestAddNote(t *testing.T) { }) t.Run("existing book", func(t *testing.T) { - _, opts := setupTestEnv(t) - // Setup - db, dbPath := database.InitTestFileDB(t) + db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) testutils.Setup3(t, db) // Execute - testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "add", "js", "-c", "foo") + testutils.RunDnoteCmd(t, opts, binaryName, "add", "js", "-c", "foo") + defer testutils.RemoveDir(t, testDir) // Test @@ -182,14 +179,13 @@ func TestAddNote(t *testing.T) { func TestEditNote(t *testing.T) { t.Run("content flag", func(t *testing.T) { - _, opts := setupTestEnv(t) - // Setup - db, dbPath := database.InitTestFileDB(t) + db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) testutils.Setup4(t, db) // Execute - testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "2", "-c", "foo bar") + testutils.RunDnoteCmd(t, opts, binaryName, "edit", "2", "-c", "foo bar") + defer testutils.RemoveDir(t, testDir) // Test var noteCount, bookCount int @@ -216,14 +212,13 @@ func TestEditNote(t *testing.T) { }) t.Run("book flag", func(t *testing.T) { - _, opts := setupTestEnv(t) - // Setup - db, dbPath := database.InitTestFileDB(t) + db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) testutils.Setup5(t, db) // Execute - testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "2", "-b", "linux") + testutils.RunDnoteCmd(t, opts, binaryName, "edit", "2", "-b", "linux") + defer testutils.RemoveDir(t, testDir) // Test var noteCount, bookCount int @@ -251,14 +246,13 @@ func TestEditNote(t *testing.T) { }) t.Run("book flag and content flag", func(t *testing.T) { - _, opts := setupTestEnv(t) - // Setup - db, dbPath := database.InitTestFileDB(t) + db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) testutils.Setup5(t, db) // Execute - testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "2", "-b", "linux", "-c", "n2 body updated") + testutils.RunDnoteCmd(t, opts, binaryName, "edit", "2", "-b", "linux", "-c", "n2 body updated") + defer testutils.RemoveDir(t, testDir) // Test var noteCount, bookCount int @@ -288,14 +282,13 @@ func TestEditNote(t *testing.T) { func TestEditBook(t *testing.T) { t.Run("name flag", func(t *testing.T) { - _, opts := setupTestEnv(t) - // Setup - db, dbPath := database.InitTestFileDB(t) + db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) testutils.Setup1(t, db) // Execute - testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "edit", "js", "-n", "js-edited") + testutils.RunDnoteCmd(t, opts, binaryName, "edit", "js", "-n", "js-edited") + defer testutils.RemoveDir(t, testDir) // Test var noteCount, bookCount int @@ -348,18 +341,17 @@ 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, dbPath := database.InitTestFileDB(t) + db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) testutils.Setup2(t, db) // Execute if tc.yesFlag { - testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "remove", "-y", "1") + testutils.RunDnoteCmd(t, opts, binaryName, "remove", "-y", "1") } else { - testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveNote, binaryName, "--dbPath", dbPath, "remove", "1") + testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveNote, binaryName, "remove", "1") } + defer testutils.RemoveDir(t, testDir) // Test var noteCount, bookCount, jsNoteCount, linuxNoteCount int @@ -436,19 +428,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, dbPath := database.InitTestFileDB(t) + db := database.InitTestDB(t, fmt.Sprintf("%s/%s/%s", testDir, consts.DnoteDirName, consts.DnoteDBFileName), nil) testutils.Setup2(t, db) // Execute if tc.yesFlag { - testutils.RunDnoteCmd(t, opts, binaryName, "--dbPath", dbPath, "remove", "-y", "js") + testutils.RunDnoteCmd(t, opts, binaryName, "remove", "-y", "js") } else { - testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveBook, binaryName, "--dbPath", dbPath, "remove", "js") + testutils.MustWaitDnoteCmd(t, opts, testutils.ConfirmRemoveBook, binaryName, "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) @@ -545,9 +537,17 @@ func TestDBPathFlag(t *testing.T) { } // Setup - use two different custom database paths - testDir, customOpts := setupTestEnv(t) - customDBPath1 := fmt.Sprintf("%s/custom-test1.db", testDir) - customDBPath2 := fmt.Sprintf("%s/custom-test2.db", testDir) + 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") @@ -569,65 +569,3 @@ 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/migrate/fixtures/local-12-pre-schema.sql b/pkg/cli/migrate/fixtures/local-12-pre-schema.sql index 5560af3d..c501a460 100644 --- a/pkg/cli/migrate/fixtures/local-12-pre-schema.sql +++ b/pkg/cli/migrate/fixtures/local-12-pre-schema.sql @@ -38,5 +38,13 @@ 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 deleted file mode 100644 index 5560af3d..00000000 --- a/pkg/cli/migrate/fixtures/local-14-pre-schema.sql +++ /dev/null @@ -1,42 +0,0 @@ -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.go b/pkg/cli/migrate/legacy.go index 4399f7fb..dc5441c7 100644 --- a/pkg/cli/migrate/legacy.go +++ b/pkg/cli/migrate/legacy.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 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 73d8b063..00ebb7d7 100644 --- a/pkg/cli/migrate/legacy_test.go +++ b/pkg/cli/migrate/legacy_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 migrate @@ -350,18 +353,14 @@ func TestMigrateToV7(t *testing.T) { } func TestMigrateToV8(t *testing.T) { - 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") + 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) ctx := context.DnoteCtx{ Paths: context.Paths{ - Home: tmpDir, - LegacyDnote: dnoteDir, + Home: "../tmp", + LegacyDnote: "../tmp/.dnote", }, DB: db, } diff --git a/pkg/cli/migrate/migrate.go b/pkg/cli/migrate/migrate.go index 9b4b0f50..b99cf7eb 100644 --- a/pkg/cli/migrate/migrate.go +++ b/pkg/cli/migrate/migrate.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 migrate @@ -46,7 +49,6 @@ var LocalSequence = []migration{ lm11, lm12, lm13, - lm14, } // RemoteSequence is a list of remote migrations to be run @@ -141,7 +143,7 @@ func Run(ctx context.DnoteCtx, migrations []migration, mode int) error { return errors.Wrap(err, "getting the current schema") } - log.Debug("%s: %d of %d\n", schemaKey, schema, len(migrations)) + log.Debug("current schema: %s %d of %d\n", consts.SystemSchema, schema, len(migrations)) toRun := migrations[schema:] diff --git a/pkg/cli/migrate/migrate_test.go b/pkg/cli/migrate/migrate_test.go index 7b31a91e..cd2619bd 100644 --- a/pkg/cli/migrate/migrate_test.go +++ b/pkg/cli/migrate/migrate_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 migrate @@ -19,8 +22,8 @@ import ( "encoding/json" "fmt" "net/http" - "net/http/httptest" "os" + "net/http/httptest" "testing" "time" @@ -35,13 +38,11 @@ import ( "github.com/pkg/errors" ) -// 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 +var paths context.Paths = context.Paths{ + Home: "../../tmp", + Cache: "../../tmp", + Config: "../../tmp", + Data: "../../tmp", } func TestExecute_bump_schema(t *testing.T) { @@ -59,8 +60,11 @@ func TestExecute_bump_schema(t *testing.T) { for _, tc := range testCases { func() { // set up - db := initTestDBNoMigration(t) - ctx := context.InitTestCtxWithDB(t, db) + opts := database.TestDBOptions{SkipMigration: true} + ctx := context.InitTestCtx(t, paths, &opts) + defer context.TeardownTestCtx(t, ctx) + + db := ctx.DB database.MustExec(t, "inserting a schema", db, "INSERT INTO system (key, value) VALUES (?, ?)", tc.schemaKey, 8) @@ -113,8 +117,11 @@ func TestRun_nonfresh(t *testing.T) { for _, tc := range testCases { func() { // set up - db := initTestDBNoMigration(t) - ctx := context.InitTestCtxWithDB(t, db) + opts := database.TestDBOptions{SkipMigration: true} + ctx := context.InitTestCtx(t, paths, &opts) + defer context.TeardownTestCtx(t, ctx) + + db := ctx.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 )") @@ -190,8 +197,11 @@ func TestRun_fresh(t *testing.T) { for _, tc := range testCases { func() { // set up - db := initTestDBNoMigration(t) - ctx := context.InitTestCtxWithDB(t, db) + opts := database.TestDBOptions{SkipMigration: true} + ctx := context.InitTestCtx(t, paths, &opts) + defer context.TeardownTestCtx(t, ctx) + + db := ctx.DB database.MustExec(t, "creating a temporary table for testing", db, "CREATE TABLE migrate_run_test ( name string )") @@ -261,8 +271,11 @@ func TestRun_up_to_date(t *testing.T) { for _, tc := range testCases { func() { // set up - db := initTestDBNoMigration(t) - ctx := context.InitTestCtxWithDB(t, db) + opts := database.TestDBOptions{SkipMigration: true} + ctx := context.InitTestCtx(t, paths, &opts) + defer context.TeardownTestCtx(t, ctx) + + db := ctx.DB database.MustExec(t, "creating a temporary table for testing", db, "CREATE TABLE migrate_run_test ( name string )") @@ -313,8 +326,11 @@ func TestRun_up_to_date(t *testing.T) { func TestLocalMigration1(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 data := testutils.MustMarshalJSON(t, actions.AddBookDataV1{BookName: "js"}) a1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting action", db, @@ -388,8 +404,11 @@ func TestLocalMigration1(t *testing.T) { func TestLocalMigration2(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 c1 := "note 1 - v1" c2 := "note 1 - v2" css := "css" @@ -472,8 +491,11 @@ func TestLocalMigration2(t *testing.T) { func TestLocalMigration3(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 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, @@ -544,8 +566,11 @@ func TestLocalMigration3(t *testing.T) { func TestLocalMigration4(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-1-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "css") @@ -585,8 +610,11 @@ func TestLocalMigration4(t *testing.T) { func TestLocalMigration5(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-5-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting css book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "css") @@ -644,8 +672,11 @@ func TestLocalMigration5(t *testing.T) { func TestLocalMigration6(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-5-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 data := testutils.MustMarshalJSON(t, actions.AddBookDataV1{BookName: "js"}) a1UUID := testutils.MustGenerateUUID(t) @@ -674,8 +705,11 @@ func TestLocalMigration6(t *testing.T) { func TestLocalMigration7_trash(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-7-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting trash book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "trash") @@ -704,8 +738,11 @@ func TestLocalMigration7_trash(t *testing.T) { func TestLocalMigration7_conflicts(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-7-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "conflicts") @@ -734,8 +771,11 @@ func TestLocalMigration7_conflicts(t *testing.T) { func TestLocalMigration7_conflicts_dup(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-7-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "conflicts") @@ -769,8 +809,11 @@ func TestLocalMigration7_conflicts_dup(t *testing.T) { func TestLocalMigration8(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-8-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1") @@ -803,13 +846,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") @@ -832,8 +875,11 @@ func TestLocalMigration8(t *testing.T) { func TestLocalMigration9(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-9-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "b1") @@ -875,8 +921,11 @@ func TestLocalMigration9(t *testing.T) { func TestLocalMigration10(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-10-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book ", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "123") @@ -944,8 +993,11 @@ func TestLocalMigration10(t *testing.T) { func TestLocalMigration11(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-11-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + 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 b1UUID := testutils.MustGenerateUUID(t) database.MustExec(t, "inserting book 1", db, "INSERT INTO books (uuid, label) VALUES (?, ?)", b1UUID, "foo") @@ -1021,8 +1073,9 @@ func TestLocalMigration11(t *testing.T) { func TestLocalMigration12(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-12-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-12-pre-schema.sql", SkipMigration: true} + ctx := context.InitTestCtx(t, paths, &opts) + defer context.TeardownTestCtx(t, ctx) data := []byte("editor: vim") path := fmt.Sprintf("%s/%s/dnoterc", ctx.Paths.Config, consts.DnoteDirName) @@ -1057,8 +1110,9 @@ func TestLocalMigration12(t *testing.T) { func TestLocalMigration13(t *testing.T) { // set up - db := database.InitTestMemoryDBRaw(t, "./fixtures/local-12-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/local-12-pre-schema.sql", SkipMigration: true} + ctx := context.InitTestCtx(t, paths, &opts) + defer context.TeardownTestCtx(t, ctx) data := []byte("editor: vim\napiEndpoint: https://test.com/api") @@ -1096,57 +1150,11 @@ 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 - db := database.InitTestMemoryDBRaw(t, "./fixtures/remote-1-pre-schema.sql") - ctx := context.InitTestCtxWithDB(t, db) + opts := database.TestDBOptions{SchemaSQLPath: "./fixtures/remote-1-pre-schema.sql", SkipMigration: true} + ctx := context.InitTestCtx(t, paths, &opts) + defer context.TeardownTestCtx(t, ctx) testutils.Login(t, &ctx) JSBookUUID := "existing-js-book-uuid" @@ -1186,6 +1194,7 @@ 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 197a2b03..af5ae86e 100644 --- a/pkg/cli/migrate/migrations.go +++ b/pkg/cli/migrate/migrations.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 migrate @@ -569,18 +572,6 @@ 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/output/output.go b/pkg/cli/output/output.go index d272ba88..ef35b4fb 100644 --- a/pkg/cli/output/output.go +++ b/pkg/cli/output/output.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 output provides functions to print informations on the terminal @@ -19,7 +22,6 @@ package output import ( "fmt" - "io" "time" "github.com/dnote/dnote/pkg/cli/database" @@ -27,7 +29,7 @@ import ( ) // NoteInfo prints a note information -func NoteInfo(w io.Writer, info database.NoteInfo) { +func NoteInfo(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 { @@ -36,13 +38,13 @@ func NoteInfo(w io.Writer, info database.NoteInfo) { log.Infof("note id: %d\n", info.RowID) log.Infof("note uuid: %s\n", info.UUID) - fmt.Fprintf(w, "\n------------------------content------------------------\n") - fmt.Fprintf(w, "%s", info.Content) - fmt.Fprintf(w, "\n-------------------------------------------------------\n") + fmt.Printf("\n------------------------content------------------------\n") + fmt.Printf("%s", info.Content) + fmt.Printf("\n-------------------------------------------------------\n") } -func NoteContent(w io.Writer, info database.NoteInfo) { - fmt.Fprintf(w, "%s", info.Content) +func NoteContent(info database.NoteInfo) { + fmt.Printf("%s", info.Content) } // BookInfo prints a note information diff --git a/pkg/cli/testutils/main.go b/pkg/cli/testutils/main.go index db3282d7..6c6caa64 100644 --- a/pkg/cli/testutils/main.go +++ b/pkg/cli/testutils/main.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 testutils provides utilities used in tests @@ -45,15 +48,12 @@ const ( // Timeout for waiting for prompts in tests const promptTimeout = 10 * time.Second -// 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) + db := ctx.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()) ctx.SessionKey = "someSessionKey" ctx.SessionKeyExpiry = time.Now().Add(24 * time.Hour).Unix() @@ -144,7 +144,7 @@ type RunDnoteCmdOptions struct { } // RunDnoteCmd runs a dnote command -func RunDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, binaryName string, arg ...string) string { +func RunDnoteCmd(t *testing.T, opts RunDnoteCmdOptions, binaryName string, arg ...string) { t.Logf("running: %s %s", binaryName, strings.Join(arg, " ")) cmd, stderr, stdout, err := NewDnoteCmd(opts, binaryName, arg...) @@ -162,8 +162,6 @@ 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. diff --git a/pkg/cli/testutils/setup.go b/pkg/cli/testutils/setup.go index d88afd2d..12c8b8ae 100644 --- a/pkg/cli/testutils/setup.go +++ b/pkg/cli/testutils/setup.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 testutils diff --git a/pkg/cli/ui/editor.go b/pkg/cli/ui/editor.go index a6c165f4..3501e7ae 100644 --- a/pkg/cli/ui/editor.go +++ b/pkg/cli/ui/editor.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 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 54538c49..c2834a09 100644 --- a/pkg/cli/ui/editor_test.go +++ b/pkg/cli/ui/editor_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 ui @@ -27,7 +30,11 @@ import ( func TestGetTmpContentPath(t *testing.T) { t.Run("no collision", func(t *testing.T) { - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, context.Paths{ + Data: "../tmp", + Cache: "../tmp", + }, nil) + defer context.TeardownTestCtx(t, ctx) res, err := GetTmpContentPath(ctx) if err != nil { @@ -40,7 +47,11 @@ func TestGetTmpContentPath(t *testing.T) { t.Run("one existing session", func(t *testing.T) { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, context.Paths{ + Data: "../tmp2", + Cache: "../tmp2", + }, nil) + defer context.TeardownTestCtx(t, ctx) p := fmt.Sprintf("%s/%s", ctx.Paths.Cache, "DNOTE_TMPCONTENT_0.md") if _, err := os.Create(p); err != nil { @@ -60,7 +71,11 @@ func TestGetTmpContentPath(t *testing.T) { t.Run("two existing sessions", func(t *testing.T) { // set up - ctx := context.InitTestCtx(t) + ctx := context.InitTestCtx(t, context.Paths{ + Data: "../tmp3", + Cache: "../tmp3", + }, nil) + defer context.TeardownTestCtx(t, ctx) p1 := fmt.Sprintf("%s/%s", ctx.Paths.Cache, "DNOTE_TMPCONTENT_0.md") if _, err := os.Create(p1); err != nil { diff --git a/pkg/cli/ui/terminal.go b/pkg/cli/ui/terminal.go index 6a255766..899060c7 100644 --- a/pkg/cli/ui/terminal.go +++ b/pkg/cli/ui/terminal.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 ui diff --git a/pkg/cli/upgrade/upgrade.go b/pkg/cli/upgrade/upgrade.go index 7c24a86d..aabfb916 100644 --- a/pkg/cli/upgrade/upgrade.go +++ b/pkg/cli/upgrade/upgrade.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 upgrade diff --git a/pkg/cli/upgrade/upgrade_test.go b/pkg/cli/upgrade/upgrade_test.go index 917e6754..6b8e089c 100644 --- a/pkg/cli/upgrade/upgrade_test.go +++ b/pkg/cli/upgrade/upgrade_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 upgrade diff --git a/pkg/cli/utils/diff/diff.go b/pkg/cli/utils/diff/diff.go index ff7e3384..68dd5eb1 100644 --- a/pkg/cli/utils/diff/diff.go +++ b/pkg/cli/utils/diff/diff.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 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 f777f26c..84794d0c 100644 --- a/pkg/cli/utils/diff/diff_test.go +++ b/pkg/cli/utils/diff/diff_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 diff diff --git a/pkg/cli/utils/files.go b/pkg/cli/utils/files.go index 60f57de6..b4b2d1df 100644 --- a/pkg/cli/utils/files.go +++ b/pkg/cli/utils/files.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 utils @@ -52,24 +55,6 @@ 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/utils/files_test.go b/pkg/cli/utils/files_test.go deleted file mode 100644 index 7f26e19c..00000000 --- a/pkg/cli/utils/files_test.go +++ /dev/null @@ -1,42 +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 utils - -import ( - "os" - "path/filepath" - "testing" - - "github.com/dnote/dnote/pkg/assert" -) - -func TestEnsureDir(t *testing.T) { - tmpDir := t.TempDir() - testPath := filepath.Join(tmpDir, "test", "nested", "dir") - - // 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") -} diff --git a/pkg/cli/utils/utils.go b/pkg/cli/utils/utils.go index 417963ce..5eed196f 100644 --- a/pkg/cli/utils/utils.go +++ b/pkg/cli/utils/utils.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 utils diff --git a/pkg/cli/validate/book_test.go b/pkg/cli/validate/book_test.go index 97a384fc..29c410a4 100644 --- a/pkg/cli/validate/book_test.go +++ b/pkg/cli/validate/book_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 validate diff --git a/pkg/cli/validate/books.go b/pkg/cli/validate/books.go index b0e4c0ed..55b03675 100644 --- a/pkg/cli/validate/books.go +++ b/pkg/cli/validate/books.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 validate diff --git a/pkg/clock/clock.go b/pkg/clock/clock.go index 061bb1a3..f421d428 100644 --- a/pkg/clock/clock.go +++ b/pkg/clock/clock.go @@ -1,26 +1,30 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 clock provides an abstract layer over the standard time package 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 { @@ -35,21 +39,16 @@ 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/dirs/dirs.go b/pkg/dirs/dirs.go index 3eb57a7f..439cfde8 100644 --- a/pkg/dirs/dirs.go +++ b/pkg/dirs/dirs.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 dirs provides base directory definitions for the system diff --git a/pkg/dirs/dirs_test.go b/pkg/dirs/dirs_test.go index 0c1ecb1f..6fe3d1e0 100644 --- a/pkg/dirs/dirs_test.go +++ b/pkg/dirs/dirs_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 dirs diff --git a/pkg/dirs/dirs_unix.go b/pkg/dirs/dirs_unix.go index 6c7696c6..59420c0e 100644 --- a/pkg/dirs/dirs_unix.go +++ b/pkg/dirs/dirs_unix.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 . */ //go:build linux || darwin || freebsd diff --git a/pkg/dirs/dirs_unix_test.go b/pkg/dirs/dirs_unix_test.go index 9ea5805a..0ab63ad8 100644 --- a/pkg/dirs/dirs_unix_test.go +++ b/pkg/dirs/dirs_unix_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 . */ //go:build linux || darwin || freebsd diff --git a/pkg/dirs/dirs_windows.go b/pkg/dirs/dirs_windows.go index 7159ae8d..fb7bccf6 100644 --- a/pkg/dirs/dirs_windows.go +++ b/pkg/dirs/dirs_windows.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 . */ //go:build windows diff --git a/pkg/dirs/dirs_windows_test.go b/pkg/dirs/dirs_windows_test.go index 101071f5..85be4a3f 100644 --- a/pkg/dirs/dirs_windows_test.go +++ b/pkg/dirs/dirs_windows_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 . */ //go:build windows diff --git a/pkg/e2e/server_test.go b/pkg/e2e/server_test.go index e8ca3da6..cfe6a711 100644 --- a/pkg/e2e/server_test.go +++ b/pkg/e2e/server_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 @@ -47,9 +50,11 @@ 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, + "APP_ENV=PRODUCTION", ) if err := cmd.Start(); err != nil { @@ -138,16 +143,17 @@ 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, "--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") + 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) { cmd := exec.Command(testServerBinary, "start") - // Set invalid BaseURL to trigger validation failure - cmd.Env = []string{"BaseURL=not-a-valid-url"} + // Set invalid WebURL to trigger validation failure + cmd.Env = []string{"WebURL=not-a-valid-url"} output, err := cmd.CombinedOutput() @@ -158,9 +164,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 BaseURL"), true, "output should mention invalid BaseURL") + 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, "--baseUrl"), true, "output should show flags") + assert.Equal(t, strings.Contains(outputStr, "-webUrl"), true, "output should show flags") } func TestServerUnknownCommand(t *testing.T) { @@ -315,39 +321,3 @@ 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)") -} - -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/e2e/sync/edge_cases_test.go b/pkg/e2e/sync/edge_cases_test.go deleted file mode 100644 index f833cadc..00000000 --- a/pkg/e2e/sync/edge_cases_test.go +++ /dev/null @@ -1,163 +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 sync - -import ( - "io" - "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" - "github.com/pkg/errors" -) - -// 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") -} - -// 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/e2e/sync/empty_server_test.go b/pkg/e2e/sync/empty_server_test.go deleted file mode 100644 index 31756ed2..00000000 --- a/pkg/e2e/sync/empty_server_test.go +++ /dev/null @@ -1,728 +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 sync - -import ( - "database/sql" - "fmt" - "io" - "os" - "strconv" - "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, - }) - }) - - 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/e2e/sync/main_test.go b/pkg/e2e/sync/main_test.go deleted file mode 100644 index 188e3a99..00000000 --- a/pkg/e2e/sync/main_test.go +++ /dev/null @@ -1,54 +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 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 deleted file mode 100644 index a5dfdf87..00000000 --- a/pkg/e2e/sync/testutils.go +++ /dev/null @@ -1,295 +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 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" - 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.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/e2e/sync/basic_test.go b/pkg/e2e/sync_test.go similarity index 70% rename from pkg/e2e/sync/basic_test.go rename to pkg/e2e/sync_test.go index d49b0cd9..c2a1c4ee 100644 --- a/pkg/e2e/sync/basic_test.go +++ b/pkg/e2e/sync_test.go @@ -1,41 +1,297 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 +package main import ( + "bytes" + "encoding/json" "fmt" + "io" + "log" + "net/http" + "net/http/httptest" "os" + "os/exec" + "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" + "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 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{ + Env: []string{ + fmt.Sprintf("XDG_CONFIG_HOME=%s", tmpDirPath), + fmt.Sprintf("XDG_DATA_HOME=%s", tmpDirPath), + fmt.Sprintf("XDG_CACHE_HOME=%s", tmpDirPath), + }, + } + + 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") + } +} + +// 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) + + 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 +} + +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) + if err != nil { + panic(err) + } + + defer server.Close() + + // Build binaries + apiEndpoint := fmt.Sprintf("%s/api", server.URL) + ldflags := fmt.Sprintf("-X main.apiEndpoint=%s", apiEndpoint) + + cmd := exec.Command("go", "build", "--tags", "fts5", "-o", cliBinaryName, "-ldflags", ldflags, "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, db *cliDatabase.DB) database.User { + user := apitest.SetupUserData(serverDb) + apitest.SetupAccountData(serverDb, user, "alice@example.com", "pass1234") + + 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) + + 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, user database.User, uuid, payload, message string) { + doHTTPReq(t, "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 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) + + 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, user database.User, noteUUID, payload, message string) { + doHTTPReq(t, "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 doHTTPReq(t *testing.T, method, path, payload, message string, user database.User) *http.Response { + apiEndpoint := fmt.Sprintf("%s/api", 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, 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, 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) + +func testSyncCmd(t *testing.T, fullSync bool, setup setupFunc, assert assertFunc) { + // clean up + apitest.ClearData(serverDb) + defer apitest.ClearData(serverDb) + + clearTmp(t) + + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + + user := setupUserAndLogin(t, ctx.DB) + ids := setup(t, ctx, user) + + if fullSync { + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") + } else { + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + } + + assert(t, ctx, 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, 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) { + 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 { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { return map[string]string{} } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { // Test - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 0, clientLastMaxUSN: 0, @@ -52,19 +308,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, env testEnv, user database.User) { - apitest.MustExec(t, env.ServerDB.Model(&user).Update("max_usn", 0), "updating user max_usn") + 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") - 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, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js2") } - assert := func(t *testing.T, env testEnv, user database.User) { - cliDB := env.DB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User) { + cliDB := ctx.DB // test client - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 3, clientBookCount: 2, clientLastMaxUSN: 5, @@ -104,11 +360,11 @@ func TestSync_oneway(t *testing.T) { // test server var apiBookJS, apiBookCSS database.Book var apiNote1JS, apiNote2JS, apiNote1CSS database.Note - 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") + 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") // assert usn assert.NotEqual(t, apiNote1JS.USN, 0, "apiNote1JS usn mismatch") @@ -135,56 +391,62 @@ func TestSync_oneway(t *testing.T) { } t.Run("stepSync", func(t *testing.T) { + clearTmp(t) + defer apitest.ClearData(serverDb) - env := setupTestEnv(t) - user := setupUserAndLogin(t, env) - setup(t, env, user) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + user := setupUserAndLogin(t, ctx.DB) + setup(t, ctx, user) - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - assert(t, env, user) + assert(t, ctx, user) }) t.Run("fullSync", func(t *testing.T) { + clearTmp(t) + defer apitest.ClearData(serverDb) - env := setupTestEnv(t) - user := setupUserAndLogin(t, env) - setup(t, env, user) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + user := setupUserAndLogin(t, ctx.DB) + setup(t, ctx, user) - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") - assert(t, env, user) + assert(t, ctx, user) }) }) t.Run("cli to api with edit and delete", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) { - apiDB := env.ServerDB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) { + apiDB := serverDb apitest.MustExec(t, apiDB.Model(&user).Update("max_usn", 0), "updating user max_usn") - 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") + 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") var nid, nid2 string - cliDB := env.DB + cliDB := ctx.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, 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, "edit", "js", nid, "-c", "js3-edited") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "css", nid2) - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css3") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css4") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css3") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css4") } - assert := func(t *testing.T, env testEnv, user database.User) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 6, clientBookCount: 2, clientLastMaxUSN: 8, @@ -285,56 +547,62 @@ func TestSync_oneway(t *testing.T) { } t.Run("stepSync", func(t *testing.T) { + clearTmp(t) + defer apitest.ClearData(serverDb) - env := setupTestEnv(t) - user := setupUserAndLogin(t, env) - setup(t, env, user) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + user := setupUserAndLogin(t, ctx.DB) + setup(t, ctx, user) - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - assert(t, env, user) + assert(t, ctx, user) }) t.Run("fullSync", func(t *testing.T) { + clearTmp(t) + defer apitest.ClearData(serverDb) - env := setupTestEnv(t) - user := setupUserAndLogin(t, env) - setup(t, env, user) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + user := setupUserAndLogin(t, ctx.DB) + setup(t, ctx, user) - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync", "-f") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync", "-f") - assert(t, env, user) + assert(t, ctx, user) }) }) t.Run("api to cli", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { - apiDB := env.ServerDB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + apiDB := serverDb apitest.MustExec(t, apiDB.Model(&user).Update("max_usn", 0), "updating user max_usn") - 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") + 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") // delete the linux book and its two notes - apiDeleteBook(t, env, user, linuxBookUUID, "deleting linux book") + apiDeleteBook(t, 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") + 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") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -354,11 +622,11 @@ func TestSync_oneway(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 6, clientBookCount: 3, clientLastMaxUSN: 21, @@ -501,41 +769,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, env testEnv, user database.User) map[string]string { - cliDB := env.DB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + cliDB := ctx.DB - 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") + 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") - 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") + 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") 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, 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) + 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) return map[string]string{ "jsBookUUID": jsBookUUID, @@ -555,11 +823,11 @@ func TestSync_twoway(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 9, clientBookCount: 6, clientLastMaxUSN: 27, @@ -735,43 +1003,43 @@ func TestSync_twoway(t *testing.T) { }) t.Run("twice", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - 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") + 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") // 2. on cli - 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") + 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") var nid string - cliDB := env.DB + cliDB := ctx.DB cliDatabase.MustScan(t, "getting id of note to edit", cliDB.QueryRow("SELECT rowid FROM notes WHERE body = ?", "math1"), &nid) - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "math", nid, "-c", "math1-edited") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "math", nid, "-c", "math1-edited") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - 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") + 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") var n1UUID string cliDatabase.MustScan(t, "getting math1-edited note UUID", cliDB.QueryRow("SELECT uuid FROM notes WHERE body = ?", "math1-edited"), &n1UUID) - apiPatchNote(t, env, user, n1UUID, fmt.Sprintf(`{"content": "%s", "public": true}`, "math1-edited"), "editing math1 note") + apiPatchNote(t, user, n1UUID, fmt.Sprintf(`{"content": "%s", "public": true}`, "math1-edited"), "editing math1 note") - cssNote2UUID := apiCreateNote(t, env, user, cssBookUUID, "css2", "adding css note 2") - apiDeleteBook(t, env, user, cssBookUUID, "deleting css book") + cssNote2UUID := apiCreateNote(t, user, cssBookUUID, "css2", "adding css note 2") + apiDeleteBook(t, user, cssBookUUID, "deleting css book") - bashBookUUID := apiCreateBook(t, env, user, "bash", "adding a bash book") - algorithmsBookUUID := apiCreateBook(t, env, user, "algorithms", "adding a algorithms book") + bashBookUUID := apiCreateBook(t, user, "bash", "adding a bash book") + algorithmsBookUUID := apiCreateBook(t, user, "algorithms", "adding a algorithms book") // 4. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js3") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js3") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "algorithms", "-c", "algorithms1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -785,11 +1053,11 @@ func TestSync_twoway(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - apiDB := env.ServerDB - cliDB := env.DB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + apiDB := serverDb + cliDB := ctx.DB - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 5, clientBookCount: 6, clientLastMaxUSN: 17, @@ -915,21 +1183,21 @@ func TestSync_twoway(t *testing.T) { }) t.Run("three times", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - goBookUUID := apiCreateBook(t, env, user, "go", "adding a go book") - goNote1UUID := apiCreateNote(t, env, user, goBookUUID, "go1", "adding go note 1") + goBookUUID := apiCreateBook(t, user, "go", "adding a go book") + goNote1UUID := apiCreateNote(t, user, goBookUUID, "go1", "adding go note 1") // 4. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "html", "-c", "html1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "html", "-c", "html1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -939,11 +1207,11 @@ func TestSync_twoway(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 4, clientBookCount: 4, clientLastMaxUSN: 8, @@ -1032,17 +1300,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, env testEnv, user database.User) map[string]string { - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") return map[string]string{} } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 2, @@ -1086,14 +1354,14 @@ func TestSync(t *testing.T) { }) t.Run("client deletes a book", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1101,10 +1369,10 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 0, clientLastMaxUSN: 5, @@ -1136,18 +1404,18 @@ func TestSync(t *testing.T) { }) t.Run("client deletes a note", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { - cliDB := env.DB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + cliDB := ctx.DB // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + 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.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1155,11 +1423,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 3, @@ -1202,19 +1470,19 @@ func TestSync(t *testing.T) { }) t.Run("client edits a note", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { - cliDB := env.DB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + cliDB := ctx.DB // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, 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, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1222,11 +1490,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 3, @@ -1273,14 +1541,14 @@ func TestSync(t *testing.T) { }) t.Run("client edits a book by renaming it", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1288,11 +1556,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 3, @@ -1344,19 +1612,19 @@ func TestSync(t *testing.T) { }) t.Run("server adds a book", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") return map[string]string{ "jsBookUUID": jsBookUUID, } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 1, @@ -1391,26 +1659,26 @@ func TestSync(t *testing.T) { }) t.Run("server edits a book by renaming it", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-new-label"), "editing js book") + apiPatchBook(t, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-new-label"), "editing js book") return map[string]string{ "jsBookUUID": jsBookUUID, } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 2, @@ -1445,25 +1713,25 @@ func TestSync(t *testing.T) { }) t.Run("server deletes a book", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") + apiDeleteBook(t, user, jsBookUUID, "deleting js book") return map[string]string{ "jsBookUUID": jsBookUUID, } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 0, clientLastMaxUSN: 2, @@ -1490,10 +1758,10 @@ func TestSync(t *testing.T) { }) t.Run("server adds a note", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1501,11 +1769,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 2, @@ -1550,16 +1818,16 @@ func TestSync(t *testing.T) { }) t.Run("server edits a note body", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") + apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1567,11 +1835,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 3, @@ -1616,17 +1884,17 @@ func TestSync(t *testing.T) { }) t.Run("server moves a note to another book", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - 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") + 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") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1635,11 +1903,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 2, clientLastMaxUSN: 4, @@ -1691,16 +1959,16 @@ func TestSync(t *testing.T) { }) t.Run("server deletes a note", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + apiDeleteNote(t, user, jsNote1UUID, "deleting js note 1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1708,11 +1976,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 3, @@ -1753,19 +2021,19 @@ func TestSync(t *testing.T) { }) t.Run("client and server deletes the same book", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") + apiDeleteBook(t, user, jsBookUUID, "deleting js book") // 4. on cli - clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1773,10 +2041,10 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 0, clientLastMaxUSN: 6, @@ -1809,23 +2077,23 @@ func TestSync(t *testing.T) { }) t.Run("client and server deletes the same note", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { - cliDB := env.DB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + cliDB := ctx.DB // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + apiDeleteNote(t, 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, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1833,11 +2101,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - apiDB := env.ServerDB - cliDB := env.DB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + apiDB := serverDb + cliDB := ctx.DB - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 4, @@ -1881,19 +2149,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 4. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1901,11 +2169,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 2, clientBookCount: 1, clientLastMaxUSN: 3, @@ -1955,13 +2223,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -1969,11 +2237,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -2030,16 +2298,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - 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") + 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") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2049,11 +2317,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 4, clientBookCount: 4, clientLastMaxUSN: 8, @@ -2135,19 +2403,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 4. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js2") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2155,11 +2423,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 2, clientBookCount: 1, clientLastMaxUSN: 3, @@ -2209,13 +2477,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js2") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "js", "-c", "js2") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2223,11 +2491,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -2283,22 +2551,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, env testEnv, user database.User) map[string]string { - cliDB := env.DB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + cliDB := ctx.DB // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, 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, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited-from-client") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited-from-client") // 3. on server - apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited-from-server"), "editing js note 1") + apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited-from-server"), "editing js note 1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2306,13 +2574,13 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb resolvedBody := "<<<<<<< Local\njs1-edited-from-client\n=======\njs1-edited-from-server\n>>>>>>> Server\n" - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 4, @@ -2359,21 +2627,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, env testEnv, user database.User) map[string]string { - cliDB := env.DB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + cliDB := ctx.DB // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + 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.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) // 3. on server - apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") + apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js note 1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2381,11 +2649,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 3, @@ -2432,22 +2700,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, env testEnv, user database.User) map[string]string { - cliDB := env.DB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + cliDB := ctx.DB // 1. on server - 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") + 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") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + 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.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveNote, cliBinaryName, "remove", "js", nid) // 3. on server - apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2456,11 +2724,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 2, clientLastMaxUSN: 4, @@ -2516,23 +2784,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, env testEnv, user database.User) map[string]string { - cliDB := env.DB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + cliDB := ctx.DB // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + apiDeleteNote(t, 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, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2540,11 +2808,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 4, @@ -2593,19 +2861,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteNote(t, env, user, jsNote1UUID, "deleting js note 1") + apiDeleteNote(t, user, jsNote1UUID, "deleting js note 1") // 4. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2613,11 +2881,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 4, @@ -2661,23 +2929,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, env testEnv, user database.User) map[string]string { - cliDB := env.DB + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { + cliDB := ctx.DB // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiDeleteBook(t, env, user, jsBookUUID, "deleting js book") + apiDeleteBook(t, 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, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-c", "js1-edited") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2685,11 +2953,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 6, @@ -2738,17 +3006,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") // 3. on server - apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") + apiPatchBook(t, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2756,11 +3024,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 1, clientLastMaxUSN: 5, @@ -2804,19 +3072,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js1 note") + apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"content": "%s"}`, "js1-edited"), "editing js1 note") // 4. on cli - clitest.MustWaitDnoteCmd(t, env.CmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") + clitest.MustWaitDnoteCmd(t, dnoteCmdOpts, clitest.ConfirmRemoveBook, cliBinaryName, "remove", "js") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2824,10 +3092,10 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 0, clientBookCount: 0, clientLastMaxUSN: 6, @@ -2860,17 +3128,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited") // 3. on server - apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") + apiPatchBook(t, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited"), "editing js book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2878,11 +3146,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 4, @@ -2934,17 +3202,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited-client") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", "-n", "js-edited-client") // 3. on server - apiPatchBook(t, env, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited-server"), "editing js book") + apiPatchBook(t, user, jsBookUUID, fmt.Sprintf(`{"name": "%s"}`, "js-edited-server"), "editing js book") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -2952,13 +3220,13 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { // In this case, server's change wins and overwrites that of client's - cliDB := env.DB - apiDB := env.ServerDB + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 1, clientLastMaxUSN: 4, @@ -3010,17 +3278,17 @@ func TestSync(t *testing.T) { }) t.Run("client moves a note", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - 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") + 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") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "1", "-b", "css") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "1", "-b", "css") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3029,11 +3297,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 2, clientLastMaxUSN: 4, @@ -3094,20 +3362,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - 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") + 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") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") // 3. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "1", "-b", "css") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "1", "-b", "css") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3116,11 +3384,11 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 2, clientLastMaxUSN: 5, @@ -3181,21 +3449,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, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - 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") + 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") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - apiPatchNote(t, env, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") + apiPatchNote(t, user, jsNote1UUID, fmt.Sprintf(`{"book_uuid": "%s"}`, cssBookUUID), "moving js note 1 to css book") // 3. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "edit", "1", "-b", "linux") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "1", "-b", "linux") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3205,9 +3473,9 @@ func TestSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb expectedNote1JSBody := `<<<<<<< Local Moved to the book linux @@ -3217,7 +3485,7 @@ Moved to the book css js1` - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 1, clientBookCount: 4, clientLastMaxUSN: 7, @@ -3296,20 +3564,20 @@ js1` }) t.Run("client adds a new book and moves a note into it", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") - cliDB := env.DB + cliDB := ctx.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, env.CmdOpts, cliBinaryName, "edit", "js", nid, "-b", "css") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "edit", "js", nid, "-b", "css") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3317,11 +3585,11 @@ js1` } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 5, @@ -3394,23 +3662,23 @@ js1` }) t.Run("client adds a duplicate book and moves a note into it", func(t *testing.T) { - setup := func(t *testing.T, env testEnv, user database.User) map[string]string { + setup := func(t *testing.T, ctx context.DnoteCtx, user database.User) map[string]string { // 1. on server - jsBookUUID := apiCreateBook(t, env, user, "js", "adding a js book") - jsNote1UUID := apiCreateNote(t, env, user, jsBookUUID, "js1", "adding js note 1") + jsBookUUID := apiCreateBook(t, user, "js", "adding a js book") + jsNote1UUID := apiCreateNote(t, user, jsBookUUID, "js1", "adding js note 1") // 2. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "sync") // 3. on server - cssBookUUID := apiCreateBook(t, env, user, "css", "adding a css book") + cssBookUUID := apiCreateBook(t, user, "css", "adding a css book") // 3. on cli - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") var nid string - 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") + 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") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3419,11 +3687,11 @@ js1` } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 2, clientBookCount: 3, clientLastMaxUSN: 6, @@ -3507,11 +3775,11 @@ js1` func TestFullSync(t *testing.T) { t.Run("consecutively with stepSync", func(t *testing.T) { - 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") + 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") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "add", "css", "-c", "css1") return map[string]string{ "jsBookUUID": jsBookUUID, @@ -3519,11 +3787,11 @@ func TestFullSync(t *testing.T) { } } - assert := func(t *testing.T, env testEnv, user database.User, ids map[string]string) { - cliDB := env.DB - apiDB := env.ServerDB + assert := func(t *testing.T, ctx context.DnoteCtx, user database.User, ids map[string]string) { + cliDB := ctx.DB + apiDB := serverDb - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkState(t, ctx, user, systemState{ clientNoteCount: 2, clientBookCount: 2, clientLastMaxUSN: 4, @@ -3583,26 +3851,489 @@ func TestFullSync(t *testing.T) { } t.Run("stepSync then fullSync", func(t *testing.T) { - env := setupTestEnv(t) - user := setupUserAndLogin(t, env) - ids := setup(t, env, user) + // clean up + os.RemoveAll(tmpDirPath) + apitest.ClearData(serverDb) + defer apitest.ClearData(serverDb) - 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) + 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) }) t.Run("fullSync then stepSync", func(t *testing.T) { - env := setupTestEnv(t) + // clean up + os.RemoveAll(tmpDirPath) + apitest.ClearData(serverDb) + defer apitest.ClearData(serverDb) - user := setupUserAndLogin(t, env) - ids := setup(t, env, user) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) - 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) + 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) + }) + }) +} + +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 := setupUserAndLogin(t, ctx.DB) + + // 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 = setupUserAndLogin(t, ctx.DB) + + // 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 := setupUserAndLogin(t, ctx.DB) + + // 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 = setupUserAndLogin(t, ctx.DB) + + // 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 := setupUserAndLogin(t, ctx.DB) + + // 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 = 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 + 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 := setupUserAndLogin(t, ctx.DB) + + // 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 = 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. + // 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.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 + 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, "sync", "--apiEndpoint", apiEndpointA) + + // Verify sync to Server A succeeded + checkStateWithDB(t, ctx.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) + 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, "sync", "--apiEndpoint", apiEndpointB) + + // Verify Server B now has data + checkStateWithDB(t, ctx.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", 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, "sync", "--apiEndpoint", apiEndpointA) + + // Verify Server A still has its data + checkStateWithDB(t, ctx.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", 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, "sync", "--apiEndpoint", apiEndpointB) + + // Verify both servers maintain independent state + checkStateWithDB(t, ctx.DB, userB, serverDbB, systemState{ + clientNoteCount: 2, + clientBookCount: 2, + clientLastMaxUSN: 4, + clientLastSyncAt: serverTime.Unix(), + serverNoteCount: 2, + serverBookCount: 2, + serverUserMaxUSN: 4, }) }) } @@ -3619,27 +4350,33 @@ 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. - env := setupTestEnv(t) + // Clean up + apitest.ClearData(serverDb) + defer apitest.ClearData(serverDb) + clearTmp(t) - user := setupUserAndLogin(t, env) + ctx := context.InitTestCtx(t, paths, nil) + defer context.TeardownTestCtx(t, ctx) + + user := setupUserAndLogin(t, ctx.DB) // Client A: Create local data (never sync) - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "js", "-c", "js1") - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "add", "css", "-c", "css1") + 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, 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") + 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, env.CmdOpts, cliBinaryName, "sync") + 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) - checkState(t, env.DB, user, env.ServerDB, systemState{ + checkStateWithDB(t, ctx.DB, user, serverDb, systemState{ clientNoteCount: 4, clientBookCount: 4, clientLastMaxUSN: 8, @@ -3651,10 +4388,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, 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'") + 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)") @@ -3663,10 +4400,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, 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'") + 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)") @@ -3675,10 +4412,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'", 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) + 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") @@ -3694,10 +4431,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'", 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) + 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") @@ -3715,28 +4452,34 @@ 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) { - env := setupTestEnv(t) - tmpDir := t.TempDir() + // 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", tmpDir) - client2DB := fmt.Sprintf("%s/client2.db", tmpDir) + 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, env) + 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, 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{ + 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, @@ -3747,12 +4490,12 @@ func TestSync_ConvergeSameBookNames(t *testing.T) { }) // Client 2: Sync (downloads client 1's data, adds own notes) ===== - 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") + 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 - checkState(t, db2, user, env.ServerDB, systemState{ + checkStateWithDB(t, db2, user, serverDb, systemState{ clientNoteCount: 4, clientBookCount: 2, clientLastMaxUSN: 8, @@ -3763,11 +4506,11 @@ func TestSync_ConvergeSameBookNames(t *testing.T) { }) // Client 1: Sync again. It downloads client2's changes (2 extra notes). - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + 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) - checkState(t, db1, user, env.ServerDB, systemState{ + checkStateWithDB(t, db1, user, serverDb, systemState{ clientNoteCount: 4, clientBookCount: 2, clientLastMaxUSN: 8, @@ -3781,10 +4524,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, env.CmdOpts, cliBinaryName, "--dbPath", client2DB, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client2DB, "sync") // Verify client2 state unchanged - checkState(t, db2, user, env.ServerDB, systemState{ + checkStateWithDB(t, db2, user, serverDb, systemState{ clientNoteCount: 4, clientBookCount: 2, clientLastMaxUSN: 8, @@ -3795,10 +4538,10 @@ func TestSync_ConvergeSameBookNames(t *testing.T) { }) // Client 1 syncs - clitest.RunDnoteCmd(t, env.CmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") + clitest.RunDnoteCmd(t, dnoteCmdOpts, cliBinaryName, "--dbPath", client1DB, "sync") // Verify client1 state unchanged - checkState(t, db1, user, env.ServerDB, systemState{ + checkStateWithDB(t, db1, user, serverDb, systemState{ clientNoteCount: 4, clientBookCount: 2, clientLastMaxUSN: 8, diff --git a/pkg/prompt/prompt.go b/pkg/prompt/prompt.go index 262685e9..1d413a27 100644 --- a/pkg/prompt/prompt.go +++ b/pkg/prompt/prompt.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 diff --git a/pkg/prompt/prompt_test.go b/pkg/prompt/prompt_test.go index 6d5eb597..f0df9480 100644 --- a/pkg/prompt/prompt_test.go +++ b/pkg/prompt/prompt_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 diff --git a/pkg/server/.env.dev b/pkg/server/.env.dev new file mode 100644 index 00000000..c78a6704 --- /dev/null +++ b/pkg/server/.env.dev @@ -0,0 +1,2 @@ +APP_ENV=DEVELOPMENT +DBPath=../../dev-server.db diff --git a/pkg/server/.env.test b/pkg/server/.env.test new file mode 100644 index 00000000..b9cf3101 --- /dev/null +++ b/pkg/server/.env.test @@ -0,0 +1 @@ +APP_ENV=TEST diff --git a/pkg/server/app/app.go b/pkg/server/app/app.go index cfaaf319..96717eea 100644 --- a/pkg/server/app/app.go +++ b/pkg/server/app/app.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -27,8 +30,10 @@ 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") - // ErrEmptyBaseURL is an error for missing BaseURL content in the app configuration - ErrEmptyBaseURL = errors.New("No BaseURL 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 @@ -39,10 +44,12 @@ var ( type App struct { DB *gorm.DB Clock clock.Clock + EmailTemplates mailer.Templates EmailBackend mailer.Backend Files map[string][]byte HTTP500Page []byte - BaseURL string + AppEnv string + WebURL string DisableRegistration bool Port string DBPath string @@ -51,12 +58,15 @@ type App struct { // Validate validates the app configuration func (a *App) Validate() error { - if a.BaseURL == "" { - return ErrEmptyBaseURL + if a.WebURL == "" { + return ErrEmptyWebURL } if a.Clock == nil { return ErrEmptyClock } + if a.EmailTemplates == nil { + return ErrEmptyEmailTemplates + } if a.EmailBackend == nil { return ErrEmptyEmailBackend } diff --git a/pkg/server/app/books.go b/pkg/server/app/books.go index f222b816..c3b89ec0 100644 --- a/pkg/server/app/books.go +++ b/pkg/server/app/books.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -34,16 +37,16 @@ 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 } book := database.Book{ - UUID: uuid, - UserID: user.ID, - Label: name, - AddedOn: a.Clock.Now().UnixNano(), - USN: nextUSN, + UUID: uuid, + UserID: user.ID, + Label: name, + AddedOn: a.Clock.Now().UnixNano(), + USN: nextUSN, + Encrypted: false, } if err := tx.Create(&book).Error; err != nil { tx.Rollback() @@ -96,6 +99,8 @@ 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/books_test.go b/pkg/server/app/books_test.go index 8953c613..85df4770 100644 --- a/pkg/server/app/books_test.go +++ b/pkg/server/app/books_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -53,10 +56,10 @@ func TestCreateBook(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) 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, "another@test.com", "password123") + anotherUser := testutils.SetupUserData(db) testutils.MustExec(t, db.Model(&anotherUser).Update("max_usn", 55), fmt.Sprintf("preparing user max_usn for test case %d", idx)) a := NewTest() @@ -119,10 +122,10 @@ func TestDeleteBook(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) 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, "another@test.com", "password123") + anotherUser := testutils.SetupUserData(db) 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} @@ -198,10 +201,10 @@ func TestUpdateBook(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) 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, "another@test.com", "password123") + anotherUser := testutils.SetupUserData(db) 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/doc.go b/pkg/server/app/doc.go index 2a3f3695..502939ff 100644 --- a/pkg/server/app/doc.go +++ b/pkg/server/app/doc.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ /* diff --git a/pkg/server/app/email.go b/pkg/server/app/email.go index fc86cda9..2f721a6f 100644 --- a/pkg/server/app/email.go +++ b/pkg/server/app/email.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -27,8 +30,8 @@ import ( var defaultSender = "admin@getdnote.com" // GetSenderEmail returns the sender email -func GetSenderEmail(baseURL, want string) (string, error) { - addr, err := getNoreplySender(baseURL) +func GetSenderEmail(webURL, want string) (string, error) { + addr, err := getNoreplySender(webURL) if err != nil { return "", errors.Wrap(err, "getting sender email address") } @@ -52,10 +55,10 @@ func getDomainFromURL(rawURL string) (string, error) { return domain, nil } -func getNoreplySender(baseURL string) (string, error) { - domain, err := getDomainFromURL(baseURL) +func getNoreplySender(webURL string) (string, error) { + domain, err := getDomainFromURL(webURL) if err != nil { - return "", errors.Wrap(err, "parsing base url") + return "", errors.Wrap(err, "parsing web url") } addr := fmt.Sprintf("noreply@%s", domain) @@ -64,18 +67,21 @@ func getNoreplySender(baseURL string) (string, error) { // SendWelcomeEmail sends welcome email func (a *App) SendWelcomeEmail(email string) error { - from, err := GetSenderEmail(a.BaseURL, defaultSender) + 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") } - data := mailer.WelcomeTmplData{ - AccountEmail: email, - BaseURL: a.BaseURL, - } - - if err := a.EmailBackend.SendEmail(mailer.EmailTypeWelcome, from, []string{email}, data); err != nil { - return errors.Wrapf(err, "sending welcome email for %s", 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) } return nil @@ -87,23 +93,26 @@ func (a *App) SendPasswordResetEmail(email, tokenValue string) error { return ErrEmailRequired } - from, err := GetSenderEmail(a.BaseURL, defaultSender) + 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") } - data := mailer.EmailResetPasswordTmplData{ - AccountEmail: email, - Token: tokenValue, - BaseURL: a.BaseURL, - } - - if err := a.EmailBackend.SendEmail(mailer.EmailTypeResetPassword, from, []string{email}, data); err != nil { + if err := a.EmailBackend.Queue("Reset your password", from, []string{email}, mailer.EmailKindText, body); err != nil { if errors.Cause(err) == mailer.ErrSMTPNotConfigured { return ErrInvalidSMTPConfig } - return errors.Wrapf(err, "sending password reset email for %s", email) + return errors.Wrapf(err, "queueing email for %s", email) } return nil @@ -111,18 +120,21 @@ 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.BaseURL, defaultSender) + 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") } - data := mailer.EmailResetPasswordAlertTmplData{ - AccountEmail: email, - BaseURL: a.BaseURL, - } - - 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) + 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) } return nil diff --git a/pkg/server/app/email_test.go b/pkg/server/app/email_test.go index e0a73aef..56270604 100644 --- a/pkg/server/app/email_test.go +++ b/pkg/server/app/email_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -27,7 +30,7 @@ func TestSendWelcomeEmail(t *testing.T) { emailBackend := testutils.MockEmailbackendImplementation{} a := NewTest() a.EmailBackend = &emailBackend - a.BaseURL = "http://example.com" + a.WebURL = "http://example.com" if err := a.SendWelcomeEmail("alice@example.com"); err != nil { t.Fatal(err, "failed to perform") @@ -43,7 +46,7 @@ func TestSendPasswordResetEmail(t *testing.T) { emailBackend := testutils.MockEmailbackendImplementation{} a := NewTest() a.EmailBackend = &emailBackend - a.BaseURL = "http://example.com" + a.WebURL = "http://example.com" if err := a.SendPasswordResetEmail("alice@example.com", "mockTokenValue"); err != nil { t.Fatal(err, "failed to perform") @@ -57,21 +60,21 @@ func TestSendPasswordResetEmail(t *testing.T) { func TestGetSenderEmail(t *testing.T) { testCases := []struct { - baseURL string + webURL string expectedSender string }{ { - baseURL: "https://www.example.com", + webURL: "https://www.example.com", expectedSender: "noreply@example.com", }, { - baseURL: "https://www.example2.com", + webURL: "https://www.example2.com", expectedSender: "alice@example2.com", }, } for _, tc := range testCases { - t.Run(fmt.Sprintf("base url %s", tc.baseURL), func(t *testing.T) { + t.Run(fmt.Sprintf("web url %s", tc.webURL), func(t *testing.T) { }) } } diff --git a/pkg/server/app/errors.go b/pkg/server/app/errors.go index 67635b23..48f193b9 100644 --- a/pkg/server/app/errors.go +++ b/pkg/server/app/errors.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -73,7 +76,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 current password." + ErrInvalidPassword appError = "Invalid currnet password." // ErrEmailTooLong is an error for email length exceeding the limit ErrEmailTooLong appError = "Email is too long." diff --git a/pkg/server/app/helpers.go b/pkg/server/app/helpers.go index 437ca9ae..3941b2cb 100644 --- a/pkg/server/app/helpers.go +++ b/pkg/server/app/helpers.go @@ -1,50 +1,37 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app import ( - "time" - "github.com/dnote/dnote/pkg/server/database" - "github.com/pkg/errors" "gorm.io/gorm" + "github.com/pkg/errors" ) // 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/app/helpers_test.go b/pkg/server/app/helpers_test.go index 93486ecd..2c7a2828 100644 --- a/pkg/server/app/helpers_test.go +++ b/pkg/server/app/helpers_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -45,7 +48,7 @@ func TestIncremenetUserUSN(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) 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.go b/pkg/server/app/notes.go index 4bdeaaf6..7773953d 100644 --- a/pkg/server/app/notes.go +++ b/pkg/server/app/notes.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -27,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, client string) (database.Note, error) { +func (a *App) CreateNote(user database.User, bookUUID, content string, addedOn *int64, editedOn *int64, public bool, client string) (database.Note, error) { tx := a.DB.Begin() nextUSN, err := incrementUserUSN(tx, user.ID) @@ -52,19 +55,20 @@ func (a *App) CreateNote(user database.User, bookUUID, content string, addedOn * uuid, err := helpers.GenUUID() if err != nil { - tx.Rollback() return database.Note{}, err } note := database.Note{ - UUID: uuid, - BookUUID: bookUUID, - UserID: user.ID, - AddedOn: noteAddedOn, - EditedOn: noteEditedOn, - USN: nextUSN, - Body: content, - Client: client, + UUID: uuid, + BookUUID: bookUUID, + UserID: user.ID, + AddedOn: noteAddedOn, + EditedOn: noteEditedOn, + USN: nextUSN, + Body: content, + Public: public, + Encrypted: false, + Client: client, } if err := tx.Create(¬e).Error; err != nil { tx.Rollback() @@ -80,6 +84,7 @@ 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 @@ -100,6 +105,15 @@ 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) @@ -113,10 +127,15 @@ 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") @@ -161,12 +180,13 @@ 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 - PerPage int + Year int + Month int + Page int + Books []string + Search string + Encrypted bool + PerPage int } type ftsParams struct { @@ -195,13 +215,14 @@ 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 = ?", - userID, false, + "notes.user_id = ? AND notes.deleted = ? AND notes.encrypted = ?", + userID, false, q.Encrypted, ) if q.Search != "" { diff --git a/pkg/server/app/notes_test.go b/pkg/server/app/notes_test.go index a165312d..7813c54b 100644 --- a/pkg/server/app/notes_test.go +++ b/pkg/server/app/notes_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -30,6 +33,8 @@ 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() @@ -70,17 +75,13 @@ 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") + user := testutils.SetupUserData(db) 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, "another@test.com", "password123") + anotherUser := testutils.SetupUserData(db) 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} @@ -90,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, ""); err != nil { + if _, err := a.CreateNote(user, b1.UUID, "note content", tc.addedOn, tc.editedOn, false, ""); err != nil { t.Fatal(errors.Wrapf(err, "creating note for test case %d", idx)) } @@ -129,7 +130,7 @@ func TestCreateNote(t *testing.T) { func TestCreateNote_EmptyBody(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -138,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, "") + note, err := a.CreateNote(user, b1.UUID, "", nil, nil, false, "") if err != nil { t.Fatal(errors.Wrap(err, "creating note with empty body")) } @@ -168,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@test.com", "password123") + user := testutils.SetupUserData(db) testutils.MustExec(t, db.Model(&user).Update("max_usn", tc.userUSN), "preparing user max_usn for test case") - anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") + anotherUser := testutils.SetupUserData(db) 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} @@ -187,6 +188,7 @@ func TestUpdateNote(t *testing.T) { c := clock.NewMock() content := "updated test content" + public := true a := NewTest() a.DB = db @@ -195,6 +197,7 @@ 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")) @@ -215,6 +218,7 @@ 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") @@ -233,7 +237,7 @@ func TestUpdateNote(t *testing.T) { func TestUpdateNote_SameContent(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -290,10 +294,10 @@ func TestDeleteNote(t *testing.T) { func() { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) 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, "another@test.com", "password123") + anotherUser := testutils.SetupUserData(db) 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"} @@ -350,7 +354,7 @@ func TestDeleteNote(t *testing.T) { func TestGetNotes_FTSSearch(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -370,9 +374,10 @@ func TestGetNotes_FTSSearch(t *testing.T) { // Search "baz" result, err := a.GetNotes(user.ID, GetNotesParams{ - Search: "baz", - Page: 1, - PerPage: 30, + Search: "baz", + Encrypted: false, + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search")) @@ -385,9 +390,10 @@ func TestGetNotes_FTSSearch(t *testing.T) { // Search for "running" - should return 1 note result, err = a.GetNotes(user.ID, GetNotesParams{ - Search: "running", - Page: 1, - PerPage: 30, + Search: "running", + Encrypted: false, + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search for review")) @@ -399,9 +405,10 @@ func TestGetNotes_FTSSearch(t *testing.T) { // Search for non-existent term - should return 0 notes result, err = a.GetNotes(user.ID, GetNotesParams{ - Search: "nonexistent", - Page: 1, - PerPage: 30, + Search: "nonexistent", + Encrypted: false, + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search for nonexistent")) @@ -414,7 +421,7 @@ func TestGetNotes_FTSSearch(t *testing.T) { func TestGetNotes_FTSSearch_Snippet(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -430,9 +437,10 @@ 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", - Page: 1, - PerPage: 30, + Search: "keyword", + Encrypted: false, + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search for keyword")) @@ -448,7 +456,7 @@ func TestGetNotes_FTSSearch_Snippet(t *testing.T) { func TestGetNotes_FTSSearch_ShortWord(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -464,9 +472,10 @@ func TestGetNotes_FTSSearch_ShortWord(t *testing.T) { a.Clock = clock.NewMock() result, err := a.GetNotes(user.ID, GetNotesParams{ - Search: "a", - Page: 1, - PerPage: 30, + Search: "a", + Encrypted: false, + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search for 'a'")) @@ -480,7 +489,7 @@ func TestGetNotes_FTSSearch_ShortWord(t *testing.T) { func TestGetNotes_All(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) b1 := database.Book{UserID: user.ID, Label: "testBook"} testutils.MustExec(t, db.Save(&b1), "preparing book") @@ -495,9 +504,10 @@ func TestGetNotes_All(t *testing.T) { a.Clock = clock.NewMock() result, err := a.GetNotes(user.ID, GetNotesParams{ - Search: "", - Page: 1, - PerPage: 30, + Search: "", + Encrypted: false, + Page: 1, + PerPage: 30, }) if err != nil { t.Fatal(errors.Wrap(err, "getting notes with FTS search for 'a'")) diff --git a/pkg/server/app/sessions.go b/pkg/server/app/sessions.go index 6c230d76..a240e036 100644 --- a/pkg/server/app/sessions.go +++ b/pkg/server/app/sessions.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -48,7 +51,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.Where("user_id = ?", userID).Delete(&database.Session{}).Error; err != nil { + if err := db.Debug().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 248f4784..45dbd5bb 100644 --- a/pkg/server/app/testutils.go +++ b/pkg/server/app/testutils.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -18,6 +21,7 @@ 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" ) @@ -25,9 +29,11 @@ import ( func NewTest() App { return App{ Clock: clock.NewMock(), + EmailTemplates: mailer.NewTemplates(), EmailBackend: &testutils.MockEmailbackendImplementation{}, HTTP500Page: assets.MustGetHTTP500ErrorPage(), - BaseURL: "http://127.0.0.0.1", + AppEnv: "TEST", + WebURL: "http://127.0.0.0.1", Port: "3000", DisableRegistration: false, DBPath: "", diff --git a/pkg/server/app/users.go b/pkg/server/app/users.go index 9c167b69..b3993d55 100644 --- a/pkg/server/app/users.go +++ b/pkg/server/app/users.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -62,12 +65,10 @@ func (a *App) CreateUser(email, password string, passwordConfirmation string) (d tx := a.DB.Begin() var count int64 - if err := tx.Model(&database.User{}).Where("email = ?", email).Count(&count).Error; err != nil { - tx.Rollback() + if err := tx.Model(database.Account{}).Where("email = ?", email).Count(&count).Error; err != nil { return database.User{}, pkgErrors.Wrap(err, "counting user") } if count > 0 { - tx.Rollback() return database.User{}, ErrDuplicateEmail } @@ -84,14 +85,21 @@ func (a *App) CreateUser(email, password string, passwordConfirmation string) (d } user := database.User{ - UUID: uuid, - Email: database.ToNullString(email), - Password: database.ToNullString(string(hashedPassword)), + UUID: uuid, } 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() @@ -103,47 +111,42 @@ func (a *App) CreateUser(email, password string, passwordConfirmation string) (d return user, nil } -// 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 +// 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) { return nil, ErrNotFound } else if err != nil { return nil, err } - 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 + return &account, nil } // Authenticate authenticates a user func (a *App) Authenticate(email, password string) (*database.User, error) { - user, err := a.GetUserByEmail(email) + account, err := a.GetAccountByEmail(email) if err != nil { return nil, err } - err = bcrypt.CompareHashAndPassword([]byte(user.Password.String), []byte(password)) + err = bcrypt.CompareHashAndPassword([]byte(account.Password.String), []byte(password)) if err != nil { return nil, ErrLoginInvalid } - return user, nil + 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 } -// UpdateUserPassword updates a user's password with validation -func UpdateUserPassword(db *gorm.DB, user *database.User, newPassword string) error { +// 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 @@ -156,25 +159,25 @@ func UpdateUserPassword(db *gorm.DB, user *database.User, newPassword string) er } // Update the password - if err := db.Model(&user).Update("password", string(hashedPassword)).Error; err != nil { + if err := db.Model(&account).Update("password", string(hashedPassword)).Error; err != nil { return pkgErrors.Wrap(err, "updating password") } return nil } -// RemoveUser removes a user from the system +// 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 user - user, err := a.GetUserByEmail(email) + // 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 = ?", user.ID, false).Count(¬eCount).Error; err != nil { + 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 { @@ -183,18 +186,34 @@ 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 = ?", user.ID, false).Count(&bookCount).Error; err != nil { + 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 user - if err := a.DB.Delete(&user).Error; err != nil { + // 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 } diff --git a/pkg/server/app/users_test.go b/pkg/server/app/users_test.go index 52183520..a4c3a60d 100644 --- a/pkg/server/app/users_test.go +++ b/pkg/server/app/users_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 app @@ -79,20 +82,21 @@ func TestCreateUser_ProValue(t *testing.T) { } -func TestGetUserByEmail(t *testing.T) { +func TestGetAccountByEmail(t *testing.T) { t.Run("success", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "alice@example.com", "password123") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@example.com", "password123") a := NewTest() a.DB = db - foundUser, err := a.GetUserByEmail("alice@example.com") + account, err := a.GetAccountByEmail("alice@example.com") assert.Equal(t, err, nil, "should not error") - assert.Equal(t, foundUser.Email.String, "alice@example.com", "email mismatch") - assert.Equal(t, foundUser.ID, user.ID, "user ID mismatch") + 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) { @@ -101,76 +105,10 @@ func TestGetUserByEmail(t *testing.T) { a := NewTest() a.DB = db - user, err := a.GetUserByEmail("nonexistent@example.com") + account, err := a.GetAccountByEmail("nonexistent@example.com") assert.Equal(t, err, ErrNotFound, "should return ErrNotFound") - assert.Equal(t, user, (*database.User)(nil), "user should be nil") - }) -} - -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") + assert.Equal(t, account, (*database.Account)(nil), "account should be nil") }) } @@ -186,21 +124,25 @@ 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), "user count mismatch") + assert.Equal(t, userCount, int64(1), "book count mismatch") - var userRecord database.User - testutils.MustExec(t, db.First(&userRecord), "finding user") + 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") - assert.Equal(t, userRecord.Email.String, "alice@example.com", "user email mismatch") + assert.Equal(t, accountCount, int64(1), "account count mismatch") + assert.Equal(t, accountRecord.Email.String, "alice@example.com", "account email mismatch") - passwordErr := bcrypt.CompareHashAndPassword([]byte(userRecord.Password.String), []byte("pass1234")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(accountRecord.Password.String), []byte("pass1234")) assert.Equal(t, passwordErr, nil, "Password mismatch") }) t.Run("duplicate email", func(t *testing.T) { db := testutils.InitMemoryDB(t) - testutils.SetupUserData(db, "alice@example.com", "somepassword") + aliceUser := testutils.SetupUserData(db) + testutils.SetupAccountData(db, aliceUser, "alice@example.com", "somepassword") a := NewTest() a.DB = db @@ -208,109 +150,116 @@ func TestCreateUser(t *testing.T) { assert.Equal(t, err, ErrDuplicateEmail, "error mismatch") - var userCount int64 + var userCount, accountCount 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 TestUpdateUserPassword(t *testing.T) { +func TestUpdateAccountPassword(t *testing.T) { t.Run("success", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "alice@example.com", "oldpassword123") + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") - err := UpdateUserPassword(db, &user, "newpassword123") + err := UpdateAccountPassword(db, &account, "newpassword123") assert.Equal(t, err, nil, "should not error") // Verify password was updated in database - var updatedUser database.User - testutils.MustExec(t, db.Where("id = ?", user.ID).First(&updatedUser), "finding updated user") + 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(updatedUser.Password.String), []byte("newpassword123")) + 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(updatedUser.Password.String), []byte("oldpassword123")) + 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, "alice@example.com", "oldpassword123") + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") - err := UpdateUserPassword(db, &user, "short") + err := UpdateAccountPassword(db, &account, "short") assert.Equal(t, err, ErrPasswordTooShort, "should return ErrPasswordTooShort") // Verify password was NOT updated in database - var unchangedUser database.User - testutils.MustExec(t, db.Where("id = ?", user.ID).First(&unchangedUser), "finding unchanged user") + 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(unchangedUser.Password.String), []byte("oldpassword123")) + 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, "alice@example.com", "oldpassword123") + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") - err := UpdateUserPassword(db, &user, "") + err := UpdateAccountPassword(db, &account, "") assert.Equal(t, err, ErrPasswordTooShort, "should return ErrPasswordTooShort") // Verify password was NOT updated in database - var unchangedUser database.User - testutils.MustExec(t, db.Where("id = ?", user.ID).First(&unchangedUser), "finding unchanged user") + 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(unchangedUser.Password.String), []byte("oldpassword123")) + 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, "alice@example.com", "oldpassword123") + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") - // Start a transaction and rollback to verify UpdateUserPassword respects transactions + // Start a transaction and rollback to verify UpdateAccountPassword respects transactions tx := db.Begin() - err := UpdateUserPassword(tx, &user, "newpassword123") + err := UpdateAccountPassword(tx, &account, "newpassword123") assert.Equal(t, err, nil, "should not error") tx.Rollback() // Verify password was NOT updated after rollback - var unchangedUser database.User - testutils.MustExec(t, db.Where("id = ?", user.ID).First(&unchangedUser), "finding unchanged user") + 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(unchangedUser.Password.String), []byte("oldpassword123")) + 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, "alice@example.com", "oldpassword123") + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword123") - // Start a transaction and commit to verify UpdateUserPassword respects transactions + // Start a transaction and commit to verify UpdateAccountPassword respects transactions tx := db.Begin() - err := UpdateUserPassword(tx, &user, "newpassword123") + err := UpdateAccountPassword(tx, &account, "newpassword123") assert.Equal(t, err, nil, "should not error") tx.Commit() // Verify password was updated after commit - var updatedUser database.User - testutils.MustExec(t, db.Where("id = ?", user.ID).First(&updatedUser), "finding updated user") + 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(updatedUser.Password.String), []byte("newpassword123")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(updatedAccount.Password.String), []byte("newpassword123")) assert.Equal(t, passwordErr, nil, "New password should match after commit") }) } @@ -319,7 +268,8 @@ func TestRemoveUser(t *testing.T) { t.Run("success", func(t *testing.T) { db := testutils.InitMemoryDB(t) - testutils.SetupUserData(db, "alice@example.com", "password123") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@example.com", "password123") a := NewTest() a.DB = db @@ -332,6 +282,11 @@ 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) { @@ -348,7 +303,8 @@ func TestRemoveUser(t *testing.T) { t.Run("user has notes", func(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "alice@example.com", "password123") + 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") @@ -368,12 +324,17 @@ 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, "alice@example.com", "password123") + 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") @@ -390,12 +351,17 @@ 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, "alice@example.com", "password123") + 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") @@ -419,5 +385,9 @@ 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/assets/embed.go b/pkg/server/assets/embed.go index e0272d95..abe8c04f 100644 --- a/pkg/server/assets/embed.go +++ b/pkg/server/assets/embed.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 assets diff --git a/pkg/server/assets/js/src/main.js b/pkg/server/assets/js/src/main.js index 9e58d92a..e63a8fb3 100644 --- a/pkg/server/assets/js/src/main.js +++ b/pkg/server/assets/js/src/main.js @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ var getNextSibling = function (el, selector) { diff --git a/pkg/server/assets/package-lock.json b/pkg/server/assets/package-lock.json index 7eb1c411..ec63082c 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": "Apache-2.0", + "license": "AGPL-3.0-or-later", "devDependencies": { "sass": "^1.50.1" } @@ -363,11 +363,10 @@ } }, "node_modules/immutable": { - "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" + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz", + "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==", + "dev": true }, "node_modules/is-extglob": { "version": "2.1.1", diff --git a/pkg/server/assets/package.json b/pkg/server/assets/package.json index 1561f6da..0edcd180 100644 --- a/pkg/server/assets/package.json +++ b/pkg/server/assets/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": {}, "author": "Dnote", - "license": "Apache-2.0", + "license": "AGPL-3.0-or-later", "devDependencies": { "sass": "^1.50.1" } diff --git a/pkg/server/assets/styles/src/_books.scss b/pkg/server/assets/styles/src/_books.scss index 10f9a8aa..c94c4347 100644 --- a/pkg/server/assets/styles/src/_books.scss +++ b/pkg/server/assets/styles/src/_books.scss @@ -1,20 +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 "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 9ccc9a78..e306a4b0 100644 --- a/pkg/server/assets/styles/src/_bootstrap.scss +++ b/pkg/server/assets/styles/src/_bootstrap.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ // From Bootstrap <4.3.1 diff --git a/pkg/server/assets/styles/src/_buttons.scss b/pkg/server/assets/styles/src/_buttons.scss index e734b003..16059864 100644 --- a/pkg/server/assets/styles/src/_buttons.scss +++ b/pkg/server/assets/styles/src/_buttons.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ @use "sass:color"; diff --git a/pkg/server/assets/styles/src/_font.scss b/pkg/server/assets/styles/src/_font.scss index 4818014a..37bc3163 100644 --- a/pkg/server/assets/styles/src/_font.scss +++ b/pkg/server/assets/styles/src/_font.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ @use 'responsive'; diff --git a/pkg/server/assets/styles/src/_global.scss b/pkg/server/assets/styles/src/_global.scss index 7bad7d58..8c497658 100644 --- a/pkg/server/assets/styles/src/_global.scss +++ b/pkg/server/assets/styles/src/_global.scss @@ -1,23 +1,26 @@ -/* 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 9e527582..362946be 100644 --- a/pkg/server/assets/styles/src/_grid.scss +++ b/pkg/server/assets/styles/src/_grid.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ /*! diff --git a/pkg/server/assets/styles/src/_header.scss b/pkg/server/assets/styles/src/_header.scss index 28374fb7..c952599e 100644 --- a/pkg/server/assets/styles/src/_header.scss +++ b/pkg/server/assets/styles/src/_header.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ @use "sass:color"; diff --git a/pkg/server/assets/styles/src/_hljs.scss b/pkg/server/assets/styles/src/_hljs.scss index 4decc572..3f05190d 100644 --- a/pkg/server/assets/styles/src/_hljs.scss +++ b/pkg/server/assets/styles/src/_hljs.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ /* diff --git a/pkg/server/assets/styles/src/_home.scss b/pkg/server/assets/styles/src/_home.scss index 6ec13eaa..ce72a9f3 100644 --- a/pkg/server/assets/styles/src/_home.scss +++ b/pkg/server/assets/styles/src/_home.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ @use 'theme'; diff --git a/pkg/server/assets/styles/src/_login.scss b/pkg/server/assets/styles/src/_login.scss index 1b8bfa97..9200a911 100644 --- a/pkg/server/assets/styles/src/_login.scss +++ b/pkg/server/assets/styles/src/_login.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ @use 'theme'; diff --git a/pkg/server/assets/styles/src/_markdown.scss b/pkg/server/assets/styles/src/_markdown.scss index e1621ffa..949ee46a 100644 --- a/pkg/server/assets/styles/src/_markdown.scss +++ b/pkg/server/assets/styles/src/_markdown.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ /* diff --git a/pkg/server/assets/styles/src/_marker.scss b/pkg/server/assets/styles/src/_marker.scss index db583dd2..6de64210 100644 --- a/pkg/server/assets/styles/src/_marker.scss +++ b/pkg/server/assets/styles/src/_marker.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ .marker { diff --git a/pkg/server/assets/styles/src/_note.scss b/pkg/server/assets/styles/src/_note.scss index 87f6e790..edc83a34 100644 --- a/pkg/server/assets/styles/src/_note.scss +++ b/pkg/server/assets/styles/src/_note.scss @@ -1,22 +1,25 @@ -/* 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 369cf5de..04587120 100644 --- a/pkg/server/assets/styles/src/_reboot.scss +++ b/pkg/server/assets/styles/src/_reboot.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ /*! diff --git a/pkg/server/assets/styles/src/_rem.scss b/pkg/server/assets/styles/src/_rem.scss index c2b914ff..cd736925 100644 --- a/pkg/server/assets/styles/src/_rem.scss +++ b/pkg/server/assets/styles/src/_rem.scss @@ -1,20 +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 "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 2ebbf0ab..9aaf9a7f 100644 --- a/pkg/server/assets/styles/src/_responsive.scss +++ b/pkg/server/assets/styles/src/_responsive.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ @use 'variables'; diff --git a/pkg/server/assets/styles/src/_select.scss b/pkg/server/assets/styles/src/_select.scss index a0dc5d8c..9a0abb60 100644 --- a/pkg/server/assets/styles/src/_select.scss +++ b/pkg/server/assets/styles/src/_select.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ /** diff --git a/pkg/server/assets/styles/src/_settings.scss b/pkg/server/assets/styles/src/_settings.scss index a965ecbb..2f5d439d 100644 --- a/pkg/server/assets/styles/src/_settings.scss +++ b/pkg/server/assets/styles/src/_settings.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ @use 'theme'; diff --git a/pkg/server/assets/styles/src/_shared.scss b/pkg/server/assets/styles/src/_shared.scss index 3dcbcbe4..1b7697c1 100644 --- a/pkg/server/assets/styles/src/_shared.scss +++ b/pkg/server/assets/styles/src/_shared.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ @use 'font'; diff --git a/pkg/server/assets/styles/src/_theme.scss b/pkg/server/assets/styles/src/_theme.scss index 5654cb7a..f37d81a5 100644 --- a/pkg/server/assets/styles/src/_theme.scss +++ b/pkg/server/assets/styles/src/_theme.scss @@ -1,18 +1,21 @@ -/* 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:color"; +/* 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 . + */ // basic colors $black: #2a2a2a; diff --git a/pkg/server/assets/styles/src/_variables.scss b/pkg/server/assets/styles/src/_variables.scss index 490d9dbb..c54cd062 100644 --- a/pkg/server/assets/styles/src/_variables.scss +++ b/pkg/server/assets/styles/src/_variables.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ $header-height: 60px; diff --git a/pkg/server/assets/styles/src/main.scss b/pkg/server/assets/styles/src/main.scss index 9afa9f6d..4a5a7379 100644 --- a/pkg/server/assets/styles/src/main.scss +++ b/pkg/server/assets/styles/src/main.scss @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ @use 'reboot'; diff --git a/pkg/server/buildinfo/info.go b/pkg/server/buildinfo/info.go index 4e6661f8..09bcdb9d 100644 --- a/pkg/server/buildinfo/info.go +++ b/pkg/server/buildinfo/info.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 buildinfo diff --git a/pkg/server/cmd/helpers.go b/pkg/server/cmd/helpers.go index ba90a7ce..a22c8721 100644 --- a/pkg/server/cmd/helpers.go +++ b/pkg/server/cmd/helpers.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 @@ -37,27 +40,24 @@ 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 := getEmailBackend() + + 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, - BaseURL: cfg.BaseURL, + AppEnv: cfg.AppEnv, + WebURL: cfg.WebURL, DisableRegistration: cfg.DisableRegistration, Port: cfg.Port, DBPath: cfg.DBPath, @@ -65,29 +65,6 @@ 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) @@ -97,7 +74,7 @@ func setupFlagSet(name, usageCmd string) *flag.FlagSet { Flags: `, usageCmd) - printFlags(fs) + fs.PrintDefaults() } return fs } @@ -111,8 +88,8 @@ func requireString(fs *flag.FlagSet, value, fieldName string) { } } -// createApp creates config, initializes app, and returns cleanup function -func createApp(fs *flag.FlagSet, dbPath string) (*app.App, func()) { +// 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, }) diff --git a/pkg/server/cmd/root.go b/pkg/server/cmd/root.go index 106ab2d9..1ed2129f 100644 --- a/pkg/server/cmd/root.go +++ b/pkg/server/cmd/root.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 diff --git a/pkg/server/cmd/start.go b/pkg/server/cmd/start.go index 0a4e5292..cbbc60ed 100644 --- a/pkg/server/cmd/start.go +++ b/pkg/server/cmd/start.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 @@ -19,12 +22,10 @@ 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" ) @@ -32,8 +33,9 @@ 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)") - baseURL := fs.String("baseUrl", "", "Full URL to server without trailing slash (env: BaseURL, default: http://localhost: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)") @@ -41,8 +43,9 @@ func startCmd(args []string) { fs.Parse(args) cfg, err := config.New(config.Params{ + AppEnv: *appEnv, Port: *port, - BaseURL: *baseURL, + WebURL: *webURL, DBPath: *dbPath, DisableRegistration: *disableRegistration, LogLevel: *logLevel, @@ -64,12 +67,6 @@ 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/cmd/user.go b/pkg/server/cmd/user.go index 7a98344d..6123cdae 100644 --- a/pkg/server/cmd/user.go +++ b/pkg/server/cmd/user.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 @@ -51,7 +54,7 @@ func userCreateCmd(args []string) { requireString(fs, *email, "email") requireString(fs, *password, "password") - a, cleanup := createApp(fs, *dbPath) + a, cleanup := setupAppWithDB(fs, *dbPath) defer cleanup() _, err := a.CreateUser(*email, *password, *password) @@ -74,16 +77,16 @@ func userRemoveCmd(args []string, stdin io.Reader) { requireString(fs, *email, "email") - a, cleanup := createApp(fs, *dbPath) + a, cleanup := setupAppWithDB(fs, *dbPath) defer cleanup() // Check if user exists first - _, err := a.GetUserByEmail(*email) + _, 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 user") + log.ErrorWrap(err, "finding account") } os.Exit(1) } @@ -127,22 +130,22 @@ func userResetPasswordCmd(args []string) { requireString(fs, *email, "email") requireString(fs, *password, "password") - a, cleanup := createApp(fs, *dbPath) + a, cleanup := setupAppWithDB(fs, *dbPath) defer cleanup() - // Find the user - user, err := a.GetUserByEmail(*email) + // 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 user") + log.ErrorWrap(err, "finding account") } os.Exit(1) } // Update the password - if err := app.UpdateUserPassword(a.DB, user, *password); err != nil { + if err := app.UpdateAccountPassword(a.DB, account, *password); err != nil { log.ErrorWrap(err, "updating password") os.Exit(1) } @@ -151,27 +154,6 @@ 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: @@ -179,7 +161,6 @@ 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) @@ -194,8 +175,6 @@ Available commands: switch subcommand { case "create": userCreateCmd(subArgs) - case "list": - userListCmd(subArgs, os.Stdout) case "remove": userRemoveCmd(subArgs, os.Stdin) case "reset-password": @@ -204,7 +183,6 @@ 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 84e5f4de..d3536d52 100644 --- a/pkg/server/cmd/user_test.go +++ b/pkg/server/cmd/user_test.go @@ -1,23 +1,24 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 ( - "bytes" - "fmt" "strings" "testing" @@ -44,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 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") + 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) { @@ -54,7 +55,8 @@ func TestUserRemoveCmd(t *testing.T) { // Create a user first db := testutils.InitDB(tmpDB) - testutils.SetupUserData(db, "test@example.com", "password123") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "test@example.com", "password123") sqlDB, _ := db.DB() sqlDB.Close() @@ -79,8 +81,9 @@ func TestUserResetPasswordCmd(t *testing.T) { // Create a user first db := testutils.InitDB(tmpDB) - user := testutils.SetupUserData(db, "test@example.com", "oldpassword123") - oldPasswordHash := user.Password.String + user := testutils.SetupUserData(db) + account := testutils.SetupAccountData(db, user, "test@example.com", "oldpassword123") + oldPasswordHash := account.Password.String sqlDB, _ := db.DB() sqlDB.Close() @@ -94,65 +97,18 @@ func TestUserResetPasswordCmd(t *testing.T) { sqlDB2.Close() }() - var updatedUser database.User - testutils.MustExec(t, db2.Where("email = ?", "test@example.com").First(&updatedUser), "finding user") + var updatedAccount database.Account + testutils.MustExec(t, db2.Where("email = ?", "test@example.com").First(&updatedAccount), "finding account") // Verify password hash changed - 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") + 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(updatedUser.Password.String), []byte("newpassword123")) + 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(updatedUser.Password.String), []byte("oldpassword123")) + err = bcrypt.CompareHashAndPassword([]byte(updatedAccount.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") - }) -} diff --git a/pkg/server/cmd/version.go b/pkg/server/cmd/version.go index c36405d4..99c68429 100644 --- a/pkg/server/cmd/version.go +++ b/pkg/server/cmd/version.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 diff --git a/pkg/server/config/config.go b/pkg/server/config/config.go index 19ee45f2..e941a9a5 100644 --- a/pkg/server/config/config.go +++ b/pkg/server/config/config.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 config @@ -26,6 +29,8 @@ 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 @@ -40,8 +45,8 @@ var ( var ( // ErrDBMissingPath is an error for an incomplete configuration missing the database path ErrDBMissingPath = errors.New("DB Path is empty") - // ErrBaseURLInvalid is an error for an incomplete configuration with invalid base url - ErrBaseURLInvalid = errors.New("Invalid BaseURL") + // ErrWebURLInvalid is an error for an incomplete configuration with invalid web url + ErrWebURLInvalid = errors.New("Invalid WebURL") // ErrPortInvalid is an error for an incomplete configuration with invalid port ErrPortInvalid = errors.New("Invalid Port") ) @@ -63,7 +68,8 @@ func getOrEnv(value, envKey, defaultVal string) string { // Config is an application configuration type Config struct { - BaseURL string + AppEnv string + WebURL string DisableRegistration bool Port string DBPath string @@ -74,8 +80,9 @@ type Config struct { // Params are the configuration parameters for creating a new Config type Params struct { + AppEnv string Port string - BaseURL string + WebURL string DBPath string DisableRegistration bool LogLevel string @@ -85,8 +92,9 @@ 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"), - BaseURL: getOrEnv(p.BaseURL, "BaseURL", "http://localhost: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"), @@ -101,9 +109,14 @@ 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.BaseURL); err != nil { - return errors.Wrapf(ErrBaseURLInvalid, "'%s'", c.BaseURL) + if _, err := url.ParseRequestURI(c.WebURL); err != nil { + return errors.Wrapf(ErrWebURLInvalid, "'%s'", c.WebURL) } if c.Port == "" { return ErrPortInvalid diff --git a/pkg/server/config/config_test.go b/pkg/server/config/config_test.go index 9c3c1baa..802a3add 100644 --- a/pkg/server/config/config_test.go +++ b/pkg/server/config/config_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 config @@ -30,17 +33,17 @@ func TestValidate(t *testing.T) { }{ { config: Config{ - DBPath: "test.db", - BaseURL: "http://mock.url", - Port: "3000", + DBPath: "test.db", + WebURL: "http://mock.url", + Port: "3000", }, expectedErr: nil, }, { config: Config{ - DBPath: "", - BaseURL: "http://mock.url", - Port: "3000", + DBPath: "", + WebURL: "http://mock.url", + Port: "3000", }, expectedErr: ErrDBMissingPath, }, @@ -48,12 +51,12 @@ func TestValidate(t *testing.T) { config: Config{ DBPath: "test.db", }, - expectedErr: ErrBaseURLInvalid, + expectedErr: ErrWebURLInvalid, }, { config: Config{ - DBPath: "test.db", - BaseURL: "http://mock.url", + DBPath: "test.db", + WebURL: "http://mock.url", }, expectedErr: ErrPortInvalid, }, diff --git a/pkg/server/consts/consts.go b/pkg/server/consts/consts.go index 1f464951..948d7631 100644 --- a/pkg/server/consts/consts.go +++ b/pkg/server/consts/consts.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 consts diff --git a/pkg/server/context/user.go b/pkg/server/context/user.go index b58d40e9..77d66916 100644 --- a/pkg/server/context/user.go +++ b/pkg/server/context/user.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 context @@ -22,8 +25,9 @@ import ( ) const ( - userKey privateKey = "user" - tokenKey privateKey = "token" + userKey privateKey = "user" + accountKey privateKey = "account" + tokenKey privateKey = "token" ) type privateKey string @@ -33,6 +37,11 @@ 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) @@ -50,6 +59,17 @@ 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.go b/pkg/server/controllers/books.go index c20ea679..e2aa6de0 100644 --- a/pkg/server/controllers/books.go +++ b/pkg/server/controllers/books.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers @@ -53,11 +56,22 @@ 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 { @@ -200,13 +214,11 @@ 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") } @@ -252,13 +264,11 @@ 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") } @@ -271,7 +281,6 @@ 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/controllers/books_test.go b/pkg/server/controllers/books_test.go index af6ba42d..d59dcd17 100644 --- a/pkg/server/controllers/books_test.go +++ b/pkg/server/controllers/books_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers @@ -47,8 +50,10 @@ func TestGetBooks(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") - anotherUser := testutils.SetupUserData(db, "bob@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db) + testutils.SetupAccountData(db, anotherUser, "bob@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -138,8 +143,10 @@ func TestGetBooksByName(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") - anotherUser := testutils.SetupUserData(db, "bob@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db) + testutils.SetupAccountData(db, anotherUser, "bob@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -205,8 +212,10 @@ func TestGetBook(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") - anotherUser := testutils.SetupUserData(db, "bob@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db) + testutils.SetupAccountData(db, anotherUser, "bob@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -267,8 +276,10 @@ func TestGetBookNonOwner(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") - nonOwner := testutils.SetupUserData(db, "bob@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + nonOwner := testutils.SetupUserData(db) + testutils.SetupAccountData(db, nonOwner, "bob@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -303,7 +314,8 @@ func TestCreateBook(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "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"}`) @@ -363,7 +375,8 @@ func TestCreateBook(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 101), "preparing user max_usn") b1 := database.Book{ @@ -452,7 +465,8 @@ func TestUpdateBook(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 101), "preparing user max_usn") b1 := database.Book{ @@ -536,9 +550,11 @@ func TestDeleteBook(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 58), "preparing user max_usn") - anotherUser := testutils.SetupUserData(db, "bob@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db) + testutils.SetupAccountData(db, anotherUser, "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/controllers.go b/pkg/server/controllers/controllers.go index 4ab9980d..b0cbe550 100644 --- a/pkg/server/controllers/controllers.go +++ b/pkg/server/controllers/controllers.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers diff --git a/pkg/server/controllers/health.go b/pkg/server/controllers/health.go index 85d8e048..fb12033d 100644 --- a/pkg/server/controllers/health.go +++ b/pkg/server/controllers/health.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers diff --git a/pkg/server/controllers/health_test.go b/pkg/server/controllers/health_test.go index 56fe9778..cec8d35a 100644 --- a/pkg/server/controllers/health_test.go +++ b/pkg/server/controllers/health_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers diff --git a/pkg/server/controllers/helpers.go b/pkg/server/controllers/helpers.go index c17e83a1..72100c8b 100644 --- a/pkg/server/controllers/helpers.go +++ b/pkg/server/controllers/helpers.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers diff --git a/pkg/server/controllers/main_test.go b/pkg/server/controllers/main_test.go index cc0383b3..35eef6da 100644 --- a/pkg/server/controllers/main_test.go +++ b/pkg/server/controllers/main_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers diff --git a/pkg/server/controllers/notes.go b/pkg/server/controllers/notes.go index 964a608f..a7434366 100644 --- a/pkg/server/controllers/notes.go +++ b/pkg/server/controllers/notes.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers @@ -70,6 +73,7 @@ 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) @@ -103,13 +107,21 @@ 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, - PerPage: notesPerPage, + Year: year, + Month: month, + Page: page, + Search: parseSearchQuery(q), + Books: books, + Encrypted: encrypted, + PerPage: notesPerPage, } return ret, nil @@ -215,11 +227,11 @@ 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.Wrapf(err, "finding book %s", params.BookUUID) + return database.Note{}, errors.Wrap(err, "finding book") } client := getClientType(r) - note, err := n.app.CreateNote(*user, params.BookUUID, params.Content, params.AddedOn, params.EditedOn, client) + note, err := n.app.CreateNote(*user, params.BookUUID, params.Content, params.AddedOn, params.EditedOn, false, client) if err != nil { return database.Note{}, errors.Wrap(err, "creating note") } @@ -298,10 +310,11 @@ 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 { + if p.BookUUID == nil && p.Content == nil && p.Public == nil { return app.ErrEmptyUpdate } @@ -337,6 +350,7 @@ 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 afbca59b..6bf3c06b 100644 --- a/pkg/server/controllers/notes_test.go +++ b/pkg/server/controllers/notes_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers @@ -39,6 +42,7 @@ 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, @@ -60,8 +64,10 @@ func TestGetNotes(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") - anotherUser := testutils.SetupUserData(db, "bob@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") + anotherUser := testutils.SetupUserData(db) + testutils.SetupAccountData(db, anotherUser, "bob@test.com", "pass1234") b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -182,8 +188,8 @@ func TestGetNote(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "user@test.com", "pass1234") - anotherUser := testutils.SetupUserData(db, "another@test.com", "pass1234") + user := testutils.SetupUserData(db) + anotherUser := testutils.SetupUserData(db) b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -192,13 +198,22 @@ func TestGetNote(t *testing.T) { } testutils.MustExec(t, db.Save(&b1), "preparing b1") - note := database.Note{ + privateNote := database.Note{ UUID: testutils.MustUUID(t), UserID: user.ID, BookUUID: b1.UUID, - Body: "note content", + Body: "privateNote content", + Public: false, } - testutils.MustExec(t, db.Save(¬e), "preparing note") + 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") deletedNote := database.Note{ UUID: testutils.MustUUID(t), UserID: user.ID, @@ -211,9 +226,9 @@ func TestGetNote(t *testing.T) { return fmt.Sprintf("/api/v3/notes/%s", noteUUID) } - t.Run("owner accessing note", func(t *testing.T) { + t.Run("owner accessing private note", func(t *testing.T) { // Execute - url := getURL(note.UUID) + url := getURL(publicNote.UUID) req := testutils.MakeReq(server.URL, "GET", url, "") res := testutils.HTTPAuthDo(t, db, req, user) @@ -225,16 +240,58 @@ func TestGetNote(t *testing.T) { t.Fatal(errors.Wrap(err, "decoding payload")) } - var noteRecord database.Note - testutils.MustExec(t, db.Where("uuid = ?", note.UUID).First(¬eRecord), "finding noteRecord") + var n2Record database.Note + testutils.MustExec(t, db.Where("uuid = ?", publicNote.UUID).First(&n2Record), "finding n2Record") - expected := getExpectedNotePayload(noteRecord, b1, user) + expected := getExpectedNotePayload(n2Record, b1, user) assert.DeepEqual(t, payload, expected, "payload mismatch") }) - t.Run("non-owner accessing note", func(t *testing.T) { + t.Run("owner accessing public note", func(t *testing.T) { // Execute - url := getURL(note.UUID) + 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) req := testutils.MakeReq(server.URL, "GET", url, "") res := testutils.HTTPAuthDo(t, db, req, anotherUser) @@ -249,21 +306,42 @@ func TestGetNote(t *testing.T) { assert.DeepEqual(t, string(body), "not found\n", "payload mismatch") }) - t.Run("guest accessing note", func(t *testing.T) { + t.Run("guest accessing public note", func(t *testing.T) { // Execute - url := getURL(note.UUID) + url := getURL(publicNote.UUID) req := testutils.MakeReq(server.URL, "GET", url, "") res := testutils.HTTPDo(t, req) // Test - assert.StatusCodeEquals(t, res, http.StatusUnauthorized, "") + 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, "") body, err := io.ReadAll(res.Body) if err != nil { t.Fatal(errors.Wrap(err, "reading body")) } - assert.DeepEqual(t, string(body), "unauthorized\n", "payload mismatch") + assert.DeepEqual(t, string(body), "not found\n", "payload mismatch") }) t.Run("nonexistent", func(t *testing.T) { @@ -311,7 +389,8 @@ func TestCreateNote(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 101), "preparing user max_usn") b1 := database.Book{ @@ -392,7 +471,8 @@ func TestDeleteNote(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 981), "preparing user max_usn") b1 := database.Book{ @@ -453,6 +533,7 @@ 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 { @@ -460,10 +541,12 @@ 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{ @@ -473,11 +556,13 @@ 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{ @@ -487,11 +572,13 @@ 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{ @@ -501,11 +588,13 @@ 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{ @@ -516,11 +605,13 @@ 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{ @@ -531,11 +622,80 @@ 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, }, } @@ -550,7 +710,8 @@ func TestUpdateNote(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") testutils.MustExec(t, db.Model(&user).Update("max_usn", 101), "preparing user max_usn") @@ -573,6 +734,7 @@ 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") @@ -603,6 +765,7 @@ 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 3552d081..db8b706d 100644 --- a/pkg/server/controllers/routes.go +++ b/pkg/server/controllers/routes.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers @@ -79,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}", mw.Auth(a.DB, c.Notes.V3Show, nil), true}, + {"GET", "/v3/notes/{noteUUID}", c.Notes.V3Show, 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/routes_test.go b/pkg/server/controllers/routes_test.go index 0d146fe6..d3084aa3 100644 --- a/pkg/server/controllers/routes_test.go +++ b/pkg/server/controllers/routes_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers diff --git a/pkg/server/controllers/static.go b/pkg/server/controllers/static.go index 42872438..5590daec 100644 --- a/pkg/server/controllers/static.go +++ b/pkg/server/controllers/static.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers diff --git a/pkg/server/controllers/sync.go b/pkg/server/controllers/sync.go index 7cda4316..2ce8d02c 100644 --- a/pkg/server/controllers/sync.go +++ b/pkg/server/controllers/sync.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers @@ -72,6 +75,7 @@ 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"` } @@ -85,6 +89,7 @@ func NewFragNote(note database.Note) SyncFragNote { AddedOn: note.AddedOn, EditedOn: note.EditedOn, Body: note.Body, + Public: note.Public, Deleted: note.Deleted, BookUUID: note.BookUUID, } @@ -298,7 +303,7 @@ func (s *Sync) GetSyncState(w http.ResponseWriter, r *http.Request) { } response := GetSyncStateResp{ - FullSyncBefore: int(user.FullSyncBefore), + FullSyncBefore: 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/controllers/sync_test.go b/pkg/server/controllers/sync_test.go index e97ecb50..ab33956a 100644 --- a/pkg/server/controllers/sync_test.go +++ b/pkg/server/controllers/sync_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers diff --git a/pkg/server/controllers/testutils.go b/pkg/server/controllers/testutils.go index 5da11a41..03a097c8 100644 --- a/pkg/server/controllers/testutils.go +++ b/pkg/server/controllers/testutils.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers diff --git a/pkg/server/controllers/users.go b/pkg/server/controllers/users.go index 26881668..b1945d8f 100644 --- a/pkg/server/controllers/users.go +++ b/pkg/server/controllers/users.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers @@ -304,23 +307,23 @@ func (u *Users) CreateResetToken(w http.ResponseWriter, r *http.Request) { return } - var user database.User - err := u.app.DB.Where("email = ?", form.Email).First(&user).Error + var account database.Account + err := u.app.DB.Where("email = ?", form.Email).First(&account).Error if errors.Is(err, gorm.ErrRecordNotFound) { return } if err != nil { - handleHTMLError(w, r, err, "finding user", u.PasswordResetView, vd) + handleHTMLError(w, r, err, "finding account", u.PasswordResetView, vd) return } - resetToken, err := token.Create(u.app.DB, user.ID, database.TokenTypeResetPassword) + resetToken, err := token.Create(u.app.DB, account.UserID, database.TokenTypeResetPassword) if err != nil { handleHTMLError(w, r, err, "generating token", u.PasswordResetView, vd) return } - if err := u.app.SendPasswordResetEmail(user.Email.String, resetToken.Value); err != nil { + if err := u.app.SendPasswordResetEmail(account.Email.String, resetToken.Value); err != nil { handleHTMLError(w, r, err, "sending password reset email", u.PasswordResetView, vd) return } @@ -393,8 +396,8 @@ func (u *Users) PasswordReset(w http.ResponseWriter, r *http.Request) { return } - var user database.User - if err := u.app.DB.Where("id = ?", token.UserID).First(&user).Error; err != nil { + var account database.Account + if err := u.app.DB.Where("user_id = ?", token.UserID).First(&account).Error; err != nil { handleHTMLError(w, r, err, "finding user", u.PasswordResetConfirmView, vd) return } @@ -402,7 +405,7 @@ func (u *Users) PasswordReset(w http.ResponseWriter, r *http.Request) { tx := u.app.DB.Begin() // Update the password - if err := app.UpdateUserPassword(tx, &user, params.Password); err != nil { + if err := app.UpdateAccountPassword(tx, &account, params.Password); err != nil { tx.Rollback() handleHTMLError(w, r, err, "updating password", u.PasswordResetConfirmView, vd) return @@ -414,7 +417,7 @@ func (u *Users) PasswordReset(w http.ResponseWriter, r *http.Request) { return } - if err := u.app.DeleteUserSessions(tx, user.ID); err != nil { + if err := u.app.DeleteUserSessions(tx, account.UserID); err != nil { tx.Rollback() handleHTMLError(w, r, err, "deleting user sessions", u.PasswordResetConfirmView, vd) return @@ -422,13 +425,19 @@ 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(user.Email.String); err != nil { + if err := u.app.SendPasswordResetAlertEmail(account.Email.String); err != nil { log.ErrorWrap(err, "sending password reset email") } } @@ -484,8 +493,14 @@ 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(user.Password.String), password); err != nil { + if err := bcrypt.CompareHashAndPassword([]byte(account.Password.String), password); err != nil { log.WithFields(log.Fields{ "user_id": user.ID, }).Warn("invalid password update attempt") @@ -493,7 +508,7 @@ func (u *Users) PasswordUpdate(w http.ResponseWriter, r *http.Request) { return } - if err := app.UpdateUserPassword(u.app.DB, user, form.NewPassword); err != nil { + if err := app.UpdateAccountPassword(u.app.DB, &account, form.NewPassword); err != nil { handleHTMLError(w, r, err, "updating password", u.SettingView, vd) return } @@ -519,6 +534,12 @@ 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) @@ -526,7 +547,7 @@ func (u *Users) ProfileUpdate(w http.ResponseWriter, r *http.Request) { } password := []byte(form.Password) - if err := bcrypt.CompareHashAndPassword([]byte(user.Password.String), password); err != nil { + if err := bcrypt.CompareHashAndPassword([]byte(account.Password.String), password); err != nil { log.WithFields(log.Fields{ "user_id": user.ID, }).Warn("invalid email update attempt") @@ -540,13 +561,23 @@ func (u *Users) ProfileUpdate(w http.ResponseWriter, r *http.Request) { return } - user.Email.String = form.Email - - if err := u.app.DB.Save(&user).Error; err != nil { + tx := u.app.DB.Begin() + if err := tx.Save(&user).Error; err != nil { + tx.Rollback() 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 f5ddf5b5..643cb016 100644 --- a/pkg/server/controllers/users_test.go +++ b/pkg/server/controllers/users_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 controllers @@ -95,14 +98,15 @@ func TestJoin(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusFound, "") - 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)) + 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)) assert.Equal(t, passwordErr, nil, "Password mismatch") - testutils.MustExec(t, db.Where("id = ?", user.ID).First(&user), "finding user") + var user database.User + testutils.MustExec(t, db.Where("id = ?", account.UserID).First(&user), "finding user") assert.Equal(t, user.MaxUSN, 0, "MaxUSN mismatch") // welcome email @@ -136,9 +140,11 @@ func TestJoinError(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status mismatch") - var userCount int64 + var accountCount, userCount int64 + testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") 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") }) @@ -162,9 +168,11 @@ func TestJoinError(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status mismatch") - var userCount int64 + var accountCount, userCount int64 + testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") 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") }) @@ -190,9 +198,11 @@ func TestJoinError(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status mismatch") - var userCount int64 + var accountCount, userCount int64 + testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") 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") }) } @@ -207,7 +217,8 @@ func TestJoinDuplicateEmail(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db) + testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") dat := url.Values{} dat.Set("email", "alice@example.com") @@ -221,13 +232,15 @@ func TestJoinDuplicateEmail(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "status code mismatch") - var userCount, verificationTokenCount int64 + var accountCount, userCount, verificationTokenCount int64 + testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") 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") @@ -255,9 +268,11 @@ func TestJoinDisabled(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusNotFound, "status code mismatch") - var userCount int64 + var accountCount, userCount int64 + testutils.MustExec(t, db.Model(&database.Account{}).Count(&accountCount), "counting account") 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") } @@ -271,7 +286,8 @@ func TestLogin(t *testing.T) { a.DB = db server := MustNewServer(t, &a) - _ = testutils.SetupUserData(db, "alice@example.com", "pass1234") + u := testutils.SetupUserData(db) + testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") defer server.Close() // Execute @@ -330,7 +346,8 @@ func TestLogin(t *testing.T) { a.DB = db server := MustNewServer(t, &a) - _ = testutils.SetupUserData(db, "alice@example.com", "pass1234") + u := testutils.SetupUserData(db) + testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") defer server.Close() var req *http.Request @@ -369,7 +386,8 @@ func TestLogin(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - _ = testutils.SetupUserData(db, "alice@example.com", "pass1234") + u := testutils.SetupUserData(db) + testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") var req *http.Request if target == testutils.EndpointWeb { @@ -438,8 +456,9 @@ func TestLogout(t *testing.T) { a.DB = db server := MustNewServer(t, &a) - aliceUser := testutils.SetupUserData(db, "alice@example.com", "pass1234") - anotherUser := testutils.SetupUserData(db, "bob@example.com", "password123") + aliceUser := testutils.SetupUserData(db) + testutils.SetupAccountData(db, aliceUser, "alice@example.com", "pass1234") + anotherUser := testutils.SetupUserData(db) session1ExpiresAt := time.Now().Add(time.Hour * 24) session1 := database.Session{ @@ -551,7 +570,8 @@ func TestResetPassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "oldpassword") + u := testutils.SetupUserData(db) + acc := testutils.SetupAccountData(db, u, "alice@example.com", "oldpassword") tok := database.Token{ UserID: u.ID, Value: "MivFxYiSMMA4An9dP24DNQ==", @@ -573,7 +593,7 @@ func TestResetPassword(t *testing.T) { } testutils.MustExec(t, db.Save(&s2), "preparing user session 2") - anotherUser := testutils.SetupUserData(db, "bob@example.com", "password123") + anotherUser := testutils.SetupUserData(db) testutils.MustExec(t, db.Save(&database.Session{ Key: "some-session-key-3", UserID: anotherUser.ID, @@ -593,12 +613,12 @@ func TestResetPassword(t *testing.T) { assert.StatusCodeEquals(t, res, http.StatusFound, "Status code mismatch") var resetToken database.Token - var user database.User + var account database.Account testutils.MustExec(t, db.Where("value = ?", "MivFxYiSMMA4An9dP24DNQ==").First(&resetToken), "finding reset token") - testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding account") + 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(user.Password.String), []byte("newpassword")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(account.Password.String), []byte("newpassword")) assert.Equal(t, passwordErr, nil, "Password mismatch") var s1Count, s2Count int64 @@ -626,7 +646,8 @@ func TestResetPassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db) + acc := testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") tok := database.Token{ UserID: u.ID, Value: "MivFxYiSMMA4An9dP24DNQ==", @@ -647,12 +668,12 @@ func TestResetPassword(t *testing.T) { assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status code mismatch") var resetToken database.Token - var user database.User + var account database.Account testutils.MustExec(t, db.Where("value = ?", "MivFxYiSMMA4An9dP24DNQ==").First(&resetToken), "finding reset token") - testutils.MustExec(t, db.Where("id = ?", u.ID).First(&user), "finding account") + testutils.MustExec(t, db.Where("id = ?", acc.ID).First(&account), "finding account") - 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, 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, resetToken.UsedAt, (*time.Time)(nil), "used_at should be nil") }) @@ -666,7 +687,8 @@ func TestResetPassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db) + acc := testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") tok := database.Token{ UserID: u.ID, Value: "MivFxYiSMMA4An9dP24DNQ==", @@ -688,10 +710,10 @@ func TestResetPassword(t *testing.T) { assert.StatusCodeEquals(t, res, http.StatusGone, "Status code mismatch") var resetToken database.Token - var user database.User + var account database.Account testutils.MustExec(t, db.Where("value = ?", "MivFxYiSMMA4An9dP24DNQ==").First(&resetToken), "failed to find reset_token") - 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") + 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") }) @@ -705,7 +727,8 @@ func TestResetPassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db) + acc := testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") usedAt := time.Now().Add(time.Hour * -11).UTC() tok := database.Token{ @@ -730,10 +753,10 @@ func TestResetPassword(t *testing.T) { assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status code mismatch") var resetToken database.Token - var user database.User + var account database.Account testutils.MustExec(t, db.Where("value = ?", "MivFxYiSMMA4An9dP24DNQ==").First(&resetToken), "failed to find reset_token") - 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") + 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") resetTokenUsedAtUTC := resetToken.UsedAt.UTC() if resetTokenUsedAtUTC.Year() != usedAt.Year() || @@ -759,7 +782,8 @@ func TestCreateResetToken(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db) + testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") // Execute dat := url.Values{} @@ -792,7 +816,8 @@ func TestCreateResetToken(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - _ = testutils.SetupUserData(db, "alice@example.com", "somepassword") + u := testutils.SetupUserData(db) + testutils.SetupAccountData(db, u, "alice@example.com", "somepassword") // Execute dat := url.Values{} @@ -821,7 +846,8 @@ func TestUpdatePassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - user := testutils.SetupUserData(db, "alice@example.com", "oldpassword") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@example.com", "oldpassword") // Execute dat := url.Values{} @@ -835,9 +861,10 @@ func TestUpdatePassword(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusFound, "Status code mismsatch") - testutils.MustExec(t, db.Where("id = ?", user.ID).First(&user), "finding account") + var account database.Account + testutils.MustExec(t, db.Where("user_id = ?", user.ID).First(&account), "finding account") - passwordErr := bcrypt.CompareHashAndPassword([]byte(user.Password.String), []byte("newpassword")) + passwordErr := bcrypt.CompareHashAndPassword([]byte(account.Password.String), []byte("newpassword")) assert.Equal(t, passwordErr, nil, "Password mismatch") }) @@ -850,7 +877,8 @@ func TestUpdatePassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "oldpassword") + u := testutils.SetupUserData(db) + acc := testutils.SetupAccountData(db, u, "alice@example.com", "oldpassword") // Execute dat := url.Values{} @@ -864,9 +892,9 @@ func TestUpdatePassword(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusUnauthorized, "Status code mismsatch") - 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") + 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") }) t.Run("password too short", func(t *testing.T) { @@ -879,7 +907,8 @@ func TestUpdatePassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "oldpassword") + u := testutils.SetupUserData(db) + acc := testutils.SetupAccountData(db, u, "alice@example.com", "oldpassword") // Execute dat := url.Values{} @@ -893,9 +922,9 @@ func TestUpdatePassword(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status code mismsatch") - 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") + 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") }) t.Run("password confirmation mismatch", func(t *testing.T) { @@ -908,7 +937,8 @@ func TestUpdatePassword(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "oldpassword") + u := testutils.SetupUserData(db) + acc := testutils.SetupAccountData(db, u, "alice@example.com", "oldpassword") // Execute dat := url.Values{} @@ -922,9 +952,9 @@ func TestUpdatePassword(t *testing.T) { // Test assert.StatusCodeEquals(t, res, http.StatusBadRequest, "Status code mismsatch") - 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") + 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") }) } @@ -939,7 +969,8 @@ func TestUpdateEmail(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "pass1234") + u := testutils.SetupUserData(db) + testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") // Execute dat := url.Values{} @@ -953,10 +984,11 @@ 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("id = ?", u.ID).First(&user), "finding account") + testutils.MustExec(t, db.Where("user_id = ?", u.ID).First(&account), "finding account") - assert.Equal(t, user.Email.String, "alice-new@example.com", "email mismatch") + assert.Equal(t, account.Email.String, "alice-new@example.com", "email mismatch") }) t.Run("password mismatch", func(t *testing.T) { @@ -969,7 +1001,8 @@ func TestUpdateEmail(t *testing.T) { server := MustNewServer(t, &a) defer server.Close() - u := testutils.SetupUserData(db, "alice@example.com", "pass1234") + u := testutils.SetupUserData(db) + testutils.SetupAccountData(db, u, "alice@example.com", "pass1234") // Execute dat := url.Values{} @@ -983,9 +1016,11 @@ 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, user.Email.String, "alice@example.com", "email mismatch") + assert.Equal(t, account.Email.String, "alice@example.com", "email mismatch") }) } diff --git a/pkg/server/crypt/crypt.go b/pkg/server/crypt/crypt.go index fb0edd26..1be220dd 100644 --- a/pkg/server/crypt/crypt.go +++ b/pkg/server/crypt/crypt.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 crypt diff --git a/pkg/server/database/consts.go b/pkg/server/database/consts.go index 4406ee5c..6a9abc0c 100644 --- a/pkg/server/database/consts.go +++ b/pkg/server/database/consts.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 database diff --git a/pkg/server/database/database.go b/pkg/server/database/database.go index bd7869bc..eaab7c50 100644 --- a/pkg/server/database/database.go +++ b/pkg/server/database/database.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 database @@ -18,13 +21,10 @@ package database import ( "os" "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 ( @@ -32,26 +32,11 @@ 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.Silent - case log.LevelWarn: - return logger.Warn - case log.LevelError: - return logger.Error - default: - return logger.Silent - } -} - // InitSchema migrates database schema to reflect the latest model definition func InitSchema(db *gorm.DB) { if err := db.AutoMigrate( &User{}, + &Account{}, &Book{}, &Note{}, &Token{}, @@ -69,70 +54,10 @@ 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{ - Logger: logger.Default.LogMode(getDBLogLevel(log.GetLevel())), - }) + db, err := gorm.Open(sqlite.Open(dbPath), &gorm.Config{}) if err != nil { 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.ErrorWrap(err, "WAL checkpoint failed") - } - } - }() -} - -// StartPeriodicVacuum runs full VACUUM on a schedule to reclaim space and defragment. -// 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.ErrorWrap(err, "VACUUM failed") - } - } - }() -} diff --git a/pkg/server/database/database_test.go b/pkg/server/database/database_test.go deleted file mode 100644 index 3d3f5b92..00000000 --- a/pkg/server/database/database_test.go +++ /dev/null @@ -1,70 +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 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/database/errors.go b/pkg/server/database/errors.go index ada00a6d..6e0faeb6 100644 --- a/pkg/server/database/errors.go +++ b/pkg/server/database/errors.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 database diff --git a/pkg/server/database/migrate.go b/pkg/server/database/migrate.go index 59e4c820..4250fd80 100644 --- a/pkg/server/database/migrate.go +++ b/pkg/server/database/migrate.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 database diff --git a/pkg/server/database/migrate_test.go b/pkg/server/database/migrate_test.go index 4ee93627..31853730 100644 --- a/pkg/server/database/migrate_test.go +++ b/pkg/server/database/migrate_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 database diff --git a/pkg/server/database/migrations/embed.go b/pkg/server/database/migrations/embed.go index 1c644d57..152d9e14 100644 --- a/pkg/server/database/migrations/embed.go +++ b/pkg/server/database/migrations/embed.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 migrations diff --git a/pkg/server/database/models.go b/pkg/server/database/models.go index 6ee4d3a7..98571e10 100644 --- a/pkg/server/database/models.go +++ b/pkg/server/database/models.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 database @@ -37,6 +40,7 @@ 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 @@ -50,20 +54,28 @@ 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"` } // 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"` - FullSyncBefore int64 `json:"-" gorm:"default:0"` + UUID string `json:"uuid" gorm:"type:text;index"` + Account Account `gorm:"foreignKey:UserID"` + 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 diff --git a/pkg/server/database/notes.go b/pkg/server/database/notes.go index b8cb8450..680c53db 100644 --- a/pkg/server/database/notes.go +++ b/pkg/server/database/notes.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 database diff --git a/pkg/server/database/types.go b/pkg/server/database/types.go index 60544c29..da3b4d6f 100644 --- a/pkg/server/database/types.go +++ b/pkg/server/database/types.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 database diff --git a/pkg/server/helpers/const.go b/pkg/server/helpers/const.go index 3a634d09..e0967cc7 100644 --- a/pkg/server/helpers/const.go +++ b/pkg/server/helpers/const.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 helpers diff --git a/pkg/server/helpers/url.go b/pkg/server/helpers/url.go index 0d935754..73c489fe 100644 --- a/pkg/server/helpers/url.go +++ b/pkg/server/helpers/url.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 helpers diff --git a/pkg/server/helpers/url_test.go b/pkg/server/helpers/url_test.go index 78142b29..55bb2fcc 100644 --- a/pkg/server/helpers/url_test.go +++ b/pkg/server/helpers/url_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 helpers diff --git a/pkg/server/helpers/uuid.go b/pkg/server/helpers/uuid.go index ed1090d4..572ea6be 100644 --- a/pkg/server/helpers/uuid.go +++ b/pkg/server/helpers/uuid.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 helpers diff --git a/pkg/server/log/log.go b/pkg/server/log/log.go index 172255ba..89eeb719 100644 --- a/pkg/server/log/log.go +++ b/pkg/server/log/log.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 provides interfaces to write structured logs @@ -70,40 +73,25 @@ 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 { + 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. -// -// 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 +// shouldLog returns true if the given level should be logged based on currentLevel func shouldLog(level string) bool { - // 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 + return levelPriority(level) >= levelPriority(currentLevel) } // 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 dd98c685..3df63b3a 100644 --- a/pkg/server/log/log_test.go +++ b/pkg/server/log/log_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 @@ -33,47 +36,3 @@ 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/pkg/server/mailer/backend.go b/pkg/server/mailer/backend.go index a09cf2e6..0abe51d8 100644 --- a/pkg/server/mailer/backend.go +++ b/pkg/server/mailer/backend.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 mailer @@ -29,7 +32,7 @@ var ErrSMTPNotConfigured = errors.New("SMTP is not configured") // Backend is an interface for sending emails. type Backend interface { - SendEmail(templateType, from string, to []string, data interface{}) error + Queue(subject, from string, to []string, contentType, body string) error } // EmailDialer is an interface for sending email messages @@ -44,10 +47,9 @@ 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 - Templates Templates + Dialer EmailDialer + Enabled bool } type dialerParams struct { @@ -83,7 +85,7 @@ func getSMTPParams() (*dialerParams, error) { } // NewDefaultBackend creates a default backend -func NewDefaultBackend() (*DefaultBackend, error) { +func NewDefaultBackend(enabled bool) (*DefaultBackend, error) { p, err := getSMTPParams() if err != nil { return nil, err @@ -92,24 +94,24 @@ func NewDefaultBackend() (*DefaultBackend, error) { d := gomail.NewDialer(p.Host, p.Port, p.Username, p.Password) return &DefaultBackend{ - Dialer: &gomailDialer{Dialer: d}, - Templates: NewTemplates(), + Dialer: &gomailDialer{Dialer: d}, + Enabled: enabled, }, 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") +// 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 } - 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...) @@ -122,34 +124,3 @@ 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 2388c16b..5ef0a355 100644 --- a/pkg/server/mailer/backend_test.go +++ b/pkg/server/mailer/backend_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 mailer @@ -31,28 +34,40 @@ func (m *mockDialer) DialAndSend(msgs ...*gomail.Message) error { return m.err } -func TestDefaultBackendSendEmail(t *testing.T) { - t.Run("sends email", func(t *testing.T) { +func TestDefaultBackendQueue(t *testing.T) { + t.Run("enabled sends email", func(t *testing.T) { mock := &mockDialer{} backend := &DefaultBackend{ - Dialer: mock, - Templates: NewTemplates(), + Dialer: mock, + Enabled: true, } - data := WelcomeTmplData{ - AccountEmail: "bob@example.com", - BaseURL: "https://example.com", - } - - err := backend.SendEmail(EmailTypeWelcome, "alice@example.com", []string{"bob@example.com"}, data) + err := backend.Queue("Test Subject", "alice@example.com", []string{"bob@example.com"}, "text/plain", "Test body") if err != nil { - t.Fatalf("SendEmail failed: %v", err) + t.Fatalf("Queue 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) { @@ -62,11 +77,14 @@ func TestNewDefaultBackend(t *testing.T) { t.Setenv("SmtpUsername", "user@example.com") t.Setenv("SmtpPassword", "secret") - backend, err := NewDefaultBackend() + backend, err := NewDefaultBackend(true) 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") } @@ -78,7 +96,7 @@ func TestNewDefaultBackend(t *testing.T) { t.Setenv("SmtpUsername", "") t.Setenv("SmtpPassword", "") - _, err := NewDefaultBackend() + _, err := NewDefaultBackend(true) if err == nil { t.Error("expected error when SMTP not configured") } @@ -87,21 +105,3 @@ 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", - BaseURL: "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 18887cf5..1cf786a7 100644 --- a/pkg/server/mailer/mailer.go +++ b/pkg/server/mailer/mailer.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 mailer provides a functionality to send emails @@ -40,19 +43,13 @@ var ( EmailKindText = "text/plain" ) -// tmpl is the common interface shared between Template from +// template is the common interface shared between Template from // html/template and text/template -type tmpl interface { +type template interface { Execute(wr io.Writer, data interface{}) error } -// template wraps a template with its subject line -type template struct { - tmpl tmpl - subject string -} - -// Templates holds the parsed email templates with their subjects +// Templates holds the parsed email templates type Templates map[string]template func getTemplateKey(name, kind string) string { @@ -62,19 +59,16 @@ func getTemplateKey(name, kind string) string { func (tmpl Templates) get(name, kind string) (template, error) { key := getTemplateKey(name, kind) t := tmpl[key] - if t.tmpl == nil { - return template{}, errors.Errorf("unsupported template '%s' with type '%s'", name, kind) + if t == nil { + return nil, errors.Errorf("unsupported template '%s' with type '%s'", name, kind) } return t, nil } -func (tmpl Templates) set(name, kind string, t tmpl, subject string) { +func (tmpl Templates) set(name, kind string, t template) { key := getTemplateKey(name, kind) - tmpl[key] = template{ - tmpl: t, - subject: subject, - } + tmpl[key] = t } // NewTemplates initializes templates @@ -93,15 +87,15 @@ func NewTemplates() Templates { } T := Templates{} - 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!") + T.set(EmailTypeResetPassword, EmailKindText, passwordResetText) + T.set(EmailTypeResetPasswordAlert, EmailKindText, passwordResetAlertText) + T.set(EmailTypeWelcome, EmailKindText, welcomeText) return T } // initTextTmpl returns a template instance by parsing the template with the given name -func initTextTmpl(templateName string) (tmpl, error) { +func initTextTmpl(templateName string) (template, error) { filename := fmt.Sprintf("%s.txt", templateName) content, err := templates.Files.ReadFile(filename) @@ -117,17 +111,17 @@ func initTextTmpl(templateName string) (tmpl, error) { return t, nil } -// 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) { +// Execute executes the template with the given name with the givn data +func (tmpl Templates) Execute(name, kind string, data any) (string, 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.tmpl.Execute(buf, data); err != nil { - return "", "", errors.Wrap(err, "executing the template") + if err := t.Execute(buf, data); err != nil { + return "", errors.Wrap(err, "executing the template") } - return t.subject, buf.String(), nil + return buf.String(), nil } diff --git a/pkg/server/mailer/mailer_test.go b/pkg/server/mailer/mailer_test.go index 71b48209..5837192a 100644 --- a/pkg/server/mailer/mailer_test.go +++ b/pkg/server/mailer/mailer_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 mailer @@ -44,37 +47,34 @@ func TestAllTemplatesInitialized(t *testing.T) { func TestResetPasswordEmail(t *testing.T) { testCases := []struct { - token string - baseURL string + token string + webURL string }{ { - token: "someRandomToken1", - baseURL: "http://localhost:3000", + token: "someRandomToken1", + webURL: "http://localhost:3000", }, { - token: "someRandomToken2", - baseURL: "http://localhost:3001", + token: "someRandomToken2", + webURL: "http://localhost:3001", }, } tmpl := NewTemplates() for _, tc := range testCases { - t.Run(fmt.Sprintf("with BaseURL %s", tc.baseURL), func(t *testing.T) { + t.Run(fmt.Sprintf("with WebURL %s", tc.webURL), func(t *testing.T) { dat := EmailResetPasswordTmplData{ - Token: tc.token, - BaseURL: tc.baseURL, + Token: tc.token, + WebURL: tc.webURL, } - subject, body, err := tmpl.Execute(EmailTypeResetPassword, EmailKindText, dat) + 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.baseURL); !ok { - t.Errorf("email body did not contain %s", tc.baseURL) + 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) @@ -86,36 +86,33 @@ func TestResetPasswordEmail(t *testing.T) { func TestWelcomeEmail(t *testing.T) { testCases := []struct { accountEmail string - baseURL string + webURL string }{ { accountEmail: "test@example.com", - baseURL: "http://localhost:3000", + webURL: "http://localhost:3000", }, { accountEmail: "user@example.org", - baseURL: "http://localhost:3001", + webURL: "http://localhost:3001", }, } tmpl := NewTemplates() for _, tc := range testCases { - t.Run(fmt.Sprintf("with BaseURL %s and email %s", tc.baseURL, tc.accountEmail), func(t *testing.T) { + t.Run(fmt.Sprintf("with WebURL %s and email %s", tc.webURL, tc.accountEmail), func(t *testing.T) { dat := WelcomeTmplData{ AccountEmail: tc.accountEmail, - BaseURL: tc.baseURL, + WebURL: tc.webURL, } - subject, body, err := tmpl.Execute(EmailTypeWelcome, EmailKindText, dat) + 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.baseURL); !ok { - t.Errorf("email body did not contain %s", tc.baseURL) + if ok := strings.Contains(body, tc.webURL); !ok { + t.Errorf("email body did not contain %s", tc.webURL) } if ok := strings.Contains(body, tc.accountEmail); !ok { t.Errorf("email body did not contain %s", tc.accountEmail) @@ -127,36 +124,33 @@ func TestWelcomeEmail(t *testing.T) { func TestResetPasswordAlertEmail(t *testing.T) { testCases := []struct { accountEmail string - baseURL string + webURL string }{ { accountEmail: "test@example.com", - baseURL: "http://localhost:3000", + webURL: "http://localhost:3000", }, { accountEmail: "user@example.org", - baseURL: "http://localhost:3001", + webURL: "http://localhost:3001", }, } tmpl := NewTemplates() for _, tc := range testCases { - t.Run(fmt.Sprintf("with BaseURL %s and email %s", tc.baseURL, tc.accountEmail), func(t *testing.T) { + t.Run(fmt.Sprintf("with WebURL %s and email %s", tc.webURL, tc.accountEmail), func(t *testing.T) { dat := EmailResetPasswordAlertTmplData{ AccountEmail: tc.accountEmail, - BaseURL: tc.baseURL, + WebURL: tc.webURL, } - subject, body, err := tmpl.Execute(EmailTypeResetPasswordAlert, EmailKindText, dat) + 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.baseURL); !ok { - t.Errorf("email body did not contain %s", tc.baseURL) + if ok := strings.Contains(body, tc.webURL); !ok { + t.Errorf("email body did not contain %s", tc.webURL) } 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 9d31d605..9053a493 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: - {{ .BaseURL }}/password-reset/{{ .Token }} + {{ .WebURL }}/password-reset/{{ .Token }} diff --git a/pkg/server/mailer/templates/reset_password_alert.txt b/pkg/server/mailer/templates/reset_password_alert.txt index ea67dce3..16957375 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 {{ .BaseURL }}/password-reset. +If you did not initiate this password change, reset your password at {{ .WebURL }}/password-reset. Thanks. diff --git a/pkg/server/mailer/templates/templates.go b/pkg/server/mailer/templates/templates.go index 78fedd07..c59d3a14 100644 --- a/pkg/server/mailer/templates/templates.go +++ b/pkg/server/mailer/templates/templates.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 mailer provides a functionality to send emails diff --git a/pkg/server/mailer/templates/welcome.txt b/pkg/server/mailer/templates/welcome.txt index cced536c..72d0fdf0 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 {{ .BaseURL }} account is "{{ .AccountEmail }}". Log in at {{ .BaseURL }}/login -If you ever forget your password, you can reset it at {{ .BaseURL }}/password-reset +Your {{ .WebURL }} account is "{{ .AccountEmail }}". Log in at {{ .WebURL }}/login +If you ever forget your password, you can reset it at {{ .WebURL }}/password-reset SOURCE CODE diff --git a/pkg/server/mailer/tokens.go b/pkg/server/mailer/tokens.go index 669c4820..0f751a4e 100644 --- a/pkg/server/mailer/tokens.go +++ b/pkg/server/mailer/tokens.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 mailer diff --git a/pkg/server/mailer/tokens_test.go b/pkg/server/mailer/tokens_test.go index 4f4fa73d..72a85fc6 100644 --- a/pkg/server/mailer/tokens_test.go +++ b/pkg/server/mailer/tokens_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 mailer diff --git a/pkg/server/mailer/types.go b/pkg/server/mailer/types.go index 40468b84..6ad862de 100644 --- a/pkg/server/mailer/types.go +++ b/pkg/server/mailer/types.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 mailer @@ -19,17 +22,17 @@ package mailer type EmailResetPasswordTmplData struct { AccountEmail string Token string - BaseURL string + WebURL string } // EmailResetPasswordAlertTmplData is a template data for reset password emails type EmailResetPasswordAlertTmplData struct { AccountEmail string - BaseURL string + WebURL string } // WelcomeTmplData is a template data for welcome emails type WelcomeTmplData struct { AccountEmail string - BaseURL string + WebURL string } diff --git a/pkg/server/main.go b/pkg/server/main.go index 737cc7a6..701912ea 100644 --- a/pkg/server/main.go +++ b/pkg/server/main.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 main diff --git a/pkg/server/middleware/auth.go b/pkg/server/middleware/auth.go index 9383d33d..984079e4 100644 --- a/pkg/server/middleware/auth.go +++ b/pkg/server/middleware/auth.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 @@ -64,6 +67,8 @@ 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 { @@ -88,6 +93,23 @@ 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 + if err := db.Where("user_id = ?", user.ID).First(&account).Error; 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 c6d0ead4..1485befa 100644 --- a/pkg/server/middleware/auth_test.go +++ b/pkg/server/middleware/auth_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 @@ -44,7 +47,7 @@ func TestGuestOnly(t *testing.T) { }) t.Run("logged in", func(t *testing.T) { - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) req := testutils.MakeReq(server.URL, "GET", "/", "") res := testutils.HTTPAuthDo(t, db, req, user) @@ -64,7 +67,8 @@ func TestGuestOnly(t *testing.T) { func TestAuth(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "alice@test.com", "pass1234") + user := testutils.SetupUserData(db) + testutils.SetupAccountData(db, user, "alice@test.com", "pass1234") session := database.Session{ Key: "A9xgggqzTHETy++GDi1NpDNe0iyqosPm9bitdeNGkJU=", @@ -171,7 +175,7 @@ func TestAuth(t *testing.T) { func TestTokenAuth(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) tok := database.Token{ UserID: user.ID, Type: database.TokenTypeResetPassword, @@ -229,23 +233,3 @@ 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("authenticated user", func(t *testing.T) { - user := testutils.SetupUserData(db, "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") - }) -} diff --git a/pkg/server/middleware/helpers.go b/pkg/server/middleware/helpers.go index 580efa7f..f43d0abb 100644 --- a/pkg/server/middleware/helpers.go +++ b/pkg/server/middleware/helpers.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 diff --git a/pkg/server/middleware/helpers_test.go b/pkg/server/middleware/helpers_test.go index 3142326f..623ec818 100644 --- a/pkg/server/middleware/helpers_test.go +++ b/pkg/server/middleware/helpers_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 diff --git a/pkg/server/middleware/limit.go b/pkg/server/middleware/limit.go index bc26664f..2f737613 100644 --- a/pkg/server/middleware/limit.go +++ b/pkg/server/middleware/limit.go @@ -1,22 +1,26 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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" + "os" "strings" "sync" "time" @@ -142,7 +146,7 @@ func (rl *RateLimiter) Limit(next http.Handler) http.HandlerFunc { func ApplyLimit(h http.HandlerFunc, rateLimit bool) http.Handler { ret := h - if rateLimit { + if rateLimit && os.Getenv("APP_ENV") != "TEST" { ret = defaultLimiter.Limit(ret) } diff --git a/pkg/server/middleware/limit_test.go b/pkg/server/middleware/limit_test.go index 594d0a94..1d5743ee 100644 --- a/pkg/server/middleware/limit_test.go +++ b/pkg/server/middleware/limit_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 diff --git a/pkg/server/middleware/logging.go b/pkg/server/middleware/logging.go index 13c9a9c9..05cdd2cb 100644 --- a/pkg/server/middleware/logging.go +++ b/pkg/server/middleware/logging.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 diff --git a/pkg/server/middleware/middleware.go b/pkg/server/middleware/middleware.go index e509c169..582e8046 100644 --- a/pkg/server/middleware/middleware.go +++ b/pkg/server/middleware/middleware.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 diff --git a/pkg/server/operations/doc.go b/pkg/server/operations/doc.go index 7a4fe7c8..981c9f5c 100644 --- a/pkg/server/operations/doc.go +++ b/pkg/server/operations/doc.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 . */ /* diff --git a/pkg/server/operations/notes.go b/pkg/server/operations/notes.go index 74b279e4..ee6dd9af 100644 --- a/pkg/server/operations/notes.go +++ b/pkg/server/operations/notes.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 operations diff --git a/pkg/server/operations/notes_test.go b/pkg/server/operations/notes_test.go index a09c1c28..6124b7e0 100644 --- a/pkg/server/operations/notes_test.go +++ b/pkg/server/operations/notes_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 operations @@ -27,8 +30,8 @@ import ( func TestGetNote(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") - anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") + user := testutils.SetupUserData(db) + anotherUser := testutils.SetupUserData(db) b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -37,17 +40,29 @@ func TestGetNote(t *testing.T) { } testutils.MustExec(t, db.Save(&b1), "preparing b1") - note := database.Note{ + privateNote := database.Note{ UUID: testutils.MustUUID(t), UserID: user.ID, BookUUID: b1.UUID, - Body: "note content", + Body: "privateNote content", Deleted: false, + Public: false, } - testutils.MustExec(t, db.Save(¬e), "preparing note") + testutils.MustExec(t, db.Save(&privateNote), "preparing privateNote") - var noteRecord database.Note - testutils.MustExec(t, db.Where("uuid = ?", note.UUID).Preload("Book").Preload("User").First(¬eRecord), "finding 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") testCases := []struct { name string @@ -57,26 +72,40 @@ func TestGetNote(t *testing.T) { expectedNote database.Note }{ { - name: "owner accessing note", + name: "owner accessing private note", user: user, - note: note, + note: privateNote, expectedOK: true, - expectedNote: noteRecord, + expectedNote: privateNoteRecord, }, { - name: "non-owner accessing note", + name: "non-owner accessing private note", user: anotherUser, - note: note, + note: privateNote, expectedOK: false, expectedNote: database.Note{}, }, { - name: "guest accessing note", + name: "non-owner accessing public note", + user: anotherUser, + note: publicNote, + expectedOK: true, + expectedNote: publicNoteRecord, + }, + { + name: "guest accessing private note", user: database.User{}, - note: note, + note: privateNote, expectedOK: false, expectedNote: database.Note{}, }, + { + name: "guest accessing public note", + user: database.User{}, + note: publicNote, + expectedOK: true, + expectedNote: publicNoteRecord, + }, } for _, tc := range testCases { @@ -95,7 +124,7 @@ func TestGetNote(t *testing.T) { func TestGetNote_nonexistent(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") + user := testutils.SetupUserData(db) b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -110,6 +139,7 @@ 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 54427acf..e3e10e63 100644 --- a/pkg/server/permissions/permissions.go +++ b/pkg/server/permissions/permissions.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 permissions @@ -21,6 +24,9 @@ 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 2a5daca1..4054b66f 100644 --- a/pkg/server/permissions/permissions_test.go +++ b/pkg/server/permissions/permissions_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 permissions @@ -26,8 +29,8 @@ import ( func TestViewNote(t *testing.T) { db := testutils.InitMemoryDB(t) - user := testutils.SetupUserData(db, "user@test.com", "password123") - anotherUser := testutils.SetupUserData(db, "another@test.com", "password123") + user := testutils.SetupUserData(db) + anotherUser := testutils.SetupUserData(db) b1 := database.Book{ UUID: testutils.MustUUID(t), @@ -36,27 +39,53 @@ func TestViewNote(t *testing.T) { } testutils.MustExec(t, db.Save(&b1), "preparing b1") - note := database.Note{ + privateNote := database.Note{ UUID: testutils.MustUUID(t), UserID: user.ID, BookUUID: b1.UUID, - Body: "note content", + Body: "privateNote content", Deleted: false, + Public: false, } - testutils.MustExec(t, db.Save(¬e), "preparing note") + testutils.MustExec(t, db.Save(&privateNote), "preparing privateNote") - t.Run("owner accessing note", func(t *testing.T) { - result := ViewNote(&user, 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) assert.Equal(t, result, true, "result mismatch") }) - t.Run("non-owner accessing note", func(t *testing.T) { - result := ViewNote(&anotherUser, note) + 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) assert.Equal(t, result, false, "result mismatch") }) - t.Run("guest accessing note", func(t *testing.T) { - result := ViewNote(nil, note) + 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) 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/book.go b/pkg/server/presenters/book.go index 9c117726..85242b26 100644 --- a/pkg/server/presenters/book.go +++ b/pkg/server/presenters/book.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 presenters diff --git a/pkg/server/presenters/book_test.go b/pkg/server/presenters/book_test.go index bf8a1b48..98155769 100644 --- a/pkg/server/presenters/book_test.go +++ b/pkg/server/presenters/book_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 presenters diff --git a/pkg/server/presenters/helpers.go b/pkg/server/presenters/helpers.go index 3cce728c..491e575e 100644 --- a/pkg/server/presenters/helpers.go +++ b/pkg/server/presenters/helpers.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 presenters diff --git a/pkg/server/presenters/helpers_test.go b/pkg/server/presenters/helpers_test.go index 33b0ed2e..c48c90ea 100644 --- a/pkg/server/presenters/helpers_test.go +++ b/pkg/server/presenters/helpers_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 presenters diff --git a/pkg/server/presenters/note.go b/pkg/server/presenters/note.go index 267717da..4119dd28 100644 --- a/pkg/server/presenters/note.go +++ b/pkg/server/presenters/note.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 presenters @@ -28,6 +31,7 @@ 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"` @@ -53,6 +57,7 @@ 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 ee2fe78d..822c5cea 100644 --- a/pkg/server/presenters/note_test.go +++ b/pkg/server/presenters/note_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 presenters @@ -38,6 +41,7 @@ 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", @@ -53,6 +57,7 @@ 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") @@ -79,6 +84,7 @@ 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", @@ -99,6 +105,7 @@ 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/session/session.go b/pkg/server/session/session.go index b9ae62d4..a9494c58 100644 --- a/pkg/server/session/session.go +++ b/pkg/server/session/session.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 session @@ -26,9 +29,9 @@ type Session struct { } // New returns a new session for the given user -func New(user database.User) Session { +func New(user database.User, account database.Account) Session { return Session{ UUID: user.UUID, - Email: user.Email.String, + Email: account.Email.String, } } diff --git a/pkg/server/session/session_test.go b/pkg/server/session/session_test.go index 081a82de..dec674b7 100644 --- a/pkg/server/session/session_test.go +++ b/pkg/server/session/session_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 session @@ -24,34 +27,33 @@ import ( ) func TestNew(t *testing.T) { - u1 := database.User{ - UUID: "0f5f0054-d23f-4be1-b5fb-57673109e9cb", - Email: database.ToNullString("alice@example.com"), - } + u1 := database.User{UUID: "0f5f0054-d23f-4be1-b5fb-57673109e9cb"} + a1 := database.Account{Email: database.ToNullString("alice@example.com")} - u2 := database.User{ - UUID: "718a1041-bbe6-496e-bbe4-ea7e572c295e", - Email: database.ToNullString("bob@example.com"), - } + u2 := database.User{UUID: "718a1041-bbe6-496e-bbe4-ea7e572c295e"} + a2 := database.Account{Email: database.ToNullString("bob@example.com")} testCases := []struct { - user database.User + user database.User + account database.Account }{ { - user: u1, + user: u1, + account: a1, }, { - user: u2, + user: u2, + account: a2, }, } for idx, tc := range testCases { t.Run(fmt.Sprintf("user %d", idx), func(t *testing.T) { // Execute - got := New(tc.user) + got := New(tc.user, tc.account) expected := Session{ UUID: tc.user.UUID, - Email: tc.user.Email.String, + Email: tc.account.Email.String, } assert.DeepEqual(t, got, expected, "result mismatch") diff --git a/pkg/server/testutils/main.go b/pkg/server/testutils/main.go index 8fce9ebf..08bc07de 100644 --- a/pkg/server/testutils/main.go +++ b/pkg/server/testutils/main.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 testutils provides utilities used in tests @@ -64,6 +67,29 @@ 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.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")) + } +} + // MustUUID generates a UUID and fails the test on error func MustUUID(t *testing.T) string { uuid, err := helpers.GenUUID() @@ -73,22 +99,15 @@ func MustUUID(t *testing.T) string { return uuid } -// SetupUserData creates and returns a new user with email and password for testing purposes -func SetupUserData(db *gorm.DB, email, password string) database.User { +// SetupUserData creates and returns a new user for testing purposes +func SetupUserData(db *gorm.DB) 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, - Email: database.ToNullString(email), - Password: database.ToNullString(string(hashedPassword)), + UUID: uuid, } if err := db.Save(&user).Error; err != nil { @@ -98,6 +117,28 @@ func SetupUserData(db *gorm.DB, email, password string) 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{ @@ -210,10 +251,10 @@ func MustRespondJSON(t *testing.T, w http.ResponseWriter, i interface{}, message // MockEmail is a mock email data type MockEmail struct { - TemplateType string - From string - To []string - Data interface{} + Subject string + From string + To []string + Body string } // MockEmailbackendImplementation is an email backend that simply discards the emails @@ -230,16 +271,16 @@ func (b *MockEmailbackendImplementation) Clear() { b.Emails = []MockEmail{} } -// SendEmail is an implementation of Backend.SendEmail. -func (b *MockEmailbackendImplementation) SendEmail(templateType, from string, to []string, data interface{}) error { +// Queue is an implementation of Backend.Queue. +func (b *MockEmailbackendImplementation) Queue(subject, from string, to []string, contentType, body string) error { b.mu.Lock() defer b.mu.Unlock() b.Emails = append(b.Emails, MockEmail{ - TemplateType: templateType, - From: from, - To: to, - Data: data, + Subject: subject, + From: from, + To: to, + Body: body, }) return nil diff --git a/pkg/server/tmpl/app.go b/pkg/server/tmpl/app.go new file mode 100644 index 00000000..7f084a85 --- /dev/null +++ b/pkg/server/tmpl/app.go @@ -0,0 +1,103 @@ +/* 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 new file mode 100644 index 00000000..fba9bed4 --- /dev/null +++ b/pkg/server/tmpl/app_test.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 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" +) + +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") + }) + + 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") + }) +} diff --git a/pkg/server/tmpl/data.go b/pkg/server/tmpl/data.go new file mode 100644 index 00000000..186c1467 --- /dev/null +++ b/pkg/server/tmpl/data.go @@ -0,0 +1,141 @@ +/* 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 new file mode 100644 index 00000000..c072d12e --- /dev/null +++ b/pkg/server/tmpl/data_test.go @@ -0,0 +1,68 @@ +/* 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 new file mode 100644 index 00000000..fbc13398 --- /dev/null +++ b/pkg/server/tmpl/tmpl.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 tmpl + +var noteMetaTags = ` + + + + + + + +` diff --git a/pkg/server/token/token.go b/pkg/server/token/token.go index af1feda5..f482d2aa 100644 --- a/pkg/server/token/token.go +++ b/pkg/server/token/token.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 token diff --git a/pkg/server/token/token_test.go b/pkg/server/token/token_test.go index 5daed181..426ff3d1 100644 --- a/pkg/server/token/token_test.go +++ b/pkg/server/token/token_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 token @@ -39,7 +42,7 @@ func TestCreate(t *testing.T) { db := testutils.InitMemoryDB(t) // Set up - u := testutils.SetupUserData(db, "user@test.com", "password123") + u := testutils.SetupUserData(db) // Execute tok, err := Create(db, u.ID, tc.kind) diff --git a/pkg/server/views/data.go b/pkg/server/views/data.go index 87fd2a90..451cade8 100644 --- a/pkg/server/views/data.go +++ b/pkg/server/views/data.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 views @@ -47,8 +50,9 @@ type Alert struct { type Data struct { Alert *Alert // CSRF template.HTML - User *database.User - Yield map[string]interface{} + User *database.User + Account *database.Account + Yield map[string]interface{} } func getErrMessage(err error) string { diff --git a/pkg/server/views/embed.go b/pkg/server/views/embed.go index 1fcb7d19..b3a070a0 100644 --- a/pkg/server/views/embed.go +++ b/pkg/server/views/embed.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 views diff --git a/pkg/server/views/engine.go b/pkg/server/views/engine.go index fbad7979..b8127b03 100644 --- a/pkg/server/views/engine.go +++ b/pkg/server/views/engine.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 views diff --git a/pkg/server/views/helpers.go b/pkg/server/views/helpers.go index 3e8f1d56..ac4546f7 100644 --- a/pkg/server/views/helpers.go +++ b/pkg/server/views/helpers.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 views diff --git a/pkg/server/views/helpers_test.go b/pkg/server/views/helpers_test.go index af39b48c..56bb7912 100644 --- a/pkg/server/views/helpers_test.go +++ b/pkg/server/views/helpers_test.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 views diff --git a/pkg/server/views/templates/books/index.gohtml b/pkg/server/views/templates/books/index.gohtml new file mode 100644 index 00000000..46ebbecc --- /dev/null +++ b/pkg/server/views/templates/books/index.gohtml @@ -0,0 +1,20 @@ +{{define "yield"}} +
+ +
+

Books

+
+ +
+ +
+
+{{end}} diff --git a/pkg/server/views/templates/books/show.gohtml b/pkg/server/views/templates/books/show.gohtml new file mode 100644 index 00000000..4d84d095 --- /dev/null +++ b/pkg/server/views/templates/books/show.gohtml @@ -0,0 +1,4 @@ +{{define "yield"}} + content + {{ .Note.Body }} +{{end}} diff --git a/pkg/server/views/templates/icons/book.gohtml b/pkg/server/views/templates/icons/book.gohtml new file mode 100644 index 00000000..a04a3e68 --- /dev/null +++ b/pkg/server/views/templates/icons/book.gohtml @@ -0,0 +1,17 @@ +{{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 new file mode 100644 index 00000000..0a9f60a0 --- /dev/null +++ b/pkg/server/views/templates/icons/caret.gohtml @@ -0,0 +1,26 @@ +{{define "caret"}} + + + + +{{end}} diff --git a/pkg/server/views/templates/layouts/navbar.gohtml b/pkg/server/views/templates/layouts/navbar.gohtml index b39a1e4e..ea7c026f 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/templates/notes/index.gohtml b/pkg/server/views/templates/notes/index.gohtml new file mode 100644 index 00000000..168430f5 --- /dev/null +++ b/pkg/server/views/templates/notes/index.gohtml @@ -0,0 +1,91 @@ +{{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 new file mode 100644 index 00000000..7051bee4 --- /dev/null +++ b/pkg/server/views/templates/notes/show.gohtml @@ -0,0 +1,33 @@ +{{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 new file mode 100644 index 00000000..4d1abdfd --- /dev/null +++ b/pkg/server/views/templates/partials/page_toolbar.gohtml @@ -0,0 +1,5 @@ +{{define "pageToolbar"}} +
    + {{template "pageToolbarContent" .data}} +
    +{{end}} diff --git a/pkg/server/views/templates/partials/time.gohtml b/pkg/server/views/templates/partials/time.gohtml new file mode 100644 index 00000000..b05b3a86 --- /dev/null +++ b/pkg/server/views/templates/partials/time.gohtml @@ -0,0 +1,13 @@ +{{define "time"}} + +{{$mobileText := defaultValue .mobileText .text}} + + + + +{{end}} diff --git a/pkg/server/views/time.go b/pkg/server/views/time.go index 88c71169..e99d36c9 100644 --- a/pkg/server/views/time.go +++ b/pkg/server/views/time.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 views diff --git a/pkg/server/views/view.go b/pkg/server/views/view.go index 53315334..3484dca8 100644 --- a/pkg/server/views/view.go +++ b/pkg/server/views/view.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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 Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * 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. + * 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 views @@ -105,13 +108,14 @@ 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.User != nil { - vd.Yield["Email"] = vd.User.Email.String + if vd.Account != nil { + vd.Yield["Email"] = vd.Account.Email.String } vd.Yield["CurrentPath"] = r.URL.Path vd.Yield["Standalone"] = buildinfo.Standalone diff --git a/pkg/watcher/main.go b/pkg/watcher/main.go index 7509fb90..a548aafe 100644 --- a/pkg/watcher/main.go +++ b/pkg/watcher/main.go @@ -1,16 +1,19 @@ -/* Copyright 2025 Dnote Authors +/* Copyright (C) 2019, 2020, 2021, 2022, 2023, 2024, 2025 Dnote contributors * - * 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. * - * 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. + * 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 diff --git a/scripts/cli/build.sh b/scripts/cli/build.sh index d17cb477..c5c6043c 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/LICENSE" "$destDir" + cp "$projectDir/licenses/GPLv3.txt" "$destDir" cp "$basedir/README.md" "$destDir" tar -C "$destDir" -zcvf "$tarballPath" "." rm -rf "$destDir" diff --git a/scripts/cli/test.sh b/scripts/cli/test.sh index 42e0ad86..e66db37a 100755 --- a/scripts/cli/test.sh +++ b/scripts/cli/test.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash -# test.sh runs tests for CLI packages +# test.sh runs test files sequentially +# https://stackoverflow.com/questions/23715302/go-how-to-run-tests-for-multiple-packages set -eux dir=$(dirname "${BASH_SOURCE[0]}") @@ -7,5 +8,7 @@ pushd "$dir/../../pkg/cli" # clear tmp dir in case not properly torn down rm -rf "./tmp" -go test ./... --tags "fts5" +go test -a ./... \ + -p 1\ + --tags "fts5" popd diff --git a/scripts/e2e/test.sh b/scripts/e2e/test.sh index 8713bb89..8ff94364 100755 --- a/scripts/e2e/test.sh +++ b/scripts/e2e/test.sh @@ -4,6 +4,10 @@ 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" ./... -v -timeout 5m +go test --tags "fts5" ./... -p 1 -v -timeout 5m popd diff --git a/scripts/license.sh b/scripts/license.sh index 4f7788e4..d75b656b 100755 --- a/scripts/license.sh +++ b/scripts/license.sh @@ -1,46 +1,75 @@ #!/usr/bin/env bash set -eux -function has_license { - # Check if file already has a copyright notice - grep -q "Copyright.*Dnote Authors" "$1" +function remove_notice { + sed -i -e '/\/\* Copyright/,/\*\//d' "$1" + + # remove leading newline + sed -i '/./,$!d' "$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 . */" dir=$(dirname "${BASH_SOURCE[0]}") basedir="$dir/.." pkgPath="$basedir/pkg" +serverPath="$basedir/pkg/server" -# 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/*") +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/*") -for file in $allFiles; do - if ! has_license "$file"; then - add_notice "$file" "$license" - fi +for file in $gplFiles; 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" done diff --git a/scripts/server/build.sh b/scripts/server/build.sh index 09bc16e3..f9c6428e 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/LICENSE" "$destDir" + cp "$projectDir/licenses/AGPLv3.txt" "$destDir" cp "$basedir/README.md" "$destDir" tar -C "$destDir" -zcvf "$tarballPath" "." rm -rf "$destDir" diff --git a/scripts/server/dev.sh b/scripts/server/dev.sh index 3786f270..7e1fe80e 100755 --- a/scripts/server/dev.sh +++ b/scripts/server/dev.sh @@ -7,8 +7,11 @@ dir=$(dirname "${BASH_SOURCE[0]}") basePath="$dir/../.." serverPath="$basePath/pkg/server" -# Set env -DBPath=../../dev-server.db +# load env +set -a +dotenvPath="$serverPath/.env.dev" +source "$dotenvPath" +set +a # copy assets mkdir -p "$basePath/pkg/server/static" diff --git a/scripts/server/test-local.sh b/scripts/server/test-local.sh index 504ef444..ce50d7d6 100755 --- a/scripts/server/test-local.sh +++ b/scripts/server/test-local.sh @@ -5,4 +5,8 @@ set -ex dir=$(dirname "${BASH_SOURCE[0]}") +set -a +source "$dir/../../pkg/server/.env.test" +set +a + "$dir/test.sh" "$1"