orange_sms_api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f4ace5adcfbc2bdca43d56d66d6c2edb63852afc004bc9f6a24756b9a7fc2b
-  data.tar.gz: 2ad036d76702540ac5f12a2afd59f9be97e17422f2c724932fe4685292a1002b
+  metadata.gz: 04b48a1b630fe2954629e29933e7aa9f70b11dd33bbb4fb3271de3d2d081992c
+  data.tar.gz: 00b889d32c506fe40a5dcaf0816c227e74e1612123712080731c025e9744dd1d
 SHA512:
-  metadata.gz: 11913fdd2e7c178c104ee5b20684435a649744640c08733226261b350208015cb1246a9bfed8248a4e4ef8958280b8e0adb2f6265802850f09b3f0ef9fbfc416
-  data.tar.gz: f03b6c592e9550d6ea51c165cdbf6c6d1571cfd15d4f67cd42e2ee2b8e1e28a7859c083ef9a97c89bfe36cbf9ae656d0a3634e41e0d9a270bac01d2995914921
+  metadata.gz: 3d2495b83aea6da3494ca00fd946e371db1c43de9eeb642e30ca16ae8981d3a1b79dd7c90bb5eb0f7a4ebc63cc0a13dbc2ee54999dc1f92ac7c2632927a4cd34
+  data.tar.gz: 4d8a4b1b48033b36c66ecfcfc89940f76fcf5f50b244a7b43702174d1d35518c74dddccd8bca81a8411ac6378a7b675146822f22580a38245aecbe4b1a9e4b25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    orange_sms_api (0.1.1)
+    orange_sms_api (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/orange_sms_api/client.rb

@@ -11,6 +11,7 @@ module OrangeSmsApi
 
             puts "MESSAGE: #{message}"
             post(OrangeSmsApi.configuration.send_sms_endpoint, message)
+            #get_token
                
         end
     end

data/lib/orange_sms_api/configuration.rb

@@ -2,7 +2,8 @@ module OrangeSmsApi
     class Configuration
         attr_accessor :authorization_header, 
         :base_url, 
-        :access_token, 
+        :access_token,
+        :access_token_date, 
         :send_sms_endpoint, 
         :authentication_endpoint,
         :dev_phone_number

data/lib/orange_sms_api/interceptor.rb

@@ -3,42 +3,81 @@ module OrangeSmsApi
     module HttpInterceptor
 
 
-        class << self 
-            attr_accessor :api_base
+
+        def api_configured?
+            base_url = OrangeSmsApi.configuration.base_url
+            authorization_header = OrangeSmsApi.configuration.authorization_header
+            authentication_endpoint = OrangeSmsApi.configuration.authentication_endpoint
+
+            if base_url.present? && authorization_header.present? && authentication_endpoint.present?
+                return true
+            else
+                return false 
+            end
         end
 
+        def access_token_validity?
+            access_token_date = OrangeSmsApi.configuration.access_token_date if OrangeSmsApi.configuration.access_token_date
+            current_date = Date.today
+            if access_token_date.present? && (current_date - access_token_date) <= 90
+                
+                return true
+            else
+                return false
+
+            end
+        end
 
         def get_token
+            if api_configured?
+                unless access_token_validity?
+                    # Inialize a new connection.
+                    conn = Faraday.new(OrangeSmsApi.configuration.base_url, 
+                        ssl: {
+                        ca_path: "/usr/lib/ssl/certs"}
+                    )
 
-            # Inialize a new connection.
-            conn = Faraday.new(
-                url: OrangeSmsApi.configuration.base_url, 
-                ssl: {
-                ca_path: "/usr/lib/ssl/certs"}
-                )
+                    # Making a http post request
+                    response =  conn.post do |req|
+                        req.url  OrangeSmsApi.configuration.authentication_endpoint
+                        req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
+                        req.headers['Authorization'] = OrangeSmsApi.configuration.authorization_header
+                        req.body = "grant_type=client_credentials"
+                    end
 
+                    if response.status == 200
 
-            # Making a http post request
-            response =  conn.post do |req|
-                req.url = OrangeSmsApi.configuration.authenticate_endpoint
-                req.headers['Content-Type'] = 'application/x-www-form-urlencoded'
-                req.headers['Authorization'] = OrangeSmsApi.configuration.authorization
-            end
+                        response_body = JSON.parse(response.body)
+
+                        OrangeSmsApi.configuration.access_token = response_body["access_token"]
+                        OrangeSmsApi.configuration.access_token_date = Date.today
+                    
+                        puts "LE TOKEN: #{OrangeSmsApi.configuration.access_token}"
+                        puts "TOKEN DATE: #{OrangeSmsApi.configuration.access_token_date}"
 
-           if response.status == 200
-            response_body = response.body
-            OrangeSmsApi.configuration.access_token = response_body.access_token
-           end
+                    elsif response.status == 401
 
+                        puts "RESPONSE BODY: #{response_body}"
+                    end
+
+                end
+            else
+                puts "API configuration error"
+            end
         end
 
+
+        
+
         def post(endpoint, message)
              
 
-            if OrangeSmsApi.configuration.base_url.present?
-
+            if api_configured? 
+                
+                get_token
+                
                 # Inialize a new connection.
-                conn = Faraday.new(url: OrangeSmsApi.configuration.base_url) 
+                conn = Faraday.new(OrangeSmsApi.configuration.base_url) 
 
                 payload = {:outboundSMSMessageRequest => { 
                             :address =>  "tel:+#{message[:recipient_phone_number]}" , 
@@ -50,20 +89,22 @@ module OrangeSmsApi
                     }
 
                 response =  conn.post do |req|
-                    req.url = endpoint + "/tel%3A%2B#{OrangeSmsApi.configuration.dev_phone_number}/requests"
-                    req.headers['Content-Type'] = 'application/js'
+                    req.url  endpoint + "/tel%3A%2B#{OrangeSmsApi.configuration.dev_phone_number}/requests"
+                    req.headers['Content-Type'] = 'application/json'
                     req.headers['Authorization'] = 'Bearer ' + OrangeSmsApi.configuration.access_token
                     req.body = payload.to_json
                 end
              
 
                 if response.status == 200
-                    puts "LA REPONSE DE LA REQUETTE EST: #{response.status}"
+                    puts "LA REPONSE DE LA REQUETTE EST: #{response.body}"
+
                    
                     return response
-                else
-                    puts "LA REPONSE DE LA REQUETTE EST: #{response.status}"
-                    get_token
+                elsif response.status == 401
+                    puts "LA REPONSE DE LA REQUETTE EST: #{response.body}"
+
+                    #get_token
                 end
             else
                 render text: "Invalid API Base!"

data/lib/orange_sms_api/version.rb

@@ -1,3 +1,3 @@
 module OrangeSmsApi
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orange_sms_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - thkernel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday