Feature/no proxy selected #1459

frenchbread · 2016-08-30T07:25:33Z

- Refactor old code to ES6 - Added apiUmbrellaIsDefined method - Refactored getApiUmbrellaUrl method

frenchbread · 2016-08-30T07:27:22Z

Depends on #1457

brylie · 2016-09-08T09:57:08Z

proxies/default/methods/apiUmbrella.js

+        // Try to create user on API Umbrella
+        try {
+          // Add user on API Umbrella
+          const response = apiUmbrellaWeb.adminApi.v1.apiUsers.createUser(apiUmbrellaUserObj);


apiUmbrellaWeb is no longer a global object. Instead, we now have a createApiUmbrellaWeb factory method, which outputs an ApiUmbrellaWeb instance. Use the factory to create an ApiUmbrellaWeb instance prior to using it here.

brylie · 2016-09-08T10:00:49Z

ApiUmbrellaWeb

This code shows progress. However, there are significant changes needed to the approach, in light of recent changes to our apiUmbrellaWeb instance.

apiUmbrellaWeb is no longer a global object. Instead, we now have a createApiUmbrellaWeb factory method, which outputs an ApiUmbrellaWeb instance. Within each Meteor method where apiUmbrellaWeb is used, we now have to call the factory method to get an ApiUmbrellaWeb object in the function scope.

File/folder structure

There are also a few structural comments:

use underscores in file/directory names instead of camelCase
- see our File Structure guidelines
move proxy related Meteor methods, helper functions, etc. into relevant subfolders within the proxies module
- API Umbrella methods go in /proxies/server/methods/api_umbrella.js
- API Umbrella helper functions go in /proxies/helper_functions/api_umbrella.js

# Conflicts: # core/client/layouts/master_layout/navbar/navbar.js # home/client/header/homeHeader.html # home/client/header/homeHeader.js

… into feature/no-proxy-selected # Conflicts: # core/client/layouts/master_layout/navbar/navbar.js # home/client/header/homeHeader.html # home/client/header/homeHeader.js

frenchbread · 2016-09-08T18:20:29Z

Suggested changes are done.

When testing consider running meteor reset to check Apis fetch from APi Umbrella after adding new proxy.

❓ Why do we hardcode api_umbrella prefix here? @brylie @jykae

55 · 2016-09-09T06:34:47Z

Getting this when trying to delete API:

Exception in delivering result of invoking 'deleteApiBackendOnApiUmbrella': TypeError: Cannot read property 'http_status' of undefined
    at http://localhost:3000/app/app.js?hash=daca40d98d454f1c963417b3a42c281cf85cdcee:2143:35
    at MethodInvoker._callback (http://localhost:3000/packages/meteor.js?hash=ae8b8affa9680bf9720bd8f7fa112f13a62f71c3:1105:22)
    at MethodInvoker._maybeInvokeCallback (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:3557:12)
    at MethodInvoker.receiveResult (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:3577:10)
    at Connection._livedata_result (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:4736:9)
    at onMessage (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:3385:12)
    at http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:2736:11
    at Array.forEach (native)
    at Function._.each._.forEach (http://localhost:3000/packages/underscore.js?hash=27b3d669b418de8577518760446467e6ff429b1e:149:11)
    at REventTarget.self.socket.onmessage (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:2735:11)

brylie · 2016-09-09T06:40:17Z

That error may have been resolved by PR #1517

brylie · 2016-09-09T06:41:34Z

We hard code the API Umbrella base prefix to make configuration simpler. I.e. we want our settings page only to contain the API Umbrella host/protocol, and not the Admin API path.

What alternative do you propose?

brylie · 2016-09-09T06:42:45Z

E.g. we might save the /api-umbrella/ string as a base_path field in the Proxies.apiUmbrella schema.

55 · 2016-09-09T06:52:24Z

@brylie, yes, resolved, but getting this right after API is removed:

Exception in delivering result of invoking 'getApiStatus': TypeError: Cannot read property 'code' of undefined
    at http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:765:30
    at MethodInvoker._callback (http://localhost:3000/packages/meteor.js?hash=ae8b8affa9680bf9720bd8f7fa112f13a62f71c3:1105:22)
    at MethodInvoker._maybeInvokeCallback (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:3557:12)
    at MethodInvoker.receiveResult (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:3577:10)
    at Connection._livedata_result (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:4736:9)
    at onMessage (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:3385:12)
    at http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:2736:11
    at Array.forEach (native)
    at Function._.each._.forEach (http://localhost:3000/packages/underscore.js?hash=27b3d669b418de8577518760446467e6ff429b1e:149:11)
    at REventTarget.self.socket.onmessage (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:2735:11)
debug.js:41 Exception in template helper: TypeError: Cannot read property '_id' of undefined
    at Object.currentUserCanEditBacklog (http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:31735:27)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:2994:16
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:1653:16
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3046:66
    at Function.Template._withTemplateInstanceFunc (http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3687:12)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3045:27
    at Object.Spacebars.call (http://localhost:3000/packages/spacebars.js?hash=65db8b6a8e3fca189b416de702967b1cb83d57d5:172:18)
    at Template.apiBacklog.HTML.DIV.HTML.DIV.Blaze.If.HTML.BUTTON.id (http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:31688:22)
    at .<anonymous> (http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:2677:44)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:1875:20
debug.js:41 Exception from Tracker recompute function:
debug.js:41 TypeError: Cannot read property 'documentationFileId' of undefined
    at .<anonymous> (documentation.js:10)
    at view.js:199
    at Function.Template._withTemplateInstanceFunc (template.js:465)
    at view.js:197
    at Object.Blaze._withCurrentView (view.js:538)
    at viewAutorun (view.js:196)
    at Tracker.Computation._compute (tracker.js:311)
    at Tracker.Computation._recompute (tracker.js:330)
    at Object.Tracker._runFlush (tracker.js:495)
    at onGlobalMessage (setimmediate.js:102)
debug.js:41 Exception in template helper: TypeError: Cannot read property 'documentation_link' of undefined
    at Object.documentationLink (http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:30192:39)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:2994:16
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:1653:16
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3046:66
    at Function.Template._withTemplateInstanceFunc (http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3687:12)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3045:27
    at Object.Spacebars.call (http://localhost:3000/packages/spacebars.js?hash=65db8b6a8e3fca189b416de702967b1cb83d57d5:172:18)
    at Template.documentation.HTML.DIV.HTML.DIV.HTML.DIV.HTML.DIV.Blaze.If.HTML.DIV.class (http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:30058:22)
    at .<anonymous> (http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:2677:44)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:1875:20
debug.js:41 Exception in template helper: TypeError: Cannot read property 'documentationFileId' of undefined
    at Object.codegenServerExists (http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:30217:38)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:2994:16
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:1653:16
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3046:66
    at Function.Template._withTemplateInstanceFunc (http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3687:12)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3045:27
    at Object.Spacebars.call (http://localhost:3000/packages/spacebars.js?hash=65db8b6a8e3fca189b416de702967b1cb83d57d5:172:18)
    at Blaze.If.HTML.BUTTON.id (http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:30028:24)
    at .<anonymous> (http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:2677:44)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:1875:20
debug.js:41 Exception in template helper: TypeError: Cannot read property 'documentationFileId' of undefined
    at Object.documentationExists (http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:30204:14)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:2994:16
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:1653:16
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3046:66
    at Function.Template._withTemplateInstanceFunc (http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3687:12)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3045:27
    at Object.Spacebars.call (http://localhost:3000/packages/spacebars.js?hash=65db8b6a8e3fca189b416de702967b1cb83d57d5:172:18)
    at http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:30111:24
    at .<anonymous> (http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:2677:44)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:1875:20
debug.js:41 Exception in template helper: TypeError: Cannot read property '_id' of undefined
    at Object.metadata (http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:34482:36)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:2994:16
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:1653:16
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3046:66
    at Function.Template._withTemplateInstanceFunc (http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3687:12)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:3045:27
    at Object.Spacebars.call (http://localhost:3000/packages/spacebars.js?hash=65db8b6a8e3fca189b416de702967b1cb83d57d5:172:18)
    at http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:34321:22
    at .<anonymous> (http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:2677:44)
    at http://localhost:3000/packages/blaze.js?hash=ef41aed769a8945fc99ac4954e8c9ec157a88cea:1875:20
19debug.js:41 Exception in delivering result of invoking 'getApiStatus': TypeError: Cannot read property 'code' of undefined
    at http://localhost:3000/app/app.js?hash=032772da68bbcc8fb8cc6456d7262c28a13eee90:765:30
    at MethodInvoker._callback (http://localhost:3000/packages/meteor.js?hash=ae8b8affa9680bf9720bd8f7fa112f13a62f71c3:1105:22)
    at MethodInvoker._maybeInvokeCallback (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:3557:12)
    at MethodInvoker.receiveResult (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:3577:10)
    at Connection._livedata_result (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:4736:9)
    at onMessage (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:3385:12)
    at http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:2736:11
    at Array.forEach (native)
    at Function._.each._.forEach (http://localhost:3000/packages/underscore.js?hash=27b3d669b418de8577518760446467e6ff429b1e:149:11)
    at REventTarget.self.socket.onmessage (http://localhost:3000/packages/ddp-client.js?hash=27502404fad7fc072e57e8b0b6719f40d92709c7:2735:11)

55 · 2016-09-09T06:53:22Z

I wonder if we need to create a separate issue for this or to resolve it here?

brylie · 2016-09-09T06:54:11Z

@NNN yes, create a separate issue. It is related to template helpers trying to access properties of the API that has been deleted. There is a moment where the API is deleted, but the API template is still rendered.

brylie · 2016-09-09T06:54:55Z

Will you be merging this PR @NNN?

frenchbread · 2016-09-09T09:22:09Z

We hard code the API Umbrella base prefix to make configuration simpler. I.e. we want our settings page only to contain the API Umbrella host/protocol, and not the Admin API path.
What alternative do you propose?

@brylie I'd suggest using Proxy Base URL as a complete url for Api Umbrella - not hardcoding part if it. For example if someone creates API Umbrella instance on separate domain and routes it serve requests without api-umbrella prefix. In this case syncing mechanism will break.

brylie · 2016-09-09T09:26:47Z

One problem is that we would have to strip the /api-umbrella/ from the base url setting when displaying instructions for API usage. In effect, this would be the inverse of hard coding, since we would be stripping out a string as opposed to appending one.

In a nutshell:

proxyBaseUrl + /api-umbrella/ is necessary for Admin API calls (via ApiUmbrellaWeb)
proxyBaseUrl+ /<proxy_base_path>/ is used for Proxy API calls (from API consumers)

Ville Jyrkkä and others added 14 commits August 29, 2016 15:10

Add collection & schema

41084cc

Move apiKey method

d5eec83

Remove API key creation from registration

f0e753a

Remove API key from profile

846e63d

Add API key template

2adcf9b

Add apikey helpers, events

3c1ca0e

Rename apikeys

11ae9e7

Remove apiKey field from user profile

6ff534c

Include apiKey template to API details tab

0d74fa0

Move ApiUmbrella settings to proxies component

707b145

- Refactor old code to ES6 - Added apiUmbrellaIsDefined method - Refactored getApiUmbrellaUrl method

Fix elasticsearch url fetch

21e4f57

Update helper function apiUmbrellaProxyIsValid

93262a6

Move apiUmbrella methods to single file

705e983

Call sync methods when proxy is added

0277d76

frenchbread added WIP in progress labels Aug 30, 2016

55 self-assigned this Aug 30, 2016

frenchbread and others added 12 commits August 30, 2016 10:47

Redirect to 'catalog' page if elasticsearch is not defined

7cf347d

Refactor and cleanup elasticsearch method

e7dfbda

Add checkElasticsearch instance function

0706704

Cleanup

bea92f6

add getChartData template method and error check

fb764fc

Redirect to catalogue if elasticsearch url is not defined

547c287

Cleanup

a09e2c5

Pseudo-code for reminder

a6e062c

Show message to a user if analytics data not found

3516290

"No data found" message

f29dd82

Show dashboard link in header only is proxy is defined

dae5088

Show dashboard link in home header only if proxy defined

0dca49a

brylie reviewed Sep 8, 2016
View reviewed changes

Ville Jyrkkä and others added 13 commits September 8, 2016 13:03

Renaming, moving files based on guidelines

d5cfd01

Merge branch 'develop' into feature/no-proxy-selected

982d592

# Conflicts: # core/client/layouts/master_layout/navbar/navbar.js # home/client/header/homeHeader.html # home/client/header/homeHeader.js

API key UI based on wireframe

2c3e7fc

Show success message only once.

12b6b58

Fix conflicts from develop

13c2672

Remove useless helper

bf75589

Restructure proxies component

9190746

Merge remote-tracking branch 'origin/feature/proxy-apikey-management'…

8f0dd20

… into feature/no-proxy-selected # Conflicts: # core/client/layouts/master_layout/navbar/navbar.js # home/client/header/homeHeader.html # home/client/header/homeHeader.js

Fix apiUmbrella methods

2bd7e21

Fix schema

b17e8dd

Fix security issue

0b430b7

Move helper function to proxies component

9b77517

Rename files

715dd68

frenchbread added the Ready for review label Sep 8, 2016

55 merged commit 56b538e into develop Sep 9, 2016

55 deleted the feature/no-proxy-selected branch September 9, 2016 06:56

ilarimikkonen added this to In Review in apinf/platform Apr 30, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/no proxy selected #1459

Feature/no proxy selected #1459

frenchbread commented Aug 30, 2016 •

edited

frenchbread commented Aug 30, 2016

brylie Sep 8, 2016

brylie commented Sep 8, 2016 •

edited

frenchbread commented Sep 8, 2016

55 commented Sep 9, 2016

brylie commented Sep 9, 2016

brylie commented Sep 9, 2016

brylie commented Sep 9, 2016

55 commented Sep 9, 2016

55 commented Sep 9, 2016

brylie commented Sep 9, 2016

brylie commented Sep 9, 2016

frenchbread commented Sep 9, 2016 •

edited

brylie commented Sep 9, 2016 •

edited

Feature/no proxy selected #1459

Feature/no proxy selected #1459

Conversation

frenchbread commented Aug 30, 2016 • edited

frenchbread commented Aug 30, 2016

brylie Sep 8, 2016

Choose a reason for hiding this comment

brylie commented Sep 8, 2016 • edited

ApiUmbrellaWeb

File/folder structure

frenchbread commented Sep 8, 2016

55 commented Sep 9, 2016

brylie commented Sep 9, 2016

brylie commented Sep 9, 2016

brylie commented Sep 9, 2016

55 commented Sep 9, 2016

55 commented Sep 9, 2016

brylie commented Sep 9, 2016

brylie commented Sep 9, 2016

frenchbread commented Sep 9, 2016 • edited

brylie commented Sep 9, 2016 • edited

frenchbread commented Aug 30, 2016 •

edited

brylie commented Sep 8, 2016 •

edited

frenchbread commented Sep 9, 2016 •

edited

brylie commented Sep 9, 2016 •

edited