Merge branch 'master' of https://github.com/andreassteph/fetsite

app/controllers/memberships_controller.rb

@@ -19,7 +19,7 @@ class MembershipsController < ApplicationController
   # POST /memberships.json
   def create
     @membership = Membership.new(params[:membership])
-    @membership.fetprofile= Fetprofle.find(params[:fetprofile_id])
+    @membership.fetprofile= Fetprofile.find(params[:fetprofile_id])
     respond_to do |format|
       if @membership.save
         format.html { redirect_to @membership.fetprofile, notice: 'Membership was successfully created.' }

app/controllers/users/omniauth_callbacks_controller.rb

@@ -0,0 +1,15 @@
+
+class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
+  def facebook
+    # You need to implement the method below in your model (e.g. app/models/user.rb)
+    @user = User.find_for_facebook_oauth(request.env["omniauth.auth"], current_user)
+
+    if @user.persisted?
+      sign_in_and_redirect @user, :event => :authentication #this will throw if @user is not activated
+      set_flash_message(:notice, :success, :kind => "Facebook") if is_navigational_format?
+    else
+      session["devise.facebook_data"] = request.env["omniauth.auth"]
+      redirect_to new_user_registration_url
+    end
+  end
+end