motion-authentication 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab7ad1c6522f447bb8e957077b29e783d5ec6175d67f9f08809f2089ea4c6383
-  data.tar.gz: aefda12e3ef3a7f8799d1d5390004a164e5379a83316fb17dcceeff3ca5d3606
+  metadata.gz: '0464095a62b779410bfb6f77ce4af35a4fdac0931ad70fa643ab9f760e9f0818'
+  data.tar.gz: 3d689a129c84e215929ce56176d3307b0eee3638f23a50960e44005808451182
 SHA512:
-  metadata.gz: ef8b4a0d2abf1ecf42ab67df9244bbbb82b5e464fcc782e7fa6fd4655ffe88b4eb2babced62efbd5178ea9791c6e83417d61397cb03199258ac698566fb74bac
-  data.tar.gz: 9a025671043d81dfb2a857edf810caf1964824cbb784f9ed5f32d53e10abcdf246251d9db2ae351f958921ae957a84e0d62249ac47cbc38df0c991374b3d1450
+  metadata.gz: a8a63d60ff70107fa47e53c24b5d99c0ec1e3c5ff81a802655ef67902372653b438f672c78bff99d474a027ba2bda2b055d5cdc6c4479b9313b78f3f9c671094
+  data.tar.gz: d44090efc74dec5cf872dda15c083d1ea4d20e5d6e812d48e42104cc591f09a8e72b238778097fc6816da8247a62402ff54d7422634da65dbc2a199bf58265cc

data/README.md

@@ -10,7 +10,7 @@ Need authorization? Use [`motion-authorization`](https://github.com/rubymotion-c
 
 Add this line to your application's `Gemfile`, then run `bundle install`:
 
-    gem 'motion-authentication'
+    gem 'motion-authentication', '~> 2.0'
 
 Next, run `rake pod:install` to install the CocoaPod dependencies.
 
@@ -20,7 +20,7 @@ Start by subclassing `Motion::Authentication` to create your own `Auth` class. S
 
 ```ruby
 class Auth < Motion::Authentication
-  strategy DeviseTokenAuth
+  strategy DeviseCookieAuth
   sign_in_url "https://example.com/api/v1/users/sign_in"
 end
 ```
@@ -29,15 +29,15 @@ Available strategies:
 
 * `DeviseCookieAuth` - This strategy supports the default way of authenticating with Devise, just as if you were submitting the sign in form using a web browser. It works by making an initial request to fetch the authenticity token, then submits the `email` and `password`, then stores the resulting cookie for authenticating future requests. If your user model has a different name (i.e. `AdminUser`), pass along the `namespace` option (i.e. `namespace: 'admin_user'`) when calling `sign_in`. Otherwise, namespace defaults to `:user`.
 
-* `DeviseTokenAuth` - This authentication strategy is based on [José Valim's example gist](https://gist.github.com/josevalim/fb706b1e933ef01e4fb6) and is also in the format that Ember Simple Auth Devise adapter expects ([tutorial](http://romulomachado.github.io/2015/09/28/using-ember-simple-auth-with-devise.html))
+* `DeviseSimpleTokenAuth` - This authentication strategy is based on [José Valim's example gist](https://gist.github.com/josevalim/fb706b1e933ef01e4fb6) and is compatible with the [`simple_token_authentication` gem](https://github.com/gonzalo-bulnes/simple_token_authentication), and the [Ember Simple Auth Devise adapter](http://romulomachado.github.io/2015/09/28/using-ember-simple-auth-with-devise.html).
 
   This strategy takes `email` and `password`, makes a POST request to the `sign_in_url`, and expects the response to include `email` and `token` keys in the JSON response object.
 
-* `DeviseTokenAuthGem` - This authentication strategy is compatible with the current version of the devise_auth_token gem at https://github.com/lynndylanhurley/devise_token_auth
+* `DeviseTokenAuth` - This authentication strategy is compatible with the [`devise_token_auth` gem](https://github.com/lynndylanhurley/devise_token_auth).
 
-  Signing up: this strategy takes `email`, `password` and `password_confirmation`, makes a POST request to the `sign_up_url`, and expects the response to include `uid`, `access-token` and `client` keys in the response object headers.
+  **Signing up:** this strategy takes `email`, `password` and `password_confirmation`, makes a POST request to the `sign_up_url`, and expects the response to include `uid`, `access-token` and `client` keys in the response object headers.
 
-  Signing in: this strategy takes `email` and `password`, makes a POST request to the `sign_in_url`, and expects the response to include `uid`, `access-token` and `client` keys in the response object headers.
+  **Signing in:** this strategy takes `email` and `password`, makes a POST request to the `sign_in_url`, and expects the response to include `uid`, `access-token` and `client` keys in the response object headers.
 
 ### `.sign_in`
 

data/lib/motion-authentication.rb

@@ -6,6 +6,8 @@ end
 
 require 'motion-cocoapods' # TODO: this won't work for Android
 require 'motion-keychain' # TODO: this won't work for Android
+require 'motion-http'
+require 'motion-html'
 
 lib_dir_path = File.dirname(File.expand_path(__FILE__))
 Motion::Project::App.setup do |app|

data/lib/project/motion-authentication.rb

@@ -5,7 +5,7 @@ class Motion
 
       def strategy(val = nil)
         @strategy = val unless val.nil?
-        @strategy ||= DeviseTokenAuth
+        @strategy ||= DeviseCookieAuth
       end
 
       def sign_in_url(val = nil)

data/lib/project/strategies/{devise_token_auth.rb → devise_simple_token_auth.rb}

@@ -1,9 +1,9 @@
 module Motion
   class Authentication
-    class DeviseTokenAuth
+    class DeviseSimpleTokenAuth
       class << self
         def sign_in(sign_in_url, params, &block)
-          AFMotion::JSON.post(sign_in_url, user: params) do |response|
+          HTTP.post(sign_in_url, json: { user: params }) do |response|
             if response.success?
               store_auth_tokens(response.object)
             end
@@ -12,7 +12,7 @@ module Motion
         end
 
         def sign_up(sign_up_url, params, &block)
-          AFMotion::JSON.post(sign_up_url, user: params) do |response|
+          HTTP.post(sign_up_url, json: { user: params }) do |response|
             if response.success?
               store_auth_tokens(response.object)
             end

data/lib/project/strategies/devise_token_auth_gem.rb

@@ -1,41 +1,38 @@
 module Motion
   class Authentication
-    class DeviseTokenAuthGem
+    class DeviseTokenAuth
       class << self
-
         def sign_in(sign_in_url, params, &block)
-          AFMotion::JSON.post(sign_in_url, params) do |response|
+          HTTP.post(sign_in_url, json: params) do |response|
             if response.success?
-              store_auth_tokens(response.object,response.operation.response.allHeaderFields)
+              store_auth_tokens(response.object, response.headers)
             end
             block.call(response)
           end
         end
 
         def sign_up(sign_up_url, params, &block)
-          AFMotion::JSON.post(sign_up_url, params) do |response|
+          HTTP.post(sign_up_url, json: params) do |response|
             if response.success?
-              store_auth_tokens(response.object,response.operation.response.allHeaderFields)
+              store_auth_tokens(response.object, response.headers)
             end
             block.call(response)
           end
         end
 
-        def store_auth_tokens(response,headers)
+        def store_auth_tokens(response, headers)
           MotionKeychain.set :auth_uid, headers["uid"]
           MotionKeychain.set :auth_token, headers["access-token"]
           MotionKeychain.set :auth_client, headers["client"]
           serialized_response = ""
-          response["data"].each do |key,value|
+          response["data"].each do |key, value|
             case key
-              when "assets"
-                value.each do |eachasset|
-                  serialized_response << eachasset["name"] + "·" + eachasset["qty"].to_s + ","
+            when "assets"
+              value.each do |eachasset|
+                serialized_response << eachasset["name"] + "·" + eachasset["qty"].to_s + ","
               end
-              when "friends"
-                #do nothing
-              else
-                serialized_response << key + "·" + value.to_s + ","
+            else
+              serialized_response << key + "·" + value.to_s + ","
             end
           end
           MotionKeychain.set :current_user, serialized_response
@@ -64,7 +61,7 @@ module Motion
           block.call
         end
 
-        def deserialize(mystring,arr_sep=',', key_sep='·')
+        def deserialize(mystring, arr_sep=',', key_sep='·')
           array = mystring.split(arr_sep)
           hash = {}
           array.each do |e|
@@ -73,7 +70,6 @@ module Motion
           end
           return hash
         end
-
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-authentication
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Andrew Havens
@@ -92,7 +92,7 @@ files:
 - lib/motion-authentication.rb
 - lib/project/motion-authentication.rb
 - lib/project/strategies/devise_cookie_auth.rb
-- lib/project/strategies/devise_token_auth.rb
+- lib/project/strategies/devise_simple_token_auth.rb
 - lib/project/strategies/devise_token_auth_gem.rb
 homepage: https://github.com/rubymotion-community/motion-authentication
 licenses: