Skip to content

Commit 24f10ca

Browse files
committed
resolve pr comments
1 parent 135da45 commit 24f10ca

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

lib/generators/boring/devise/jwt/install/install_generator.rb

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,12 @@ def verify_presence_of_devise_model
4848

4949
def add_devise_jwt_gem
5050
say "Adding devise-jwt gem", :green
51-
Bundler.with_unbundled_env do
52-
run "bundle add devise-jwt"
53-
end
51+
gem "devise-jwt"
5452
end
5553

5654
def add_devise_jwt_config_to_devise_initializer
5755
say "Adding devise-jwt configurations to a file `config/initializers/devise.rb`", :green
58-
say "Value for jwt.secret will be used from `#{devise_jwt_secret_key}`. You can change this values if they don't match with your app.\n", :yellow
56+
5957
jwt_config = <<~RUBY
6058
config.jwt do |jwt|
6159
jwt.secret = #{devise_jwt_secret_key}
@@ -72,10 +70,14 @@ def add_devise_jwt_config_to_devise_initializer
7270
inject_into_file "config/initializers/devise.rb",
7371
optimize_indentation(jwt_config, 2),
7472
before: /^end\s*\Z/m
73+
74+
say "❗️❗️\nValue for jwt.secret will be used from `#{devise_jwt_secret_key}`. You can change this values if they don't match with your app.\n",
75+
:yellow
7576
end
7677

7778
def configure_revocation_strategies
78-
say "Configuring revocation strategies for #{options[:revocation_strategy]}", :green
79+
say "Configuring #{options[:revocation_strategy]} revocation strategy",
80+
:green
7981

8082
case options[:revocation_strategy]
8183
when "JTIMatcher"
@@ -113,7 +115,7 @@ def configure_jti_matcher_strategy
113115
verbose: false
114116

115117
add_devise_jwt_module(
116-
"self",
118+
strategy: "self",
117119
include_content: "include Devise::JWT::RevocationStrategies::JTIMatcher"
118120
)
119121

@@ -145,7 +147,7 @@ def configure_denylist_strategy
145147
before: /^ end/,
146148
verbose: false
147149

148-
add_devise_jwt_module("JwtDenylist")
150+
add_devise_jwt_module(strategy: "JwtDenylist")
149151

150152
jwt_denylist_content = <<~RUBY
151153
include Devise::JWT::RevocationStrategies::Denylist
@@ -183,10 +185,13 @@ def configure_allowlist_strategy
183185
before: /^ end/,
184186
verbose: false
185187

186-
add_devise_jwt_module("self", include_content: "include Devise::JWT::RevocationStrategies::Allowlist")
188+
add_devise_jwt_module(
189+
strategy: "self",
190+
include_content: "include Devise::JWT::RevocationStrategies::Allowlist"
191+
)
187192
end
188193

189-
def add_devise_jwt_module(strategy, include_content: nil)
194+
def add_devise_jwt_module(strategy:, include_content: nil)
190195
model_name = options[:model_name].underscore
191196
model_content = File.read("app/models/#{model_name}.rb")
192197
devise_module_pattern = /devise\s*(?:(?:(?::\w+)|(?:\w+:\s*\w+))(?:(?:,\s*:\w+)|(?:,\s*\w+:\s*\w+))*)/

test/generators/devise/devise_jwt_install_generator_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def test_should_exit_if_devise_model_is_not_present
3333
end
3434
end
3535

36-
def test_should_install_devise_jwt_successfully
36+
def test_should_configure_devise_jwt
3737
Dir.chdir(app_path) do
3838
setup_devise
3939
quietly { run_generator }

0 commit comments

Comments
 (0)