+
+
{{outlet "overlay"}}
{{outlet "error"}}
-{{page-nav expand=navExpand}}
-{{page-header pageName=pageName}}
-
- {{outlet}}
-
+{{outlet}}
diff --git a/app/pods/application/view.js b/app/pods/application/view.js
index 2a9c5b368..8645cb60b 100644
--- a/app/pods/application/view.js
+++ b/app/pods/application/view.js
@@ -1,8 +1,6 @@
import Ember from "ember";
export default Ember.View.extend({
- classNameBindings: ['context.navExpand:nav-expand'],
-
didInsertElement: function() {
this.$().tooltip({
selector: '*[tooltip]',
diff --git a/app/pods/authenticated/controller.js b/app/pods/authenticated/controller.js
new file mode 100644
index 000000000..cba99afeb
--- /dev/null
+++ b/app/pods/authenticated/controller.js
@@ -0,0 +1,16 @@
+import Ember from "ember";
+
+export default Ember.Controller.extend({
+ navExpand: (parseInt($.cookie('navExpand'),10) !== 0),
+ error: null,
+ pageName: '',
+
+ navExpandChange: function() {
+ var inAYear = new Date();
+ inAYear.setYear(inAYear.getFullYear()+1);
+
+ $.cookie('navExpand', (this.get('navExpand') ? 1 : 0), {
+ expires: inAYear
+ });
+ }.observes('navExpand'),
+});
diff --git a/app/pods/authenticated/index/route.js b/app/pods/authenticated/index/route.js
new file mode 100644
index 000000000..edeb2f088
--- /dev/null
+++ b/app/pods/authenticated/index/route.js
@@ -0,0 +1,7 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+ beforeModel: function() {
+ this.transitionTo('hosts');
+ }
+});
diff --git a/app/pods/authenticated/route.js b/app/pods/authenticated/route.js
new file mode 100644
index 000000000..7871be915
--- /dev/null
+++ b/app/pods/authenticated/route.js
@@ -0,0 +1,282 @@
+import Ember from 'ember';
+import Socket from 'ui/utils/socket';
+import Util from 'ui/utils/util';
+import AuthenticatedRouteMixin from 'ui/mixins/authenticated-route';
+
+export default Ember.Route.extend(AuthenticatedRouteMixin, {
+ socket: null,
+
+ model: function() {
+ return this.get('store').find('schema', null, {url: 'schemas'}).then(function() {
+ return Ember.RSVP.resolve();
+ });
+ },
+
+ actions: {
+ error: function(err,transition) {
+ // Unauthorized error, send back to login screen
+ if ( err.status === 401 )
+ {
+ this.send('logout',transition,true);
+ return false;
+ }
+ else
+ {
+ // Bubble up
+ return true;
+ }
+ },
+
+ setPageName: function(str) {
+ this.controller.set('pageName',str);
+ },
+
+ // Raw message from the WebSocket
+ wsMessage: function(/*data*/) {
+ //console.log('wsMessage',data);
+ },
+
+ // WebSocket connected
+ wsConnected: function(tries,msec) {
+ var msg = 'WebSocket connected';
+ if (tries > 0)
+ {
+ msg += ' (after '+ tries + ' ' + (tries === 1 ? 'try' : 'tries');
+ if (msec)
+ {
+ msg += ', ' + (msec/1000) + ' sec';
+ }
+
+ msg += ')';
+ }
+ console.log(msg);
+ },
+
+ // WebSocket disconnected
+ wsDisconnected: function() {
+ console.log('WebSocket disconnected');
+ },
+
+ wsPing: function() {
+ console.log('WebSocket ping');
+ },
+
+ /*
+ agentChanged: function(change) {
+ if (!change || !change.data || !change.data.resource)
+ {
+ return;
+ }
+ //console.log('Agent Changed:', change);
+ var agent = change.data.resource;
+ var id = agent.id;
+ delete agent.hosts;
+
+ var hosts = this.controllerFor('hosts');
+ hosts.forEach(function(host) {
+ if ( host.get('agent.id') === id )
+ {
+ host.get('agent').setProperties(agent);
+ }
+ });
+ },
+ */
+
+ containerChanged: function(change) {
+ this._instanceChanged(change);
+ },
+
+ instanceChanged: function(change) {
+ this._instanceChanged(change);
+ },
+
+ mountChanged: function(change) {
+ var mount = change.data.resource;
+ var volume = this.get('store').getById('volume', mount.get('volumeId'));
+ if ( volume )
+ {
+ var mounts = volume.get('mounts');
+ if ( !Ember.isArray('mounts') )
+ {
+ mounts = [];
+ volume.set('mounts',mounts);
+ }
+
+ var existingMount = mounts.filterBy('id', mount.get('id')).get('firstObject');
+ if ( existingMount )
+ {
+ existingMount.setProperties(mount);
+ }
+ else
+ {
+ mounts.pushObject(mount);
+ }
+ }
+ }
+ },
+
+ enter: function() {
+ var self = this;
+ var store = this.get('store');
+ var boundTypeify = store._typeify.bind(store);
+
+ var url = "ws://"+window.location.host + this.get('app.wsEndpoint');
+ var token = this.get('session.token');
+ if ( token )
+ {
+ url += (url.indexOf('?') >= 0 ? '&' : '?') + 'token=' + encodeURIComponent(token);
+ }
+
+ var socket = Socket.create({
+ url: url
+ });
+
+ socket.on('message', function(event) {
+ var d = JSON.parse(event.data, boundTypeify);
+ self._trySend('wsMessage',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 = 'wsPing';
+ }
+
+ if ( action )
+ {
+ self._trySend(action,d);
+ }
+ });
+
+ socket.on('connected', function(tries, after) {
+ self._trySend('wsConnected', tries, after);
+ });
+
+ socket.on('disconnected', function() {
+ self._trySend('wsDisconnected', self.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
+ {
+ this.send.apply(this,arguments);
+ }
+ catch (err)
+ {
+ if ( err instanceof Ember.Error && err.message.indexOf('Nothing handled the action') === 0 )
+ {
+ // Don't care
+ }
+ else
+ {
+ throw err;
+ }
+ }
+ },
+
+
+ _findInCollection: function(collectionName,id) {
+ var collection = this.controllerFor(collectionName);
+ var existing = collection.filterBy('id',id).get('firstObject');
+ return existing;
+ },
+
+ _instanceChanged: function(change) {
+ if (!change || !change.data || !change.data.resource)
+ {
+ return;
+ }
+
+ //console.log('Instance Changed:',change);
+ var self = this;
+ var instance = change.data.resource;
+ var id = instance.get('id');
+
+ // All the hosts
+ var allHosts = self.get('store').all('host');
+
+ // Host IDs the instance should be on
+ var expectedHostIds = [];
+ if ( instance.get('state') !== 'purged' )
+ {
+ expectedHostIds = (instance.get('hosts')||[]).map(function(host) {
+ return host.get('id');
+ });
+ }
+
+ // Host IDs it is currently on
+ var curHostIds = [];
+ allHosts.forEach(function(host) {
+ var existing = (host.get('instances')||[]).filterBy('id', id);
+ if ( existing.length )
+ {
+ curHostIds.push(host.get('id'));
+ }
+ });
+
+ // Remove from hosts the instance shouldn't be on
+ var remove = Util.arrayDiff(curHostIds, expectedHostIds);
+ remove.forEach(function(hostId) {
+ var host = self._findInCollection('hosts',hostId);
+ if ( host )
+ {
+ var instances = host.get('instances');
+ if ( !instances )
+ {
+ return;
+ }
+
+ instances.removeObjects(instances.filterBy('id', id));
+ }
+ });
+
+ // Add or update hosts the instance should be on
+ expectedHostIds.forEach(function(hostId) {
+ var host = self._findInCollection('hosts',hostId);
+ if ( host )
+ {
+ var instances = host.get('instances');
+ if ( !instances )
+ {
+ instances = [];
+ host.set('instances',instances);
+ }
+
+ var existing = instances.filterBy('id', id);
+ if ( existing.length === 0)
+ {
+ instances.pushObject(instance);
+ }
+ }
+ });
+ }
+});
diff --git a/app/pods/authenticated/template.hbs b/app/pods/authenticated/template.hbs
new file mode 100644
index 000000000..cb16dd14b
--- /dev/null
+++ b/app/pods/authenticated/template.hbs
@@ -0,0 +1,5 @@
+{{page-nav expand=navExpand}}
+{{page-header pageName=pageName}}
+
+ {{outlet}}
+
diff --git a/app/pods/authenticated/view.js b/app/pods/authenticated/view.js
new file mode 100644
index 000000000..13aff1ce9
--- /dev/null
+++ b/app/pods/authenticated/view.js
@@ -0,0 +1,5 @@
+import Ember from "ember";
+
+export default Ember.View.extend({
+ classNameBindings: ['context.navExpand:nav-expand'],
+});
diff --git a/app/pods/components/github-avatar/component.js b/app/pods/components/github-avatar/component.js
new file mode 100644
index 000000000..29ee2eb2f
--- /dev/null
+++ b/app/pods/components/github-avatar/component.js
@@ -0,0 +1,29 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+ type: 'user',
+ login: null,
+
+ classNames: ['gh-avatar'],
+ name: 'Loading...',
+ avatarUrl: null,
+
+ nameChanged: function() {
+ var self = this;
+ var url = 'https://api.github.com/' + this.get('type') + 's/' + this.get('login') + '?s=40';
+
+ Ember.$.ajax({url: url, dataType: 'json'}).then(function(body) {
+ self.set('name', body.name);
+ self.set('avatarUrl', body.avatar_url);
+ }, function() {
+ var type = self.get('type');
+ type = type.substr(0,1).toUpperCase() + type.substr(1);
+
+ self.set('name', 'Warning: ' + type + ' not found');
+ });
+ }.observes('login','type').on('init'),
+
+ url: function() {
+ return 'https://github.com/'+ encodeURIComponent(this.get('login'));
+ }.property('login'),
+});
diff --git a/app/pods/components/github-avatar/template.hbs b/app/pods/components/github-avatar/template.hbs
new file mode 100644
index 000000000..eb63daac8
--- /dev/null
+++ b/app/pods/components/github-avatar/template.hbs
@@ -0,0 +1,16 @@
+{{yield}}
+
+ {{#if avatarUrl}}
+
+ 
+
+ {{else}}
+
+ {{/if}}
+
+
diff --git a/app/pods/components/page-header/template.hbs b/app/pods/components/page-header/template.hbs
index fc2659e2f..c7acfbaf8 100644
--- a/app/pods/components/page-header/template.hbs
+++ b/app/pods/components/page-header/template.hbs
@@ -1,7 +1,33 @@
-
-
-
-
-
-
-
{{pageName}}
+{{#if app.hasAuthentication}}
+ {{#if app.authenticationEnabled}}
+
+ {{else}}
+
+
+
+ Access Control is not configured
+ {{#link-to "settings.auth"}}Settings{{/link-to}}
+
+
+ {{/if}}
+
{{pageName}}
+{{/if}}
diff --git a/app/pods/hosts/index/template.hbs b/app/pods/hosts/index/template.hbs
index 62be2e7d6..4756b8111 100644
--- a/app/pods/hosts/index/template.hbs
+++ b/app/pods/hosts/index/template.hbs
@@ -17,4 +17,6 @@
No hosts or containers yet.
{{/each}}
diff --git a/app/pods/hosts/route.js b/app/pods/hosts/route.js
index 164e25444..55f4656dd 100644
--- a/app/pods/hosts/route.js
+++ b/app/pods/hosts/route.js
@@ -5,11 +5,6 @@ export default Ember.Route.extend({
return this.get('store').findAll('host');
},
- renderTemplate: function() {
- this._super();
- this.render('hosts', {into: 'application'});
- },
-
actions: {
newContainer: function() {
this.transitionTo('newContainer');
diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js
new file mode 100644
index 000000000..a1f3845ad
--- /dev/null
+++ b/app/pods/login/controller.js
@@ -0,0 +1,83 @@
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+ queryParams: ['timedOut'],
+
+ timedOut: false,
+ waiting: false,
+ errorMsg: null,
+
+ infoColor: function() {
+ if ( this.get('errorMsg') )
+ {
+ return 'alert-warning';
+ }
+ {
+ return 'alert-info';
+ }
+ }.property('errorMsg'),
+
+ infoMsg: function() {
+ if ( this.get('errorMsg') )
+ {
+ return this.get('errorMsg');
+ }
+ else if ( this.get('timedOut') )
+ {
+ return 'Your session has timed out. Log in again to continue.';
+ }
+ else
+ {
+ return '';
+ }
+ }.property('timedOut','waiting','errorMsg'),
+
+ actions: {
+ authenticate: function() {
+ var self = this;
+ var session = self.get('session');
+ var app = self.get('app');
+
+ self.set('timedOut', false);
+ self.set('waiting', true);
+
+ self.get('torii').open('github-oauth2').then(function(github){
+ return self.get('store').rawRequest({
+ url: 'token',
+ method: 'POST',
+ data: {
+ code: github.authorizationCode,
+ }
+ }).then(function(res) {
+ var auth = JSON.parse(res.xhr.responseText);
+ session.set('token', auth.jwt);
+ session.set('isLoggedIn',1);
+ var transition = app.get('afterLoginTransition');
+ if ( transition )
+ {
+ app.set('afterLoginTransition', null);
+ transition.retry();
+ }
+ else
+ {
+ self.transitionToRoute('index');
+ }
+ });
+ })
+ .catch(function(res) {
+ if ( res.xhr && res.xhr.responseText )
+ {
+ var body = JSON.parse(res.xhr.responseText);
+ self.set('errorMsg', body.message);
+ }
+ else
+ {
+ self.set('errorMsg', res.err);
+ }
+ }).finally(function() {
+ self.set('waiting', false);
+ });
+ }
+ }
+});
+
diff --git a/app/pods/login/route.js b/app/pods/login/route.js
new file mode 100644
index 000000000..f1f45be8e
--- /dev/null
+++ b/app/pods/login/route.js
@@ -0,0 +1,10 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+ beforeModel: function() {
+ if ( !this.get('app.authenticationEnabled') )
+ {
+ this.transitionTo('index');
+ }
+ }
+});
diff --git a/app/pods/login/template.hbs b/app/pods/login/template.hbs
new file mode 100644
index 000000000..e18f14b6b
--- /dev/null
+++ b/app/pods/login/template.hbs
@@ -0,0 +1,25 @@
+