Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
4543cee
Add ProxyBackends collection
brylie Aug 29, 2016
5c110dc
Initial schema structure
brylie Aug 29, 2016
112a974
Basic schema fields and ApiUmbrellaSchema import
brylie Aug 29, 2016
0879bd8
Basic API Umbrella schema
brylie Aug 29, 2016
e22adbf
Fix typo
brylie Aug 29, 2016
eb15bcc
Cleanup comments
brylie Aug 30, 2016
53cec17
Simplify user conditions
brylie Aug 30, 2016
4b9ae66
Add proxy section
brylie Aug 30, 2016
69088b1
Initial proxy template
brylie Aug 30, 2016
354c2cf
Add proxy tab
brylie Aug 30, 2016
a1c8434
Add viewApiBackend proxy string
brylie Aug 30, 2016
2316a5c
Proxy backend configuration panel
brylie Aug 30, 2016
fe2ea2e
Add apiBackend proxy string
brylie Aug 30, 2016
9d1d971
Initial ProxyBackends quickform
brylie Aug 30, 2016
6914bcc
Add proxyBackendsCollection template helper
brylie Aug 30, 2016
7c67aa2
Add esversion 6 support
brylie Aug 30, 2016
d96ec35
Export ApiUmbrellaSchema
brylie Aug 30, 2016
5acf92e
Cleanup
brylie Aug 30, 2016
069dc9b
Add quickForm with api/proxy ID fields
brylie Aug 30, 2016
caa5fda
Add apiId field
brylie Aug 30, 2016
1e1c36f
Add apiUmbrella fields
brylie Sep 1, 2016
d7d177e
Delete
brylie Sep 2, 2016
9e15680
Fix conflicts
brylie Sep 2, 2016
15c76c6
Add API Umbrella name field, autopopulate
brylie Sep 2, 2016
83ba2aa
Fix branding route bug
brylie Sep 2, 2016
962db78
Rename
brylie Sep 2, 2016
e111504
Rename
brylie Sep 2, 2016
36c0a71
Change 'apiBacked' to 'api'; lint
brylie Sep 2, 2016
bf84cd8
Fix ApiMetadata imports
brylie Sep 2, 2016
d0c06d7
Explicit variable name
brylie Sep 2, 2016
3460832
Change 'apiBackends' to 'apis'
brylie Sep 2, 2016
4682e7c
Add safety check
brylie Sep 2, 2016
eae8b0c
Note about possible defect; lint
brylie Sep 2, 2016
4d87078
Remove 'backend' text from IDs/hrefs
brylie Sep 2, 2016
b03eb49
Use api instead of apiBackend
brylie Sep 2, 2016
ece3c26
Move proxy template in to privelege check block
brylie Sep 2, 2016
664d7b6
Fix privilege check
brylie Sep 2, 2016
d5cd2e3
Add proxyId helper
brylie Sep 2, 2016
f0dfb8b
Provide proxyId
brylie Sep 2, 2016
57ceaf9
Add publicProxyDetails publication
brylie Sep 2, 2016
6eb900e
Subscribe to publicProxyDetails
brylie Sep 2, 2016
7200bef
Add proxy check
brylie Sep 2, 2016
3fa9512
Remove unnecessary file
brylie Sep 2, 2016
1b428dd
Add/use proxyIsConfigured helper
brylie Sep 2, 2016
7651d15
Import Proxies collection
brylie Sep 2, 2016
43995cb
Fix publication
brylie Sep 2, 2016
2eec23b
Change proxy helper; use proxy._id
brylie Sep 2, 2016
22c02fb
Publish apiUmbrella.url
brylie Sep 2, 2016
32dc338
Auto-populate apiUmbrella.url
brylie Sep 2, 2016
7aace7d
Add backend_protocol allowedValues; lint
brylie Sep 2, 2016
e89bc07
Add backend host/protocol fields
brylie Sep 2, 2016
9872c8a
Remove 'backend' from navigation ID
brylie Sep 2, 2016
06764ec
Add apiUmbrella.url_matches fields
brylie Sep 2, 2016
8f48e69
balance_algorithm defaultValue least_conn
brylie Sep 2, 2016
e87f49d
Add apiUmbrella.servers fields
brylie Sep 2, 2016
7375c84
Fix panel ID (remove 'backend')
brylie Sep 5, 2016
66643c4
Fix conflicts
brylie Sep 5, 2016
1def81a
Fix conflicts
brylie Sep 5, 2016
226def6
Add urijs
brylie Sep 5, 2016
3c297cf
Add apiUrlProtocol helper
brylie Sep 5, 2016
f625a27
Autofill backend_protocol with apiUrlProtocol
brylie Sep 5, 2016
79169e5
Add url field
brylie Sep 5, 2016
150a836
Add viewApiBackendSettings save button text
brylie Sep 5, 2016
33ca5d9
Add apiUmbrella servers object, zero index
brylie Sep 5, 2016
f1c2b81
Auto-value apiUmbrella server host
brylie Sep 5, 2016
b268183
Flatten apiUmbrella urlMatches form elements (zero index)
brylie Sep 5, 2016
30a9154
Add initial labels; todo: i18n
brylie Sep 5, 2016
52f8f91
Add backend protocol label
brylie Sep 5, 2016
486789a
Fix mistake
brylie Sep 5, 2016
22d31d4
Switch Proxy to API
brylie Sep 5, 2016
cea7f0e
Rename file
brylie Sep 6, 2016
6288daa
Move proxy backend form
brylie Sep 6, 2016
d0a556a
Hide auto-populated fields; api host readonly
brylie Sep 6, 2016
1882c84
Add apiPortHelper
brylie Sep 6, 2016
ebd27e3
Comments
brylie Sep 6, 2016
c938b84
Full proxy base path field markup
brylie Sep 6, 2016
20ce553
Full api base path markup
brylie Sep 6, 2016
ec3e8da
Hide api host field
brylie Sep 6, 2016
0032916
API fields inline
brylie Sep 6, 2016
89ed6f6
Add submit button
brylie Sep 6, 2016
2536a1a
Rename apiBackendId to apiId
brylie Sep 6, 2016
e853811
Add formType helper
brylie Sep 6, 2016
15d1aa9
Add apiProxySettings publication
brylie Sep 6, 2016
f7c0998
Add apiProxySettings helper
brylie Sep 6, 2016
239c2ae
Basic allow rules
brylie Sep 6, 2016
260885f
Fix allow key (remove)
brylie Sep 6, 2016
1d35846
Fix publication; include manager/admin check code
brylie Sep 6, 2016
a3745c5
Alphabetize helpers; lint
brylie Sep 6, 2016
8a72548
Use ProxyBackends collection for published docment
brylie Sep 6, 2016
40ab860
Rename proxyBackendSettings
brylie Sep 6, 2016
d2c43c6
Rename to proxyBackendSettings
brylie Sep 6, 2016
b6db1aa
Add onSuccess hook, sAlert
brylie Sep 6, 2016
50325d6
Shorten template name
brylie Sep 6, 2016
de3db90
Add proxyBackendForm i18n string
brylie Sep 6, 2016
df1384f
Fix error
brylie Sep 6, 2016
c5109eb
Comments; p instead of span
brylie Sep 6, 2016
86baad1
Add danger class to validation text
brylie Sep 6, 2016
18893dd
Simpler comments
brylie Sep 6, 2016
5c1b838
Add Proxy base path help text; comments
brylie Sep 6, 2016
baa76f6
Comments; validation messages markup
brylie Sep 6, 2016
f3f7f28
Add API base path help text; simplify
brylie Sep 6, 2016
0337e1e
Refactor API port field
brylie Sep 6, 2016
a5b4700
Add proxyBackendForm i18n texts
brylie Sep 6, 2016
e6ce17f
Add api/proxy base path regular expressions
brylie Sep 7, 2016
2d9c35a
Lint
brylie Sep 7, 2016
83fc6e3
Add proxy/api base path regular expressions
brylie Sep 7, 2016
2b38eb9
Switch to ES2015 object literal syntax
brylie Sep 7, 2016
fbf644d
Make sure only Manager/Administrator can insert/update/remove
brylie Sep 7, 2016
3eb7cb3
Lint
brylie Sep 7, 2016
7079f80
Allow Proxy base path with / infix characters
brylie Sep 7, 2016
55f9084
Refactor for consistency
brylie Sep 7, 2016
d27a6c8
Fix regEx defintion/usage
brylie Sep 7, 2016
e9cc765
Refactor for brevity
brylie Sep 7, 2016
8240067
Clarify comments
brylie Sep 7, 2016
09b1de6
Refactor for brevity
brylie Sep 7, 2016
d503565
Clarify comment
brylie Sep 7, 2016
d9a8efb
Refactor for brevity
brylie Sep 7, 2016
6ed36da
Clarify comment
brylie Sep 7, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add apiProxySettings helper
  • Loading branch information
brylie committed Sep 6, 2016
commit f7c0998a85526ca660f746535ac590345c042f73
1 change: 1 addition & 0 deletions proxy_backends/client/form/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
collection=proxyBackendsCollection
id="insertProxyBackend"
type=formType
doc=apiProxySettings
}}

<!-- hidden fields, auto-value -->
Expand Down
9 changes: 9 additions & 0 deletions proxy_backends/client/form/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@ Template.proxyBackendForm.helpers({

return port;
},
apiProxySettings () {
// Get API ID
const apiId = this.api._id;

// Look for existing proxy backend document for this API
const apiProxySettings = ProxyBackends.findOne({ apiId });

return apiProxySettings;
},
formType () {
// Placeholder for form type
let formType;
Expand Down