clever 3.1.1 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba04605f8dd24c5294e0ad902c29df9296ce14e1
-  data.tar.gz: 275fecc1abefb5af4a08d146b38eca3acc24602a
+  metadata.gz: 6694d0cb1936ab84956d227272a9539ecc6a5791
+  data.tar.gz: a23ad0110f1459719445ac685af838c42b438ebc
 SHA512:
-  metadata.gz: a336127ba0c65de367f9ed9a027ab71baa411baf0ee2302e105a475665035d1a6ec9da5cbe1680adc6280acfacf2ae7ac9c8ec28b52837610a39cadacfbd5810
-  data.tar.gz: 1eea6ee645d14b4410dcab268a4508a23200faf724f77467c61822ba8a904e994f11871a39fefe3cc25bd1c633f0c45635aeb9c5676ec55fb6cb13c4fbec7134
+  metadata.gz: ab3e3447b9c05aaf6758e14ae0ce6e533a559fdac407c29cc548fc5acfca6ad05c719810a857b265514e5a4052a4a96abc7d0ac2b6f51b9159c615a1c50a816a
+  data.tar.gz: 74e9b01f178087d04f568bc79b667441439ae809e19697c7f78ba9518cc606f66b003f7f4574785cb458f24deac94b0765f81193229e6087143b3d2c559c2b7f

data/.circleci/config.yml

@@ -22,7 +22,7 @@ install_dependencies: &install_dependencies
     command: |
       echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
       source $BASH_ENV
-      gem install bundler
+      gem install bundler  -v '2.1.4'
       bundle install --jobs=4 --retry=3 --path vendor/bundle
 
 save_ruby_cache: &save_ruby_cache

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clever (3.1.1)
+    clever (3.2.3)
       faraday
       faraday_middleware
 

data/lib/clever.rb

@@ -17,21 +17,25 @@ require 'clever/types/event'
 require 'clever/types/student'
 require 'clever/types/section'
 require 'clever/types/teacher'
-require 'clever/types/admin'
+require 'clever/types/district_admin'
+require 'clever/types/school_admin'
 require 'clever/types/term'
 require 'clever/types/token'
 
 module Clever
-  API_URL           = 'https://api.clever.com/v3.0'
-  TOKENS_ENDPOINT   = 'https://clever.com/oauth/tokens?owner_type=district'
-  STUDENTS_ENDPOINT = '/v3.0/users?role=student'
-  COURSES_ENDPOINT  = '/v3.0/courses'
-  SECTIONS_ENDPOINT = '/v3.0/sections'
-  TEACHERS_ENDPOINT = '/v3.0/users?role=teacher'
-  ADMINS_ENDPOINT   = '/v3.0/users?role=district_admin'
-  EVENTS_ENDPOINT   = '/v1.2/events'
-  TERMS_ENDPOINT    = '/v3.0/terms'
-  GRADES_ENDPOINT   = 'https://grades-api.beta.clever.com/v1/grade'
+  API_URL                  = 'https://api.clever.com/v3.0'
+  ME_ENDPOINT              = '/v3.0/me'
+  USER_TOKEN_ENDPOINT      = 'https://clever.com/oauth/tokens'
+  TOKENS_ENDPOINT          = 'https://clever.com/oauth/tokens?owner_type=district'
+  STUDENTS_ENDPOINT        = '/v3.0/users?role=student'
+  COURSES_ENDPOINT         = '/v3.0/courses'
+  SECTIONS_ENDPOINT        = '/v3.0/sections'
+  TEACHERS_ENDPOINT        = '/v3.0/users?role=teacher'
+  DISTRICT_ADMINS_ENDPOINT = '/v3.0/users?role=district_admin'
+  SCHOOL_ADMINS_ENDPOINT   = '/v3.0/users?role=staff'
+  EVENTS_ENDPOINT          = '/v1.2/events'
+  TERMS_ENDPOINT           = '/v3.0/terms'
+  GRADES_ENDPOINT          = 'https://grades-api.beta.clever.com/v1/grade'
 
   class DistrictNotFound < StandardError; end
   class ConnectionError < StandardError; end

data/lib/clever/client.rb

@@ -2,14 +2,14 @@
 
 module Clever
   class Client
-    attr_accessor :app_id, :app_token, :sync_id, :logger,
+    attr_accessor :app_id, :app_token, :sync_id, :logger, :redirect_uri,
                   :vendor_key, :vendor_secret, :username_source, :staff_username_source
 
     attr_reader :api_url, :tokens_endpoint
 
     def initialize
-      @api_url           = API_URL
-      @tokens_endpoint   = TOKENS_ENDPOINT
+      @api_url         = API_URL
+      @tokens_endpoint = TOKENS_ENDPOINT
     end
 
     def self.configure
@@ -38,6 +38,22 @@ module Clever
       response
     end
 
+    def user_uid_for_code(code)
+      response = connection.execute(USER_TOKEN_ENDPOINT,
+                                    :post,
+                                    nil,
+                                    { code: code,
+                                      grant_type: 'authorization_code',
+                                      redirect_uri: redirect_uri })
+
+      fail ConnectionError, response.raw_body unless response.success?
+
+      connection.set_token(response.raw_body['access_token'])
+
+      response = connection.execute(ME_ENDPOINT, :get)
+      response&.body&.dig('id')
+    end
+
     def most_recent_event
       authenticate
 
@@ -54,7 +70,7 @@ module Clever
       Paginator.fetch(connection, endpoint, :get, Types::Event, client: self).force
     end
 
-    %i(students courses teachers admins sections terms).each do |record_type|
+    %i(students courses teachers sections terms).each do |record_type|
       define_method(record_type) do |record_uids = []|
         authenticate
 
@@ -69,6 +85,22 @@ module Clever
       end
     end
 
+    def admins(record_uids = [])
+      authenticate
+
+      district_admins = Paginator.fetch(connection, Clever::DISTRICT_ADMINS_ENDPOINT,
+                                        :get, Types::DistrictAdmin, client: self).force
+
+      school_admins = Paginator.fetch(connection, Clever::SCHOOL_ADMINS_ENDPOINT,
+                                      :get, Types::SchoolAdmin, client: self).force
+
+      admins = (district_admins + school_admins).uniq(&:uid)
+
+      return admins if record_uids.empty?
+
+      admins.select { |record| record_uids.to_set.include?(record.uid) }
+    end
+
     # discard params to make the API behave the same as the one roster gem
     def classrooms(*)
       authenticate

data/lib/clever/types/{admin.rb → district_admin.rb}

@@ -2,7 +2,7 @@
 
 module Clever
   module Types
-    class Admin < Teacher
+    class DistrictAdmin < Teacher
       def initialize(attributes = {}, *, client: nil)
         @district_username = attributes.dig('roles', 'district_admin', 'credentials', 'district_username')
         @email             = attributes['email']
@@ -10,7 +10,7 @@ module Clever
         @last_name         = attributes['name']['last']
         @legacy_id         = attributes.dig('roles', 'district_admin', 'legacy_id')
         @provider          = 'clever'
-        @sis_id            = attributes.dig('roles', 'district_admin', 'credentials', 'sis_id')
+        @sis_id            = attributes.dig('roles', 'district_admin', 'sis_id')
         @uid               = attributes['id']
         @username          = username(client)
         @role              = 'admin'

data/lib/clever/types/school_admin.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Clever
+  module Types
+    class SchoolAdmin < Teacher
+      def initialize(attributes = {}, *, client: nil)
+        @district_username = attributes.dig('roles', 'staff', 'credentials', 'district_username')
+        @email             = attributes['email']
+        @first_name        = attributes['name']['first']
+        @last_name         = attributes['name']['last']
+        @legacy_id         = attributes.dig('roles', 'staff', 'legacy_id')
+        @provider          = 'clever'
+        @sis_id            = attributes.dig('roles', 'staff', 'sis_id')
+        @uid               = attributes['id']
+        @username          = username(client)
+        @role              = 'admin'
+      end
+    end
+  end
+end

data/lib/clever/types/student.rb

@@ -16,7 +16,7 @@ module Clever
         @last_name         = attributes['name']['last']
         @legacy_id         = attributes.dig('roles', 'student', 'legacy_id')
         @provider          = 'clever'
-        @sis_id            = attributes['sis_id']
+        @sis_id            = attributes.dig('roles', 'student', 'sis_id')
         @uid               = attributes['id']
         @username          = username(client)
       end

data/lib/clever/types/teacher.rb

@@ -18,7 +18,7 @@ module Clever
         @last_name         = attributes['name']['last']
         @legacy_id         = attributes.dig('roles', 'teacher', 'legacy_id')
         @provider          = 'clever'
-        @sis_id            = attributes.dig('roles', 'teacher', 'credentials', 'sis_id')
+        @sis_id            = attributes.dig('roles', 'teacher', 'sis_id')
         @uid               = attributes['id']
         @username          = username(client)
         @role              = 'teacher'
@@ -37,7 +37,8 @@ module Clever
           first_name: @first_name,
           last_name: @last_name,
           username: @username,
-          provider: @provider
+          provider: @provider,
+          legacy_id: @legacy_id
         }
       end
 

data/lib/clever/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Clever
-  VERSION = '3.1.1'
+  VERSION = '3.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clever
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.3
 platform: ruby
 authors:
 - Robert Julius
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -192,12 +192,13 @@ files:
 - lib/clever/connection.rb
 - lib/clever/paginator.rb
 - lib/clever/response.rb
-- lib/clever/types/admin.rb
 - lib/clever/types/base.rb
 - lib/clever/types/classroom.rb
 - lib/clever/types/course.rb
+- lib/clever/types/district_admin.rb
 - lib/clever/types/enrollment.rb
 - lib/clever/types/event.rb
+- lib/clever/types/school_admin.rb
 - lib/clever/types/section.rb
 - lib/clever/types/student.rb
 - lib/clever/types/teacher.rb