cyclid-ui 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca86e931e0eb566c2bf638de74c388e675222437
-  data.tar.gz: 26afc5f71cf7f4ade5ae25cc6c57b9babe9dab80
+  metadata.gz: cd46e94bf7a619733c91ec752eaebbb95fe350eb
+  data.tar.gz: c15070a30d7e592fdfda470fcb7cc5445ca66c17
 SHA512:
-  metadata.gz: 106ad7cb054099d963434b127d7dda2cfbedbe9dc66f4fcbc8147456b063534d7d7ea3dc9e56a36bb8dfa446f4a0870bdf267ce500817c8d12e61c33975175c0
-  data.tar.gz: b56757b82268f45d2774c3e0390798b17ef6f190c34c636e94143ce014fef7686b64bc748501a77bb9d944b6969a0a1a3e7aea45a6ccecde771f586ff350de62
+  metadata.gz: 94f096894e5d41acbaf6f061723646e3b5bf8e9a2bbe7f9c48988eca30dd8d1caa6311343ef197a45ed9da279c5ce3380133ea2ec2fbcf299445c81ffe49e92c
+  data.tar.gz: eccb3e14ffe05c46f3676d21aa92efd44e0cd3aa84cf6ebe9886340b7f69c79a82899bc402aca5bdf77f1d0cf3711feb687caa50c563c33dcbf76a23878d9115

data/app/cyclid_ui.rb

@@ -88,9 +88,13 @@ module Cyclid
       use Warden::Manager do |config|
         config.serialize_into_session(&:username)
         config.serialize_from_session do |username|
-          # Animal skins & flint knives...
-          token = env['rack.request.cookie_hash']['cyclid.token']
-          Models::User.get(username: username, token: token)
+          begin
+            # Animal skins & flint knives...
+            token = env['rack.request.cookie_hash']['cyclid.token']
+            Models::User.get(username: username, token: token)
+          rescue
+            nil
+          end
         end
 
         config.scope_defaults :default,
@@ -113,6 +117,8 @@ module Cyclid
           user = Models::User.get(username: username, token: token)
 
           user.nil? ? fail!('invalid user') : success!(user)
+        rescue
+          fail!('invalid user')
         end
       end
 
@@ -125,6 +131,7 @@ module Cyclid
         # it sees the 401 response
         env['warden'].custom_failure!
         flash[:login_error] = 'Invalid username or password'
+        cookies.delete 'cyclid.token'
         redirect to '/login'
       end
 

data/app/cyclid_ui/controllers/auth.rb

@@ -51,8 +51,12 @@ module Cyclid
 
           # At this point the user has authenticated successfully; get the user
           # information; the User model will cache it automatically.
-          user = Models::User.get(username: username, password: password)
-          Cyclid.logger.debug "user=#{user.to_hash}"
+          begin
+            user = Models::User.get(username: username, password: password)
+            Cyclid.logger.debug "user=#{user.to_hash}"
+          rescue
+            halt_with_401
+          end
 
           # Store the username in the session
           session[:username] = username

data/app/cyclid_ui/models/user.rb

@@ -69,6 +69,9 @@ module Cyclid
 
           auth_method = token.nil? ? Client::AUTH_BASIC : Client::AUTH_TOKEN
 
+          # We must have one or the other
+          raise 'no password or token' if password.nil? and token.nil?
+
           user_data = nil
           begin
             Cyclid.logger.debug "api=#{Cyclid.config.server_api.inspect}"

data/app/cyclid_ui/templates/layout.mustache

@@ -48,17 +48,21 @@
                   <li><a href="/{{.}}">{{.}}</a></li>
                   {{/organizations}}
                   {{#signup}}
+                  {{#organization}}
                   <li role="separator" class="divider"></li>
+                  {{/organization}}
                   <li><a href="{{signup}}/organization" target="_blank">Create a new Organization</a></li>
                   {{/signup}}
                 </ul>
               </li>
             </ul>
 
+            {{#organization}}
             <ul class="nav navbar-nav">
               <li><a href="/{{organization}}">Jobs</a></li>
               <li><a href="/{{organization}}/config">Configuration</a></li>
             </ul>
+            {{/organization}}
 
             <ul class="nav navbar-nav navbar-right">
               <li class="dropdown">

data/lib/cyclid_ui/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Cyclid
   module UI
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/public/js/job.js

@@ -173,13 +173,22 @@ function ji_update_all(job) {
 }
 
 function ji_get_failed(xhr) {
-  var failure_message = `<p>
-                           <h2>Failed to retrieve job</h2><br>
-                           <strong>${xhr.status}:</strong> ${xhr.responseText}
-                         </p>`
-  $('#ji_failure > #error_message').html(failure_message);
+  // 401 Unauthorized means an obvious authentication issue, and the user
+  // should log in again. A status of 0 here means that an error occured
+  // during the AJAX request; possible a CORS issue. In that case we'll assume
+  // the worst (cyclid.token is invalid) and force re-authentication, too.
+  if(xhr.status == 401 || xhr.status == 0){
+    console.log(`Failed to retrieve job list: status was ${xhr.status}`);
+    window.location = '/login';
+  } else {
+    var failure_message = `<p>
+                             <h2>Failed to retrieve job</h2><br>
+                             <strong>${xhr.status}:</strong> ${xhr.responseText}
+                           </p>`
+    $('#ji_failure > #error_message').html(failure_message);
 
-  $('#ji_failure').removeClass('hidden');
+    $('#ji_failure').removeClass('hidden');
+  }
 }
 
 function ji_update_status_and_check_completion(url, job) {

data/public/js/organization.js

@@ -70,13 +70,22 @@ function org_add_job(job, append) {
 }
 
 function org_job_list_failed(xhr) {
-  var failure_message = `Failed to retrieve job list<br>
-                         <strong>${xhr.status}:</strong> ${xhr.responseText}`;
+  // 401 Unauthorized means an obvious authentication issue, and the user
+  // should log in again. A status of 0 here means that an error occured
+  // during the AJAX request; possible a CORS issue. In that case we'll assume
+  // the worst (cyclid.token is invalid) and force re-authentication, too.
+  if(xhr.status == 401 || xhr.status == 0){
+    console.log(`Failed to retrieve job list: status was ${xhr.status}`);
+    window.location = '/login';
+  } else {
+    var failure_message = `Failed to retrieve job list<br>
+                           <strong>${xhr.status}:</strong> ${xhr.responseText}`;
 
-  failure_message = `List failed: ${xhr.status}`;
-  $('#organization_failure > #error_message').html(failure_message);
+    failure_message = `List failed: ${xhr.status}`;
+    $('#organization_failure > #error_message').html(failure_message);
 
-  $('#organization_failure').removeClass('hidden');
+    $('#organization_failure').removeClass('hidden');
+  }
 }
 
 function org_update_job_list(jobs, append) {

data/public/js/user.js

@@ -4,11 +4,20 @@ function user_show_error(msg){
 }
 
 function user_get_failed(xhr){
-  var failure_message = `Failed to retrieve user details<br>
-                         <strong>${xhr.status}:</strong> ${xhr.responseText}`;
-  failure_message = `Get failed: ${xhr.status}`;
+  // 401 Unauthorized means an obvious authentication issue, and the user
+  // should log in again. A status of 0 here means that an error occured
+  // during the AJAX request; possible a CORS issue. In that case we'll assume
+  // the worst (cyclid.token is invalid) and force re-authentication, too.
+  if(xhr.status == 401 || xhr.status == 0){
+    console.log(`Failed to retrieve job list: status was ${xhr.status}`);
+    window.location = '/login';
+  } else {
+    var failure_message = `Failed to retrieve user details<br>
+                           <strong>${xhr.status}:</strong> ${xhr.responseText}`;
+    failure_message = `Get failed: ${xhr.status}`;
 
-  user_show_error(failure_message);
+    user_show_error(failure_message);
+  }
 }
 
 function user_update_details(user){

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cyclid-ui
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Kristian Van Der Vliet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all