workos 1.2.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e38af4531cb784be6a6cc834752307e8bfcf7379dde43272c0e85b762f9f56
-  data.tar.gz: 2de643c621a51264c255d7d8b0a55d1aa7a900f5a1b9bd49877e6f5ad9f47956
+  metadata.gz: ae5493072c3719c3a6475116ed51d7955e072fb9499a9a40b231482ffd9db082
+  data.tar.gz: 451ba6d7ac9542bf9cda07fe9703035fb8d58d0b1e6b4beceb4b6e7273e3b3f6
 SHA512:
-  metadata.gz: '095f641cd40934575456a19cdf4dc5714d010555680d18b98f599467bafaf57b78f6f90988d064f53611f6d95bb7daa6e1ebdea450a7e7a03f43637026856a7b'
-  data.tar.gz: 157928a66025475cc4b306fbcc719ea6e3fe6404006f3fb00eb6498d7d4655d18076cbe64874137ba8c301a22561752c5feb40d9158225a89797e5eff36c1503
+  metadata.gz: d5a7b8b11117bf140ee16cd1f390cd4c94cb9dba75c5c1668cc558290a2619e016c6e59f47ae2a13d5483e61078d79731bee619643ca6ec9640464b0e96a3d17
+  data.tar.gz: 1534875a20f5410c6b9f9a9680cb9da1ad95247308765a3dc8917f3ffde2c2e1535ae56f022051207f69295d678f621a94b8b9f9ac8ea70812ec3f4108d6edef

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    workos (1.2.0)
+    workos (1.5.0)
       sorbet-runtime (~> 0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.2)
     codecov (0.2.12)
@@ -60,7 +60,7 @@ GEM
     simplecov_json_formatter (0.1.2)
     sorbet (0.5.6388)
       sorbet-static (= 0.5.6388)
-    sorbet-runtime (0.5.6424)
+    sorbet-runtime (0.5.9035)
     sorbet-static (0.5.6388-universal-darwin-14)
     sorbet-static (0.5.6388-universal-darwin-15)
     sorbet-static (0.5.6388-universal-darwin-16)

data/lib/workos/client.rb

@@ -48,7 +48,7 @@ module WorkOS
         'Content-Type' => 'application/json',
       )
 
-      request['Authorization'] = "Bearer #{access_token || WorkOS.key!}}" if auth
+      request['Authorization'] = "Bearer #{access_token || WorkOS.key!}" if auth
       request['User-Agent'] = user_agent
       request
     end

data/lib/workos/connection.rb

@@ -10,8 +10,9 @@ module WorkOS
     extend T::Sig
 
     attr_accessor :id, :name, :connection_type, :domains, :organization_id,
-                  :state, :status
+                  :state, :status, :created_at, :updated_at
 
+    # rubocop:disable Metrics/AbcSize
     sig { params(json: String).void }
     def initialize(json)
       raw = parse_json(json)
@@ -23,7 +24,10 @@ module WorkOS
       @organization_id = T.let(raw.organization_id, String)
       @state = T.let(raw.state, String)
       @status = T.let(raw.status, String)
+      @created_at = T.let(raw.created_at, String)
+      @updated_at = T.let(raw.updated_at, String)
     end
+    # rubocop:enable Metrics/AbcSize
 
     def to_json(*)
       {
@@ -34,6 +38,8 @@ module WorkOS
         organization_id: organization_id,
         state: state,
         status: status,
+        created_at: created_at,
+        updated_at: updated_at,
       }
     end
 
@@ -51,6 +57,8 @@ module WorkOS
         organization_id: hash[:organization_id],
         state: hash[:state],
         status: hash[:status],
+        created_at: hash[:created_at],
+        updated_at: hash[:updated_at],
       )
     end
   end

data/lib/workos/directory.rb

@@ -8,8 +8,9 @@ module WorkOS
   class Directory
     extend T::Sig
 
-    attr_accessor :id, :domain, :name, :type, :state
+    attr_accessor :id, :domain, :name, :type, :state, :organization_id, :created_at, :updated_at
 
+    # rubocop:disable Metrics/AbcSize
     sig { params(json: String).void }
     def initialize(json)
       raw = parse_json(json)
@@ -19,7 +20,11 @@ module WorkOS
       @domain = T.let(raw.domain, String)
       @type = T.let(raw.type, String)
       @state = T.let(raw.state, String)
+      @organization_id = T.let(raw.organization_id, String)
+      @created_at = T.let(raw.created_at, String)
+      @updated_at = T.let(raw.updated_at, String)
     end
+    # rubocop:enable Metrics/AbcSize
 
     def to_json(*)
       {
@@ -28,6 +33,9 @@ module WorkOS
         domain: domain,
         type: type,
         state: state,
+        organization_id: organization_id,
+        created_at: created_at,
+        updated_at: updated_at,
       }
     end
 
@@ -47,6 +55,9 @@ module WorkOS
         domain: hash[:domain],
         type: hash[:type],
         state: hash[:state],
+        organization_id: hash[:organization_id],
+        created_at: hash[:created_at],
+        updated_at: hash[:updated_at],
       )
     end
   end

data/lib/workos/directory_user.rb

@@ -9,8 +9,9 @@ module WorkOS
     extend T::Sig
 
     attr_accessor :id, :idp_id, :emails, :first_name, :last_name, :username, :state,
-                  :raw_attributes
+                  :groups, :custom_attributes, :raw_attributes
 
+    # rubocop:disable Metrics/AbcSize
     sig { params(json: String).void }
     def initialize(json)
       raw = parse_json(json)
@@ -22,8 +23,11 @@ module WorkOS
       @last_name = raw.last_name
       @username = raw.username
       @state = raw.state
+      @groups = T.let(raw.groups, Array)
+      @custom_attributes = raw.custom_attributes
       @raw_attributes = raw.raw_attributes
     end
+    # rubocop:enable Metrics/AbcSize
 
     def to_json(*)
       {
@@ -34,6 +38,8 @@ module WorkOS
         last_name: last_name,
         username: username,
         state: state,
+        groups: groups,
+        custom_attributes: custom_attributes,
         raw_attributes: raw_attributes,
       }
     end
@@ -56,6 +62,8 @@ module WorkOS
         last_name: hash[:last_name],
         username: hash[:username],
         state: hash[:state],
+        groups: hash[:groups],
+        custom_attributes: hash[:custom_attributes],
         raw_attributes: hash[:raw_attributes],
       )
     end

data/lib/workos/errors.rb

@@ -13,12 +13,16 @@ module WorkOS
     sig do
       params(
         message: T.nilable(String),
+        error: T.nilable(String),
+        error_description: T.nilable(String),
         http_status: T.nilable(Integer),
         request_id: T.nilable(String),
       ).void
     end
-    def initialize(message: nil, http_status: nil, request_id: nil)
+    def initialize(message: nil, error: nil, error_description: nil, http_status: nil, request_id: nil)
       @message = message
+      @error = error
+      @error_description = error_description
       @http_status = http_status
       @request_id = request_id
     end
@@ -27,7 +31,14 @@ module WorkOS
     def to_s
       status_string = @http_status.nil? ? '' : "Status #{@http_status}, "
       id_string = @request_id.nil? ? '' : " - request ID: #{@request_id}"
-      "#{status_string}#{@message}#{id_string}"
+      if @error && @error_description
+        error_string = "error: #{@error}, error_description: #{@error_description}"
+        "#{status_string}#{error_string}#{id_string}"
+      elsif @error
+        "#{status_string}#{@error}#{id_string}"
+      else
+        "#{status_string}#{@message}#{id_string}"
+      end
     end
   end
 

data/lib/workos/organization.rb

@@ -8,7 +8,7 @@ module WorkOS
   class Organization
     extend T::Sig
 
-    attr_accessor :id, :domains, :name
+    attr_accessor :id, :domains, :name, :created_at, :updated_at
 
     sig { params(json: String).void }
     def initialize(json)
@@ -17,6 +17,8 @@ module WorkOS
       @id = T.let(raw.id, String)
       @name = T.let(raw.name, String)
       @domains = T.let(raw.domains, Array)
+      @created_at = T.let(raw.created_at, String)
+      @updated_at = T.let(raw.updated_at, String)
     end
 
     def to_json(*)
@@ -24,6 +26,8 @@ module WorkOS
         id: id,
         name: name,
         domains: domains,
+        created_at: created_at,
+        updated_at: updated_at,
       }
     end
 
@@ -41,6 +45,8 @@ module WorkOS
         id: hash[:id],
         name: hash[:name],
         domains: hash[:domains],
+        created_at: hash[:created_at],
+        updated_at: hash[:updated_at],
       )
     end
   end

data/lib/workos/sso.rb

@@ -248,12 +248,15 @@ module WorkOS
       end
 
       sig { params(response: Net::HTTPResponse).void }
+      # rubocop:disable Metrics/MethodLength
       def check_and_raise_profile_and_token_error(response:)
         begin
           body = JSON.parse(response.body)
           return if body['access_token'] && body['profile']
 
           message = body['message']
+          error = body['error']
+          error_description = body['error_description']
           request_id = response['x-request-id']
         rescue StandardError
           message = 'Something went wrong'
@@ -261,10 +264,13 @@ module WorkOS
 
         raise APIError.new(
           message: message,
+          error: error,
+          error_description: error_description,
           http_status: nil,
           request_id: request_id,
         )
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/lib/workos/types/connection_struct.rb

@@ -13,6 +13,8 @@ module WorkOS
       const :organization_id, String
       const :state, String
       const :status, String
+      const :created_at, String
+      const :updated_at, String
     end
   end
 end

data/lib/workos/types/directory_struct.rb

@@ -11,6 +11,9 @@ module WorkOS
       const :domain, String
       const :type, String
       const :state, String
+      const :organization_id, String
+      const :created_at, String
+      const :updated_at, String
     end
   end
 end

data/lib/workos/types/directory_user_struct.rb

@@ -13,6 +13,8 @@ module WorkOS
       const :last_name, T.nilable(String)
       const :username, T.nilable(String)
       const :state, T.nilable(String)
+      const :groups, T::Array[T.untyped]
+      const :custom_attributes, T::Hash[Symbol, T.untyped]
       const :raw_attributes, T::Hash[Symbol, Object]
     end
   end

data/lib/workos/types/organization_struct.rb

@@ -9,6 +9,8 @@ module WorkOS
       const :id, String
       const :name, String
       const :domains, T::Array[T.untyped]
+      const :created_at, String
+      const :updated_at, String
     end
   end
 end

data/lib/workos/types/provider_enum.rb

@@ -8,6 +8,7 @@ module WorkOS
     class Provider < T::Enum
       enums do
         Google = new('GoogleOAuth')
+        Microsoft = new('MicrosoftOAuth')
       end
     end
   end

data/lib/workos/version.rb

@@ -2,5 +2,5 @@
 # typed: strong
 
 module WorkOS
-  VERSION = '1.2.0'
+  VERSION = '1.5.0'
 end

data/spec/lib/workos/directory_sync_spec.rb

@@ -282,7 +282,7 @@ describe WorkOS::DirectorySync do
     context 'with directory option' do
       it 'forms the proper request to the API' do
         request_args = [
-          '/directory_users?directory=directory_01EK2YEMVTWGX27STRDR0N3MP9',
+          '/directory_users?directory=directory_01FAZYMST676QMTFN1DDJZZX87',
           'Content-Type' => 'application/json'
         ]
 
@@ -293,10 +293,10 @@ describe WorkOS::DirectorySync do
 
         VCR.use_cassette 'directory_sync/list_users/with_directory' do
           users = described_class.list_users(
-            directory: 'directory_01EK2YEMVTWGX27STRDR0N3MP9',
+            directory: 'directory_01FAZYMST676QMTFN1DDJZZX87',
           )
 
-          expect(users.data.size).to eq(10)
+          expect(users.data.size).to eq(4)
         end
       end
     end
@@ -304,7 +304,7 @@ describe WorkOS::DirectorySync do
     context 'with group option' do
       it 'forms the proper request to the API' do
         request_args = [
-          '/directory_users?group=directory_group_01EQ7V7C6Y4RPMCH3KNB9853FF',
+          '/directory_users?group=directory_group_01FBXGP79EJAYKW0WS9JCK1V6E',
           'Content-Type' => 'application/json'
         ]
 
@@ -315,10 +315,10 @@ describe WorkOS::DirectorySync do
 
         VCR.use_cassette 'directory_sync/list_users/with_group' do
           users = described_class.list_users(
-            group: 'directory_group_01EQ7V7C6Y4RPMCH3KNB9853FF',
+            group: 'directory_group_01FBXGP79EJAYKW0WS9JCK1V6E',
           )
 
-          expect(users.data.size).to eq(2)
+          expect(users.data.size).to eq(1)
         end
       end
     end
@@ -326,8 +326,8 @@ describe WorkOS::DirectorySync do
     context 'with the before option' do
       it 'forms the proper request to the API' do
         request_args = [
-          '/directory_users?before=before-id&'\
-          'directory=directory_01EK2YEMVTWGX27STRDR0N3MP9',
+          '/directory_users?before=directory_user_01FAZYNPC8TJBP7Y2ERT51MGDF&'\
+          'directory=directory_01FAZYMST676QMTFN1DDJZZX87',
           'Content-Type' => 'application/json'
         ]
 
@@ -338,8 +338,8 @@ describe WorkOS::DirectorySync do
 
         VCR.use_cassette 'directory_sync/list_users/with_before' do
           users = described_class.list_users(
-            before: 'before-id',
-            directory: 'directory_01EK2YEMVTWGX27STRDR0N3MP9',
+            before: 'directory_user_01FAZYNPC8TJBP7Y2ERT51MGDF',
+            directory: 'directory_01FAZYMST676QMTFN1DDJZZX87',
           )
 
           expect(users.data.size).to eq(2)
@@ -350,8 +350,8 @@ describe WorkOS::DirectorySync do
     context 'with the after option' do
       it 'forms the proper request to the API' do
         request_args = [
-          '/directory_users?after=after-id&' \
-          'directory=directory_01EK2YEMVTWGX27STRDR0N3MP9',
+          '/directory_users?after=directory_user_01FAZYNPC8TJBP7Y2ERT51MGDF&' \
+          'directory=directory_01FAZYMST676QMTFN1DDJZZX87',
           'Content-Type' => 'application/json'
         ]
 
@@ -362,11 +362,11 @@ describe WorkOS::DirectorySync do
 
         VCR.use_cassette 'directory_sync/list_users/with_after' do
           users = described_class.list_users(
-            after: 'after-id',
-            directory: 'directory_01EK2YEMVTWGX27STRDR0N3MP9',
+            after: 'directory_user_01FAZYNPC8TJBP7Y2ERT51MGDF',
+            directory: 'directory_01FAZYMST676QMTFN1DDJZZX87',
           )
 
-          expect(users.data.size).to eq(10)
+          expect(users.data.size).to eq(1)
         end
       end
     end
@@ -375,7 +375,7 @@ describe WorkOS::DirectorySync do
       it 'forms the proper request to the API' do
         request_args = [
           '/directory_users?limit=2&' \
-          'directory=directory_01EK2YEMVTWGX27STRDR0N3MP9',
+          'directory=directory_01FAZYMST676QMTFN1DDJZZX87',
           'Content-Type' => 'application/json'
         ]
 
@@ -387,7 +387,7 @@ describe WorkOS::DirectorySync do
         VCR.use_cassette 'directory_sync/list_users/with_limit' do
           users = described_class.list_users(
             limit: 2,
-            directory: 'directory_01EK2YEMVTWGX27STRDR0N3MP9',
+            directory: 'directory_01FAZYMST676QMTFN1DDJZZX87',
           )
 
           expect(users.data.size).to eq(2)
@@ -425,10 +425,10 @@ describe WorkOS::DirectorySync do
       it 'returns a user' do
         VCR.use_cassette('directory_sync/get_user') do
           user = WorkOS::DirectorySync.get_user(
-            'directory_usr_01E64QS50EAY48S0XJ1AA4WX4D',
+            'directory_user_01FAZYNPC8M0HRYTKFP2GNX852',
           )
 
-          expect(user['first_name']).to eq('Mark')
+          expect(user['first_name']).to eq('Logan')
         end
       end
     end