lg_pod_plugin 1.1.7.3 → 1.1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44d4ceb34301dcc5a0312f8591cdbde166e1a4b7e2cb8a885738fa6997192de8
-  data.tar.gz: 0f770eba1a322ed7294d68d7ed81f9aef997f546a0d9c3c61f315cb563824e8d
+  metadata.gz: f4b61db7b5001df6188133eaf111f4570d0580fe4e71bc3e89863f2245d9c3ff
+  data.tar.gz: 14afb884ec6e4247b37f95b0002c2dd19098c75cf464fe07d3c79565f83916a0
 SHA512:
-  metadata.gz: 06506e9cd1131a5932ea3e550cc641832f13f194cd9427edfafcff2bcdd93758da909a8f0542c282869be565b23f42b80fee02c2e0ae52515eabefee433bcbb3
-  data.tar.gz: 72be08ac45145844d3c7082bdf1fe53e68b8892ac3bef7b9c58d6bfabe35448c2033290e66aace828a3397490e641926c8a7297c5480eb4b6cb61770da2ebc41
+  metadata.gz: b2ee449bb57c15cc6d9cd7d5566aa91af414c34a3c2aabc1a2e858650447b93df9bba3d705d248beffed8bee615b31cfc2db935c525b6eed2178658f7ab2a655
+  data.tar.gz: c3f587b3ed1ccb1ca27a902db900346767bb012e082f45a6f1aa8a60b17d6da913fa6cf926645b966020fc813517470a1b85d621f51a3849b255683da87bdcde

data/lib/command/init.rb

@@ -52,7 +52,7 @@ module LgPodPlugin
         File.open(token_file.to_path, 'w+') { |f| f.write(str) }
         LSqliteDb.shared.init_database
         user_id = LUserAuthInfo.get_user_id(self.host)
-        user_model = LUserAuthInfo.new(user_id, "", "", self.host, self.token, "", (created_at + expires_in))
+        user_model = LUserAuthInfo.new(user_id, "", "", self.host, self.token, "", (created_at + expires_in), created_at, 1)
         LSqliteDb.shared.insert_user_info(user_model)
         LgPodPlugin.log_green "设置私人访问令牌成功"
       end

data/lib/lg_pod_plugin/db/database.rb

@@ -21,36 +21,13 @@ module LgPodPlugin
 
   end
 
-  # class LPodLatestRefs
-  #   attr_accessor :id
-  #   attr_accessor :name
-  #   attr_accessor :tag
-  #   attr_accessor :git
-  #   attr_accessor :branch
-  #   attr_accessor :commit
-  #
-  #   def initialize(id, name, git, branch, tag, commit)
-  #     self.id = id
-  #     self.git = git
-  #     self.tag = tag
-  #     self.name = name
-  #     self.branch = branch
-  #     self.commit = commit
-  #   end
-  #
-  #   def self.get_pod_id(name, git, branch)
-  #     key = name + git + branch
-  #     return Digest::MD5.hexdigest(key)
-  #   end
-  #
-  # end
-
   class LUserAuthInfo
-    REQUIRED_ATTRS ||= %i[id username password host access_token refresh_token expires_in update_time].freeze
+    REQUIRED_ATTRS ||= %i[id username password host access_token refresh_token expires_in update_time type].freeze
     attr_accessor(*REQUIRED_ATTRS)
 
-    def initialize(id = nil, name = nil, pwd = nil, host = nil, token = nil, refresh_token = nil, time = nil, update_time = nil)
+    def initialize(id = nil, name = nil, pwd = nil, host = nil, token = nil, refresh_token = nil, time = nil, update_time = nil, type = 0)
       self.id = id
+      self.type = type
       self.host = host
       self.password = pwd
       self.username = name
@@ -114,6 +91,13 @@ module LgPodPlugin
         self.db.execute(alter)
       end
 
+      user_sel_sql2 = "select * from sqlite_master where name = '#{K_USER_TABLE}' and sql like '%type%'; "
+      resultSetPrincipal2 = self.db.execute(user_sel_sql2)
+      if resultSetPrincipal2.count == 0
+        alter = "ALTER TABLE #{K_USER_TABLE}  ADD 'type' INT;"
+        self.db.execute(alter)
+      end
+
       #添加项目表
       sql2 = "create table if not exists #{K_USER_PROJECTS}(
         id varchar(100) primary key not null,
@@ -128,27 +112,6 @@ module LgPodPlugin
        );"
       self.db.execute(sql2)
 
-      # #添加项目表
-      # sql3 = "create table if not exists #{K_POD_LATEST_REFS}(
-      #   id varchar(100) primary key not null,
-      #   name varchar(100),
-	    #   git varchar(100),
-	    #   branch varchar(100),
-      #   tag varchar(100),
-      #   sha varchar(100)
-      #   );"
-      # self.db.execute(sql3)
-      #
-      # #添加项目表
-      # sql4 = "create table if not exists #{K_POD_SHA_BRANCH}(
-      #   id varchar(100) primary key not null,
-      #   name varchar(100),
-      #   git varchar(100),
-	    #   branch varchar(100),
-      #   sha varchar(100)
-      #   );"
-      # self.db.execute(sql4)
-
     end
 
     public
@@ -156,11 +119,11 @@ module LgPodPlugin
       # pp "user.id => #{user.id}"
       if self.query_user_info(user.id) != nil
         self.db.execute_batch(
-          "UPDATE #{K_USER_TABLE} SET username = (:username), password = (:password), host = (:host), access_token = (:access_token), expires_in = (:expires_in), refresh_token = (:refresh_token), update_time = (:update_time) where (id = :id)", { "username" => user.username, "password" => user.password, "host" => user.host, "access_token" => user.access_token, :expires_in => user.expires_in, :id => user.id, :refresh_token => user.refresh_token , :update_time => user.update_time}
+          "UPDATE #{K_USER_TABLE} SET username = (:username), password = (:password), host = (:host), access_token = (:access_token), expires_in = (:expires_in), refresh_token = (:refresh_token), update_time = (:update_time), type = (:type) where (id = :id)", { "username" => user.username, "password" => user.password, "host" => user.host, "access_token" => user.access_token, :expires_in => user.expires_in, :id => user.id, :refresh_token => user.refresh_token , :update_time => user.update_time, :type => user.type}
         )
       else
-        self.db.execute("INSERT INTO #{K_USER_TABLE} (id, username, password, host, access_token,refresh_token, expires_in, update_time)
-            VALUES (?, ?, ?, ?,?,?,?, ?)", [user.id, user.username, user.password, user.host, user.access_token, user.refresh_token, user.expires_in, user.update_time])
+        self.db.execute("INSERT INTO #{K_USER_TABLE} (id, username, password, host, access_token,refresh_token, expires_in, update_time, type)
+            VALUES (?, ?, ?, ?,?,?,?, ?, ?)", [user.id, user.username, user.password, user.host, user.access_token, user.refresh_token, user.expires_in, user.update_time, user.type])
       end
 
     end
@@ -179,6 +142,7 @@ module LgPodPlugin
         user_info.refresh_token = row[5]
         user_info.expires_in = row[6]
         user_info.update_time = row[7]
+        user_info.type = row[8]
       end
       user_info
     end

data/lib/lg_pod_plugin/git/gitlab_api.rb

@@ -23,10 +23,11 @@ module LgPodPlugin
         return self.get_gitlab_access_token_input(uri, user_id, nil, nil) if encrypt_access_token.nil?
       end
       user_id = LUserAuthInfo.get_user_id(uri.hostname)
+      now_time = Time.now.to_i
       refresh_token = json["refresh_token"]
       expires_in = json["expires_in"] ||= 7879680
-      created_at = json["created_at"] ||= Time.now.to_i
-      user_model = LUserAuthInfo.new(user_id, "", "", uri.hostname, access_token, refresh_token, (created_at + expires_in))
+      created_at = json["created_at"] ||= now_time
+      user_model = LUserAuthInfo.new(user_id, "", "", uri.hostname, access_token, refresh_token, (created_at + expires_in), now_time, 1)
       LSqliteDb.shared.insert_user_info(user_model)
       LgPodPlugin.log_green "请求成功: `access_token` => #{access_token}, expires_in => #{expires_in}"
       return user_model
@@ -48,13 +49,12 @@ module LgPodPlugin
     def self.check_gitlab_access_token_valid(uri, user_info)
       time_now = Time.now.to_i
       refresh_token = user_info.refresh_token
-      # 判断 token 是否失效
-      if user_info.expires_in  <= time_now
-        if refresh_token.nil? || refresh_token == "" # 使用本地令牌访问
+      if user_info.type == 1
+        if user_info.expires_in  <= time_now
           project_name = LUtils.get_git_project_name(uri.to_s)
-          token_vaild = GitLabAPI.request_user_emails(uri.hostname, user_info.access_token)
-          if token_vaild == "success"
-            new_user_info = LUserAuthInfo.new(user_info.id, "", "", uri.hostname, user_info.access_token, nil, (time_now + 7879680))
+          token_valid = GitLabAPI.request_user_emails(uri.hostname, user_info.access_token)
+          if token_valid == "success"
+            new_user_info = LUserAuthInfo.new(user_info.id, "", "", uri.hostname, user_info.access_token, nil, (time_now + 7879680), time_now, 1)
             LSqliteDb.shared.insert_user_info(user_info)
             return new_user_info
           else
@@ -63,21 +63,25 @@ module LgPodPlugin
             return self.get_gitlab_access_token_input(uri, user_info.id, nil, nil)
           end
         else
-          # 刷新 token 失败时, 通过已经保存的用户名密码来刷新 token
-          return refreshUserToken uri, refresh_token, user_info.id, user_info.username, user_info.password
+          return user_info
         end
       else
-        update_time = user_info.update_time.to_i
-        if time_now - update_time > 1800
-          user_info = refreshUserToken uri, refresh_token, user_info.id, user_info.username, user_info.password
-          return  user_info
+        # 判断 token 是否失效
+        if user_info.expires_in  <= time_now
+          return refreshUserToken uri, refresh_token, user_info.id, user_info.username, user_info.password
         else
-          return user_info
+          update_time = user_info.update_time.to_i
+          if time_now - update_time > 1800
+            user_info = refreshUserToken uri, refresh_token, user_info.id, user_info.username, user_info.password
+            return  user_info
+          else
+            return user_info
+          end
         end
       end
     end
 
-    def self.refreshUserToken(uri, refresh_token, user_id, username, password)
+    def self.refresh_user_token(uri, refresh_token, user_id, username, password)
       # 刷新 token 失败时, 通过已经保存的用户名密码来刷新 token
       new_user_info = GitLabAPI.refresh_gitlab_access_token uri.hostname, refresh_token
       unless new_user_info
@@ -109,7 +113,7 @@ module LgPodPlugin
         expires_in = json["expires_in"] ||= 7200
         created_at = json["created_at"] ||= Time.now.to_i
         time_now = Time.now.to_i
-        user_model = LUserAuthInfo.new(user_id, username, password, host, access_token, refresh_token, (created_at + expires_in), time_now)
+        user_model = LUserAuthInfo.new(user_id, username, password, host, access_token, refresh_token, (created_at + expires_in), time_now, 0)
         LSqliteDb.shared.insert_user_info(user_model)
         LgPodPlugin.log_green "请求成功: `access_token` => #{access_token}, expires_in => #{expires_in}"
       rescue => exception
@@ -148,6 +152,7 @@ module LgPodPlugin
         user_model.access_token = access_token
         user_model.refresh_token = refresh_token
         user_model.update_time = time_now
+        user_model.type = 0
         LSqliteDb.shared.insert_user_info(user_model)
         LgPodPlugin.log_green "刷新token成功: `refresh_token` => #{refresh_token}, expires_in => #{expires_in}"
         return user_model

data/lib/lg_pod_plugin/version.rb

@@ -1,3 +1,3 @@
 module LgPodPlugin
-  VERSION = "1.1.7.3"
+  VERSION = "1.1.7.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lg_pod_plugin
 version: !ruby/object:Gem::Version
-  version: 1.1.7.3
+  version: 1.1.7.4
 platform: ruby
 authors:
 - dongzb01
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-10 00:00:00.000000000 Z
+date: 2023-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +44,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 7.0.8
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement