-
-
Notifications
You must be signed in to change notification settings - Fork 5.3k
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
Don't init oauth if settings have it disabled #31533
Open
techknowlogick
wants to merge
2
commits into
go-gitea:main
Choose a base branch
from
techknowlogick:fix-30266
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains 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
…is it is possible to have suprious jwt/ directories all over the place
delvh
reviewed
Jul 1, 2024
@@ -30,6 +30,11 @@ const ProviderHeaderKey = "gitea-oauth2-provider" | |||
|
|||
// Init initializes the oauth source | |||
func Init(ctx context.Context) error { | |||
// if oauth is disabled, we don't need to initialize anything | |||
if !setting.OAuth2.Enable { |
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.
According to the CI, this should be called
Suggested change
if !setting.OAuth2.Enable { | |
if !setting.OAuth2.Enabled { |
@@ -30,6 +30,11 @@ const ProviderHeaderKey = "gitea-oauth2-provider" | |||
|
|||
// Init initializes the oauth source | |||
func Init(ctx context.Context) error { | |||
// if oauth is disabled, we don't need to initialize anything | |||
if !setting.OAuth2.Enable { | |||
return |
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.
Suggested change
return | |
return nil |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport/v1.22
This PR should be backported to Gitea 1.22
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
modifies/go
Pull requests that update Go code
size/XS
Denotes a PR that changes 0-9 lines, ignoring generated files.
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.
Fix #30266
Patch credit to: @hawicz