-
Notifications
You must be signed in to change notification settings - Fork 543
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
APIv1: Start working on new REST API. Refactor logic in domains. #497
Conversation
9936757
to
f9bf322
Compare
"strings" | ||
"time" | ||
|
||
"github.com/sethvargo/go-envconfig" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how about use viper to do these config things?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right now we have a mix of environment variables and CLI flags. I tend to use environment variables because I only use the server version, but we need to figure out what's the best solution for both worlds. Ideally the CLI would read configuration from some file as well. I will take a look at Viper, it seems to provide everything on one package :)
internal/http/routes/api/auth.go
Outdated
} | ||
|
||
func (r *AuthAPIRoutes) Setup() *AuthAPIRoutes { | ||
r.router.Post("/login", r.loginHandler) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's a little veiled to declare route here. I prefer the original way, put routes together and use difference handlers
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The problem with using a single package for everything is that after a while you either have huge files containing all kinds of related logic for the API (handlers, payloads, responses, middlewares, codecs, ...). I followed a similar approach here as with the "domains", each endpoint is contained in a "domain", in this case this is the "auth" domain, so all routes for the auth domain are defined here, and all domains are defined in api.go. (auth, bookmarks, tags, ...). As with everything, suggestions welcome!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I get you.I think it's just a matter of taste. I don't think I'm much experienced in dev in go. I can learn from this :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we could have the best of both worlds, defining the API in a file and having the handlers and everything related in separate packages. Will try to integrate those changes over the weekend for you to take a look. Even if you think you're not experienced, an extra pair of eyes is always welcome.
…0@628826c by renovate (#19427) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [ghcr.io/go-shiori/shiori](https://togithub.com/go-shiori/shiori) | minor | `v1.5.5` -> `v1.6.0` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>go-shiori/shiori (ghcr.io/go-shiori/shiori)</summary> ### [`v1.6.0`](https://togithub.com/go-shiori/shiori/releases/tag/v1.6.0) [Compare Source](https://togithub.com/go-shiori/shiori/compare/v1.5.5...v1.6.0) It's finally here! After some work we have started moving towards **a more usable and open API** for others to consume, with **proper session handling** (no more random logouts on server shutdowns!), improvements to **ePubs**, UX and some more! See details below for more information (important notes are the breaking changes) and please fill an issue if you see anything weird, better be safe than sorry! #### Breaking changes - The `serve` command is considered deprecated and will be removed in a future release. Right now just proxies to a new `server` command that is the one that should be used from now on. - The **server** command uses a new http backend. This **should be transparent to users** and all things should keep working as usual, but that meant refactoring some of the underlying systems too, so experiences may vary between deployments and operating systems. Please fill an issue if you see that something is not working as expected. - We are moving the API to a more stable, documented and with a proper code structure. Right now there's a mix between old and new endpoints until migration is completed. Check [the documentation](https://togithub.com/go-shiori/shiori/blob/master/docs/APIv1.md) for more information on the new API and [this roadmap filter](https://togithub.com/orgs/go-shiori/projects/2/views/11) to see progress on the API migration. - Authentication to the API now uses JWTs instead of session tokens and the **endpoint has changed to a new one**, please check the documentation mentioned above. This means that there's no longer logout issues when the server is restarted or when you log in in other computer/browser. - The `--webroot` flag **no longer modifies the routes internally**, is up to the user to proxy the routes properly to Shiori without the prefix used to serve it. That means that if you want to serve Shiori under `domain.com/shiori` you need to send the path back to Shiori without the `/shiori` prefix so routes keep working. This can be done in most reverse proxies that we're aware of. We provided [a sample configuration for Nginx](https://togithub.com/go-shiori/shiori/blob/master/docs/Configuration.md#reverse-proxies-and-the-webroot-path). PRs are welcome for other reverse proxies. - The `shiori/gopher` initial user is a full fledged user instead of being hardcoded into Shiori. If you want a new user you need to create a new owner user and then remove the `shiori` user. #### Release cadence Right now the release cadence has been slow because we made too many changes at once and we had to test and finish everything before doing this release. Plan moving forward is to iterate and release faster so we're planning smaller milestones to provide new features and fixes faster to you. I will post an update announcement when [the roadmap](https://togithub.com/orgs/go-shiori/projects/2/views/4) is reviewed. #### What's Changed - APIv1: Start working on new REST API. Refactor logic in domains. by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#497 - Run legacy API and new API at the same time. by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#648 - fix: docker buildx tags by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#650 - Allow JWT authentication into legacy APIs by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#651 - Show version in login page by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#652 - fix: package-name in cleanup tag by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#655 - fix: pr tag prune using other action by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#656 - fix: title is never retrieved when adding bookmark by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#664 - Show Shiori version on server command by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#669 - chore: remove irc badge from README by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#674 - fix: title overwritten if user has defined it by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#684 - Proper SQLite default database and warn SHIORI_DBMS users by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#667 - chore: remove verbose logger by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#685 - Fix CI incorrectly tagging RC releases and disables docker builds on forks by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#686 - preserve fragment in URLs ([#​315](https://togithub.com/go-shiori/shiori/issues/315)) by [@​arakimo](https://togithub.com/arakimo) in [go-shiori/shiori#687 - Swagger improvements by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#666 - fix: Ensure bookmark files are correctly downloaded before deleting current ones by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#683 - fix(db): handle usage of special characters in searches by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#721 - fix: properly parse mysql connection string, docs update by [@​rutkai](https://togithub.com/rutkai) in [go-shiori/shiori#730 - deps: upgrade to Go 1.21 by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#698 - deps: upgrade github.com/gofrs/uuid to v5 by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#736 - feat: build css from less files locally by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#735 - refactor: Migrate ePub generation to go-epub by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#679 - chore(deps): bump the all group with 6 updates by [@​dependabot](https://togithub.com/dependabot) in [go-shiori/shiori#738 - chore(deps): bump the all group with 1 update by [@​dependabot](https://togithub.com/dependabot) in [go-shiori/shiori#740 - feat: use new JWT auth in all frontend API calls by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#743 - chore(deps): bump the all group with 1 update by [@​dependabot](https://togithub.com/dependabot) in [go-shiori/shiori#746 - fix: styles-check and swag-check monitor just needed directory not project root by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#747 - feat: allow resize the dialogbox for bigger/hidpi screens by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#732 - feat: allow per-user settings and store them in database by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#639 - fix: Remove unneeded variable and unify the way send token in header by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#763 - add create ebook by default in settings by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#761 - fix: Actions in overlays on mobile hard to press by [@​cbe](https://togithub.com/cbe) in [go-shiori/shiori#759 - fix: Use webp as thumbnail by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#758 - Update documentation for add links to shiori in android devices from share menu by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#757 - Fix typos by [@​shirayu](https://togithub.com/shirayu) in [go-shiori/shiori#756 - chore(deps): bump the all group with 1 update by [@​dependabot](https://togithub.com/dependabot) in [go-shiori/shiori#767 - refactor: migrate ebook routes by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#742 - Make suggestions tapable/clickable by [@​cbe](https://togithub.com/cbe) in [go-shiori/shiori#765 - chore: frontend formatting by [@​cbe](https://togithub.com/cbe) in [go-shiori/shiori#764 - ci: add codecov reporting by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#776 - deps: update go dependencies by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#777 - fix typo by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#778 - docs: example deployment for kubernetes by [@​JPFrancoia](https://togithub.com/JPFrancoia) in [go-shiori/shiori#754 - Add Documentation>CLI>Add bookmark by [@​LLKoder](https://togithub.com/LLKoder) in [go-shiori/shiori#794 - fix: generate coverage profile by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#797 - fix: use noreferer to prevent exposing shiori instance url to archived websites by [@​istiak101](https://togithub.com/istiak101) in [go-shiori/shiori#802 - deps: upgrade by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#804 - refactor: migrate bookmark static pages to new http server by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#775 - Fixed lint errors after refactor by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#806 - docs: updated configuration page by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#808 - fix: force usage of shiori prefix for environment variables in configuration by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#807 - deps: updated docker image versions by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#809 - chore(deps): bump the all group with 3 updates by [@​dependabot](https://togithub.com/dependabot) in [go-shiori/shiori#812 - chore(deps): bump the all group with 3 updates by [@​dependabot](https://togithub.com/dependabot) in [go-shiori/shiori#815 - chore(deps): bump the all group with 3 updates by [@​dependabot](https://togithub.com/dependabot) in [go-shiori/shiori#830 - fix: fixes path issues on windows by [@​Monirzadeh](https://togithub.com/Monirzadeh) in [go-shiori/shiori#829 - fix: regressions and documentation from 1.5.5 upgrade by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#837 - fix: update go-epub to latest version to avoid filename errors on windows by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#840 - fix: point go-epub go correct repository by [@​fmartingr](https://togithub.com/fmartingr) in [go-shiori/shiori#842 - feat: allow authentication using proxy request header by [@​PterX](https://togithub.com/PterX) in [go-shiori/shiori#836 #### New Contributors - [@​arakimo](https://togithub.com/arakimo) made their first contribution in [go-shiori/shiori#687 - [@​rutkai](https://togithub.com/rutkai) made their first contribution in [go-shiori/shiori#730 - [@​cbe](https://togithub.com/cbe) made their first contribution in [go-shiori/shiori#759 - [@​shirayu](https://togithub.com/shirayu) made their first contribution in [go-shiori/shiori#756 - [@​JPFrancoia](https://togithub.com/JPFrancoia) made their first contribution in [go-shiori/shiori#754 - [@​LLKoder](https://togithub.com/LLKoder) made their first contribution in [go-shiori/shiori#794 - [@​istiak101](https://togithub.com/istiak101) made their first contribution in [go-shiori/shiori#802 - [@​PterX](https://togithub.com/PterX) made their first contribution in [go-shiori/shiori#836 **Full Changelog**: go-shiori/shiori@v1.5.5...v1.6.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4yNTIuMCIsInVwZGF0ZWRJblZlciI6IjM3LjI1Mi4wIiwidGFyZ2V0QnJhbmNoIjoibWFzdGVyIn0=-->
Meta: #640
Added a proof of concept (extending the idea from #467) with a new API server built on gin.
server
command to launch the new HTTP serverMakefile
with a bunch of QoL commands for contributing, along with some contributing documentation.Status
UI Routes
GET
GET
GET
GET
GET
/*files*
API routes
GET
POST
PUT/PATCH
DELETE
GET
POST
PUT/PATCH
DELETE
GET
POST
POST
GET
POST
PUT/PATCH
PUT
Database
CreateTags
Discussion here: #462
Fixes: #571 #184 #463