detect merge conflicts #32
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Added a doc to help folks bootstrap a development environment. Signed-off-by: Josh Farwell <josh.farwell@gmail.com>
Signed-off-by: Josh Farwell <josh.farwell@gmail.com>
This was hard-coded, which is a lot better than an injection site, but I want my zip code to show up :) I'm using sqlalchemy.sql.text() to give us parameterized and type-validated input even though we're not using a model here. Returning None for invalid data bubbles up to a 400 error which seems appropriate to me. Signed-off-by: Josh Farwell <josh.farwell@gmail.com>
Signed-off-by: Josh Farwell <josh.farwell@gmail.com>
Instead of rendering the login template on 401s, we redirect to the login page. The login page will now redirect to ?next after it has validated the URL is safe. This fixes the issue with trying to log in from pages that aren't /login. Signed-off-by: Josh Farwell <josh.farwell@gmail.com>
We want to avoid circular imports so we instantiate login_manager in views and then initialize it in application.py. Signed-off-by: Josh Farwell <josh.farwell@gmail.com>
Turns out that Flask-Login implements the redirect chain by itself. It doesn't validate the redirect URL though. Signed-off-by: Josh Farwell <josh.farwell@gmail.com>
Bug fixes
Fix 405 issue
Bumps [werkzeug](https://github.com/pallets/werkzeug) from 0.12.2 to 0.15.3. - [Release notes](https://github.com/pallets/werkzeug/releases) - [Changelog](https://github.com/pallets/werkzeug/blob/master/CHANGES.rst) - [Commits](pallets/werkzeug@0.12.2...0.15.3) Signed-off-by: dependabot[bot] <support@github.com>
Bump werkzeug from 0.12.2 to 0.15.3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.