-
-
Notifications
You must be signed in to change notification settings - Fork 719
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
Avoid submitting duplicate Connected Apps #12481
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# frozen_string_literal: true | ||
|
||
module Admin | ||
class ConnectedAppsController < ApplicationController | ||
def create | ||
authorize! :admin, enterprise | ||
|
||
app = ConnectedApp.create!(enterprise_id: enterprise.id) | ||
|
||
ConnectAppJob.perform_later( | ||
app, spree_current_user.spree_api_key, | ||
channel: SessionChannel.for_request(request), | ||
) | ||
|
||
render_panel | ||
end | ||
|
||
def destroy | ||
authorize! :admin, enterprise | ||
|
||
app = enterprise.connected_apps.first | ||
app.destroy | ||
|
||
WebhookDeliveryJob.perform_later( | ||
app.data["destroy"], | ||
"disconnect-app", | ||
nil | ||
) | ||
|
||
render_panel | ||
end | ||
|
||
private | ||
|
||
def enterprise | ||
@enterprise ||= Enterprise.find(params.require(:enterprise_id)) | ||
end | ||
|
||
def render_panel | ||
redirect_to "#{edit_admin_enterprise_path(enterprise)}#/connected_apps_panel" | ||
end | ||
end | ||
end |
This file was deleted.
Oops, something went wrong.
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
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
Oops, something went wrong.
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.
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.
That doesn't seem ideal to me, and might have unexpected drawbacks. But I can't think of a better, so if it works, it works!
I'm guessing if you have other unsaved changes on the Enterprise (from another tab), it will display a confirmation as usual? That could be a little confusing for users, but I think that would be rare and fine for this case.
I'm not sure if the enterprise fields would also be submitted by this button, but even if they are, I expect they'd be silently ignored.
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.
This may be the cause for the latest bug:
My tests show that it was this commit.