oauth-bwergemn 1.0.10 → 1.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e46c6acfa64976a4efd66ac4e880f2b82c83354d275b81edadbd66632563c0db
4
- data.tar.gz: 813e8774a700ed3225a3a5065928d39500b1110b2ee54e68dd6d229ed374ffc9
3
+ metadata.gz: 2693a4a7425ecbcd52df5b7e5cda3bbe0797c40af3f089d5a78a88f2fb80932d
4
+ data.tar.gz: 543449662afc954c055fad61a73ac3e748ca882e2eb4dc370ecf639df81dbddb
5
5
  SHA512:
6
- metadata.gz: 28f9010d626ed0d8e1c4d51cb6fe370eb95eed73485077cbd1146caf1504cf8579c66d6725514c8b161d3f334464fdb7f98c9488898531ac4ee3890e7dbe010c
7
- data.tar.gz: 05ecce137a71d52d379dbbb72674abd5b54c731ffa2c42d394720002f7344f544612fb2a644338e1d8f8d0b57bd6a01ac552e8c7fb0634b6746086cf3a99de80
6
+ metadata.gz: b47c2291394b8306621f73a025325acd2a063cee6c4d66b12f5bedfd092c4e3bb6833eb6090cef6bc109fc73a9ac122a9170d2cb0783c10f9f1a4085550e9587
7
+ data.tar.gz: 22a22898d1e0dd75ccb6ae86a5eba9ffcd7766075dfce6b0a9be08ee5bc8c4bf2f65f580f8047a080b637e06361a0568df6a8fe217b857c760ea8f1c841a9e05
@@ -22,6 +22,7 @@ module OauthBwergemn
22
22
  define_setting :auth_strategy, 'hub'
23
23
  define_setting :resources, user: 'User'
24
24
  define_setting :default_resources, :user
25
+ define_setting :is_custom_scopes, false
25
26
 
26
27
  def self.config_resources
27
28
  resources
@@ -53,7 +53,11 @@ module OauthBwergemn
53
53
  end
54
54
 
55
55
  def access_scopes access
56
- access.scopes.all.map!(&:to_sym) rescue []
56
+ if OauthBwergemn.is_custom_scopes
57
+ access.scopes.map!(&:to_sym) rescue []
58
+ else
59
+ access.scopes.all.map!(&:to_sym) rescue []
60
+ end
57
61
  end
58
62
 
59
63
  def is_args_include_validate?
@@ -88,11 +92,15 @@ module OauthBwergemn
88
92
  unless access.present?
89
93
  raise OauthBwergemn::Errors::InvalidToken
90
94
  end
91
- scope_authorize! access
92
95
  resource_as = (is_args_include_as? ? args[:as] : OauthBwergemn.default_resources)
93
96
  # rubocop:disable Security/Eval
94
97
  resource = eval(OauthBwergemn.resources[resource_as.to_sym]).where(id: access.resource_owner_id).last rescue nil
95
98
  # rubocop:enable Security/Eval
99
+ if OauthBwergemn.is_custom_scopes
100
+ scope_authorize! resource
101
+ else
102
+ scope_authorize! access
103
+ end
96
104
  {
97
105
  resource_owner: resource,
98
106
  resource_credential: {
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module OauthBwergemn
4
- VERSION = '1.0.10'
4
+ VERSION = '1.0.11'
5
5
  public_constant :VERSION
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oauth-bwergemn
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.10
4
+ version: 1.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alam Ybs
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-07-08 00:00:00.000000000 Z
11
+ date: 2020-07-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler