From b5d17dc862d764561bdc8d8afb09df8c07a2c916 Mon Sep 17 00:00:00 2001
From: Rick Barrette <rickbarrette@gmail.com>
Date: Sun, 5 Jan 2020 12:21:36 -0500
Subject: [PATCH] Removed oauth1 database columns & updated settings

---
 app/views/qbo/_settings.html.erb   | 17 ++++++-----------
 db/migrate/031_remove_qbos_keys.rb |  5 ++---
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/app/views/qbo/_settings.html.erb b/app/views/qbo/_settings.html.erb
index 70c98fe..a998e42 100644
--- a/app/views/qbo/_settings.html.erb
+++ b/app/views/qbo/_settings.html.erb
@@ -1,7 +1,7 @@
 <!--
 The MIT License (MIT)
 
-Copyright (c) 2016 rick barrette
+Copyright (c) 2020 rick barrette
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -22,7 +22,7 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_au
   <tbody>
   
     <tr>
-      <th>Intuit QBO OAuth Consumer Key</th>
+      <th>Intuit QBO OAuth2 Client ID</th>
       <td>
         <input type="text" style="width:350px" id="settingsOAuthConsumerKey" 
                            value="<%= settings['settingsOAuthConsumerKey'] %>" 
@@ -31,7 +31,7 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_au
     </tr>
 
     <tr>
-      <th>Intuit QBO OAuth Consumer Secret</th>
+      <th>Intuit QBO OAuth2 Client Secret</th>
       <td>
         <input type="text" style="width:350px" id="settingsOAuthConsumerSecret"
                            value="<%= settings['settingsOAuthConsumerSecret'] %>"
@@ -49,20 +49,15 @@ intuit.ipp.anywhere.setup({menuProxy: '/path/to/blue-dot', grantUrl: '<%= qbo_au
     </tr>
 
      <tr>
-       <th>Token Expires At</th>
-       <td><%= if Qbo.exists? then Qbo.first.token_expires_at end %>
-     </tr>
-
-     <tr>
-       <th>Reconnect Token At</th>
-       <td><%= if Qbo.exists? then Qbo.first.reconnect_token_at end  %>
+       <th>OAuth2 Access Token Expires At</th>
+       <td><%= if Qbo.exists? then Qbo.first.expire end %>
      </tr>
 
   </tbody>
 </table>
 
 <br/>
-Note: You need to authenticate after saving your key and secret above
+Note: You need to authenticate with Quickbooks after saving your key and secret above
 <br/>
 <br/>
 
diff --git a/db/migrate/031_remove_qbos_keys.rb b/db/migrate/031_remove_qbos_keys.rb
index b15f356..c0da640 100644
--- a/db/migrate/031_remove_qbos_keys.rb
+++ b/db/migrate/031_remove_qbos_keys.rb
@@ -9,11 +9,10 @@
 #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class RemoveQbosKeys < ActiveRecord::Migration
-  
   def change
-    remove_column :qbos, :qb_token
-    remove_column :qbos, :qb_secrect
+    remove_column :qbos, :qb_secret
     remove_column :qbos, :token_expires_at
     remove_column :qbos, :reconnect_token_at
+    remove_column :qbos, :qb_token
   end
 end