Merge branch 'master' into prep_upgrade

app/controllers/users/omniauth_callbacks_controller.rb

@@ -2,11 +2,23 @@
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   skip_before_filter :verify_authenticity_token
   def failure
-    
     # flash[:notice] = "Failure #{Hash.new(request.env)} #{Hash.new(params)}"
     #redirect_to new_user_registration_url , :notice=>"Omniauth Login failed" 
     super
   end  
+  def developer
+    if Rails.env.development?
+      @user= User.find_for_developer_oauth(request.env["omniauth.auth"],current_user)
+      if @user
+        sign_in_and_redirect @user, event: :authentication
+      else
+        redirect_to new_user_registration_url
+      end
+    else
+      flash[:notice]=flash[:notice] + "Still not logged in "
+      redirect_to new_user_registration_url
+    end
+  end
   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)
@@ -23,7 +35,7 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   end
 
   def ldap
-logger.debug current_user.to_s
+    logger.debug current_user.to_s
     @user=User.find_for_ldap_oauth(request.env["omniauth.auth"],current_user) 
  #  @user=User.find_for_ldap_oauth(session["devise.ldap_data"],current_user)
    # @user=User.first

app/models/user.rb

@@ -29,13 +29,34 @@ class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable,:omniauthable, :omniauth_providers => [:facebook,:ldap]
+  devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable,:omniauthable, :omniauth_providers => [:facebook,:ldap,:developer]
   acts_as_voter
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation, :remember_me, :provider, :uid, :name
 belongs_to :fetprofile
   # attr_accessible :title, :body
-  def self.find_for_facebook_oauth(auth, signed_in_resource=nil)
+
+def self.find_for_developer_oauth(auth, signed_in_resource=nil)
+ # logger.debug("Developer Login started")
+ # logger.debug(auth.info.to_s)
+  
+ # logger.debug(auth.extra.raw_info.to_s)
+  email = auth.info.email.to_s
+  logger.debug("Login E-Mail:"+"'"+ email+"'")
+  user= User.where(:provider=>auth.provider,:uid=>email).first
+  unless user
+    user= User.create(name: email,
+                      provider: auth.provider,
+                      uid: email,
+                      email: email,
+                      password:Devise.friendly_token[0,20])
+    user.add_role("fetuser")
+   
+  end
+  user
+end
+
+def self.find_for_facebook_oauth(auth, signed_in_resource=nil)
 logger.debug auth.to_s
     logger.debug "DDD Username= #{auth.username}"
     user = User.where(:provider => auth.provider, :uid => auth.uid).first

app/views/devise/sessions/new.html.erb

@@ -24,6 +24,4 @@
   <div><%= f.submit "Sign in" %></div>
 <% end %>
 
-
-
 <%= render "devise/shared/links" %>

app/views/layouts/menu.html.erb

@@ -43,9 +43,20 @@
 	<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
 	
 	</ul></div>
-	</li><li>
+	</li>
- <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap)  %>
+	<li>
-	<%# render 'layouts/login' %>
+	  <% if not user_signed_in? %>
+	  <% if Rails.env.development? %>
+	  <%# link_to I18n.t('home.login'), user_omniauth_authorize_path(:developer)  %>
+	  <%= render 'layouts/login' %>
+	  
+	  <% else %>
+	  <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap)  %>
+	  <% end %>
+	  <% else %>
+	  <%= render 'layouts/login' %>
+	  <% end %>
+
 </li></ul>
 
 	<!--<span class="pull-right"><%if I18n.locale == :en %>

config/initializers/devise.rb

@@ -225,6 +225,7 @@ Devise.setup do |config|
   # up on your models and hooks.
   #config.omniauth :facebook, 'appid', 'secret'
   secrets = YAML.load_file("#{::Rails.root.to_s}/config/omniauth_secrets.yml")
+  config.omniauth :developer,:title => "Developer" unless Rails.env.production?
   config.omniauth :facebook, secrets["facebook"]["appid"], secrets["facebook"]["secret"]
   config.omniauth :ldap, :title => "My LDAP", 
     :host => secrets["ldap"]["host"],
@@ -236,6 +237,8 @@ Devise.setup do |config|
   :bind_dn =>secrets["ldap"]['bind'],
   :password => secrets["ldap"]['password']
 
+
+  
   # ==> Warden configuration<<
   # If you want to use other strategies, that are not supported by Devise, or
   # change the failure app, you can configure them inside the config.warden block.

config/routes.rb

@@ -72,6 +72,7 @@ end
     end
   end
   devise_for :users , :controllers=>{:omniauth_callbacks=> "users/omniauth_callbacks"}
+  #match '/auth/:provider/callback', to: "session#new", via: [:get, :post]
 
  
   scope '(:locale)', constraints: {:locale=>/en|de/i} do