Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

remove all references to fichteid

  • Loading branch information...
commit 163b7f48333554583c580f88643b3dd1b6c561e9 1 parent f752658
@jonasschneider authored
View
1  Gemfile
@@ -14,7 +14,6 @@ gem "canable"
gem 'warden'
gem 'omniauth', :git => 'git://github.com/intridea/omniauth.git'
gem 'omniauth-ldap'
-gem 'fichteid-client', :git => 'git://github.com/jonasschneider/fichteid-client.git'
gem "ernie", :group => :ernie
View
9 Gemfile.lock
@@ -6,13 +6,6 @@ GIT
hashie (~> 1.2)
rack
-GIT
- remote: git://github.com/jonasschneider/fichteid-client.git
- revision: 528546a3589979a2c8821e5f36eb9878bca03f6c
- specs:
- fichteid-client (0.0.1)
- ruby-openid (~> 2.1.8)
-
GEM
remote: http://rubygems.org/
specs:
@@ -111,7 +104,6 @@ GEM
diff-lcs (~> 1.1.2)
rspec-mocks (2.7.0)
ruby-hmac (0.4.0)
- ruby-openid (2.1.8)
rubyntlm (0.1.1)
sass (3.1.7)
signature (0.1.2)
@@ -143,7 +135,6 @@ DEPENDENCIES
bson_ext
canable
ernie
- fichteid-client!
fog
fog-external
haml
View
8 app/auth.rb
@@ -22,7 +22,7 @@ def request_phase
f.text_field 'Benutzername im Schulnetzwerk', 'username'
f.password_field 'Passwort', 'password'
f.instance_eval do
- @html << "<h4><i>(Kann ein wenig dauern)</i></h4>"
+ @html << "<h4><i>(Dauert einen Moment)</i></h4>"
end
f.to_response
end
@@ -69,8 +69,8 @@ def self.registered(app)
use Warden::Manager do |manager|
manager.failure_app = Proc.new do |env|
- puts "auth failure, redirecting to fichteid"
- [301, { 'Location' => '/auth/fichteid', 'Content-Type'=> 'text/plain' }, ['Log in please.']]
+ puts "auth failure, redirecting to login"
+ [301, { 'Location' => '/auth/ldap', 'Content-Type'=> 'text/plain' }, ['Log in please.']]
end
end
@@ -139,7 +139,7 @@ def authenticate_with_info!(info)
get '/logout' do
warden.logout
- redirect "http://fichteid.heroku.com/sso/logout?return_to=#{url '/?logged_out=true'}"
+ redirect url('/?logged_out=true')
end
end
end
View
4 app/boot.rb
@@ -1,4 +1,2 @@
require 'sinatra'
-require 'redcarpet'
-
-require 'omniauth/strategies/fichteid'
+require 'redcarpet'
View
8 app/views/splash.haml
@@ -65,10 +65,4 @@
%p.notice Du wurdest abgemeldet.
%p
Dies ist ein Projekt für die Kursstufe 2 des Fichte-Gymnasiums im Schuljahr 2011/2012.
- Bitte melde dich mit deiner FichteID an.
- %form{ action: '/auth/fichteid', id: 'go' }
- %p
- %button{ onclick: "document.getElementById('go').submit()" }
- %span Mit
- %img{ :src => '/images/fichteid-logo.png', :width => 100 }
- %span anmelden
+ %a{ href: '/auth/ldap' } Bitte melde dich an.
View
6 spec/requests/auth_spec.rb
@@ -13,7 +13,7 @@
it "displays a link to log in" do
get '/'
- last_response.should have_selector("form[action='/auth/fichteid']")
+ last_response.should have_selector("a[href='/auth/ldap']")
end
describe "with logged_out=true" do
@@ -103,8 +103,8 @@
get '/logout'
end
- it 'redirects to the fichteID logout page with a return_to parameter' do
- last_response.headers["Location"].should == 'http://fichteid.heroku.com/sso/logout?return_to=http://example.org/?logged_out=true'
+ it 'redirects to the logout page with a return_to parameter' do
+ last_response.headers["Location"].should == 'http://example.org/?logged_out=true'
end
it "clears the session" do
Please sign in to comment.
Something went wrong with that request. Please try again.