Merge pull request #133 from mizoR/fix-credentials-validation

Fix broken credentials validation

Author: mizoR

lib/line/bot/api/errors.rb

@@ -16,7 +16,6 @@ module Line
   module Bot
     module API
       class Error < StandardError; end
-      class InvalidCredentialsError < Error; end
     end
   end
 end

lib/line/bot/client.rb

@@ -13,7 +13,6 @@
 # under the License.
 
 require 'line/bot/request'
-require 'line/bot/api/errors'
 require 'base64'
 require 'net/http'
 require 'openssl'
@@ -57,18 +56,14 @@ def credentials
         }
       end
 
-      def credentials?
-        credentials.values.all?
-      end
-
       # Push messages to line server and to user.
       #
       # @param user_id [String] User's identifiers
       # @param messages [Hash or Array]
       #
       # @return [Net::HTTPResponse]
       def push_message(user_id, messages)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         messages = [messages] if messages.is_a?(Hash)
 
@@ -91,7 +86,7 @@ def push_message(user_id, messages)
       #
       # @return [Net::HTTPResponse]
       def reply_message(token, messages)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         messages = [messages] if messages.is_a?(Hash)
 
@@ -114,7 +109,7 @@ def reply_message(token, messages)
       #
       # @return [Net::HTTPResponse]
       def multicast(to, messages)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         to = [to] if to.is_a?(String)
         messages = [messages] if messages.is_a?(Hash)
@@ -137,7 +132,7 @@ def multicast(to, messages)
       #
       # @return [Net::HTTPResponse]
       def broadcast(messages)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         messages = [messages] if messages.is_a?(Hash)
 
@@ -153,7 +148,7 @@ def broadcast(messages)
       end
 
       def leave_group(group_id)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         request = Request.new do |config|
           config.httpclient     = httpclient
@@ -166,7 +161,7 @@ def leave_group(group_id)
       end
 
       def leave_room(room_id)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         request = Request.new do |config|
           config.httpclient     = httpclient
@@ -473,7 +468,7 @@ def get_quota_consumption
       #
       # @return [Net::HTTPResponse]
       def get(endpoint_path)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         request = Request.new do |config|
           config.httpclient     = httpclient
@@ -491,7 +486,7 @@ def get(endpoint_path)
       #
       # @return [Net::HTTPResponse]
       def post(endpoint_path, payload = nil)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         request = Request.new do |config|
           config.httpclient     = httpclient
@@ -510,7 +505,7 @@ def post(endpoint_path, payload = nil)
       #
       # @return [Net::HTTPResponse]
       def delete(endpoint_path)
-        raise Line::Bot::API::InvalidCredentialsError, 'Invalidates credentials' unless credentials?
+        channel_token_required
 
         request = Request.new do |config|
           config.httpclient     = httpclient
@@ -576,6 +571,10 @@ def secure_compare(a, b)
         b.each_byte { |byte| res |= byte ^ l.shift }
         res == 0
       end
+
+      def channel_token_required
+        raise ArgumentError, '`channel_token` is not configured' unless channel_token
+      end
     end
   end
 end