From 2cb6427aa1b78d1015dff4f7b7f38468323d6b5c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 3 Apr 2018 10:54:06 +0630
Subject: [PATCH] update license check

---
 app/models/license.rb | 33 +++++++++++++++++----------------
 config/license.yml    | 15 +++++++++++++++
 2 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 config/license.yml

diff --git a/app/models/license.rb b/app/models/license.rb
index ac82721c..132585d8 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -134,21 +134,23 @@ class License
   def verify_license    
     api_token = read_license_no_decrypt("api_token")    
     @params = { query: {lookup_type: "application", api_token: api_token} }
-    response = self.class.get("/verify", @params)
-
-    rescue SocketError => e
-      Rails.logger.debug  "In Socket errror"
-      return true
-    rescue => e
-      @varified = response.parsed_response
-      Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
-      if (@varified["status"])
-        if (!check_expired(@varified["renewable_date"]))
-          return true
-        end
-      else
-        delete_license_file
-      end  
+    
+    begin
+        response = self.class.get("/verify", @params)
+        @varified = response.parsed_response
+        Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
+        if (@varified["status"])
+           
+          if (!check_expired(@varified["renewable_date"]))
+            return true
+          end
+        else
+          delete_license_file
+        end 
+      rescue SocketError => e
+        Rails.logger.debug  "In SocketError No Internet connection ! "
+        return true
+    end 
     return false  
   end
 
@@ -164,7 +166,6 @@ class License
   def check_expired(renewal_date_str)    
     expired_date_str = read_license("renewable_date")
     renewal_date = DateTime.parse(renewal_date_str)
-   
     if(renewal_date_str != expired_date_str)
       update_license("renewable_date", renewal_date_str)
     end
diff --git a/config/license.yml b/config/license.yml
new file mode 100644
index 00000000..9f4d1542
--- /dev/null
+++ b/config/license.yml
@@ -0,0 +1,15 @@
+iv_key: rwOZKWcQho6fE4V+A2zFuQ==
+shop_name: AMZ_Test
+email: aungmyo.zaw@code2lab.com
+telephone: 
+fax: 
+address: 
+dbhost: dNzh66R80remB694OEds96OpuyZ4wmHeHFdQh0KwjYFvTInK6+pCN/y6HdbyIlqqjcBHkqPjkjzw45PznLn7hA==
+dbschema: 4vooJDxgWdFv/8V7Qx8tzR/8B8T2c5U4XvYcF+2KOoA=
+dbusername: Xc8ELRsW7N/f8KsVikMBlg==
+dbpassword: HMg+TbLxmfYrDFI4IIAd4g==
+api_token: bisryXiEnbTJlZwghAnIByQpiRUMouu
+app_token: LycQXJYBZGeCygjIEKdlBXnjIGMiMzgmt
+plan_sku: 84hdnSCgkfhvItY7uB/pPQ==
+renewable_date: 8E6Ecz8QXAMSlKZnIzn0pQ==
+plan_name: 4cMIO0n/JzGFPIccXM6u5A==