yonder 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cab3d792b4319fb93f505b1d689b3b873487f484e9ee1c1de2ca902644b45349
-  data.tar.gz: acd3ffb29382b246035e6410eafb5d344a467b0ce02e2ce7972842a38527b9e5
+  metadata.gz: 2702e3ab4ae8d1d1d254df861aba3dd705adfcd77c0900fc6200d024c6775676
+  data.tar.gz: e26e68823fe42d8d6813b9008067c7b69fa710cd7d045e2ca61ff9b225dd6e19
 SHA512:
-  metadata.gz: db13171aee0b173178588517ce6edd291c18f01c510627cc856611eb01287ff7658fbd8c76bbf50673520903e2549ff63c241c270708ea29dafa84647752668a
-  data.tar.gz: 607c672ad910130a580e5f92a5f62fe7469d5bc3db4d19305ed42ed6ffa7894662d353343ba96f65e0e80f4e9a8728dc7979d897a861b222b46cc7976b4e2927
+  metadata.gz: b0e662fb8778962ab28be960cb87c2987d825225c64f0f5c1744db7f3b30d190d89e32cdcf39c40bfd804e933b92bfb79f38922171e412ae6c5f096a50bb22e0
+  data.tar.gz: 2a9a49a413a02c4e191fb04e5daa02c4bebac6b8fd3e77d9c56d4e5534243fe7761c27f43fb80ccbe76b49fc0f728e5b531596a5d4c1c5561e5c0be211caca89

data/lib/yonder/session.rb

@@ -0,0 +1,21 @@
+module Yonder
+  class Session
+    attr_accessor :user_did
+    attr_accessor :access_token
+    attr_accessor :refresh_token
+
+    def self.from_json(payload)
+      Session.new(
+        user_did: payload["did"],
+        access_token: payload["accessJwt"],
+        refresh_token: payload["refreshJwt"]
+      )
+    end
+
+    def initialize(user_did:, access_token:, refresh_token:)
+      @user_did = user_did
+      @access_token = access_token
+      @refresh_token = refresh_token
+    end
+  end
+end

data/lib/yonder/version.rb

@@ -1,3 +1,3 @@
 module Yonder
-  VERSION = 0.2
+  VERSION = 0.3
 end

data/lib/yonder.rb

@@ -3,6 +3,7 @@
 $LOAD_PATH.unshift(__dir__)
 
 require 'httpx'
+require 'yonder/session'
 require 'yonder/version'
 require 'yonder/errors'
 
@@ -17,8 +18,8 @@ module Yonder
     }
 
     attr_accessor :api_host
-    attr_accessor :access_token
-    attr_accessor :refresh_token
+    attr_accessor :session
+    attr_accessor :user_agent
 
     def create_post(user_did:, message:)
       create_record(
@@ -32,36 +33,56 @@ module Yonder
     end
 
     def create_record(user_did:, record:, collection:)
-      post("/com.atproto.repo.createRecord", params: {
-        repo: user_did,
-        collection: collection,
-        record: record
-      })
+      post(
+        endpoint: "/com.atproto.repo.createRecord",
+        params: {
+          repo: user_did,
+          collection: collection,
+          record: record
+        }
+      )
     end
 
     def create_session(username:, password:)
-      post("/com.atproto.server.createSession", params: {
-        identifier: username,
-        password: password
-      })
+      response = post(
+        endpoint: "/com.atproto.server.createSession",
+        params: {
+          identifier: username,
+          password: password
+        }
+      )
+
+      @session = Session.from_json(response)
+      true
     end
 
-    def renew_session(renewal_token)
-      post("/com.atproto.server.refreshSession")
+    def refresh_session
+      response = post(
+        endpoint: "/com.atproto.server.refreshSession",
+        access_token: @session&.refresh_token
+      )
+
+      @session = Session.from_json(response)
+      true
     end
 
-    def get(endpoint)
-      make_api_request(endpoint, method: :get)
+    def get(endpoint:)
+      make_api_request(endpoint: endpoint, method: :get)
     end
 
-    def post(endpoint, params: {})
-      make_api_request(endpoint, method: :post, params: params)
+    def post(endpoint:, params: {}, access_token: nil)
+      make_api_request(endpoint: endpoint, method: :post, params: params, access_token: access_token)
     end
 
     private
 
-    def make_api_request(endpoint, method: :get, params: {})
-      response = http_client.request(method, endpoint, json: params)
+    def make_api_request(endpoint:, method: :get, params: {}, access_token: nil)
+      access_token ||= @session&.access_token
+
+      client = http_client
+      client = client.bearer_auth(access_token) unless access_token.nil?
+
+      response = client.request(method, endpoint, json: params)
 
       response.raise_for_status
       response.json
@@ -73,15 +94,11 @@ module Yonder
     end
 
     def http_client
-      client = HTTPX.with(
+      HTTPX.with(
         origin: @api_host || BASE_URL,
         headers: { "user-agent": @user_agent || "yonder v#{Yonder::VERSION}" },
         base_path: '/xrpc'
       ).plugin(:auth)
-
-      return client if @access_token.nil?
-
-      client.bearer_auth(@access_token)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yonder
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Daniel Bogan
@@ -32,6 +32,7 @@ extra_rdoc_files: []
 files:
 - lib/yonder.rb
 - lib/yonder/errors.rb
+- lib/yonder/session.rb
 - lib/yonder/version.rb
 homepage: http://github.com/waferbaby/yonder
 licenses: