omniauth-saml-rmunify 1.0.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGYyZTEwMzliMWZiZTNlMmRhYzE5M2Q5Y2VjOWMxNjEyZWNlMDA5OA==
+    MjM3ZDIyODhkZmE3YmYyZTNjZWRkNWM2N2Q0NTgxYzUyNmE4Y2JlNg==
   data.tar.gz: !binary |-
-    ZTE2Zjk5MzE2OTY0ZTY5OWY1YjIwOWI3MTllY2JmMDQ4NGQ4YjUyNw==
+    OThlYTM2MzM3NGY4OWUzNGU5NDk2YmUzNjQ2MDQ1MjIyY2ZhMDBiOA==
 SHA512:
   metadata.gz: !binary |-
-    MjJiMzk2Y2VhNjVlMDIyYjRkMTM4MmI5Zjc5OWUwMjAwNDkwNjc4ZWNhOTMz
-    MWVmZGE2ZTk5MWQxMWUyMmI2MzNmOGE1NjIwMzI5MzFiZDFhMTQwM2IyZjQw
-    ZDllODA0YWI2OTE4NjI0MDgyZjExMmVhMTA3MjEzMmQ1NDhiNDI=
+    ZmU3YzFhNjA2MWFmYmE4OGNmNzAwYTE1NmM4MjI1NjRiNGRkM2ZhMGFjNjll
+    MDYyMGVlMDQ1YWQzYjIzZGVlN2E4MDU5YWRjODkzMGRmMDY5MjlmMGVmMjU3
+    YTE5MTVhN2M2NDgyNmU2NjZjN2UxMGE0OWY3NTFlOGY3YTBhNTk=
   data.tar.gz: !binary |-
-    OTZmMTkzYjY0ODkxZTFiMzNmZGZhY2UwNjI3ZjUzYjJjOGE2NjQ2OTczNTg3
-    NTJmYmRhZTA3NGUyNjdlZWNmZWJhY2FjMjhmNzEzMGQxNjVlYjI2NjFhOWZm
-    ZjkzZWY5MzYyN2Q1Nzc4OTNkYWI5ZDFjNjE1YzI0MTYzOTUzYTA=
+    NmUyMzI4ODVhZGRhOGQ4NjhiOWU4MzA2Y2IyYjE5MThiNTVlMWQ0NmY4ZTFk
+    MDBjZTJhNzI1YmNjYWVhZTIxOTBmNzAyOWIxM2U2YjAwODM2MzljYzEyODIw
+    Yzc1YzQ0MjkzNWI3MjNmODQ0MTE2OWJhMWRmMmVhM2E4NWVhZTM=

data/CHANGELOG.md

@@ -6,6 +6,13 @@ https://github.com/hampei/omniauth-saml-rmunify
 
 ## master
 
+## 2.0.0 (2014-02-17)
+
+* Added app_licence underscore hash keys.
+* Removed app_licence camelcased keys.
+* Added app_name, package_name, school_type and term to the licence hash.
+* Made is_unify_admin a boolean.
+* Made licence.is_connector and licence.is_trial booleans.
 
 ## 1.0.0 (2014-02-15)
 

data/README.md

@@ -6,7 +6,7 @@ https://github.com/hampei/omniauth-saml-rmunify
 
 * It's a simple subclass of omniauth-saml with a rm unify specific info hash.
 * Take a look at [rm attributes](http://dev.rmunify.com/reference/understanding-rm-unify/user-attributes.aspx) for descriptions.
-* The attribute names have been taken from the manage-app/single-sign-on/saml-p page, underscored for you convenience.
+* The attribute names have been taken from the manage-app/single-sign-on/saml-p page, underscored for your convenience.
 * Read the [list of info attributes](https://github.com/hampei/omniauth-saml-rmunify/blob/master/lib/omniauth/strategies/saml-rmunify.rb) for what is available.
 
 ## Requirements
@@ -37,6 +37,17 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
+In your callback:
+
+```ruby
+  def saml_rmunify
+    uid = request.env["omniauth.auth"].uid
+    info = request.env["omniauth.auth"].info
+    info.licence # {"is_trial"=>false, "is_connector"=>false, "description"=>".../premium/Pri/1y/RMUnify",
+                 #  "app_name"=>"...", "package_name"=>"premium", "school_type"=>"Pri", "term"=>"1y"}
+  end
+```
+
 ## Authors
 
 Authored by Henk van der Veen.

data/lib/omniauth-saml-rmunify/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module SAMLRMUnify
-    VERSION = '1.0.0'
+    VERSION = '2.0.0'
   end
 end

data/lib/omniauth/strategies/saml-rmunify.rb

@@ -27,7 +27,7 @@ module OmniAuth
           :display_name      => @attributes['urn:oid:2.16.840.1.113730.3.1.241'],
           :role              => @attributes['http://schemas.microsoft.com/ws/2008/06/identity/claims/role'],
           :scope_affiliation => @attributes['urn:oid:1.3.6.1.4.1.5923.1.1.1.9'],
-          :is_unify_admin    => @attributes['http://schemas.rm.com/identity/claims/isunifyadmin'],
+          :is_unify_admin    => @attributes['http://schemas.rm.com/identity/claims/isunifyadmin'] == 'True',
           :year_of_entry     => @attributes['http://schemas.rm.com/identity/claims/yearofentry'],
           :app_licence       => licence,
           :app_user_id       => @attributes['http://schemas.rm.com/identity/claims/appuserid'],
@@ -35,9 +35,27 @@ module OmniAuth
         }
       end
 
-      private def licence
+      private
+
+      def licence
         licence_str =  @attributes['http://schemas.rm.com/identity/claims/applicence']
-        licence = Hash[licence_str[1..-2].split('|').map{|kv| kv.split(':')}]
+        licence = Hash[licence_str[1..-2].split('|').map{|kv|
+          (k,v) = kv.split(':')
+          [k.underscore, v]
+        }]
+        licence['is_trial'] = licence['is_trial'] == 'True'
+        licence['is_connector'] = licence['is_connector'] == 'True'
+        licence.merge!(licence_description(licence))
+      end
+
+      def licence_description(licence)
+        desc = licence['description'].split('/')
+        {
+          :app_name     => desc[0],
+          :package_name => desc[1],
+          :school_type  => desc[2],
+          :term         => desc[3]
+        }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-saml-rmunify
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Henk van der Veen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-saml