navilocal 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05c4ddb6b2bb24f88658865d28f9aa7d1b9a8186139af9c515a83e1b265e01d
-  data.tar.gz: 73717985f4242e2ecb9d561b7ec53be28ef027a9b5a668f9aeb214d07a38f2d9
+  metadata.gz: 6575cdbb5a600420d301caeecfe2bf46db5ed45670d31178961939ac52da0ed7
+  data.tar.gz: 757578ef7d44ae686c2aeb54c4536eb13f02eb923cbe3fb5b05a78ff4dff7516
 SHA512:
-  metadata.gz: 7659b8c0bdb23adfdb75dc2c849630a6b8491c115f58d751efd43d218b164fd632e01d919d4c992868ac18df097ecbc534add957855a9fe72235219fc0e49671
-  data.tar.gz: 59972f8c0ecace1982da8b5f5f099b8cc64f6f4f0018f030f70e2302d802015adc9cd03c33ce097a3a7d324c9aae10c39f7529634e6856d0a40a1372026961d5
+  metadata.gz: 87e23ffc790f52696b1f28afb844be7f3b71df42601f75bc04ba5afae3ec2810b896ce75a56293f9b20e15b9e53ed26858420ce0cceec07d92ff5c90a4408182
+  data.tar.gz: d2de279fddaab157e496a3ccd2e46337bd98c2d42bd073eb3e3f93581d1164ddc3f1d7eb0aee3b5af9ff8b40ca6db77208ac2e7aa933f9ac71ea0b828da9330d

data/application/ui/navi/installer_assistant.rb

@@ -87,7 +87,7 @@ module NaviClientInstaller
     def setupMainApp()
       @runner_window = NaviClientInstaller::NaviRunner.new @settings, @application
       main_stack.add_named(@runner_window.window_ui, "runner_main")
-      @signup_gauss = Proc.new do |token, *args|
+      @signup_gauss = Proc.new do |token, client_token, *args|
         if @settings.logout
 
           main_stack.remove @runner_window.window_ui
@@ -99,7 +99,7 @@ module NaviClientInstaller
         @settings.logout = false
         @settings.save_settings
         @current_window = @runner_window
-        @runner_window.set_token token
+        @runner_window.set_token token, client_token
         main_stack.set_transition_type(Gtk::Stack::TransitionType::SLIDE_RIGHT)
         main_stack.set_visible_child(@current_window.window_ui)
 
@@ -156,10 +156,10 @@ module NaviClientInstaller
 
         if(resp && @settings.hash && resp.code == 200)
           @settings.logout = false
-          @settings.identifier = JSON.parse(Base64.decode64(resp["user"]))["resource_name"]
+          @settings.identifier = resp['data']['resource_name']
           @settings.save_settings
           @current_window = @runner_window
-          @runner_window.set_token resp["access_token"]
+          @runner_window.set_token resp.headers["access-token"], resp.headers["client"]
           @runner_window.start
           endSplash
           # main_stack.set_visible_child(@splash.window_ui)

data/application/ui/navi/main_runner.rb

@@ -169,7 +169,7 @@ module NaviClientInstaller
           @client.setupLoggly("navi-client")
         end
 
-        @client.set_token "Token: #{@token}##{@settings.username}"
+        @client.set_token @token, @client_token
 
         unless @controller.nil?
           filenames = []
@@ -324,8 +324,9 @@ module NaviClientInstaller
 
     end
 
-    def set_token token
+    def set_token token, client_token
       @token = token
+      @client_token = client_token
     end
 
     def start_naviai

data/application/ui/navi/splash.rb

@@ -38,23 +38,22 @@ module NaviClientInstaller
     def validate_email(email, pass)
       # need to remove this hardcoded code
       begin
-        response = HTTParty.post(ENV['api_url'] + "/oauth/token",
+        response = HTTParty.post(ENV['api_url'] + "/auth/sign_in",
                       body: {
                           email: email, # get from sso_web application
-                          password: pass,
-                          grant_type: "password"
+                          password: pass
                       }
         )
-
-        if response.code == 200
-          user_resp = get_current_user token: "Token: #{response["access_token"]}##{email}"
-
-          return user_resp
-        else
-          return nil
-        end
-
-
+        #
+        # if response.code == 200 && response.headers['access-token']
+        #   #user_resp = get_current_user token: "Token: #{response["access_token"]}##{email}"
+        #
+        #   return response
+        # else
+        #   return nil
+        # end
+
+        return response
       rescue
         false
       end
@@ -97,10 +96,11 @@ module NaviClientInstaller
               error_label.set_opacity 0
 
               @settings.hash = password_entry.text
-              @settings.identifier = JSON.parse(Base64.decode64(response["user"]))["resource_name"]
+              # @settings.identifier = JSON.parse(Base64.decode64(response["user"]))["resource_name"]
+              @settings.identifier = response['data']['resource_name']
               @settings.save_settings
 
-              callback.call response["access_token"]
+              callback.call response.headers["access-token"], response.headers["client"]
             else
               error_label.set_opacity 1
             end
@@ -122,9 +122,10 @@ module NaviClientInstaller
             if response && response.code == 200
               error_label.set_opacity 0
               @settings.hash = widget.text
-              @settings.identifier = JSON.parse(Base64.decode64(response["user"]))["resource_name"]
+              # @settings.identifier = JSON.parse(Base64.decode64(response["user"]))["resource_name"]
+              @settings.identifier = response['data']['resource_name']
               @settings.save_settings
-              callback.call response["access_token"]
+              callback.call response.headers["access-token"], response.headers["client"]
             else
               error_label.set_opacity 1
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: navilocal
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Msanjib
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Navi Local