identity_client 0.1.2 → 0.1.3

data/app/controllers/identity_client/sessions_controller.rb

@@ -1,11 +1,20 @@
 module IdentityClient
   class SessionsController < ApplicationController
     def create
-      auth = request.env["omniauth.auth"]
-      user = User.find_by_provider_and_uid(auth["provider"], auth["uid"].to_s) || User.create_with_omniauth(auth)
+      AccessGrant.create_or_update_by_user_and_credentials(user, auth['credentials'])
 
       session[:user_id] = user.id
       redirect_to '/'
     end
+
+    private
+
+    def user
+      @user ||= User.find_by_provider_and_uid(auth['provider'], auth['uid'].to_s) || User.create_with_omniauth(auth)
+    end
+
+    def auth
+      @auth ||= request.env['omniauth.auth']
+    end
   end
 end

data/app/models/identity_client/access_grant.rb

@@ -0,0 +1,26 @@
+module IdentityClient
+  class AccessGrant < ActiveRecord::Base
+    attr_accessible :access_token, :expires_at, :user_id
+
+    belongs_to :user
+
+    def self.create_or_update_by_user_and_credentials(user, credentials)
+      attributes = {
+        access_token: credentials['token'],
+        expires_at:   Time.at(credentials['expires_at'])
+      }
+
+      if (grant = AccessGrant.by_user(user))
+        grant.update_attributes(attributes)
+      else
+        grant = user.create_access_grant(attributes)
+      end
+
+      grant
+    end
+
+    def self.by_user(user)
+      AccessGrant.where(user_id: user.id).first
+    end
+  end
+end

data/app/models/identity_client/user.rb

@@ -1,5 +1,7 @@
 module IdentityClient
   class User < ActiveRecord::Base
+    has_one :access_grant
+
     def self.create_with_omniauth(auth)
       create! do |user|
         user.provider = auth["provider"]

data/db/migrate/20130410122748_create_identity_client_access_grants.rb

@@ -0,0 +1,11 @@
+class CreateIdentityClientAccessGrants < ActiveRecord::Migration
+  def change
+    create_table :identity_client_access_grants do |t|
+      t.integer :user_id
+      t.string :access_token
+      t.datetime :expires_at
+
+      t.timestamps
+    end
+  end
+end

data/lib/identity_client/version.rb

@@ -1,3 +1,3 @@
 module IdentityClient
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/dummy/db/schema.rb

@@ -0,0 +1,32 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20130410122748) do
+
+  create_table "identity_client_access_grants", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "identity_client_users", :force => true do |t|
+    t.string   "provider"
+    t.string   "uid"
+    t.string   "name"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
+end

data/test/dummy/log/development.log

@@ -902,3 +902,19 @@ Completed 302 Found in 1ms (ActiveRecord: 0.0ms)
 
 
 Started GET "/identity_client/auth/icis" for 127.0.0.1 at 2013-04-06 09:47:28 -0400
+Connecting to database specified by database.yml
+   (0.1ms)  select sqlite_version(*)
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateIdentityClientUsers (20130406131436)
+   (0.0ms)  begin transaction
+   (0.4ms)  CREATE TABLE "identity_client_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "provider" varchar(255), "uid" varchar(255), "name" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20130406131436')
+   (1.2ms)  commit transaction
+Migrating to CreateIdentityClientAccessGrants (20130410122748)
+   (0.0ms)  begin transaction
+   (0.4ms)  CREATE TABLE "identity_client_access_grants" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer, "access_token" varchar(255), "expires_at" datetime, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20130410122748')
+   (0.9ms)  commit transaction
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 

data/test/dummy/log/test.log

@@ -1,3 +1,12 @@
 Connecting to database specified by database.yml
    (0.3ms)  begin transaction
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.3ms)  begin transaction
+Processing by HomeController#show as HTML
+Redirected to http://test.host/identity_client/auth/icis
+Filter chain halted as :authenticate rendered or redirected
+Completed 302 Found in 0ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction

data/test/fixtures/identity_client/access_grants.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  user_id: 1
+  access_token: MyString
+  expires_at: 2013-04-10 08:27:48
+
+two:
+  user_id: 1
+  access_token: MyString
+  expires_at: 2013-04-10 08:27:48

data/test/unit/identity_client/access_grant_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module IdentityClient
+  class AccessGrantTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identity_client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-07 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,10 +87,12 @@ files:
 - app/controllers/identity_client/application_controller.rb
 - app/controllers/identity_client/sessions_controller.rb
 - app/helpers/identity_client/application_helper.rb
+- app/models/identity_client/access_grant.rb
 - app/models/identity_client/user.rb
 - app/views/layouts/identity_client/application.html.erb
 - config/routes.rb
 - db/migrate/20130406131436_create_identity_client_users.rb
+- db/migrate/20130410122748_create_identity_client_access_grants.rb
 - lib/identity_client/engine.rb
 - lib/identity_client/version.rb
 - lib/identity_client.rb
@@ -125,6 +127,7 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
 - test/dummy/db/development.sqlite3
+- test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/test.log
@@ -151,10 +154,12 @@ files:
 - test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
 - test/dummy/tmp/cache/assets/DED/F20/sprockets%2Fe2ec6b180edb4e4d0c5e691da72ad13a
 - test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
+- test/fixtures/identity_client/access_grants.yml
 - test/fixtures/identity_client/users.yml
 - test/identity_client_test.rb
 - test/integration/navigation_test.rb
 - test/test_helper.rb
+- test/unit/identity_client/access_grant_test.rb
 - test/unit/identity_client/user_test.rb
 homepage: http://iorahealth.com
 licenses: []
@@ -208,6 +213,7 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
 - test/dummy/db/development.sqlite3
+- test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
 - test/dummy/log/test.log
@@ -234,8 +240,10 @@ test_files:
 - test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
 - test/dummy/tmp/cache/assets/DED/F20/sprockets%2Fe2ec6b180edb4e4d0c5e691da72ad13a
 - test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
+- test/fixtures/identity_client/access_grants.yml
 - test/fixtures/identity_client/users.yml
 - test/identity_client_test.rb
 - test/integration/navigation_test.rb
 - test/test_helper.rb
+- test/unit/identity_client/access_grant_test.rb
 - test/unit/identity_client/user_test.rb