lti_skydrive 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ede3590eb9ebc419a81536127f904bd2135d6da8
-  data.tar.gz: fce3f92328a9efb6e75e63c12dbd2933ed16dbf0
+  metadata.gz: 7bd921706c714324e9418139cb0703c3f9586e3f
+  data.tar.gz: e8d14137930c1c7de4bb11dd8c6bee694f3e4d39
 SHA512:
-  metadata.gz: 39a6613cf257ce176bda999705dfd96b1caef79e9c3d35286c328416fa41370bcbcbab784d8480f2243e300762a57143459c638ed472768100304a648e4f19e1
-  data.tar.gz: dafdbaed8579c7887ee391a15fc5e3d9567633b49d15afe48e7fe8edb074765e270259403231fa2d9c8f471c02804da9179561b8db54683a109c0616113e6e98
+  metadata.gz: 3a465e4b70b352f3fd1f27a6ff1d77df2772314e628f722031e23dbe1fa2c47339190d1778a14f60bd7921dceaf663db78e96269f229aa622dd8eef42457b92b
+  data.tar.gz: 00474a7e21e7f4d385052846a7e50a7a92a5dc166029f43ed2bbcc32f364d52dea33b80e671e59d70006b617c1b978b3aeddaaeb4cc8c8ec74f7e3585b9f7d49

data/app/assets/javascripts/skydrive/ember_app.js

@@ -126,10 +126,11 @@ var AuthManager = Ember.Object.extend({
 
   // Determine if the user is currently authenticated.
   isAuthenticated: function() {
-    return !Ember.isEmpty(this.get('apiKey.accessToken'));
+    return (!Ember.isEmpty(this.get('apiKey.accessToken')) && !this.get('isAuthenticating'));
   },
 
   authenticateWithCode: function(code) {
+    this.set('isAuthenticating', true);
     $.post('oauth2/token', {code: code})
       .always($.proxy(function(response) {
         if(!Ember.isEmpty(response.api_key)){
@@ -137,14 +138,17 @@ var AuthManager = Ember.Object.extend({
         } else {
           this.authenticateWithCookie();
         }
+        this.set('isAuthenticating', false);
       }, this));
   },
 
   authenticateWithCookie: function() {
+    this.set('isAuthenticating', true);
     var accessToken = $.cookie('access_token');
     if (!Ember.isEmpty(accessToken)) {
       this.authenticate(accessToken);
     }
+    this.set('isAuthenticating', false);
   },
 
   // Authenticate the user. Once they are authenticated, set the access token to be submitted with all
@@ -278,18 +282,26 @@ var FilesRoute = AuthenticatedRoute.extend({
   setupController: function(controller, model) {
     var uri = model.uri;
     path = Ember.ENV.CONFIG.root_path;
+    controller.set('isLoading', true);
     var skydriveAuthorized = Ember.$.getJSON(path + 'api/v1/skydrive_authorized').then(
       function() {
-        controller.set('isLoading', true);
-        Ember.$.getJSON(path + 'api/v1/files/' + uri).then(function(data) {
-          controller.set('model', data);
-          controller.set('isLoading', false);
-        })
+        Ember.$.getJSON(path + 'api/v1/files/' + uri).then(
+          function(data) {
+            controller.set('model', data);
+            controller.set('isLoading', false);
+          },
+          function(jqxhr) {
+            controller.set('model', {});
+            controller.set('authRedirectUrl', jqxhr.responseText);
+            controller.set('isLoading', false);
+          }
+        );
         controller.set('authRedirectUrl', null);
       },
       function(jqxhr) {
         controller.set('model', {});
         controller.set('authRedirectUrl', jqxhr.responseText);
+        controller.set('isLoading', false);
       }
     );
   },

data/app/assets/stylesheets/skydrive/application.css

@@ -1,4 +1,5 @@
 /* ...
 *= require ./normalize
 *= require ./app
+*= require ./custom
 */

data/app/assets/stylesheets/skydrive/custom.css

@@ -0,0 +1,6 @@
+div.error-instructions {
+  padding: 20px;
+  text-align: center;
+  background-color: #efefef;
+  margin-top: 65px;
+}

data/app/controllers/skydrive/launch_controller.rb

@@ -19,13 +19,13 @@ module Skydrive
       tp = IMS::LTI::ToolProvider.new(key, secret, params)
 
       if !key
-        tp.lti_errorlog = "No consumer key"
+        tp.lti_errorlog = "Invalid consumer key or secret"
       elsif !secret
         tp.lti_errorlog = "Consumer key wasn't recognized"
       elsif !tp.valid_request?(request)
         tp.lti_errorlog = "The OAuth signature was invalid"
       elsif Time.now.utc.to_i - tp.request_oauth_timestamp.to_i > 120
-        tp.lti_errorlog = "Your request is too old."
+        tp.lti_errorlog = "Your request is too old"
       end
 
       #
@@ -47,18 +47,18 @@ module Skydrive
     def basic_launch
       tp = tool_provider
       if tp.lti_errorlog
-        render text: tp.lti_errorlog, status: 400
+        render text: tp.lti_errorlog, status: 400, layout: "skydrive/error"
         return
       end
 
       email = tp.lis_person_contact_email_primary
       unless email.present?
-        render text: "Missing email information"
+        render text: "Missing email information", layout: "skydrive/error"
         return
       end
 
       unless client_domain = tp.get_custom_param('sharepoint_client_domain')
-        render text: "Missing sharepoint client domain", status: 400
+        render text: "Missing sharepoint client domain", status: 400, layout: "skydrive/error"
         return
       end
 

data/app/views/layouts/skydrive/error.html.erb

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <title>Sky Drive</title>
+  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+  <%= stylesheet_link_tag    "skydrive/font-awesome/font-awesome.min.css", media: "all" %>
+  <%= stylesheet_link_tag    "skydrive/application.css", media: "all" %>
+  <%= javascript_include_tag "skydrive/application.js" %>
+  <%= csrf_meta_tags %>
+  <title>Sky Drive</title>
+</head>
+<body>
+
+<nav class="top-bar">
+  <img src="https://p.sfx.ms/images/SkyDriveLogoLight.png" />
+</nav>
+
+<div class="error-instructions">
+  <%= yield %>
+</div>
+
+</body>
+</html>

data/lib/skydrive/file.rb

@@ -39,7 +39,7 @@ module Skydrive
           self.is_embeddable = false
         end
       else
-        self.icon = "/skydrive/images/icon-file.png"
+        self.icon = "/assets/skydrive/icon-file.png"
         self.kind = ''
         self.suffix = self.name.split('.').try(:last) || ''
         self.is_embeddable = false

data/lib/skydrive/version.rb

@@ -1,3 +1,3 @@
 module Skydrive
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/dummy/log/development.log

@@ -8403,3 +8403,61 @@ Processing by Skydrive::FilesController#download as */*
   Rendered text template (0.0ms)
 Sent data  (0.6ms)
 Completed 200 OK in 380ms (Views: 0.4ms | ActiveRecord: 0.4ms)
+
+
+Started GET "/api/v1/lti_apps?access_token=16e255ac9df64d9b54ea387555cfce6f&offset=0" for 127.0.0.1 at 2014-01-15 11:13:05 -0700
+
+ActionController::RoutingError (No route matches [GET] "/api/v1/lti_apps"):
+  actionpack (4.0.2) lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call'
+  actionpack (4.0.2) lib/action_dispatch/middleware/show_exceptions.rb:30:in `call'
+  railties (4.0.2) lib/rails/rack/logger.rb:38:in `call_app'
+  railties (4.0.2) lib/rails/rack/logger.rb:20:in `block in call'
+  activesupport (4.0.2) lib/active_support/tagged_logging.rb:67:in `block in tagged'
+  activesupport (4.0.2) lib/active_support/tagged_logging.rb:25:in `tagged'
+  activesupport (4.0.2) lib/active_support/tagged_logging.rb:67:in `tagged'
+  railties (4.0.2) lib/rails/rack/logger.rb:20:in `call'
+  actionpack (4.0.2) lib/action_dispatch/middleware/request_id.rb:21:in `call'
+  rack (1.5.2) lib/rack/methodoverride.rb:21:in `call'
+  rack (1.5.2) lib/rack/runtime.rb:17:in `call'
+  activesupport (4.0.2) lib/active_support/cache/strategy/local_cache.rb:83:in `call'
+  rack (1.5.2) lib/rack/lock.rb:17:in `call'
+  actionpack (4.0.2) lib/action_dispatch/middleware/static.rb:64:in `call'
+  rack (1.5.2) lib/rack/sendfile.rb:112:in `call'
+  railties (4.0.2) lib/rails/engine.rb:511:in `call'
+  railties (4.0.2) lib/rails/application.rb:97:in `call'
+  rack (1.5.2) lib/rack/lock.rb:17:in `call'
+  rack (1.5.2) lib/rack/content_length.rb:14:in `call'
+  rack (1.5.2) lib/rack/handler/webrick.rb:60:in `service'
+  /Users/brad/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/webrick/httpserver.rb:138:in `service'
+  /Users/brad/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/webrick/httpserver.rb:94:in `run'
+  /Users/brad/.rbenv/versions/2.0.0-p247/lib/ruby/2.0.0/webrick/server.rb:295:in `block in start_thread'
+
+
+  Rendered /Users/brad/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/actionpack-4.0.2/lib/action_dispatch/middleware/templates/rescues/_trace.erb (1.0ms)
+  Rendered /Users/brad/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/actionpack-4.0.2/lib/action_dispatch/middleware/templates/routes/_route.html.erb (1.1ms)
+  Rendered /Users/brad/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/actionpack-4.0.2/lib/action_dispatch/middleware/templates/routes/_route.html.erb (1.9ms)
+  Rendered /Users/brad/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/actionpack-4.0.2/lib/action_dispatch/middleware/templates/routes/_table.html.erb (40.6ms)
+  Rendered /Users/brad/.rbenv/versions/2.0.0-p247/lib/ruby/gems/2.0.0/gems/actionpack-4.0.2/lib/action_dispatch/middleware/templates/rescues/routing_error.erb within rescues/layout (100.6ms)
+
+
+Started GET "/assets/skydrive/skydrive_icon.png" for 127.0.0.1 at 2014-01-15 11:13:35 -0700
+
+
+Started POST "/skydrive/launch" for 127.0.0.1 at 2014-01-15 11:13:38 -0700
+Processing by Skydrive::LaunchController#basic_launch as HTML
+  Parameters: {"oauth_consumer_key"=>"fe240219-0559-4cb8-933d-ad7ef572005c", "oauth_signature_method"=>"HMAC-SHA1", "oauth_timestamp"=>"1389809618", "oauth_nonce"=>"6g0Lm9i6LZTr80aUEWYRsfPyLBOOv4xwGBfMiuaGY", "oauth_version"=>"1.0", "context_id"=>"d2be670fbe0876dc2e5dde5a1fbb35982fe20f9f", "context_label"=>"LTI", "context_title"=>"LTI", "custom_canvas_api_domain"=>"localhost:3000", "custom_canvas_assignment_id"=>"7", "custom_canvas_course_id"=>"1", "custom_canvas_enrollment_state"=>"active", "custom_canvas_user_id"=>"1", "custom_canvas_user_login_id"=>"brad", "custom_sharepoint_client_domain"=>"instructure", "ext_content_intended_use"=>"homework", "ext_content_return_types"=>"file", "ext_content_return_url"=>"http://localhost:3000/external_content/success/external_tool", "launch_presentation_document_target"=>"iframe", "launch_presentation_height"=>"600", "launch_presentation_locale"=>"en", "launch_presentation_return_url"=>"http://localhost:3000/external_content/success/external_tool", "launch_presentation_width"=>"700", "lis_person_contact_email_primary"=>"brad", "lis_person_name_family"=>"", "lis_person_name_full"=>"brad", "lis_person_name_given"=>"brad", "lti_message_type"=>"basic-lti-launch-request", "lti_version"=>"LTI-1p0", "oauth_callback"=>"about:blank", "resource_link_id"=>"d2be670fbe0876dc2e5dde5a1fbb35982fe20f9f", "resource_link_title"=>"SkydrivePro", "roles"=>"Instructor,Learner,urn:lti:instrole:ims/lis/Administrator", "tool_consumer_info_product_family_code"=>"canvas", "tool_consumer_info_version"=>"cloud", "tool_consumer_instance_contact_email"=>"canvas@example.com", "tool_consumer_instance_guid"=>"a4a7c6f7128c3946d872188732e68cc877bfe245.localhost:3000", "tool_consumer_instance_name"=>"test", "user_id"=>"f3e8abfd08ea30734fdb78d4503523c0f2f35f12", "user_image"=>"https://secure.gravatar.com/avatar/884354eb56db3323cbce63a5e177ecac?s=50&d=https%3A%2F%2Fcanvas.instructure.com%2Fimages%2Fmessages%2Favatar-50.png", "oauth_signature"=>"+DR6BYOnWXCTSC0/TYLt6WJXjjQ="}
+  Skydrive::LtiKey Load (0.2ms)  SELECT "skydrive_lti_keys".* FROM "skydrive_lti_keys" WHERE "skydrive_lti_keys"."key" = 'fe240219-0559-4cb8-933d-ad7ef572005c' ORDER BY "skydrive_lti_keys"."id" ASC LIMIT 1
+  Rendered text template (0.0ms)
+Completed 400 Bad Request in 2ms (Views: 0.7ms | ActiveRecord: 0.2ms)
+
+
+Started GET "/assets/skydrive/skydrive_icon.png" for 127.0.0.1 at 2014-01-15 11:14:04 -0700
+
+
+Started POST "/skydrive/launch" for 127.0.0.1 at 2014-01-15 11:14:07 -0700
+Processing by Skydrive::LaunchController#basic_launch as HTML
+  Parameters: {"oauth_consumer_key"=>"fe240219-0559-4cb8-933d-ad7ef572005c", "oauth_signature_method"=>"HMAC-SHA1", "oauth_timestamp"=>"1389809647", "oauth_nonce"=>"qU7Rdmz7nWi5plLaqOKluyRBF3h3BcTBMRbzbBdXTa8", "oauth_version"=>"1.0", "context_id"=>"d2be670fbe0876dc2e5dde5a1fbb35982fe20f9f", "context_label"=>"LTI", "context_title"=>"LTI", "custom_canvas_api_domain"=>"localhost:3000", "custom_canvas_assignment_id"=>"7", "custom_canvas_course_id"=>"1", "custom_canvas_enrollment_state"=>"active", "custom_canvas_user_id"=>"1", "custom_canvas_user_login_id"=>"brad", "custom_sharepoint_client_domain"=>"instructure", "ext_content_intended_use"=>"homework", "ext_content_return_types"=>"file", "ext_content_return_url"=>"http://localhost:3000/external_content/success/external_tool", "launch_presentation_document_target"=>"iframe", "launch_presentation_height"=>"600", "launch_presentation_locale"=>"en", "launch_presentation_return_url"=>"http://localhost:3000/external_content/success/external_tool", "launch_presentation_width"=>"700", "lis_person_contact_email_primary"=>"brad", "lis_person_name_family"=>"", "lis_person_name_full"=>"brad", "lis_person_name_given"=>"brad", "lti_message_type"=>"basic-lti-launch-request", "lti_version"=>"LTI-1p0", "oauth_callback"=>"about:blank", "resource_link_id"=>"d2be670fbe0876dc2e5dde5a1fbb35982fe20f9f", "resource_link_title"=>"SkydrivePro", "roles"=>"Instructor,Learner,urn:lti:instrole:ims/lis/Administrator", "tool_consumer_info_product_family_code"=>"canvas", "tool_consumer_info_version"=>"cloud", "tool_consumer_instance_contact_email"=>"canvas@example.com", "tool_consumer_instance_guid"=>"a4a7c6f7128c3946d872188732e68cc877bfe245.localhost:3000", "tool_consumer_instance_name"=>"test", "user_id"=>"f3e8abfd08ea30734fdb78d4503523c0f2f35f12", "user_image"=>"https://secure.gravatar.com/avatar/884354eb56db3323cbce63a5e177ecac?s=50&d=https%3A%2F%2Fcanvas.instructure.com%2Fimages%2Fmessages%2Favatar-50.png", "oauth_signature"=>"6g65vS/tXIo5mGxe26G1fQA3VNc="}
+  Skydrive::LtiKey Load (0.2ms)  SELECT "skydrive_lti_keys".* FROM "skydrive_lti_keys" WHERE "skydrive_lti_keys"."key" = 'fe240219-0559-4cb8-933d-ad7ef572005c' ORDER BY "skydrive_lti_keys"."id" ASC LIMIT 1
+  Rendered text template (0.0ms)
+Completed 400 Bad Request in 2ms (Views: 0.3ms | ActiveRecord: 0.2ms)
+  Skydrive::LtiKey Load (0.1ms)  SELECT "skydrive_lti_keys".* FROM "skydrive_lti_keys" ORDER BY "skydrive_lti_keys"."id" DESC LIMIT 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lti_skydrive
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Brad Humphrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -138,6 +138,7 @@ files:
 - app/assets/javascripts/skydrive/vendor/jquery.js
 - app/assets/stylesheets/skydrive/app.css
 - app/assets/stylesheets/skydrive/application.css
+- app/assets/stylesheets/skydrive/custom.css
 - app/assets/stylesheets/skydrive/font-awesome/font-awesome.min.css
 - app/assets/stylesheets/skydrive/normalize.css
 - app/controllers/skydrive/api_keys_controller.rb
@@ -156,6 +157,7 @@ files:
 - app/serializers/api_key_serializer.rb
 - app/serializers/user_serializer.rb
 - app/views/layouts/skydrive/application.html.erb
+- app/views/layouts/skydrive/error.html.erb
 - app/views/skydrive/ember/index.html.erb
 - config/initializers/sharepoint.rb
 - config/routes.rb
@@ -353,7 +355,6 @@ files:
 - test/dummy/tmp/cache/assets/production/sprockets/f48290aae486ea863a9f456ba96443e9
 - test/dummy/tmp/cache/assets/production/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - test/dummy/tmp/cache/assets/production/sprockets/fa078ac6abaaee94445294c5a7c6d793
-- test/dummy/tmp/pids/server.pid
 - test/helpers/skydrive/ember_helper_test.rb
 - test/integration/navigation_test.rb
 - test/skydrive_test.rb
@@ -555,7 +556,6 @@ test_files:
 - test/dummy/tmp/cache/assets/production/sprockets/f48290aae486ea863a9f456ba96443e9
 - test/dummy/tmp/cache/assets/production/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - test/dummy/tmp/cache/assets/production/sprockets/fa078ac6abaaee94445294c5a7c6d793
-- test/dummy/tmp/pids/server.pid
 - test/helpers/skydrive/ember_helper_test.rb
 - test/integration/navigation_test.rb
 - test/skydrive_test.rb

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-15608