anoubis_sso_server 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99a948f147bd85dbac2a05e1776cb9d782df8270d8c952231954891b5aefbe90
-  data.tar.gz: 30f5032129b1b8e43665842c528e6a6f0e4a8f3bb1e843a4012b78b326918a67
+  metadata.gz: '0148b84eeebcb0d63e3959c2bd2fe28baeae62a2f223d4e314b5fd3a9e4a9401'
+  data.tar.gz: 13ca48de82c3d0028bfe0e1954324a404f7a6db95ff7d2388d1c9772d8e4414a
 SHA512:
-  metadata.gz: 4058632c8ea913bd5456a3fc55485b1ad99644f93065a6e92a0192d28bf79c6de8cb221204007047f37a1e4186829dd670202f687b24c687c428092f6c2c027a
-  data.tar.gz: 26f2624db76c5bca8f94b923ae040554a7f41abf02fcfd4bf6065f9f0e4cd6173221c0e493f9ca998bbfec8fc7e830fe64fdb8eda33e2fc6a70a7f572f34fb6e
+  metadata.gz: bf848a61c3f01f4e1e5effa132c0d1a88a72a0f4f550fa00819aacb9482658d6ee2094b694849bb1742054c041eb37d0c1e6f9fe7b1798e26ae113907aed25e5
+  data.tar.gz: bedcc154d4636babacc398b3e86ac141bf7898013436104c8c27355cf30efd20c12726cae5f8812844d1bb7855e94dec425ad9fce2cc7257331a361296e8fc75

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## [Released]
 
+## [1.0.2] - 2022-02-28
+- Action /api/1/auth was added.
+
 ## [1.0.1] - 2022-02-27
 - Library was released.
 

data/app/controllers/anoubis_sso_server/application_controller.rb

@@ -272,4 +272,21 @@ class AnoubisSsoServer::ApplicationController < Anoubis::ApplicationController
 
     user
   end
+
+  ##
+  # Check parameters
+  # @param list [Array] Array of parameters to check
+  def check_listed_parameters(list)
+    list.each do |key|
+      return I18n.t('anoubis.errors.is_not_defined', title: key) unless params.key? key.to_sym
+
+      return I18n.t('anoubis.errors.is_not_correct', title: key) unless params[key.to_sym]
+
+      params[key.to_sym].strip!
+
+      return I18n.t('anoubis.errors.is_not_correct', title: key)  if params[key.to_sym] == ''
+    end
+
+    nil
+  end
 end

data/app/controllers/anoubis_sso_server/main_controller.rb

@@ -56,7 +56,7 @@ class AnoubisSsoServer::MainController < AnoubisSsoServer::ApplicationController
     code = nil
     if params[:code]
       begin
-        code = JSON.parse(self.redis.get("#{self.redis_prefix}login_code:#{params[:code]}"),{ symbolize_names: true })
+        code = JSON.parse(self.redis.get("#{redis_prefix}login_code:#{params[:code]}"),{ symbolize_names: true })
       rescue
 
       end
@@ -81,4 +81,46 @@ class AnoubisSsoServer::MainController < AnoubisSsoServer::ApplicationController
       redirect_to redirect_url + "code=#{auth_code}", { allow_other_host: true }
     end
   end
+
+  ##
+  # Procedure check current login status of user and redirect to URL used for call /openid/oauth2/auth.
+  def auth
+    redirect_url = sso_silent_url
+    redirect_url += redirect_url.index('?') ? '&' : '?'
+
+    err = check_listed_parameters %w[code]
+
+    if err
+      redirect_to redirect_url + 'error=' + ERB::Util.url_encode(err), { allow_other_host: true }
+      return
+    end
+
+    begin
+      session = JSON.parse(redis.get("#{redis_prefix}session:#{cookies[:oauth_session]}"), { symbolize_names: true })
+    rescue StandardError
+      session = nil
+      cookies[:oauth_session] = nil
+    end
+
+    unless session
+      redirect_to redirect_url + 'error=' + ERB::Util.url_encode(I18n.t('anoubis.errors.session_expired')), { allow_other_host: true }
+      return
+    end
+
+    begin
+      auth_code = redis.get("#{redis_prefix}auth_code:#{params[:code]}")
+      code = JSON.parse(redis.get("#{redis_prefix}login_code:#{auth_code}"), { symbolize_names: true })
+    rescue StandardError
+      code = nil
+    end
+
+    unless code
+      redirect_to redirect_url + 'error=' + ERB::Util.url_encode(I18n.t('anoubis.errors.is_not_correct', title: 'code')), { allow_other_host: true }
+      return
+    end
+
+    self.redis.del("#{redis_prefix}auth_code:#{params[:code]}")
+    self.redis.del("#{redis_prefix}login_code:#{auth_code}")
+    redirect_to code[:original_url], { allow_other_host: true }
+  end
 end

data/app/controllers/anoubis_sso_server/open_id_controller.rb

@@ -281,23 +281,6 @@ class AnoubisSsoServer::OpenIdController < AnoubisSsoServer::ApplicationControll
     nil
   end
 
-  ##
-  # Check parameters
-  # @param list [Array] Array of parameters to check
-  def check_listed_parameters(list)
-    list.each do |key|
-      return I18n.t('anoubis.errors.is_not_defined', title: key) unless params.key? key.to_sym
-
-      return I18n.t('anoubis.errors.is_not_correct', title: key) unless params[key.to_sym]
-
-      params[key.to_sym].strip!
-
-      return I18n.t('anoubis.errors.is_not_correct', title: key)  if params[key.to_sym] == ''
-    end
-
-    nil
-  end
-
   ##
   # Check if page should be redirected to url
   # @param error [String] Error message

data/config/routes.rb

@@ -5,7 +5,7 @@ AnoubisSsoServer::Engine.routes.draw do
     scope path: 'api', defaults: { format: 'json' } do
       scope path: ':version' do
         get 'login', to: 'anoubis_sso_server/main#login', as: 'api_internal_login'
-        #get 'auth', to: 'main#auth'
+        get 'auth', to: 'anoubis_sso_server/main#auth', as: 'api_internal_auth'
         get 'dashboard', to: 'anoubis_sso_server/index#dashboard'
         get 'menu', to: 'anoubis_sso_server/index#menu'
       end

data/lib/anoubis_sso_server/version.rb

@@ -2,5 +2,5 @@
 
 module AnoubisSsoServer
   ## Library version
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,211 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: anoubis_sso_server
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Andrey Ryabov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-27 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anoubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.5.1
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.16
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 6.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 6.2.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.21'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.25'
 description: Library for create basic SSO Server based on OAUTH authentication.
 email:
 - andrey.ryabov@ra-company.kz
@@ -224,7 +224,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- anoubis_sso_server.gemspec
 - app/controllers/anoubis_sso_server/application_controller.rb
 - app/controllers/anoubis_sso_server/data_controller.rb
 - app/controllers/anoubis_sso_server/index_controller.rb

data/anoubis_sso_server.gemspec

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/anoubis_sso_server/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "anoubis_sso_server"
-  spec.version = AnoubisSsoServer::VERSION
-  spec.authors = ["Andrey Ryabov"]
-  spec.email = ["andrey.ryabov@ra-company.kz"]
-
-  spec.summary = "Library for create basic SSO Server based on OAUTH authentication."
-  spec.description = "Library for create basic SSO Server based on OAUTH authentication."
-  spec.homepage = "https://github.com/RA-Company/"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.1"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/RA-Company/anoubis_sso_server"
-  spec.metadata["changelog_uri"] = "https://github.com/RA-Company/anoubis_sso_server/blob/main/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "anoubis", ">= 1.0.0"
-  spec.add_dependency "rails", ">= 7.0.0"
-  spec.add_dependency "redis", ">= 4.5.1"
-  spec.add_dependency "bcrypt", ">= 3.1.16"
-  spec.add_dependency "rest-client", ">= 2.1.0"
-  spec.add_dependency "mysql2", ">= 0.5.3"
-  spec.add_dependency "jwt", ">= 2.3.0"
-
-  spec.add_development_dependency "rake", ">= 0.13"
-  spec.add_development_dependency "rspec", ">= 3.11.0"
-  spec.add_development_dependency "rspec-rails", ">= 5.1"
-  spec.add_development_dependency "factory_bot_rails", ">= 6.2.0"
-  spec.add_development_dependency "dotenv", '>= 2.7'
-  spec.add_development_dependency "simplecov", '>= 0.21'
-  spec.add_development_dependency "rubocop"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end