omniauth-centro 0.0.2 → 0.0.3

data/lib/omniauth-centro/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Centro
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/omniauth/strategies/centro.html

@@ -0,0 +1,119 @@
+<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js"></script>
+
+<link href="http://wwwendt.de/tech/dynatree/src/skin/ui.dynatree.css" rel="stylesheet" type="text/css">
+<script src="http://wwwendt.de/tech/dynatree/src/jquery.dynatree.js" type="text/javascript"></script>
+
+<script type="text/javascript">
+  var updateRawInfoJsonFromTree = function() {
+    var rawInfo = { organizations: [], memberships: [] };
+    var products = {};
+    var organization_owner = {};
+    var tree = getTree();
+    var selectedOrganizationId = null;
+
+    tree.visit(function(node) {
+      if (node.data.product_name) {
+        organization_id = node.data.organization_id;
+
+        if (products[organization_id] == null) {
+          products[organization_id] = [];
+        }
+
+        if (node.bSelected == true) {
+          products[organization_id].push(node.data.product_name);
+          selectedOrganizationId = organization_id;
+        }
+      } else if (node.data.title == "organization_owner") {
+        organization_owner[node.data.organization_id] = node.bSelected;
+      }
+    });
+
+    tree.visit(function(node) {
+      if (node.data.id == selectedOrganizationId) {
+        rawInfo.organizations.push({ id: node.data.id, name: node.data.title });
+      }
+    });
+
+    $.each(rawInfo.organizations, function(index, organization) {
+      rawInfo.memberships.push({ organization_id: organization.id, organization_name: organization.name, organization_owner: organization_owner[organization.id], products: products[organization.id] });
+    });
+
+    rawInfo["current_organization_id"] = selectedOrganizationId;
+    $('#raw_info_json')[0].value = JSON.stringify(rawInfo);
+  }
+
+  var ensureSingleOrganizationSelected = function(selectedNode) {
+    getTree().visit(function(node) {
+      if (node.data.id) {
+        node.select(node == selectedNode);
+        node.expand(node == selectedNode);
+        if (node != selectedNode) {
+          node.visit(function(childNode) {
+            childNode.select(false);
+          });
+        }
+      }
+    });
+  }
+
+  var getTree = function() {
+    return $('#raw_info').dynatree('getRoot').tree;
+  }
+
+  $(function() {
+    var product = function(organization_id, organization_name, product_name, selected) {
+      return { title: product_name, organization_id: organization_id, organization_name: organization_name, product_name: product_name, select: selected };
+    }
+
+    var organization = function(id, name, selected) {
+      return { id: id, title: name, expand: selected, key: name, children: [
+          { title: 'organization_owner', organization_id: id, select: selected },
+          product(id, name, 'mms', selected),
+          product(id, name, 'finance', selected),
+          product(id, name, 'insight', selected),
+          product(id, name, 'planner', selected),
+          product(id, name, 'roz', selected)
+        ]
+      }
+    }
+
+    var organizations = [
+      organization(1, 'Centro', true),
+      organization(2, 'Test Agency Organization', false),
+      organization(3, 'Test Publisher Organization', false),
+    ];
+
+    $("#raw_info").dynatree({
+      checkbox: true,
+      selectMode: 3,
+      children: organizations,
+      autoCollapse: true,
+      onDblClick: function(node, event) {
+        node.toggleSelect();
+      },
+      onKeydown: function(node, event) {
+        if (event.which == 32) {
+          node.toggleSelect();
+          return false;
+        }
+      },
+      onSelect: function(flag, node) {
+        if (flag == true) {
+          ensureSingleOrganizationSelected(node);
+        }
+      }
+    });
+
+    $("form").submit(function() {
+      if ($('#email').val() === "") {
+        alert("Email is required!");
+        return false;
+      } else {
+        updateRawInfoJsonFromTree();
+        return true;
+      }
+    });
+  });
+</script>
+

data/lib/omniauth/strategies/centro.rb

@@ -8,13 +8,7 @@ module OmniAuth
       end
 
       info do
-        {
-          :email         => raw_info["email"],
-          :organizations => raw_info['organizations'],
-          :features      => raw_info['features'],
-          :current_organization_id => raw_info['current_organization_id'],
-          :raw_info      => raw_info
-        }
+        raw_info
       end
 
       def request_phase
@@ -34,71 +28,16 @@ module OmniAuth
       option :uid_field, :email
 
       def request_phase
-        form = OmniAuth::Form.new(:title => "Centro Developer Login", :url => callback_path, :header_info => <<-HTML)
-<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
-<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.8.23/jquery-ui.min.js"></script>
+        form = OmniAuth::Form.new(:title => "Centro Developer Login",
+                                  :url => callback_path,
+                                  :header_info => File.read(File.join(File.dirname(__FILE__), "centro.html")))
 
-<link href="http://wwwendt.de/tech/dynatree/src/skin/ui.dynatree.css" rel="stylesheet" type="text/css">
-<script src="http://wwwendt.de/tech/dynatree/src/jquery.dynatree.js" type="text/javascript"></script>
-<script type="text/javascript">
-  var updateRawInfoJsonFromTree = function(tree){
-    var rawInfo = {organizations: [], features: []};
-    $.each(tree.getSelectedNodes(), function(index, node){
-      // This is a "Feature" node
-      if(node.data.key.feature_name){
-        rawInfo.features.push({organization_id: node.data.key.organization_id, name: node.data.key.feature_name});
-        // OTherwise if it has an ID it's an organization
-      }else if(node.data.id){
-        rawInfo.organizations.push({id: node.data.id, name: node.data.title});
-      }
-    });
-    $('#raw_info_json')[0].value = JSON.stringify(rawInfo);
-  }
-  $(function(){
-    var feature = function(organization_id, organization_name, feature_name, selected){
-      return {title: feature_name, key: {organization_id: organization_id, organization_name: organization_name, feature_name: feature_name}, select: selected};
-    }
-    var organization = function(id, name, selected){
-      return {id: id, title: name, expand: true, key: name, children: [
-          feature(id, name,'admin',selected),
-          feature(id, name,'media_plan_creation',selected),
-          feature(id, name,'media_plan_negotiation',selected),
-          feature(id, name,'media_plan_analysis',selected),
-          feature(id, name,'finance',selected)
-        ]
-      }
-    }
-    var organizations = [
-      organization(1, 'Centro',true),
-      organization(2, 'CentroTestAgency',false),
-      organization(3, 'CentroTestPublisher',false),
-    ];
-    $("#raw_info").dynatree({
-      checkbox: true,
-      selectMode: 3,
-      children: organizations,
-      onSelect: function(select, node) {
-        updateRawInfoJsonFromTree(node.tree);
-      },
-      onDblClick: function(node, event) {
-        node.toggleSelect();
-      },
-      onKeydown: function(node, event) {
-        if( event.which == 32 ) {
-          node.toggleSelect();
-          return false;
-        }
-      },
-    });
-    updateRawInfoJsonFromTree($('#raw_info').dynatree('getRoot').tree);
-  });
-</script>
-        HTML
         options.fields.each do |field|
           form.text_field field.to_s.capitalize.gsub("_", " "), field.to_s
         end
+
         form.html "<input type='hidden' id='raw_info_json' name='raw_info_json' />"
-        form.html "<h3>Features</h3>"
+        form.html "<h3>Membership</h3>"
         form.html "<div id='raw_info'></div>"
         form.button "Sign In"
         form.to_response
@@ -114,7 +53,8 @@ module OmniAuth
           hash
         end.merge(
           :organizations => raw_info['organizations'],
-          :features      => raw_info['features']
+          :memberships => raw_info['memberships'],
+          :current_organization_id => raw_info['current_organization_id']
         )
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-centro
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -54,6 +54,7 @@ files:
 - README.md
 - lib/omniauth-centro.rb
 - lib/omniauth-centro/version.rb
+- lib/omniauth/strategies/centro.html
 - lib/omniauth/strategies/centro.rb
 - omniauth-centro.gemspec
 homepage: https://github.com/centro/omniauth-centro