oneroster 2.3.1 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ac81a3a6a046beb01b2ae6d34e6ff2f373921d41
-  data.tar.gz: 35e4d0240dc30cfe9aa5bf38af83de2ab19dcb31
+SHA256:
+  metadata.gz: e72a336a1a4c7cd0e21b3065a474993262189398a0ceefb042ded61127a3a43b
+  data.tar.gz: 59ff3722aa3d8e78fae4293a1bbd8d78e0de300efc73904c40d305e20f5c1685
 SHA512:
-  metadata.gz: dcd9b28d5b6d2607fff300142b0978a97b01d0227fa0ed1f89f828bdcad656b1955b9951864afd3a7ef75277cf4312d6b121ce12e61a882376adce66d9f46f7e
-  data.tar.gz: b8bc51ac42ea3b4aa4609f6b8d999368b2b181c35006d951133c1169151a02a85a41ba1c24fc035a00263185a26d776801203a3aa27094a05d08710d23919375
+  metadata.gz: 1c73de1025c312ad11ea71d78df642c5c4aaa74d8409e121ecd03639b4d1bbb1403b06d92142cb499262432c8fb50e87af5844b49a8e8b80f13bd9d74dceb7d5
+  data.tar.gz: 1a267675a5e12e242f9384ce8ab1edc4dcef01256fbd0c8a215d83e86b559b4cd64a73889e87132b13ffc860d1e1d23518c0fef8666785912d8c7adc5d307bbc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oneroster (2.3.1)
+    oneroster (2.3.4)
       dry-inflector
       faraday
       faraday_middleware
@@ -16,10 +16,31 @@ GEM
     coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.3.1)
-    dry-inflector (0.2.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (1.0.0)
+    dry-inflector (0.3.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     jaro_winkler (1.5.2)
     json (2.2.0)
@@ -27,8 +48,8 @@ GEM
     method_source (0.8.2)
     mocha (1.8.0)
       metaclass (~> 0.0.1)
-    multipart-post (2.1.1)
-    oauth (0.5.4)
+    multipart-post (2.2.3)
+    oauth (0.5.10)
     parallel (1.15.0)
     parser (2.6.2.0)
       ast (~> 2.4.0)
@@ -66,6 +87,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.6)
     ruby-progressbar (1.10.0)
+    ruby2_keywords (0.0.5)
     simple_oauth (0.3.1)
     simplecov (0.16.1)
       docile (~> 1.1)

data/lib/one_roster/client.rb

@@ -2,9 +2,9 @@
 
 module OneRoster
   class Client
-    attr_accessor :app_id, :app_token, :api_url,
+    attr_accessor :app_id, :app_token, :api_url, :token_url,
                   :app_secret, :logger, :vendor_key,
-                  :username_source, :oauth_strategy
+                  :username_source, :oauth_strategy, :staff_username_source
 
     attr_reader :authenticated
 
@@ -31,7 +31,8 @@ module OneRoster
 
         return records if record_uids.empty?
 
-        records.select { |record| record_uids.to_set.include?(record.uid) }
+        record_uids_set = record_uids.to_set
+        records.select { |record| record_uids_set.include?(record.uid) }
       end
     end
 
@@ -127,7 +128,8 @@ module OneRoster
     end
 
     def token
-      connection.execute("#{api_url}/token", :post)
+      url = token_url || "#{api_url}/token"
+      connection.execute(url, :post)
     end
 
     def set_auth_headers(token, cookie)

data/lib/one_roster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OneRoster
-  VERSION = '2.3.1'
+  VERSION = '2.3.4'
 end

data/lib/types/teacher.rb

@@ -9,12 +9,59 @@ module OneRoster
                   :last_name,
                   :provider
 
-      def initialize(attributes = {}, *)
-        @uid        = attributes['sourcedId']
-        @email      = attributes['email']
-        @first_name = attributes['givenName']
-        @last_name  = attributes['familyName']
-        @provider   = 'oneroster'
+      def initialize(attributes = {}, *, client: nil)
+        @uid          = attributes['sourcedId']
+        @email        = attributes['email']
+        @first_name   = attributes['givenName']
+        @last_name    = attributes['familyName']
+        @api_username = attributes['username']
+        @username     = username(client)
+        @provider     = 'oneroster'
+      end
+
+      def username(client = nil)
+        username_source = client&.staff_username_source
+        @username ||= presence(username_from(username_source))
+      end
+
+      def to_h
+        {
+          uid: @uid,
+          email: @email,
+          first_name: @first_name,
+          last_name: @last_name,
+          username: @username,
+          provider: @provider
+        }
+      end
+
+      private
+
+      def presence(field)
+        field unless blank?(field)
+      end
+
+      def blank?(field)
+        field.nil? || field == ''
+      end
+
+      def username_from(username_source)
+        return unless presence(username_source)
+
+        source = username_source(username_source)
+
+        presence(instance_variable_get("@#{source}"))
+      end
+
+      # if the username_source is `sourcedId`, we want to return `uid`
+      # so we can grab the right instance variable
+      def username_source(source)
+        case source
+        when 'sourcedId' then 'uid'
+        when 'username' then 'api_username'
+        else
+          source
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneroster
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.4
 platform: ruby
 authors:
 - Robert Julius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2022-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -265,8 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Wrapper for the OneRoster API.