Merge pull request lynndylanhurley#26 from hannahhoward/master

Remove OmniAuth dependency

config/initializers/devise.rb

@@ -196,6 +196,8 @@
 
   # mounted routes will point to this
   Rails.application.config.after_initialize do
-    ::OmniAuth::config.path_prefix = config.omniauth_path_prefix = DeviseTokenAuth.omniauth_prefix
+    if defined?(::OmniAuth)
+      ::OmniAuth::config.path_prefix = config.omniauth_path_prefix = DeviseTokenAuth.omniauth_prefix
+    end
   end
 end

config/routes.rb

@@ -1,3 +1,5 @@
 Rails.application.routes.draw do
-  get "#{::OmniAuth::config.path_prefix}/:provider/callback", to: 'devise_token_auth/auth#omniauth_success'
+  if defined?(::OmniAuth)
+    get "#{::OmniAuth::config.path_prefix}/:provider/callback", to: 'devise_token_auth/auth#omniauth_success'
+  end
 end

lib/devise_token_auth/rails/routes.rb

@@ -13,22 +13,24 @@ def mount_devise_token_auth_for(resource, opts)
 
         devise_scope resource.underscore.to_sym do
           get "validate_token",      to: "devise_token_auth/auth#validate_token"
-          get "failure",             to: "devise_token_auth/auth#omniauth_failure"
-          get ":provider/callback",  to: "devise_token_auth/auth#omniauth_success"
-          post ":provider/callback", to: "devise_token_auth/auth#omniauth_success"
+          if defined?(::OmniAuth)
+            get "failure",             to: "devise_token_auth/auth#omniauth_failure"
+            get ":provider/callback",  to: "devise_token_auth/auth#omniauth_success"
+            post ":provider/callback", to: "devise_token_auth/auth#omniauth_success"
 
-          # preserve the resource class thru oauth authentication by setting name of
-          # resource as "resource_class" param
-          match ":provider", to: redirect{|params, request|
-            # get the current querystring
-            qs = CGI::parse(request.env["QUERY_STRING"])
+            # preserve the resource class thru oauth authentication by setting name of
+            # resource as "resource_class" param
+            match ":provider", to: redirect{|params, request|
+              # get the current querystring
+              qs = CGI::parse(request.env["QUERY_STRING"])
 
-            # append name of current resource
-            qs["resource_class"] = [resource]
+              # append name of current resource
+              qs["resource_class"] = [resource]
 
-            # re-construct the path for omniauth
-            "#{::OmniAuth::config.path_prefix}/#{params[:provider]}?#{{}.tap {|hash| qs.each{|k, v| hash[k] = v.first}}.to_param}"
-          }, via: [:get]
+              # re-construct the path for omniauth
+              "#{::OmniAuth::config.path_prefix}/#{params[:provider]}?#{{}.tap {|hash| qs.each{|k, v| hash[k] = v.first}}.to_param}"
+            }, via: [:get]
+          end
         end
       end
     end