yandex360 1.1.3 → 1.1.4

data/lib/yandex360/resources/departments.rb

@@ -2,53 +2,65 @@
 
 module Yandex360
   class DepartmentsResource < Resource
+    include ParamBuilder
     def add_alias(org_id:, dep_id:, name:)
+      validate_required_params({org_id: org_id, dep_id: dep_id, name: name}, %i[org_id dep_id name])
       dep_alias = {alias: name}
-      DepartmentAlias.new post("directory/v1/org/#{org_id}/departments/#{dep_id}/aliases", body: dep_alias).body
+      DepartmentAlias.new post("/directory/v1/org/#{org_id}/departments/#{dep_id}/aliases", body: dep_alias).body
     end
 
     def update(org_id:, dep_id:, parent_id:, **params)
-      department = {
-        orgId: org_id,
-        departmentId: dep_id,
-        parentId: parent_id
-      }
-      params.each {|param, value| department[param] = value }
-      Department.new patch("directory/v1/org/#{org_id}/departments/#{dep_id}", body: department).body
+      validate_required_params({org_id: org_id, dep_id: dep_id, parent_id: parent_id}, %i[org_id dep_id parent_id])
+      department = build_department_params({
+                                             orgId: org_id,
+                                             departmentId: dep_id,
+                                             parentId: parent_id
+                                           }, params)
+      Department.new patch("/directory/v1/org/#{org_id}/departments/#{dep_id}", body: department).body
     end
 
     def info(org_id:, dep_id:)
-      Department.new get("directory/v1/org/#{org_id}/departments/#{dep_id}").body
+      validate_required_params({org_id: org_id, dep_id: dep_id}, %i[org_id dep_id])
+      Department.new get("/directory/v1/org/#{org_id}/departments/#{dep_id}").body
     end
 
     def list(org_id:, page: 1, per_page: 10, parent_id: 0, order_by: "id")
-      resp = get("directory/v1/org/#{org_id}/departments \
-                  ?page=#{page} \
-                  &perPage=#{per_page} \
-                  &parentId=#{parent_id} \
-                  &orderBy=#{order_by}".gsub(/\s+/, "").strip)
+      validate_required_params({org_id: org_id}, [:org_id])
+      params = {
+        page: page,
+        perPage: per_page,
+        parentId: parent_id,
+        orderBy: order_by
+      }
+      resp = get("/directory/v1/org/#{org_id}/departments", params: params)
       Collection.from_response(resp, key: "departments", type: Department)
     end
 
     # parent_id:, name:, description: "", external_id: "", head_id: 0, label: ""
     def create(org_id:, name:, parent_id:, **params)
-      department = {
-        parentId: parent_id,
-        name: name
-      }
-      params.each do |param, value|
-        department[param] = value
-      end
+      validate_required_params({org_id: org_id, name: name, parent_id: parent_id}, %i[org_id name parent_id])
+      department = build_department_params({
+                                             parentId: parent_id,
+                                             name: name
+                                           }, params)
 
-      Department.new post("directory/v1/org/#{org_id}/departments", body: department).body
+      Department.new post("/directory/v1/org/#{org_id}/departments", body: department).body
     end
 
     def delete_alias(org_id:, dep_id:, name:)
-      Object.new delete_request("directory/v1/org/#{org_id}/departments/#{dep_id}/aliases/#{name}").body
+      validate_required_params({org_id: org_id, dep_id: dep_id, name: name}, %i[org_id dep_id name])
+      Object.new delete_request("/directory/v1/org/#{org_id}/departments/#{dep_id}/aliases/#{name}").body
     end
 
     def delete(org_id:, dep_id:)
-      Object.new delete_request("directory/v1/org/#{org_id}/departments/#{dep_id}").body
+      validate_required_params({org_id: org_id, dep_id: dep_id}, %i[org_id dep_id])
+      Object.new delete_request("/directory/v1/org/#{org_id}/departments/#{dep_id}").body
+    end
+
+    private
+
+    def build_department_params(base_params, additional_params)
+      build_params(base_params, additional_params)
     end
   end
 end

data/lib/yandex360/resources/dns.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Yandex360
+  class DnsResource < Resource
+    include ParamBuilder
+
+    def list(org_id:, domain:)
+      validate_required_params({org_id: org_id, domain: domain}, %i[org_id domain])
+      resp = get("/directory/v1/org/#{org_id}/domains/#{domain}/dns")
+      Collection.from_response(resp, key: "records", type: DnsRecord)
+    end
+
+    def create(org_id:, domain:, **params)
+      validate_required_params({org_id: org_id, domain: domain}, %i[org_id domain])
+      dns_record = build_params({}, params)
+      DnsRecord.new post("/directory/v1/org/#{org_id}/domains/#{domain}/dns", body: dns_record).body
+    end
+
+    def update(org_id:, domain:, record_id:, **params)
+      validate_required_params({org_id: org_id, domain: domain, record_id: record_id}, %i[org_id domain record_id])
+      dns_record = build_params({}, params)
+      DnsRecord.new patch("/directory/v1/org/#{org_id}/domains/#{domain}/dns/#{record_id}", body: dns_record).body
+    end
+
+    def delete(org_id:, domain:, record_id:)
+      validate_required_params({org_id: org_id, domain: domain, record_id: record_id}, %i[org_id domain record_id])
+      Object.new delete_request("/directory/v1/org/#{org_id}/domains/#{domain}/dns/#{record_id}").body
+    end
+  end
+end

data/lib/yandex360/resources/domains.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Yandex360
+  class DomainsResource < Resource
+    include ParamBuilder
+
+    def list(org_id:)
+      validate_required_params({org_id: org_id}, [:org_id])
+      resp = get("/directory/v1/org/#{org_id}/domains")
+      Collection.from_response(resp, key: "domains", type: Domain)
+    end
+
+    def add(org_id:, name:, **params)
+      validate_required_params({org_id: org_id, name: name}, %i[org_id name])
+      domain = build_params({name: name}, params)
+      Domain.new post("/directory/v1/org/#{org_id}/domains", body: domain).body
+    end
+
+    def info(org_id:, domain:)
+      validate_required_params({org_id: org_id, domain: domain}, %i[org_id domain])
+      Domain.new get("/directory/v1/org/#{org_id}/domains/#{domain}").body
+    end
+
+    def delete(org_id:, domain:)
+      validate_required_params({org_id: org_id, domain: domain}, %i[org_id domain])
+      Object.new delete_request("/directory/v1/org/#{org_id}/domains/#{domain}").body
+    end
+
+    def verify(org_id:, domain:)
+      validate_required_params({org_id: org_id, domain: domain}, %i[org_id domain])
+      Domain.new post("/directory/v1/org/#{org_id}/domains/#{domain}/verify", body: {}).body
+    end
+  end
+end

data/lib/yandex360/resources/groups.rb

@@ -2,48 +2,61 @@
 
 module Yandex360
   class GroupsResource < Resource
+    include ParamBuilder
     def add_user(org_id:, group_id:, user_id:, type: "user")
+      validate_required_params({org_id: org_id, group_id: group_id, user_id: user_id}, %i[org_id group_id user_id])
       user = {
         id: user_id,
         type: type
       }
-      Group.new post("directory/v1/org/#{org_id}/groups/#{group_id}/members", body: user).body
+      Group.new post("/directory/v1/org/#{org_id}/groups/#{group_id}/members", body: user).body
     end
 
     def update(org_id:, group_id:, **user_params)
-      user = {}
-      user_params.each {|param, value| user[param] = value }
-      Group.new patch("directory/v1/org/#{org_id}/groups/#{group_id}", body: user).body
+      validate_required_params({org_id: org_id, group_id: group_id}, %i[org_id group_id])
+      user = build_group_params({}, user_params)
+      Group.new patch("/directory/v1/org/#{org_id}/groups/#{group_id}", body: user).body
     end
 
     def params(org_id:, group_id:)
-      Group.new get("directory/v1/org/#{org_id}/groups/#{group_id}").body
+      validate_required_params({org_id: org_id, group_id: group_id}, %i[org_id group_id])
+      Group.new get("/directory/v1/org/#{org_id}/groups/#{group_id}").body
     end
 
     def list(org_id:, page: 1, per_page: 10)
-      resp = get("directory/v1/org/#{org_id}/groups?page=#{page}&perPage=#{per_page}")
+      validate_required_params({org_id: org_id}, [:org_id])
+      params = {page: page, perPage: per_page}
+      resp = get("/directory/v1/org/#{org_id}/groups", params: params)
       Collection.from_response(resp, key: "groups", type: Group)
     end
 
     def users(org_id:, group_id:)
-      resp = get("directory/v1/org/#{org_id}/groups/#{group_id}/members")
+      validate_required_params({org_id: org_id, group_id: group_id}, %i[org_id group_id])
+      resp = get("/directory/v1/org/#{org_id}/groups/#{group_id}/members")
       Collection.from_response(resp, key: "users", type: User)
     end
 
     def create(org_id:, name:, **group_params)
-      group = {
-        name: name
-      }
-      group_params.each {|param, value| group[param] = value }
-      Group.new post("directory/v1/org/#{org_id}/groups", body: group).body
+      validate_required_params({org_id: org_id, name: name}, %i[org_id name])
+      group = build_group_params({name: name}, group_params)
+      Group.new post("/directory/v1/org/#{org_id}/groups", body: group).body
     end
 
     def delete(org_id:, group_id:)
-      Group.new delete_request("directory/v1/org/#{org_id}/groups/#{group_id}").body
+      validate_required_params({org_id: org_id, group_id: group_id}, %i[org_id group_id])
+      Group.new delete_request("/directory/v1/org/#{org_id}/groups/#{group_id}").body
     end
 
     def delete_user(org_id:, group_id:, type:, user_id:)
-      Object.new delete_request("directory/v1/org/#{org_id}/groups/#{group_id}/members/#{type}/#{user_id}").body
+      validate_required_params({org_id: org_id, group_id: group_id, type: type, user_id: user_id},
+                               %i[org_id group_id type user_id])
+      Object.new delete_request("/directory/v1/org/#{org_id}/groups/#{group_id}/members/#{type}/#{user_id}").body
+    end
+
+    private
+
+    def build_group_params(base_params, additional_params)
+      build_params(base_params, additional_params)
     end
   end
 end

data/lib/yandex360/resources/organizations.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Yandex360
+  class OrganizationsResource < Resource
+    def list
+      resp = get("/directory/v1/org")
+      Collection.from_response(resp, key: "organizations", type: Organization)
+    end
+
+    def info(org_id:)
+      validate_required_params({org_id: org_id}, [:org_id])
+      Organization.new get("/directory/v1/org/#{org_id}").body
+    end
+  end
+end

data/lib/yandex360/resources/post_settings.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Yandex360
+  class PostSettingsResource < Resource
+    include ParamBuilder
+
+    def list(org_id:, user_id:)
+      validate_required_params({org_id: org_id, user_id: user_id}, %i[org_id user_id])
+      Object.new get("/directory/v1/org/#{org_id}/users/#{user_id}/settings/mail").body
+    end
+
+    def update(org_id:, user_id:, **params)
+      validate_required_params({org_id: org_id, user_id: user_id}, %i[org_id user_id])
+      settings = build_params({}, params)
+      Object.new patch("/directory/v1/org/#{org_id}/users/#{user_id}/settings/mail", body: settings).body
+    end
+
+    def forwarding_list(org_id:, user_id:)
+      validate_required_params({org_id: org_id, user_id: user_id}, %i[org_id user_id])
+      resp = get("/directory/v1/org/#{org_id}/users/#{user_id}/settings/mail/forwarding")
+      Collection.from_response(resp, key: "forwardings", type: Object)
+    end
+
+    def add_forwarding(org_id:, user_id:, address:)
+      validate_required_params({org_id: org_id, user_id: user_id, address: address}, %i[org_id user_id address])
+      body = {address: address}
+      Object.new post("/directory/v1/org/#{org_id}/users/#{user_id}/settings/mail/forwarding", body: body).body
+    end
+
+    def delete_forwarding(org_id:, user_id:, address:)
+      validate_required_params({org_id: org_id, user_id: user_id, address: address}, %i[org_id user_id address])
+      Object.new delete_request("/directory/v1/org/#{org_id}/users/#{user_id}/settings/mail/forwarding/#{address}").body
+    end
+  end
+end

data/lib/yandex360/resources/two_fa.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Yandex360
+  class TwoFaResource < Resource
+    def enable(org_id:, user_id:)
+      validate_required_params({org_id: org_id, user_id: user_id}, %i[org_id user_id])
+      Object.new post("/security/v1/org/#{org_id}/users/#{user_id}/2fa/enable", body: {}).body
+    end
+
+    def disable(org_id:, user_id:)
+      validate_required_params({org_id: org_id, user_id: user_id}, %i[org_id user_id])
+      Object.new post("/security/v1/org/#{org_id}/users/#{user_id}/2fa/disable", body: {}).body
+    end
+
+    def status(org_id:, user_id:)
+      validate_required_params({org_id: org_id, user_id: user_id}, %i[org_id user_id])
+      Object.new get("/security/v1/org/#{org_id}/users/#{user_id}/2fa/status").body
+    end
+
+    def domain_status(org_id:)
+      validate_required_params({org_id: org_id}, [:org_id])
+      Object.new get("/security/v1/org/#{org_id}/domain_2fa").body
+    end
+
+    def configure_domain(org_id:, enabled:)
+      validate_required_params({org_id: org_id, enabled: enabled}, %i[org_id enabled])
+      body = {enabled: enabled}
+      Object.new post("/security/v1/org/#{org_id}/domain_2fa", body: body).body
+    end
+  end
+end

data/lib/yandex360/resources/users.rb

@@ -2,40 +2,45 @@
 
 module Yandex360
   class UsersResource < Resource
+    include ParamBuilder
     def add(org_id:, dep_id:, **user_params)
-      user = {
-        departmentId: dep_id
-      }
-      user_params.each {|param, value| user[param] = value }
+      validate_required_params({org_id: org_id, dep_id: dep_id}, %i[org_id dep_id])
+      user = build_user_params({departmentId: dep_id}, user_params)
 
-      User.new post("directory/v1/org/#{org_id}/users", body: user).body
+      User.new post("/directory/v1/org/#{org_id}/users", body: user).body
     end
 
     def add_alias(org_id:, user_id:, user_alias:)
+      validate_required_params({org_id: org_id, user_id: user_id, user_alias: user_alias},
+                               %i[org_id user_id user_alias])
       body = {alias: user_alias}
-      User.new post("directory/v1/org/#{org_id}/users/#{user_id}/aliases", body: body).body
+      User.new post("/directory/v1/org/#{org_id}/users/#{user_id}/aliases", body: body).body
     end
 
     def update(org_id:, user_id:, **user_params)
-      user = {}
-      user_params.each {|param, value| user[param] = value }
+      validate_required_params({org_id: org_id, user_id: user_id}, %i[org_id user_id])
+      user = build_user_params({}, user_params)
 
-      User.new patch("directory/v1/org/#{org_id}/users/#{user_id}", body: user).body
+      User.new patch("/directory/v1/org/#{org_id}/users/#{user_id}", body: user).body
     end
 
     def info(org_id:, user_id:)
-      User.new get("directory/v1/org/#{org_id}/users/#{user_id}").body
+      validate_required_params({org_id: org_id, user_id: user_id}, %i[org_id user_id])
+      User.new get("/directory/v1/org/#{org_id}/users/#{user_id}").body
     end
 
     def list(org_id:, page: 1, per_page: 10)
-      resp = get("directory/v1/org/#{org_id}/users?page=#{page}&perPage=#{per_page}")
+      validate_required_params({org_id: org_id}, [:org_id])
+      params = {page: page, perPage: per_page}
+      resp = get("/directory/v1/org/#{org_id}/users", params: params)
       Collection.from_response(resp, key: "users", type: User)
     end
 
     # rubocop:disable Naming/MethodName
     def get2FA(org_id:, user_id:)
+      validate_required_params({org_id: org_id, user_id: user_id}, %i[org_id user_id])
       # TODO: add User2FA.new type
-      Object.new get("directory/v1/org/#{org_id}/users/#{user_id}/2fa").body
+      Object.new get("/directory/v1/org/#{org_id}/users/#{user_id}/2fa").body
     end
 
     def has2FA?(org_id:, user_id:)
@@ -44,11 +49,20 @@ module Yandex360
     # rubocop:enable Naming/MethodName
 
     def delete(org_id:, user_id:)
-      User.new delete_request("/directory/v1/org/#{org_id}/users/#{user_id}/contacts").body
+      validate_required_params({org_id: org_id, user_id: user_id}, %i[org_id user_id])
+      User.new delete_request("/directory/v1/org/#{org_id}/users/#{user_id}").body
     end
 
     def delete_alias(org_id:, user_id:, user_alias:)
-      Alias.new delete_request("directory/v1/org/#{org_id}/users/#{user_id}/aliases/#{user_alias}").body
+      validate_required_params({org_id: org_id, user_id: user_id, user_alias: user_alias},
+                               %i[org_id user_id user_alias])
+      Alias.new delete_request("/directory/v1/org/#{org_id}/users/#{user_id}/aliases/#{user_alias}").body
+    end
+
+    private
+
+    def build_user_params(base_params, additional_params)
+      build_params(base_params, additional_params)
     end
   end
 end

data/lib/yandex360/version.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
 module Yandex360
-  major = 1
-  minor = 1
-  patch = 3
-  VERSION = "#{major}.#{minor}.#{patch}"
+  VERSION = "1.1.4"
 end

data/lib/yandex360.rb

@@ -8,7 +8,14 @@ module Yandex360
   autoload :Object, "yandex360/object"
   autoload :Resource, "yandex360/resource"
   autoload :Collection, "yandex360/collection"
+  autoload :ParamBuilder, "yandex360/param_builder"
   autoload :Error, "yandex360/error"
+  autoload :AuthenticationError, "yandex360/error"
+  autoload :AuthorizationError, "yandex360/error"
+  autoload :NotFoundError, "yandex360/error"
+  autoload :ValidationError, "yandex360/error"
+  autoload :RateLimitError, "yandex360/error"
+  autoload :ServerError, "yandex360/error"
 
   autoload :AntispamResource, "yandex360/resources/antispam"
   autoload :AllowList, "yandex360/objects/types"
@@ -27,4 +34,20 @@ module Yandex360
 
   autoload :UsersResource, "yandex360/resources/users"
   autoload :User, "yandex360/objects/types"
+
+  autoload :OrganizationsResource, "yandex360/resources/organizations"
+  autoload :Organization, "yandex360/objects/types"
+
+  autoload :DomainsResource, "yandex360/resources/domains"
+  autoload :Domain, "yandex360/objects/types"
+
+  autoload :DnsResource, "yandex360/resources/dns"
+  autoload :DnsRecord, "yandex360/objects/types"
+
+  autoload :TwoFaResource, "yandex360/resources/two_fa"
+
+  autoload :AuditResource, "yandex360/resources/audit"
+  autoload :AuditEvent, "yandex360/objects/types"
+
+  autoload :PostSettingsResource, "yandex360/resources/post_settings"
 end

data/yandex360.gemspec

@@ -22,13 +22,16 @@ Gem::Specification.new do |s|
 
   s.metadata["rubygems_mfa_required"] = "true"
 
-  s.add_dependency "faraday", "~> 1.7"
+  s.add_dependency "faraday", ">= 1.7", "< 3.0"
+
+  s.add_development_dependency "fiddle", "~> 1.0"
+  s.add_development_dependency "logger", "~> 1.4"
+  s.add_development_dependency "ostruct", "~> 0.5"
 
   s.add_development_dependency "bundler"
-  s.add_development_dependency "rake", "~> 12.3.3"
+  s.add_development_dependency "rake", "~> 13.3.0"
   s.add_development_dependency "rspec", "~> 3.0"
+  s.add_development_dependency "rubocop", "~> 1.60"
   s.add_development_dependency "simplecov", "~> 0.9"
-  s.add_development_dependency "simplecov-lcov", "~> 0.7.0"
-  s.add_development_dependency "vcr", "~> 6.1"
-  s.add_development_dependency "webmock", "~> 3.18", ">= 3.18.1"
+  s.add_development_dependency "simplecov-lcov", "~> 0.9.0"
 end