authic_client 0.0.2 → 0.0.3

data/README.rdoc

@@ -6,4 +6,6 @@ gem "authic_client"
 
 run bundle install
 
+rails g authic:install
+
 rails g active_record:authic User

data/app/controllers/authic_client/sessions_controller.rb

@@ -3,8 +3,8 @@ module AuthicClient
     def create
       user = User.find_for_authic_oauth(request.env["omniauth.auth"], current_user)
       if user.persisted?
-        session[:user_id] = user.id
-        redirect_path ||= session[:return_to_this_url] ||= root_url
+        session[:authic_user_id] = user.id
+        redirect_path ||= session[:authic_return_to_this_url] ||= root_url
         redirect_to redirect_path, :notice => "You have been successfully signed in"
       else
         redirect_to root_url  
@@ -12,7 +12,7 @@ module AuthicClient
     end
 
     def destroy
-      session[:user_id] = nil
+      session[:authic_user_id] = nil
       #TODO: Change to PROD url
       redirect_path = "http://#{AuthicClient::AUTHIC_CLIENT_SUBDOMAIN}.authicstaging.com/authic_sign_out?&return_path=#{URI.escape root_url}"
       redirect_to redirect_path

data/app/helpers/authic_client/application_helper.rb

@@ -2,7 +2,7 @@ module AuthicClient
   module ApplicationHelper
     
     def current_user
-      @current_user ||= User.find(session[:user_id]) if session[:user_id]
+      @current_user ||= User.find(session[:authic_user_id]) if session[:authic_user_id]
     end
 
     def signin_path
@@ -15,7 +15,7 @@ module AuthicClient
 
     def login_required
       unless current_user
-        session[:return_to_this_url] = request.full_path
+        session[:authic_return_to_this_url] = request.fullpath
         redirect_to signin_path
       end
     end

data/lib/authic_client/version.rb

@@ -1,3 +1,3 @@
 module AuthicClient
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/generators/templates/authic.rb

@@ -1,4 +1,6 @@
-# Authic config
-$authic_client_key ||= ENV['AUTHIC_CLIENT_KEY'] ||= 'E6FRBHNNhWDOMhubF9hfg4ibhuiHn4XMngkbXl5o'  
-$authic_client_secret ||= ENV['AUTHIC_CLIENT_SECRET'] ||= 'YjpvSh7KqjnpTfhZgklBQqrpFRamz7354t9GzPoj'  
-$authic_client_subdomain ||= ENV['AUTHIC_CLIENT_SUBDOMAIN'] ||= 'dev'
+module AuthicClient
+  # Authic config
+  AUTHIC_CLIENT_KEY ||= ENV['AUTHIC_CLIENT_KEY'] ||= 'E6FRBHNNhWDOMhubF9hfg4ibhuiHn4XMngkbXl5o'  
+  AUTHIC_CLIENT_SECRET ||= ENV['AUTHIC_CLIENT_SECRET'] ||= 'YjpvSh7KqjnpTfhZgklBQqrpFRamz7354t9GzPoj'  
+  AUTHIC_CLIENT_SUBDOMAIN ||= ENV['AUTHIC_CLIENT_SUBDOMAIN'] ||= 'dev'
+end

data/lib/generators/templates/omniauth.rb

@@ -1,6 +1,6 @@
 Rails.application.config.middleware.use OmniAuth::Builder do
 
   #TODO: Change to PROD url
-  provider :authic, $authic_client_key, $authic_client_secret, :subdomain => $authic_client_subdomain, :domain => "authicstaging.com"
+  provider :authic, AuthicClient::AUTHIC_CLIENT_KEY, AuthicClient::AUTHIC_CLIENT_SECRET, :subdomain => AuthicClient::AUTHIC_CLIENT_SUBDOMAIN, :domain => "authicstaging.com"
   
 end

data/test/dummy/app/controllers/welcome_controller.rb

@@ -1,4 +1,5 @@
 class WelcomeController < ApplicationController
+  
   def index
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: authic_client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - authic
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3364850827576231942
+      hash: 2335199687854049895
       segments: 
       - 0
       version: "0"
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3364850827576231942
+      hash: 2335199687854049895
       segments: 
       - 0
       version: "0"