artfully_ose 1.3.0.pre2 → 1.3.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2227e62aa7b96bf9b47c53b10e6f7be5e505b8d2
-  data.tar.gz: 2730b7c985317b350a7375e3d323ce1625652f77
+  metadata.gz: 2fbca74b3c729a037bb45f57968f80d5f307c6bf
+  data.tar.gz: d82ddcd5912ed3aaabb3070d5fecca425f581482
 SHA512:
-  metadata.gz: a1d9292c210b7f9eb3a73b4ab50be727c9a2963b494475ce7b2638d7f3ca8f1d5958972af8fb1f14c146b054be255d74c6dde8c7148933caa07a395061a94988
-  data.tar.gz: e94e5cda62a1e681e59f7dfffe0621018b3ea8c9c84c414e8ed4d51aac6bf7d58bc0ad6b0d8410d306e4f1379d3241a57a73d0283fbefb7a18f4dcba8d4feb33
+  metadata.gz: 1df7b7aeff9f5aa8d33a9319c688b0bb71453a2f79885a04c2c39aff2da05da5459d2771769b0aff8d0e54261ddcbdf4a3cec832902766e68418c7d7134bec02
+  data.tar.gz: df671c3cd62c19462a95c709abc93f6dec9cff3b0194646c3d1507128cd8a6f8540a490393ef9229ed4cd7dc6c7012f160e0542a2a105438ded262103b5355d7

data/app/controllers/mobile/users_controller.rb

@@ -1,27 +1,15 @@
 class Mobile::UsersController < ApplicationController
   skip_before_filter :authenticate_user!, :only => :sign_in
-  include Ext::MobileAuthenticator
 
   def sign_in
-    Rails.logger.debug("------- MOBILE LOGIN -------")
+    user = User.find_by_email(params[:email])
 
-    if response = valid_login?
-      @user = User.find_by_fa_user_id(response["extra_attributes"]["id"])
+    if user && user.valid_password?(params[:password])
 
-      if @user.nil?
+      if user.organizations.empty?
         error = {
           :error => "Could not sign in",
-          :reason => "Please go to fracturedatlas.org to activate your artful.ly organization",
-          :code => 2
-        }
-        render :json => error, :status => 422 and return
-      end
-
-
-      if @user.organizations.empty?
-        error = {
-          :error => "Could not sign in",
-          :reason => "You are not a member of any organizations",
+          :reason => "User is not a member of any organizations",
           :code => 2
         }
         render :json => error, :status => 422 and return
@@ -29,14 +17,14 @@ class Mobile::UsersController < ApplicationController
 
       now = Time.parse(params[:now]) rescue Time.zone.now
 
-      render :json => @user, :auth_token => true, :organization => @user.organizations.first, :now => now
+      render :json => user, :auth_token => true, :organization => user.organizations.first, :now => now
     else
       error = {
         :error => "Could not sign in",
-        :reason => "Invalid email and password",
+        :reason => "Invalid email/password",
         :code => 1
       }
       render :json => error, :status => 422
     end
   end
-end
+end

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.3.0.pre2"
+  VERSION = "1.3.0.pre3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre2
+  version: 1.3.0.pre3
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails