- {{textarea id="description" value=description classNames="form-control no-resize" rows="5" placeholder="e.g. This key is used by the app servers to deploy containers"}}
+ {{textarea id="description" value=primaryResource.description classNames="form-control no-resize" rows="5" placeholder="e.g. This key is used by the app servers to deploy containers"}}
{{partial "save-cancel"}}
diff --git a/app/apikeys/template.hbs b/app/apikeys/template.hbs
index 518268bec..3fe089028 100644
--- a/app/apikeys/template.hbs
+++ b/app/apikeys/template.hbs
@@ -1,4 +1,4 @@
-{{#with controllers.authenticated.project as p controller="project"}}
+{{#with controllers.authenticated.project controller="project" as |p|}}
API & Keys for "{{p.displayName}}" Environment
diff --git a/app/app.js b/app/app.js
index 757df3899..8d66b9587 100644
--- a/app/app.js
+++ b/app/app.js
@@ -3,9 +3,11 @@ import Resolver from 'ember/resolver';
import loadInitializers from 'ember/load-initializers';
import config from './config/environment';
+var App;
+
Ember.MODEL_FACTORY_INJECTIONS = true;
-var App = Ember.Application.extend({
+App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver: Resolver
diff --git a/app/application/route.js b/app/application/route.js
index a763c535b..c69414640 100644
--- a/app/application/route.js
+++ b/app/application/route.js
@@ -150,7 +150,38 @@ export default Ember.Route.extend({
if ( agent.indexOf('msie ') >= 0 || agent.indexOf('trident/') >= 0 || agent.indexOf('edge/') >= 0 )
{
this.replaceWith('ie');
+ return;
}
+
+ // Find out if auth is enabled
+ return this.get('store').rawRequest({
+ url: 'token',
+ headers: {
+ [C.HEADER.PROJECT]: undefined
+ }
+ })
+ .then((obj) => {
+ // If we get a good response back, the API supports authentication
+ var body = JSON.parse(obj.xhr.responseText);
+ var token = body.data[0];
+
+ this.set('app.authenticationEnabled', token.security);
+ this.set('app.githubClientId', token.clientId);
+ this.set('app.githubHostname', token.hostname );
+
+ if ( !token.security )
+ {
+ this.get('github').clearSessionKeys();
+ }
+
+ return Ember.RSVP.resolve(undefined,'API supports authentication');
+ })
+ .catch((obj) => {
+ // Otherwise this API is too old to do auth.
+ this.set('app.authenticationEnabled', false);
+ this.set('app.initError', obj);
+ return Ember.RSVP.resolve(undefined,'Error determining API authentication');
+ });
},
setupController: function(controller/*, model*/) {
diff --git a/app/authenticated/route.js b/app/authenticated/route.js
index edb865b55..f419cfec8 100644
--- a/app/authenticated/route.js
+++ b/app/authenticated/route.js
@@ -6,6 +6,8 @@ import ActiveArrayProxy from 'ui/utils/active-array-proxy';
import C from 'ui/utils/constants';
export default Ember.Route.extend(AuthenticatedRouteMixin, {
+ prefs: Ember.inject.service(),
+
socket: null,
pingTimer: null,
@@ -188,6 +190,77 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
},
actions: {
+ activate: function() {
+ var store = this.get('store');
+ var boundTypeify = store._typeify.bind(store);
+
+ var url = "ws://"+window.location.host + this.get('app.wsEndpoint');
+ var session = this.get('session');
+
+ var projectId = session.get(C.SESSION.PROJECT);
+ if ( projectId )
+ {
+ url = Util.addQueryParam(url, 'projectId', projectId);
+ }
+
+ var socket = Socket.create({
+ url: url
+ });
+
+ socket.on('message', (event) => {
+ var d = JSON.parse(event.data, boundTypeify);
+ //this._trySend('subscribeMessage',d);
+
+ var str = d.name;
+ if ( d.resourceType )
+ {
+ str += ' ' + d.resourceType;
+
+ if ( d.resourceId )
+ {
+ str += ' ' + d.resourceId;
+ }
+ }
+
+ var action;
+ if ( d.name === 'resource.change' )
+ {
+ action = d.resourceType+'Changed';
+ }
+ else if ( d.name === 'ping' )
+ {
+ action = 'subscribePing';
+ }
+
+ if ( action )
+ {
+ this._trySend(action,d);
+ }
+ });
+
+ socket.on('connected', (tries, after) => {
+ this._trySend('subscribeConnected', tries, after);
+ });
+
+ socket.on('disconnected', () => {
+ this._trySend('subscribeDisconnected', this.get('tries'));
+ });
+
+ this.set('socket', socket);
+ socket.connect();
+ },
+
+ deactivate: function() {
+ var socket = this.get('socket');
+ if ( socket )
+ {
+ socket.disconnect();
+ }
+
+ // Forget all the things
+ this.get('store').reset();
+ },
+
error: function(err,transition) {
// Unauthorized error, send back to login screen
if ( err.status === 401 )
@@ -355,77 +428,6 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
},
},
- enter: function() {
- var store = this.get('store');
- var boundTypeify = store._typeify.bind(store);
-
- var url = "ws://"+window.location.host + this.get('app.wsEndpoint');
- var session = this.get('session');
-
- var projectId = session.get(C.SESSION.PROJECT);
- if ( projectId )
- {
- url = Util.addQueryParam(url, 'projectId', projectId);
- }
-
- var socket = Socket.create({
- url: url
- });
-
- socket.on('message', (event) => {
- var d = JSON.parse(event.data, boundTypeify);
- //this._trySend('subscribeMessage',d);
-
- var str = d.name;
- if ( d.resourceType )
- {
- str += ' ' + d.resourceType;
-
- if ( d.resourceId )
- {
- str += ' ' + d.resourceId;
- }
- }
-
- var action;
- if ( d.name === 'resource.change' )
- {
- action = d.resourceType+'Changed';
- }
- else if ( d.name === 'ping' )
- {
- action = 'subscribePing';
- }
-
- if ( action )
- {
- this._trySend(action,d);
- }
- });
-
- socket.on('connected', (tries, after) => {
- this._trySend('subscribeConnected', tries, after);
- });
-
- socket.on('disconnected', () => {
- this._trySend('subscribeDisconnected', this.get('tries'));
- });
-
- this.set('socket', socket);
- socket.connect();
- },
-
- exit: function() {
- var socket = this.get('socket');
- if ( socket )
- {
- socket.disconnect();
- }
-
- // Forget all the things
- this.get('store').reset();
- },
-
_trySend: function(/*arguments*/) {
try
{
diff --git a/app/components/loadbalancertarget-subpod/template.hbs b/app/components/loadbalancertarget-subpod/template.hbs
index 7abd9221c..1b56412e9 100644
--- a/app/components/loadbalancertarget-subpod/template.hbs
+++ b/app/components/loadbalancertarget-subpod/template.hbs
@@ -6,7 +6,7 @@
{{model.ipAddress}}
{{else}}
{{#if model.instance}}
- {{#with model.instance as container controller="container"}}
+ {{#with model.instance controller="container" as |container|}}
{{#link-to "container" model.instanceId}}
{{container.displayName}}
diff --git a/app/components/page-articles/component.js b/app/components/page-articles/component.js
index b95fdb282..3f8183e19 100644
--- a/app/components/page-articles/component.js
+++ b/app/components/page-articles/component.js
@@ -2,6 +2,7 @@ import Ember from 'ember';
import C from 'ui/utils/constants';
export default Ember.Component.extend({
+ prefs: Ember.inject.service(),
classNames: ['articles'],
actions: {
diff --git a/app/components/page-header/template.hbs b/app/components/page-header/template.hbs
index 328fcee56..590e12a43 100644
--- a/app/components/page-header/template.hbs
+++ b/app/components/page-header/template.hbs
@@ -81,7 +81,7 @@