oneroster 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac81a3a6a046beb01b2ae6d34e6ff2f373921d41
-  data.tar.gz: 35e4d0240dc30cfe9aa5bf38af83de2ab19dcb31
+  metadata.gz: 3d9b2a06cf3a50f5e78071d6a74349c39079a687
+  data.tar.gz: fb2d03aca728cf15aa886cf72010ede9ee14359e
 SHA512:
-  metadata.gz: dcd9b28d5b6d2607fff300142b0978a97b01d0227fa0ed1f89f828bdcad656b1955b9951864afd3a7ef75277cf4312d6b121ce12e61a882376adce66d9f46f7e
-  data.tar.gz: b8bc51ac42ea3b4aa4609f6b8d999368b2b181c35006d951133c1169151a02a85a41ba1c24fc035a00263185a26d776801203a3aa27094a05d08710d23919375
+  metadata.gz: 472c0969f9ce2256f1b52615a135c61411be0c4dc04466b72aea5c24bf534cb205586d1727c32b71217fa1663d9db8fbcc9fe1a350858a551e8b7929f8f7cd44
+  data.tar.gz: b07e234e1a1c5323e341a8fb3e0a34fd3e194c13b17431db8fea10030d73b7a1cd80ade3b21d8dc64ec88db06cfb98c139463fe3a3ae9c0d9e29a38a1f8e5cd5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oneroster (2.3.1)
+    oneroster (2.3.2)
       dry-inflector
       faraday
       faraday_middleware

data/lib/one_roster/client.rb

@@ -4,7 +4,7 @@ module OneRoster
   class Client
     attr_accessor :app_id, :app_token, :api_url,
                   :app_secret, :logger, :vendor_key,
-                  :username_source, :oauth_strategy
+                  :username_source, :oauth_strategy, :staff_username_source
 
     attr_reader :authenticated
 

data/lib/one_roster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OneRoster
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 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.2
 platform: ruby
 authors:
 - Robert Julius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday