virtuatable-core 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfc5218a02310414bc7961f93e97d05bb37cb73b9d4868fa8c83e6666485447a
-  data.tar.gz: c83d949e50ae999b2182fd7c4678b9b45a5418c25d750d859d43f4f41713029e
+  metadata.gz: 203433dce36ee2d214216cd18bdb69fcd4e42328a4527678ece54d96c8608383
+  data.tar.gz: 5864fa51e5c3fb70385f0419485042a23dfd8af8e0de918bcae219026b7e26e8
 SHA512:
-  metadata.gz: 34d89edd05d094d7db645e4403060bbbe091e3e4c77733285cd34fb7d4ab3890f28a03427bb270195c5422f4ea6235140a5693d5a112b3178f25d7a1fe9e8314
-  data.tar.gz: c5c6871afefd3a2dd445ffaf060c59cb676ed54a720ae26c401af4a5b62e49be4969baac10eebea8bd46ded9a8835249b62168c6ef1338560f00f6d190d288cc
+  metadata.gz: e8c387a4883b7d4ff02120461895bcadcb4744e3b865326423ac24be062b60d80be5f05d0baac49860f958cc6479012e196e54b540a46d5382313e485570a9b8
+  data.tar.gz: 3b6429e446fb7fc955999b9bdd4b861bfe889b8d17eb22cb7029318ae52dee81b2b368326ae6cd052e7b91951d1e16ba42313b08740530a76e9e404c18abf377

data/lib/core/helpers/applications.rb

@@ -10,10 +10,10 @@ module Core
       def application(premium: false)
         return @application unless @application.nil?
 
-        check_presence 'app_key'
-        @application = application_model.find_by(key: params['app_key'])
-        api_not_found 'app_key.unknown' if @application.nil?
-        api_forbidden 'app_key.forbidden' if premium && !@application.premium
+        check_presence 'client_id'
+        @application = application_model.find_by(client_id: params['client_id'])
+        api_not_found 'client_id.unknown' if @application.nil?
+        api_forbidden 'client_id.forbidden' if premium && !@application.premium
 
         @application
       end

data/lib/core/models/concerns/sluggable.rb

@@ -6,22 +6,16 @@ module Core
       module Sluggable
         extend ActiveSupport::Concern
 
-        # Module holding the class methods for the classes including this concern.
-        # @author Vincent Courtois <courtois.vincent@outlook.com>
-        module ClassMethods
-          # Add the field and its validations in the model including it.
-          # @param entity_type [String,Symbol] the name of the model including it, to be included in the error messages.
-          def make_sluggable(entity_type)
-            # @!attribute [rw] slug
-            #   @return [String] the slug of the current entity ; it must be snake-cased, longer than four characters, unique for the entity and given.
-            field :slug, type: String
+        included do
+          # @!attribute [rw] slug
+          #   @return [String] the slug of the current entity ; it must be snake-cased, longer than four characters, unique for the entity and given.
+          field :slug, type: String
 
-            validates :slug,
-              length: {minimum: 4, message: 'minlength', if: :slug?},
-              format: {with: /\A[a-z]+(_[a-z]+)*\z/, message: 'pattern', if: :slug?},
-              uniqueness: {message: 'uniq', if: :slug?},
-              presence: {message: 'required'}
-          end
+          validates :slug,
+            length: {minimum: 4, message: 'minlength', if: :slug?},
+            format: {with: /\A[a-z]+(_[a-z]+)*\z/, message: 'pattern', if: :slug?},
+            uniqueness: {message: 'uniq', if: :slug?},
+            presence: {message: 'required'}
         end
       end
     end

data/lib/core/models/oauth/access_token.rb

@@ -8,7 +8,7 @@ module Core
         include Mongoid::Document
         include Mongoid::Timestamps
 
-        store_in collection: 'oauth_access_token'
+        store_in collection: 'oauth_access_tokens'
 
         # @!attribute [rw] value
         #   @return [String] the value of the token, returned to the application when built.
@@ -21,6 +21,12 @@ module Core
         #   @return [Core::Models::OAuth::Authorization] the authorization code that issued this token to the application for this user.
         belongs_to :authorization, class_name: 'Core::Models::OAuth::Authorization', inverse_of: :tokens
 
+
+        # A refresh token is attached to each and every refresh token so that it can be used to deliver a new access token.
+        # @!attribute [rx] refresh_token
+        #   @return [Core::Models::OAuth::RefreshToken] the refresh token linked to this token
+        has_one :refresh_token, class_name: 'Core::Models::OAuth::RefreshToken', inverse_of: :token
+
         validates :value, 
           presence: {message: 'required'},
           uniqueness: {message: 'uniq'}
@@ -28,8 +34,25 @@ module Core
         # Checks if the current date is inferior to the creation date + expiration period
         # @return [Boolean] TRUE if the token is expired, FALSE otherwise.
         def expired?
+          # Handles the case where the token is given to a premium app (our apps have infinite tokens).
+          return false if premium?
+          return true if refresh_token.used?
+
           created_at.to_time.to_i + expiration < Time.now.to_i
         end
+
+        # Returns the scopes this access token can use to access the application
+        # @return [Array<Core::Models::OAuth::Scope>] the array of scopes from the linked authorization
+        def scopes
+          # Premium applications (our applications) have all the rights on the API.
+          return Core::Models::OAuth::Scope.all.to_a if premium?
+
+          authorization.scopes
+        end
+
+        def premium?
+          authorization.application.premium
+        end
       end
     end
   end

data/lib/core/models/oauth/application.rb

@@ -7,14 +7,17 @@ module Core
         include Mongoid::Document
         include Mongoid::Timestamps
 
-        store_in collection: 'oauth_application'
+        store_in collection: 'oauth_applications'
 
         # @!attribute [rw] name
         #   @return [String] the unique name of the application, mainly used to identify and display it.
         field :name, type: String
-        # @!attribute [rw] key
+        # @!attribute [rw] client_id
         #   @return [String] the unique key for the application, identifying it when requesting a token for the API.
-        field :key, type: String, default: ->{ SecureRandom.hex }
+        field :client_id, type: String, default: ->{ SecureRandom.hex }
+        # @!attribute [rw] client_secret
+        #   @return [String] the "password" of the application, used to identify it when requesting tokens.
+        field :client_secret, type: String, default: ->{ SecureRandom.hex }
         # @!attribute [rw] premium
         #   @return [Boolean] a value indicating whether the application should automatically receive a token when an account is created, or not.
         field :premium, type: Mongoid::Boolean, default: false
@@ -28,16 +31,22 @@ module Core
         # @!attribute [rw] authorizations
         #   @return [Array<Core::Models::OAuth::Authorization>] the authorizations linked to the accounts this application can get the data from.
         has_many :authorizations, class_name: 'Core::Models::OAuth::Authorization', inverse_of: :application
+        # @!attribute [rw]
+        #   @return [Array<Core::Models::OAuth::Scope>] the scopes this application will transmit to its token
+        has_and_belongs_to_many :scopes, class_name: 'Core::Models::OAuth::Scope', inverse_of: :applications
 
         validates :name,
           presence: {message: 'required'},
           length: {minimum: 6, message: 'minlength'},
           uniqueness: {message: 'uniq'}
 
-        validates :key,
+        validates :client_id,
           presence: {message: 'required'},
           uniqueness: {message: 'uniq'}
 
+        validates :client_secret,
+          presence: {message: 'required'}
+
         validate :redirect_uris_values
 
         # Checks the URIs to get sure they are correct, a URI is correct if :
@@ -48,7 +57,7 @@ module Core
             if !uri.is_a? String
               errors.add(:redirect_uris, 'type')
               break
-            elsif uri.match(/\A(https?:\/\/)((([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*)|(localhost:[0-9]{2,4})\/?)\z/).nil?
+            elsif uri.match(/\Ahttps?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&\/\/=]*)\z/).nil?
               errors.add(:redirect_uris, 'format')
               break
             end

data/lib/core/models/oauth/authorization.rb

@@ -10,11 +10,14 @@ module Core
         include Mongoid::Document
         include Mongoid::Timestamps
 
-        store_in collection: 'oauth_authorization'
+        store_in collection: 'oauth_authorizations'
 
         # @!attribute [rw] code
         #   @return [String] the value corresponding to the authentication code in the RFC of OAuth2.0, kep for historic purpose.
         field :code, type: String, default: ->{ SecureRandom.hex }
+        # @!attribute [rw] expiration
+        #   @return [Integer] the time, in seconds, after which the authorization is declared expired.
+        field :expiration, type: Integer, default: 86400
 
         # @!attribute [rw] account
         #   @return [Arkaaan::Account] the account granting the authorization to access its data to the application.
@@ -25,10 +28,19 @@ module Core
         # @!attribute [rw] token
         #   @return [Core::Models::OAuth::AccessToken] the access token used further in the application process to access private data of the account.
         has_many :tokens, class_name: 'Core::Models::OAuth::AccessToken', inverse_of: :authorization
+        # @!attribute [rw]
+        #   @return [Array<Core::Models::OAuth::Scope>] the scopes this access token has.
+        has_and_belongs_to_many :scopes, class_name: 'Core::Models::OAuth::Scope', inverse_of: :authorizations
 
         validates :code,
           presence: {message: 'required'},
           uniqueness: {message: 'uniq'}
+
+        # Checks if the current date is inferior to the creation date + expiration period
+        # @return [Boolean] TRUE if the authorization is expired, FALSE otherwise.
+        def expired?
+          created_at.to_time.to_i + expiration < Time.now.to_i
+        end
       end
     end
   end

data/lib/core/models/oauth/refresh_token.rb

@@ -7,15 +7,22 @@ module Core
         include Mongoid::Document
         include Mongoid::Timestamps
 
-        store_in collection: 'oauth_refresh_token'
+        store_in collection: 'oauth_refresh_tokens'
 
         # @!attribute [rw] value
         #   @return [String] the value of the token, returned to the application when built.
         field :value, type: String, default: ->{ SecureRandom.hex }
+        # @!attribute [rw] used_at
+        #   @return [DateTime] the date and time at which this refresh token has been useds to create a new access token.
+        field :used_at, type: DateTime, default: nil
 
         # @!attribute [rw] authorization
         #   @return [Core::Models::OAuth::Authorization] the authorization code that issued this token to the application for this user.
-        belongs_to :authorization, class_name: 'Core::Models::OAuth::Authorization', inverse_of: :refresh_token
+        belongs_to :token, class_name: 'Core::Models::OAuth::AccessToken', inverse_of: :refresh_token
+
+        def used?
+          !used_at.nil? && used_at < DateTime.now
+        end
       end
     end
   end

data/lib/core/models/oauth/scope.rb

@@ -0,0 +1,32 @@
+module Core
+  module Models
+    module OAuth
+      # A scope gives access to some parts of the API, for example to the management of campaigns,
+      # applications or for account profile management.
+      # @author Vincent Courtois <courtois.vincent@outlook.com>
+      class Scope
+        include Mongoid::Document
+        include Mongoid::Timestamps
+
+        store_in collection: 'oauth_scopes'
+
+        # @!attribute [rw] name
+        #   @return [String] the name of the scope, used to get its translation on the frontend.
+        field :name, type: String, default: ''
+
+        # @!attribute [rw] applications
+        #   @return [Array<Core::Models::OAuth::Application>] the applications that want to have access to this
+        #     scope from the users of the platform. These rights will be carried on to the tokens and frozen.
+        has_and_belongs_to_many :applications, class_name: 'Core::Models::OAuth::Application', inverse_of: :scopes
+        # @!attribute [rw] tokeauthorizationsns
+        #   @return [Array<Core::Models::OAuth::Authorization] the tokens having these scopes.
+        has_and_belongs_to_many :authorizations, class_name: 'Core::Models::OAuth::Authorization', inverse_of: :scopes
+
+        validates :name,
+          presence: {message: 'required'},
+          length: {minimum: 6, if: :name?, message: 'minlength'},
+          uniqueness: {id: :name?, message: 'uniq'}
+      end
+    end
+  end
+end

data/lib/core/models/oauth.rb

@@ -7,6 +7,7 @@ module Core
       autoload :Authorization, 'core/models/oauth/authorization'
       autoload :AccessToken  , 'core/models/oauth/access_token'
       autoload :RefreshToken , 'core/models/oauth/refresh_token'
+      autoload :Scope        , 'core/models/oauth/scope'
     end
   end
 end

data/lib/core/models/permissions/category.rb

@@ -11,8 +11,6 @@ module Core
         store_in collection: 'categories'
 
         has_many :rights, class_name: 'Core::Models::Permissions::Right', inverse_of: :category
-
-        make_sluggable 'category'
       end
     end
   end

data/lib/core/models/permissions/group.rb

@@ -26,8 +26,6 @@ module Core
         # @!attribute [rw] routes
         #   @return [Array<Core::Models::Monitoring::Route>] the routes this group can access in the API.
         has_and_belongs_to_many :routes, class_name: 'Core::Models::Permissions::Route', inverse_of: :groups
-
-        make_sluggable 'group'
       end
     end
   end

data/lib/core/models/permissions/right.rb

@@ -15,8 +15,6 @@ module Core
         has_and_belongs_to_many :groups, class_name: 'Core::Models::Permissions::Group', inverse_of: :rights
 
         belongs_to :category, class_name: 'Core::Models::Permissions::Category', inverse_of: :rights
-
-        make_sluggable 'right'
       end
     end
   end

data/lib/core/models.rb

@@ -1,24 +1,22 @@
-require 'mongoid'
-require 'active_model'
-require 'active_support'
-require 'dotenv/load'
+# frozen_string_literal: true
 
-# Main module of the application, holding all the subsequent classes.
-# @author Vincent Courtois <courtois.vincent@outlook.com>
 module Core
+  # Module holding the representations of the business objects we're manipulating
+  # in the database. Models are declared as Mongoid classes to connect to MongoDB
+  # @author Vincent Courtois <courtois.vincent@outlook.com>
   module Models
-    autoload :Account       , 'core/models/account'
+    autoload :Account, 'core/models/account'
     autoload :Authentication, 'core/models/authentication'
-    autoload :Campaign      , 'core/models/campaign'
-    autoload :Campaigns     , 'core/models/campaigns'
-    autoload :Chatroom      , 'core/models/chatroom'
-    autoload :Chatrooms     , 'core/models/chatrooms'
-    autoload :Concerns      , 'core/models/concerns'
-    autoload :Event         , 'core/models/event'
-    autoload :Files         , 'core/models/files'
-    autoload :Notification  , 'core/models/notification'
-    autoload :OAuth         , 'core/models/oauth'
-    autoload :Permissions   , 'core/models/permissions'
-    autoload :Ruleset       , 'core/models/ruleset'
+    autoload :Campaign, 'core/models/campaign'
+    autoload :Campaigns, 'core/models/campaigns'
+    autoload :Chatroom, 'core/models/chatroom'
+    autoload :Chatrooms, 'core/models/chatrooms'
+    autoload :Concerns, 'core/models/concerns'
+    autoload :Event, 'core/models/event'
+    autoload :Files, 'core/models/files'
+    autoload :Notification, 'core/models/notification'
+    autoload :OAuth, 'core/models/oauth'
+    autoload :Permissions, 'core/models/permissions'
+    autoload :Ruleset, 'core/models/ruleset'
   end
-end
+end

data/lib/core/services.rb

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 module Core
+  # Services are orchestrating models to provide more high-level operations.
+  # @author Vincent Courtois <courtois.vincent@outlook.com>
   module Services
     autoload :Accounts, 'core/services/accounts'
     autoload :Base, 'core/services/base'
     autoload :Registry, 'core/services/registry'
     autoload :Sessions, 'core/services/sessions'
   end
-end
+end

data/lib/core/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Core
-  VERSION = '1.2.1'
-end
+  VERSION = '1.3.1'
+end

data/lib/core.rb

@@ -1,7 +1,6 @@
-require 'mongoid'
-require 'active_model'
-require 'active_support'
-require 'dotenv/load'
+# frozen_string_literal: true
+
+%w[active_model mongoid active_support].each { |g| require g }
 
 # Main module of the application, holding all the subsequent classes.
 # @author Vincent Courtois <courtois.vincent@outlook.com>
@@ -10,4 +9,4 @@ module Core
   autoload :Helpers, 'core/helpers'
   autoload :Models, 'core/models'
   autoload :Services, 'core/services'
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: virtuatable-core
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Vincent Courtois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
@@ -332,6 +332,7 @@ files:
 - lib/core/models/oauth/application.rb
 - lib/core/models/oauth/authorization.rb
 - lib/core/models/oauth/refresh_token.rb
+- lib/core/models/oauth/scope.rb
 - lib/core/models/permissions.rb
 - lib/core/models/permissions/category.rb
 - lib/core/models/permissions/group.rb