jbcn 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 951525ccc503519e49cb98ada2ac871fdae43d82
-  data.tar.gz: 620abb4e2d0230396e5648ba024c7bc1e0366333
+  metadata.gz: bde689c52f2c16b04e9caadda4e40fc7411ad61a
+  data.tar.gz: 35d083194b0c7ea8c85381f1a9df04a77f85f221
 SHA512:
-  metadata.gz: aa9357f5df69aa3d078a536ae6e95ffee28a2e98d4ad3ccd446d4aaf208374cfa35dfd1d4076667736b37e3ebac4b3e5d10479ee914eebd646e5540f78808461
-  data.tar.gz: b595c710692edc242bd000b54afe975b1363170bb0bcb4fe32bb4115a3b7d9239b83f978eb8e5e5076f8e8f16382098c519b78d895c6b3a34bc3ff94a4c3df75
+  metadata.gz: aa364bb5f8c480b6ee59a03b103227e08c281bada28c7d016a7a13c9d5dbce18c88164e214f2a07f35031e47b5c0556330ee08cd838c32ac2bc834ec9bd605f9
+  data.tar.gz: 4eedcbdbf65e2be40f6999ce72b5c9cb350af73d469fe9ff609334292f854027488694346bff66b996a3a8f63eceba269e4805246e566448a137d3cf8140755e

data/lib/jbcn/client.rb

@@ -5,8 +5,16 @@ module Jbcn
     CLOCK_ENDPOINT = "https://ssl.jobcan.jp/employee/index/adit"
 
     def authenticate(credentials)
-      if credentials.is_a?(Hash) && (code = credentials[:code])
-        credentials = CodeCredentials.new(code)
+      if (h = credentials).is_a?(Hash)
+        if (code = h[:code])
+          credentials = CodeCredentials.new(code)
+        elsif ((client_id = h[:client_id]) &&
+               (username = h[:username]) &&
+               (password = h[:password]))
+          credentials = UserCredentials.new(client_id: client_id, username: username, password: password)
+        else
+          fail(ArgumentError.new("missing keyword: either [code] or [client_id, email, password]"))
+        end
       end
       @token = credentials.authenticate(faraday)
     end
@@ -16,7 +24,7 @@ module Jbcn
         fail(RuntimeError, "not authenticated")
       end
       unless [:in, :out].include?(in_out)
-        fail(ArgumentError, "expected :in or :out")
+        fail(ArgumentError.new("expected :in or :out"))
       end
 
       params = build_params(in_out, group_id.to_s, note.to_s, !!night_shift)

data/lib/jbcn/credentials.rb

@@ -19,22 +19,59 @@ module Jbcn
     end
 
     def authenticate(faraday)
-      response = faraday.get(AUTH_ENDPOINT + @code) rescue fail(AuthError)
+      response = faraday.get(AUTH_ENDPOINT + @code) rescue
+        fail(AuthError.new(credentials: self))
 
       unless response.status == 200
-        fail(AuthError, response: response)
+        fail(AuthError.new(credentials: self, response: response))
       end
 
       token = response.body[/<input type="hidden" class="token" name="token" value="([^"]+)">/, 1]
       unless token
-        fail(AuthTokenNotFoundError, response: response)
+        fail(AuthTokenNotFoundError.new(credentials: self, response: response))
       end
 
       token
     end
   end
 
-  # TODO
-  #class UserCredentials < Credentials
-  #end
+  class UserCredentials < Credentials
+    AUTH_ENDPOINT = "https://ssl.jobcan.jp/login/pc-employee/try"
+
+    attr_reader :client_id, :username, :password
+
+    def initialize(client_id:, username:, password:)
+      @client_id = client_id
+      @username = username
+      @password = password
+    end
+
+    def authenticate(faraday)
+      response = faraday.post(AUTH_ENDPOINT, params) rescue
+        fail(AuthError.new(credentials: self))
+
+      unless response.status == 200
+        fail(AuthError.new(response: response))
+      end
+
+      token = response.body[/<input type="hidden" class="token" name="token" value="([^"]+)">/, 1]
+      unless token
+        fail(AuthTokenNotFoundError.new(response: response))
+      end
+
+      token
+    end
+
+    private
+
+    def params
+      {
+        client_id: @client_id,
+        email: @username, # email or staff code in fact
+        password: @password,
+        url: "/employee",
+        login_type: "1",
+      }
+    end
+  end
 end

data/lib/jbcn/error.rb

@@ -5,10 +5,11 @@ module Jbcn
   end
 
   class AuthError < Error
-    attr_reader :response
+    attr_reader :credentials, :response
 
-    def initialize(message = nil, response: nil)
+    def initialize(message = nil, credentials: nil, response: nil)
       super(message || default_message)
+      @credentials = credentials
       @response = response
     end
 
@@ -23,7 +24,7 @@ module Jbcn
     private
 
     def default_message
-      "token not found (maybe jobcan's html structure has changed)"
+      "token not found (maybe credentials are incorrect or jobcan's html structure has changed)"
     end
   end
 

data/lib/jbcn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jbcn
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbcn
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tomoki Aonuma