jpsclient 2.2.0 → 2.3.0

data/lib/jpsclient/api/lark_bitable.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
     end
   end

data/lib/jpsclient/api/lark_card_message.rb

@@ -28,16 +28,7 @@ module JPSClient
         params[:startTime] = start_time if start_time
         params[:endTime] = end_time if end_time
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
     end

data/lib/jpsclient/api/lark_chat_group.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
     end
   end

data/lib/jpsclient/api/lark_comment.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Create Sync
@@ -36,16 +27,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Create Delete
@@ -58,16 +40,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Create Create
@@ -80,16 +53,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Get List
@@ -102,16 +66,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
     end
   end

data/lib/jpsclient/api/lark_department.rb

@@ -24,16 +24,7 @@ module JPSClient
         params[:parent_department_id] = parent_department_id if parent_department_id
         params[:page_token] = page_token if page_token
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
       # 获取所有部门（别名方法）

data/lib/jpsclient/api/lark_file.rb

@@ -15,16 +15,7 @@ module JPSClient
         path = config["url"]
         params = { image_key: image_key }
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
     end

data/lib/jpsclient/api/lark_leave_approval.rb

@@ -30,16 +30,7 @@ module JPSClient
         params[:department_id] = department_id if department_id
         params[:status] = status if status
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
     end

data/lib/jpsclient/api/lark_message.rb

@@ -15,16 +15,7 @@ module JPSClient
         path = config["url"]
         params = { message_id: message_id }
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
     end

data/lib/jpsclient/api/lark_task.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Get List
@@ -36,16 +27,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Create Delete
@@ -58,16 +40,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Create Create
@@ -80,16 +53,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Get Type Info List
@@ -102,16 +66,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
       # Get Detail
@@ -124,16 +79,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
     end
   end

data/lib/jpsclient/api/lark_task_list.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Get Create
@@ -36,16 +27,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Get List
@@ -58,16 +40,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
       # Get Custom Fields
@@ -80,16 +53,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
       # Get All
@@ -102,16 +66,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
     end
   end

data/lib/jpsclient/api/lark_task_section.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
 
       # Get List
@@ -36,16 +27,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
 
       # Get Detail
@@ -58,16 +40,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
     end
   end

data/lib/jpsclient/api/lark_user.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
     end
   end

data/lib/jpsclient/api/lark_wiki_node.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.post(path, body: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.post(path, body: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:post, path, body: params)
       end
     end
   end

data/lib/jpsclient/api/lark_wiki_space.rb

@@ -14,16 +14,7 @@ module JPSClient
 
         path = config["url"]
 
-        response = @http_client.get(path, params: params)
-        result = JPSClient::Response.new(response)
-
-        if result.need_login?
-          do_login(force_login: true)
-          response = @http_client.get(path, params: params)
-          result = JPSClient::Response.new(response)
-        end
-
-        return result.to_h
+        return request_with_auth(:get, path, params: params)
       end
     end
   end

data/lib/jpsclient/api/lazy_client.rb

@@ -117,7 +117,7 @@ module JPSClient
         @token_manager = Token.new(@jps_config)
 
         # 尝试加载已保存的 token
-        if @token_manager.load && @token_manager.valid?
+        if @token_manager.load && @token_manager.loaded?
           @token = @token_manager.to_h
         end
 
@@ -148,50 +148,35 @@ module JPSClient
     end
 
     # 核心登录功能
+    # token 有效性由服务端 401 响应判断，本地不做过期检查
     def do_login(force_login: false)
-      # 使用 token 管理器统一处理
       if force_login
-        # 强制重新登录
-        @token_manager.clear  # 清除旧 token
-        auth = Auth.new(@jps_config)
-        result = auth.login
-
-        if result == :user_cancelled
-          Logger.instance.fancyinfo_error("用户取消了登录操作")
-          return false
-        elsif result == true
-          # 保存新 token
-          @token_manager.save(auth.access_token, auth.username, auth.expires_at)
-          update_token_everywhere()
-          return true
-        else
-          Logger.instance.fancyinfo_error("登录失败，未能获取有效token")
-          return false
-        end
+        @token_manager.clear
       else
-        # 尝试加载并验证现有 token
-        if @token_manager.load && @token_manager.valid?
-          update_token_everywhere()
+        # 本地存在 token，直接使用
+        if @token_manager.load && @token_manager.loaded?
+          update_token_everywhere
           return true
-        else
-          # Token 无效或不存在，需要重新登录
-          auth = Auth.new(@jps_config)
-          result = auth.login
-
-          if result == :user_cancelled
-            Logger.instance.fancyinfo_error("用户取消了登录操作")
-            return false
-          elsif result == true
-            # 保存新 token
-            @token_manager.save(auth.access_token, auth.username, auth.expires_at)
-            update_token_everywhere()
-            return true
-          else
-            Logger.instance.fancyinfo_error("登录失败，未能获取有效token")
-            return false
-          end
         end
       end
+
+      # 需要重新登录
+      auth = Auth.new(@jps_config)
+      result = auth.login
+
+      if result == :user_cancelled
+        Logger.instance.fancyinfo_error("用户取消了登录操作")
+        return false
+      elsif result == true
+        unless @token_manager.save(auth.get_token_data)
+          Logger.instance.fancyinfo_error("Token 保存失败，下次启动需要重新登录")
+        end
+        update_token_everywhere
+        return true
+      else
+        Logger.instance.fancyinfo_error("登录失败，未能获取有效token")
+        return false
+      end
     end
 
     # 获取已加载的模块列表
@@ -241,6 +226,21 @@ module JPSClient
       module_name && API_MODULES.key?(module_name.to_sym) || super
     end
 
+    # 带 401 重试的统一请求方法
+    def request_with_auth(method, path, **opts)
+      response = @http_client.send(method, path, **opts)
+      result = JPSClient::Response.new(response)
+
+      if result.need_login?
+        if do_login(force_login: true)
+          response = @http_client.send(method, path, **opts)
+          result = JPSClient::Response.new(response)
+        end
+      end
+
+      result.to_h
+    end
+
     private
 
     # 统一更新token到所有组件