feat: 🎸 Stop using "secrets.yml" (#45)

Stop using "secrets.yml" and start using "dotenv" and "credentials:edit"

Author: nikukyugamer

.env.sample

@@ -20,3 +20,11 @@ MYSQL_PORT_TEST=
 MYSQL_USERNAME_TEST=
 MYSQL_PASSWORD_TEST=
 MYSQL_DATABASE_TEST=
+
+TWITTER_CONSUMER_KEY=
+TWITTER_CONSUMER_SECRET=
+TWITTER_ACCESS_TOKEN=
+TWITTER_ACCESS_TOKEN_SECRET=
+
+MEMBERS_PAGE_AUTH_USERNAME=
+MEMBERS_PAGE_AUTH_PASSWORD=

.gitignore

@@ -51,3 +51,5 @@ app/lib/suikoden_election_2017_tweets.md
 public/assets/*
 .idea/
 .env
+
+/config/master.key

app/controllers/for_members_all_vote_controller.rb

@@ -8,7 +8,7 @@ class ForMembersAllVoteController < ApplicationController
 
   def index
     authenticate_or_request_with_http_basic("Hello, gensosenkyo staff!") do |username, password|
-      username == Rails.application.secrets.members_page_auth_username && password == Rails.application.secrets.members_page_auth_password
+      username == ENV['MEMBERS_PAGE_AUTH_USERNAME'] && password == ENV['MEMBERS_PAGE_AUTH_PASSWORD']
     end
     for_get_method if request.get?
     for_post_method(params[:search_word]) if request.post?

app/controllers/for_members_check_vote_controller.rb

@@ -9,7 +9,7 @@ class ForMembersCheckVoteController < ApplicationController
 
   def show
     authenticate_or_request_with_http_basic("Hello, gensosenkyo staff!") do |username, password|
-      username == Rails.application.secrets.members_page_auth_username && password == Rails.application.secrets.members_page_auth_password
+      username == ENV['MEMBERS_PAGE_AUTH_USERNAME'] && password == ENV['MEMBERS_PAGE_AUTH_PASSWORD']
     end
 
     @screen_name = params[:search_tw_id].nil? ? "" : params[:search_tw_id].gsub(/@/, "")
@@ -32,7 +32,7 @@ def show
 
   def result
     authenticate_or_request_with_http_basic("Hello, gensosenkyo staff!") do |username, password|
-      username == Rails.application.secrets.members_page_auth_username && password == Rails.application.secrets.members_page_auth_password
+      username == ENV['MEMBERS_PAGE_AUTH_USERNAME'] && password == ENV['MEMBERS_PAGE_AUTH_PASSWORD']
     end
 
     @screen_name = params[:search_tw_id].nil? ? "" : params[:search_tw_id].gsub(/@/, "")

app/controllers/for_members_controller.rb

@@ -9,7 +9,7 @@ class ForMembersController < ApplicationController
 
   def site_http_basic_authenticate_with
     authenticate_or_request_with_http_basic("Hello, gensosenkyo staff!") do |username, password|
-      username == Rails.application.secrets.members_page_auth_username && password == Rails.application.secrets.members_page_auth_password
+      username == ENV['MEMBERS_PAGE_AUTH_USERNAME'] && password == ENV['MEMBERS_PAGE_AUTH_PASSWORD']
     end
   end
 

app/controllers/for_members_duplicated_vote_controller.rb

@@ -8,7 +8,7 @@ class ForMembersDuplicatedVoteController < ApplicationController
 
   def index
     authenticate_or_request_with_http_basic("Hello, gensosenkyo staff!") do |username, password|
-      username == Rails.application.secrets.members_page_auth_username && password == Rails.application.secrets.members_page_auth_password
+      username == ENV['MEMBERS_PAGE_AUTH_USERNAME'] && password == ENV['MEMBERS_PAGE_AUTH_PASSWORD']
     end
 
     for_get_method if request.get?

app/controllers/for_members_normal_vote_controller.rb

@@ -9,7 +9,7 @@ class ForMembersNormalVoteController < ApplicationController
 
   def site_http_basic_authenticate_with
     authenticate_or_request_with_http_basic("Hello, gensosenkyo staff!") do |username, password|
-      username == Rails.application.secrets.members_page_auth_username && password == Rails.application.secrets.members_page_auth_password
+      username == ENV['MEMBERS_PAGE_AUTH_USERNAME'] && password == ENV['MEMBERS_PAGE_AUTH_PASSWORD']
     end
   end
 

app/controllers/for_members_other_tag_vote_controller.rb

@@ -8,7 +8,7 @@ class ForMembersOtherTagVoteController < ApplicationController
 
   def index
     authenticate_or_request_with_http_basic("Hello, gensosenkyo staff!") do |username, password|
-      username == Rails.application.secrets.members_page_auth_username && password == Rails.application.secrets.members_page_auth_password
+      username == ENV['MEMBERS_PAGE_AUTH_USERNAME'] && password == ENV['MEMBERS_PAGE_AUTH_PASSWORD']
     end
 
     for_get_method if request.get?

config/credentials.yml.enc

@@ -0,0 +1 @@
+fDmAxxamruglQWaqRApvTBJYrCX1L4aCFYn6YvdFWpS24hev+y02c5URgoNYODy9JpJlGy2SAmJU1XKU4u+dH1ykncLmeqc9XVUt6BOL6DiEDMEB9uZB5Libqs3oMZJ8Ix/I5wSBRn6ugdxRGE7qsOjzj0NGkd4c2Pjy3/VrddKx0Zad8bECAF8RoYblNsvyCKbXSU9XO4y21uXzDtte9wEc8zPU3umixxZ7aC44s5+TySSKH/lt7li+7QnCuVqUIXW3llZhr0yZELCwppDFDihabCGDudYyyK9C5LN+2DPtJcqLLQVvlv8dpqmkFpo/i5sAKTAhUOU1gu+Anwa90c4m2s+9tvSqb/dSTqPWlJcBQ9FI0ec6t5HpVY3NpCJeI/78jhyDqwMqxPmhhrr8spwM/MBVtuVdlh4B--Q1+tZBciHlwEuplQ--6vM+dxWucaUpA/3KGhX4yA==

lib/collect_tweet/image_salvage.rb

@@ -8,11 +8,10 @@ class SuikodenElection2017Tweets
 
   def client
     @client = Twitter::REST::Client.new do |config|
-      twitter_api_config = YAML.load_file('config/secrets.yml')
-      config.consumer_key        = twitter_api_config["shared"]["twitter_consumer_key"]
-      config.consumer_secret     = twitter_api_config["shared"]["twitter_consumer_secret"]
-      config.access_token        = twitter_api_config["shared"]["twitter_access_token"]
-      config.access_token_secret = twitter_api_config["shared"]["twitter_access_token_secret"]
+      config.consumer_key        = ENV['TWITTER_CONSUMER_KEY']
+      config.consumer_secret     = ENV['TWITTER_CONSUMER_SECRET']
+      config.access_token        = ENV['TWITTER_ACCESS_TOKEN']
+      config.access_token_secret = ENV['TWITTER_ACCESS_TOKEN_SECRET']
     end
   end
 

lib/collect_tweet/suikoden_election_2017_tweets.rb

@@ -7,11 +7,10 @@ class SuikodenElection2017Tweets
 
   def client
     @client = Twitter::REST::Client.new do |config|
-      twitter_api_config = YAML.load_file('config/secrets.yml')
-      config.consumer_key        = twitter_api_config["shared"]["twitter_consumer_key"]
-      config.consumer_secret     = twitter_api_config["shared"]["twitter_consumer_secret"]
-      config.access_token        = twitter_api_config["shared"]["twitter_access_token"]
-      config.access_token_secret = twitter_api_config["shared"]["twitter_access_token_secret"]
+      config.consumer_key        = ENV['TWITTER_CONSUMER_KEY']
+      config.consumer_secret     = ENV['TWITTER_CONSUMER_SECRET']
+      config.access_token        = ENV['TWITTER_ACCESS_TOKEN']
+      config.access_token_secret = ENV['TWITTER_ACCESS_TOKEN_SECRET']
     end
   end
 

lib/collect_tweet/user_icon_renew.rb

@@ -7,11 +7,10 @@ class SuikodenElection2017Tweets
 
   def client
     @client = Twitter::REST::Client.new do |config|
-      twitter_api_config = YAML.load_file('config/secrets.yml')
-      config.consumer_key        = twitter_api_config["shared"]["twitter_consumer_key"]
-      config.consumer_secret     = twitter_api_config["shared"]["twitter_consumer_secret"]
-      config.access_token        = twitter_api_config["shared"]["twitter_access_token"]
-      config.access_token_secret = twitter_api_config["shared"]["twitter_access_token_secret"]
+      config.consumer_key        = ENV['TWITTER_CONSUMER_KEY']
+      config.consumer_secret     = ENV['TWITTER_CONSUMER_SECRET']
+      config.access_token        = ENV['TWITTER_ACCESS_TOKEN']
+      config.access_token_secret = ENV['TWITTER_ACCESS_TOKEN_SECRET']
     end
   end