lti_skydrive 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c5546f82f82d6e9bddbf74d659db07d279dbf2f
-  data.tar.gz: 2b9e840801f7c3c539f2c3ae7545ba551d51baa5
+  metadata.gz: d5f0e4eb5600f5de944e305ba7cb69eb7de311fc
+  data.tar.gz: 3f846d19fe45a85cac359e3568de322f8a6d0abc
 SHA512:
-  metadata.gz: 92dcfaf6cd22df44617d668ea61b0189407ea952e3e9a27c9452fa5ac3a997e934666c6b81c5dd16fe662a238fc8d4e0228d7bdd55789c7b09002e1d654bdbea
-  data.tar.gz: 9b70899e5727825ed1c6a4ab76e4297f17b58e60e686faea2fc678eec13fbcfbc4cc94c9e56f7a8b36eb9ff09a05f3241ee5649f59a2931c7e5986b0a7f12cbf
+  metadata.gz: f67883452939a9d22987e07ee7f1759f1b9b26239a6f0a866ccd40442620eb6e636cc6aa11ee1b06b7ae067d96243e03a76f66259faacaa0d77b73f5f83fbded
+  data.tar.gz: aa337b119ede3a92b73a35dbc40106af465a98177e9ed5edbb13052f6eca56d70812fb9f5eb1bd82f00b5e220008c71a389beec326e2557c5c27f109fc87e259

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

@@ -337,122 +337,122 @@
 /* 6 */
 /***/ function(module, exports, __webpack_require__) {
 
-	/*
-		MIT License http://www.opensource.org/licenses/mit-license.php
-		Author Tobias Koppers @sokra
-	*/
-	var stylesInDom = {};
-
-	module.exports = function(list) {
-		if(false) {
-			if(typeof document !== "object") throw new Error("The style-loader cannot be used in a non-browser environment");
-		}
-		var styles = listToStyles(list);
-		addStylesToDom(styles);
-		return function update(newList) {
-			var mayRemove = [];
-			for(var i = 0; i < styles.length; i++) {
-				var item = styles[i];
-				var domStyle = stylesInDom[item.id];
-				domStyle.refs--;
-				mayRemove.push(domStyle);
-			}
-			if(newList) {
-				var newStyles = listToStyles(newList);
-				addStylesToDom(newStyles);
-			}
-			for(var i = 0; i < mayRemove.length; i++) {
-				var domStyle = mayRemove[i];
-				if(domStyle.refs === 0) {
-					for(var j = 0; j < domStyle.parts.length; j++)
-						domStyle.parts[j]();
-					delete stylesInDom[domStyle.id];
-				}
-			}
-		};
-	}
-
-	function addStylesToDom(styles) {
-		for(var i = 0; i < styles.length; i++) {
-			var item = styles[i];
-			var domStyle = stylesInDom[item.id];
-			if(domStyle) {
-				domStyle.refs++;
-				for(var j = 0; j < domStyle.parts.length; j++) {
-					domStyle.parts[j](item.parts[j]);
-				}
-				for(; j < item.parts.length; j++) {
-					domStyle.parts.push(addStyle(item.parts[j]));
-				}
-			} else {
-				var parts = [];
-				for(var j = 0; j < item.parts.length; j++) {
-					parts.push(addStyle(item.parts[j]));
-				}
-				stylesInDom[item.id] = {id: item.id, refs: 1, parts: parts};
-			}
-		}
-	}
-
-	function listToStyles(list) {
-		var styles = [];
-		var newStyles = {};
-		for(var i = 0; i < list.length; i++) {
-			var item = list[i];
-			var id = item[0];
-			var css = item[1];
-			var media = item[2];
-			// var sourceMap = item[3];
-			var part = {css: css, media: media/*, sourceMap: sourceMap*/};
-			if(!newStyles[id])
-				styles.push(newStyles[id] = {id: id, parts: [part]});
-			else
-				newStyles[id].parts.push(part);
-		}
-		return styles;
-	}
-
-	function addStyle(obj) {
-		var styleElement = document.createElement("style");
-		var head = document.head || document.getElementsByTagName("head")[0];
-		styleElement.type = "text/css";
-		head.appendChild(styleElement);
-		applyToTag(styleElement, obj);
-		return function(newObj) {
-			if(newObj) {
-				if(newObj.css === obj.css && newObj.media === obj.media /*&& newObj.sourceMap === obj.sourceMap*/)
-					return;
-				applyToTag(styleElement, obj = newObj);
-			} else {
-				head.removeChild(styleElement);
-			}
-		};
-	};
-
-	function applyToTag(styleElement, obj) {
-		var css = obj.css;
-		var media = obj.media;
-		// var sourceMap = obj.sourceMap;
-
-		// No browser support
-		// if(sourceMap && typeof btoa === "function") {
-			// try {
-				// css += "\n/*# sourceMappingURL=data:application/json;base64," + btoa(JSON.stringify(sourceMap)) + " */";
-			// } catch(e) {}
-		// }
-		if(media) {
-			styleElement.setAttribute("media", media)
-		}
-		if (styleElement.styleSheet) {
-			styleElement.styleSheet.cssText = css;
-		} else {
-			while(styleElement.firstChild) {
-				styleElement.removeChild(styleElement.firstChild);
-			}
-			styleElement.appendChild(document.createTextNode(css));
-		}
-
-	}
+	/*
+		MIT License http://www.opensource.org/licenses/mit-license.php
+		Author Tobias Koppers @sokra
+	*/
+	var stylesInDom = {};
+
+	module.exports = function(list) {
+		if(false) {
+			if(typeof document !== "object") throw new Error("The style-loader cannot be used in a non-browser environment");
+		}
+		var styles = listToStyles(list);
+		addStylesToDom(styles);
+		return function update(newList) {
+			var mayRemove = [];
+			for(var i = 0; i < styles.length; i++) {
+				var item = styles[i];
+				var domStyle = stylesInDom[item.id];
+				domStyle.refs--;
+				mayRemove.push(domStyle);
+			}
+			if(newList) {
+				var newStyles = listToStyles(newList);
+				addStylesToDom(newStyles);
+			}
+			for(var i = 0; i < mayRemove.length; i++) {
+				var domStyle = mayRemove[i];
+				if(domStyle.refs === 0) {
+					for(var j = 0; j < domStyle.parts.length; j++)
+						domStyle.parts[j]();
+					delete stylesInDom[domStyle.id];
+				}
+			}
+		};
+	}
+
+	function addStylesToDom(styles) {
+		for(var i = 0; i < styles.length; i++) {
+			var item = styles[i];
+			var domStyle = stylesInDom[item.id];
+			if(domStyle) {
+				domStyle.refs++;
+				for(var j = 0; j < domStyle.parts.length; j++) {
+					domStyle.parts[j](item.parts[j]);
+				}
+				for(; j < item.parts.length; j++) {
+					domStyle.parts.push(addStyle(item.parts[j]));
+				}
+			} else {
+				var parts = [];
+				for(var j = 0; j < item.parts.length; j++) {
+					parts.push(addStyle(item.parts[j]));
+				}
+				stylesInDom[item.id] = {id: item.id, refs: 1, parts: parts};
+			}
+		}
+	}
+
+	function listToStyles(list) {
+		var styles = [];
+		var newStyles = {};
+		for(var i = 0; i < list.length; i++) {
+			var item = list[i];
+			var id = item[0];
+			var css = item[1];
+			var media = item[2];
+			// var sourceMap = item[3];
+			var part = {css: css, media: media/*, sourceMap: sourceMap*/};
+			if(!newStyles[id])
+				styles.push(newStyles[id] = {id: id, parts: [part]});
+			else
+				newStyles[id].parts.push(part);
+		}
+		return styles;
+	}
+
+	function addStyle(obj) {
+		var styleElement = document.createElement("style");
+		var head = document.head || document.getElementsByTagName("head")[0];
+		styleElement.type = "text/css";
+		head.appendChild(styleElement);
+		applyToTag(styleElement, obj);
+		return function(newObj) {
+			if(newObj) {
+				if(newObj.css === obj.css && newObj.media === obj.media /*&& newObj.sourceMap === obj.sourceMap*/)
+					return;
+				applyToTag(styleElement, obj = newObj);
+			} else {
+				head.removeChild(styleElement);
+			}
+		};
+	};
+
+	function applyToTag(styleElement, obj) {
+		var css = obj.css;
+		var media = obj.media;
+		// var sourceMap = obj.sourceMap;
+
+		// No browser support
+		// if(sourceMap && typeof btoa === "function") {
+			// try {
+				// css += "\n/*# sourceMappingURL=data:application/json;base64," + btoa(JSON.stringify(sourceMap)) + " */";
+			// } catch(e) {}
+		// }
+		if(media) {
+			styleElement.setAttribute("media", media)
+		}
+		if (styleElement.styleSheet) {
+			styleElement.styleSheet.cssText = css;
+		} else {
+			while(styleElement.firstChild) {
+				styleElement.removeChild(styleElement.firstChild);
+			}
+			styleElement.appendChild(document.createTextNode(css));
+		}
+
+	}
 
 
 /***/ },
@@ -34404,16 +34404,16 @@
 /* 155 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports = function(module) {
-		if(!module.webpackPolyfill) {
-			module.deprecate = function() {};
-			module.paths = [];
-			// module.parent = undefined by default
-			module.children = [];
-			module.webpackPolyfill = 1;
-		}
-		return module;
-	}
+	module.exports = function(module) {
+		if(!module.webpackPolyfill) {
+			module.deprecate = function() {};
+			module.paths = [];
+			// module.parent = undefined by default
+			module.children = [];
+			module.webpackPolyfill = 1;
+		}
+		return module;
+	}
 
 
 /***/ },
@@ -41139,21 +41139,21 @@
 /* 280 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports = function() {
-		var list = [];
-		list.toString = function toString() {
-			var result = [];
-			for(var i = 0; i < this.length; i++) {
-				var item = this[i];
-				if(item[2]) {
-					result.push("@media " + item[2] + "{" + item[1] + "}");
-				} else {
-					result.push(item[1]);
-				}
-			}
-			return result.join("");
-		};
-		return list;
+	module.exports = function() {
+		var list = [];
+		list.toString = function toString() {
+			var result = [];
+			for(var i = 0; i < this.length; i++) {
+				var item = this[i];
+				if(item[2]) {
+					result.push("@media " + item[2] + "{" + item[1] + "}");
+				} else {
+					result.push(item[1]);
+				}
+			}
+			return result.join("");
+		};
+		return list;
 	}
 
 /***/ },
@@ -43842,7 +43842,7 @@
 /* 300 */
 /***/ function(module, exports, __webpack_require__) {
 
-	module.exports = function() { throw new Error("define cannot be used indirect"); };
+	module.exports = function() { throw new Error("define cannot be used indirect"); };
 
 
 /***/ },

data/app/controllers/skydrive/application_controller.rb

@@ -40,7 +40,7 @@ module Skydrive
     def skydrive_client
       @skydrive_client ||=
           Client.new(SHAREPOINT.merge(
-                         client_domain: current_user.token.client_domain,
+                         personal_url: current_user.token.personal_url,
                          token: current_user.token.access_token
                      ))
     end

data/app/controllers/skydrive/launch_controller.rb

@@ -3,7 +3,6 @@ require 'ims/lti'
 module Skydrive
   class LaunchController < ApplicationController
     include ActionController::Cookies
-
     before_filter :ensure_authenticated_user, only: :skydrive_authorized
 
     def tool_provider
@@ -35,11 +34,6 @@ module Skydrive
       #  register_error "Why are you reusing the nonce?"
       #  return false
       #end
-      #
-      ## save the launch parameters for use in later request
-      ##session['launch_params'] = @tp.to_params
-      #
-      #@username = @tp.username("Dude")
 
       return tp
     end
@@ -51,11 +45,6 @@ module Skydrive
         return
       end
 
-      unless client_domain = tp.get_custom_param('sharepoint_client_domain')
-        render text: "Missing sharepoint client domain", status: 400, layout: "skydrive/error"
-        return
-      end
-
       user = @account.users.where(username: tp.user_id).first ||
           @account.users.create(
               lti_user_id: tp.user_id,
@@ -64,11 +53,8 @@ module Skydrive
               email: tp.lis_person_contact_email_primary,
           )
 
-      if user.token
-        user.token.update_attributes(client_domain: "#{client_domain}-my.sharepoint.com")
-      else
-        user.token = Token.create(client_domain: "#{client_domain}-my.sharepoint.com")
-      end
+      user.token = Token.create unless user.token
+
       user.cleanup_api_keys
 
       code = user.session_api_key(params).oauth_code
@@ -86,68 +72,41 @@ module Skydrive
       else
         code = current_user.api_keys.active.skydrive_oauth.create.oauth_code
 
-        if current_user.account.admin
-          #Get the user's access token
-          auth_url = skydrive_client.app_redirect_uri(microsoft_oauth_url, state: code)
-        else
-          #Authorize the tenant
-          auth_url = skydrive_client.oauth_authorize_redirect_uri(microsoft_oauth_url, state: code)
-        end
-        render text: auth_url, status: 401
+        render text: skydrive_client.oauth_authorize_redirect_uri(microsoft_oauth_url, state: code), status: 401
       end
     end
 
-    def app_redirect
-      @current_user = ApiKey.trade_oauth_code_for_access_token(params['state']).user
-
-      token = @current_user.token
-
-      token.token_type = Token::USER
-      token.refresh_token = params[:SPAppToken]
-      token.refresh!(skydrive_client)
-
-      redirect_to "#{root_path}oauth/callback"
-    end
-
     def microsoft_oauth
       @current_user = ApiKey.trade_oauth_code_for_access_token(params['state']).user
 
-      results = skydrive_client.authorize_app(microsoft_oauth_url, params['code'])
+      skydrive_client.request_oauth_token(params['code'], microsoft_oauth_url)
+      service = skydrive_client.get_my_files_service()
+      current_user.token.resource = service["serviceResourceId"]
+      current_user.token.refresh!(skydrive_client)
 
-      unless results.key? 'error'
-        results.merge!(token_type: Token::ADMIN, personal_url: skydrive_client.get_user['PersonalUrl'])
-        @current_user.token.update_attributes(results)
-        @current_user.account.update_attributes(admin: @current_user)
-      end
+      personal_url = skydrive_client.get_personal_url(service["serviceEndpointUri"]).gsub(/\/Documents$/,'/')
+      current_user.token.update_attribute(:personal_url, personal_url)
 
       redirect_to "#{root_path}oauth/callback"
     end
 
     def xml_config
-      # ie http://localhost:9393/config?sharepoint_client_domain=my_subdomain
       host = request.scheme + "://" + request.host_with_port + "/"
 
-      if params['sharepoint_client_domain']
-        url = "#{request.protocol}#{request.host_with_port}#{launch_path}"
-        title = "Onedrive Pro"
-        tc = IMS::LTI::ToolConfig.new(:title => title, :launch_url => url)
-        tc.extend IMS::LTI::Extensions::Canvas::ToolConfig
-        tc.description = 'Allows you to pull in documents from Onedrive Pro to canvas'
-        tc.canvas_privacy_public!
-        tc.canvas_domain!(request.host)
-        tc.canvas_icon_url!("#{host}assets/skydrive/skydrive_icon.png")
-        tc.canvas_selector_dimensions!(700,600)
-        tc.canvas_text!(title)
-        tc.canvas_homework_submission!
-        tc.canvas_account_navigation!
-        tc.canvas_course_navigation!(visibility: 'admin')
-        tc.set_ext_param(
-            IMS::LTI::Extensions::Canvas::ToolConfig::PLATFORM, :custom_fields,
-            {sharepoint_client_domain: params['sharepoint_client_domain']})
-        render xml: tc.to_xml
-      else
-        render text: 'The sharepoint_client_domain is a required parameter.'
-      end
+      url = "#{request.protocol}#{request.host_with_port}#{launch_path}"
+      title = "Onedrive Pro"
+      tc = IMS::LTI::ToolConfig.new(:title => title, :launch_url => url)
+      tc.extend IMS::LTI::Extensions::Canvas::ToolConfig
+      tc.description = 'Allows you to pull in documents from Onedrive Pro to canvas'
+      tc.canvas_privacy_public!
+      tc.canvas_domain!(request.host)
+      tc.canvas_icon_url!("#{host}assets/skydrive/skydrive_icon.png")
+      tc.canvas_selector_dimensions!(700,600)
+      tc.canvas_text!(title)
+      tc.canvas_homework_submission!
+      tc.canvas_account_navigation!
+      tc.canvas_course_navigation!(visibility: 'admin')
+      render xml: tc.to_xml
     end
   end
 end