[APPINT-1044] Feature/app setup #563
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
|
@ouranos Please, review |
ouranos
requested changes
Nov 6, 2017
| Rails.logger.info("Error on request #{url} with options #{options}: #{e}") | ||
| end | ||
| end | ||
| end |
| module MnoEnterprise | ||
| module AddOnHelper | ||
|
|
||
| def AddOnHelper.send_request(instance, method, path, options = {}) |
| @@ -16,7 +16,7 @@ module MnoEnterprise::Concerns::Controllers::Jpi::V1::AppInstancesController | |||
| # GET /mnoe/jpi/v1/organization/1/app_instances | |||
| def index | |||
| statuses = MnoEnterprise::AppInstance::ACTIVE_STATUSES.join(',') | |||
| @app_instances = MnoEnterprise::AppInstance.includes(:app).where(owner_id: parent_organization.id, 'status.in': statuses).to_a.select do |i| | |||
| @app_instances = MnoEnterprise::AppInstance.with_params(extra_fields: true).includes(:app).where(owner_id: parent_organization.id, 'status.in': statuses).to_a.select do |i| | |||
There was a problem hiding this comment.
What is extra_fields doing? Couldn't find it
| def setup_form | ||
| app_instance = MnoEnterprise::AppInstance.find_one(params[:id], :app) | ||
| response = MnoEnterprise::AddOnHelper.send_request(app_instance, :get, '/setup_form') | ||
| MnoEnterprise::EventLogger.info('addon_form_request', current_user.id, 'Request add_on form', app_instance) |
There was a problem hiding this comment.
Do we need an event every time the form is displayed?
| # GET /mnoe/jpi/v1/organization/1/app_instances/11/setup_form | ||
| def setup_form | ||
| app_instance = MnoEnterprise::AppInstance.find_one(params[:id], :app) | ||
| response = MnoEnterprise::AddOnHelper.send_request(app_instance, :get, '/setup_form') |
| def create_omniauth | ||
| app_instance = MnoEnterprise::AppInstance.find_one(params[:id], :app) | ||
| body = params[:app_instance].merge!(org_uid: app_instance.channel_id) | ||
| response = MnoEnterprise::AddOnHelper.send_request(app_instance, :post, "/auth/#{app_instance.name.downcase}/request", body: body) |
| def stub_add_on(instance, method, path, status, response = {}) | ||
| url = instance.metadata['app']['host'] + path | ||
| stub_options = { | ||
| headers: { |
There was a problem hiding this comment.
You don't need to specify all the headers
ouranos
approved these changes
Nov 7, 2017
| @@ -16,7 +16,7 @@ module MnoEnterprise::Concerns::Controllers::Jpi::V1::AppInstancesController | |||
| # GET /mnoe/jpi/v1/organization/1/app_instances | |||
| def index | |||
| statuses = MnoEnterprise::AppInstance::ACTIVE_STATUSES.join(',') | |||
| @app_instances = MnoEnterprise::AppInstance.with_params(extra_fields: true).includes(:app).where(owner_id: parent_organization.id, 'status.in': statuses).to_a.select do |i| | |||
| @app_instances = MnoEnterprise::AppInstance.select(MnoEnterprise::AppInstance::REQUIRED_INDEX_FIELDS).includes(:app).where(owner_id: parent_organization.id, 'status.in': statuses).to_a.select do |i| | |||
x4d3
approved these changes
Nov 7, 2017
alexnoox
approved these changes
Nov 12, 2017
manu-d
force-pushed
the
feature/app-setup
branch
2 times, most recently
from
02f2137 to
4032d5b
Compare
manu-d
force-pushed
the
feature/app-setup
branch
from
76bf13a to
b0803f2
Compare
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.
Add new endpoints on app instances to interact with mno-enterprise-angular and mno-hub
List of new endpoints:
=> Returns the form generated by the add-on for the user to link their account
=> Link the user's account to the add-on
=> Launches a sync on the add-on
=> Unlink the user's account
=> History of add-on syncs
=> List of add-on id-maps