openstax_api 1.0.3 → 1.0.4
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0f1429c6653d5491a5d6b1e9ed52f9a3f60545f3
|
4
|
+
data.tar.gz: 3132f7b1b24f55834b4d1675a1daef215b82ace3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 02f3f16a5b88f6071b20472fc8f4a73d77e1ca7314d3a7c1d80512f674135f33c679468239316cde65c56d856e4798667e06ddfb5f2b6e61aa844822997b1b33
|
7
|
+
data.tar.gz: c2d09d5c8a36c38d11074424d9df2153baaab847fa7930fc802ec7e3883dbbb34beaa384260fb02ee246a872a68661a970e10e0fe924ece44f8d47d78261eb55
|
@@ -20,15 +20,15 @@ module OpenStax
|
|
20
20
|
skip_protect_beta if respond_to? :skip_protect_beta
|
21
21
|
|
22
22
|
skip_before_filter :authenticate_user!
|
23
|
-
doorkeeper_for :all, :unless => :
|
23
|
+
doorkeeper_for :all, :unless => :user_without_token?
|
24
24
|
skip_before_filter :verify_authenticity_token,
|
25
|
-
:unless => :
|
25
|
+
:unless => :user_without_token?
|
26
26
|
|
27
27
|
respond_to :json
|
28
28
|
rescue_from Exception, :with => :rescue_from_exception
|
29
29
|
|
30
30
|
# Keep old current_user method so we can use it
|
31
|
-
alias_method :
|
31
|
+
alias_method :current_human_user,
|
32
32
|
OpenStax::Api.configuration.current_user_method
|
33
33
|
|
34
34
|
# TODO: doorkeeper users (or rather users who have doorkeeper
|
@@ -43,13 +43,13 @@ module OpenStax
|
|
43
43
|
# Always return an ApiUser
|
44
44
|
def current_user
|
45
45
|
@current_api_user ||= ApiUser.new(doorkeeper_token,
|
46
|
-
lambda {
|
46
|
+
lambda { current_human_user })
|
47
47
|
end
|
48
48
|
|
49
49
|
protected
|
50
50
|
|
51
|
-
def
|
52
|
-
|
51
|
+
def user_without_token?
|
52
|
+
current_human_user && doorkeeper_token.blank?
|
53
53
|
end
|
54
54
|
|
55
55
|
def rescue_from_exception(exception)
|
@@ -81,8 +81,6 @@ module OpenStax
|
|
81
81
|
|
82
82
|
head error
|
83
83
|
end
|
84
|
-
|
85
|
-
|
86
84
|
|
87
85
|
end
|
88
86
|
|
data/lib/openstax/api/version.rb
CHANGED
data/spec/dummy/db/test.sqlite3
CHANGED
Binary file
|
@@ -484,3 +484,20 @@ Connecting to database specified by database.yml
|
|
484
484
|
Connecting to database specified by database.yml
|
485
485
|
Connecting to database specified by database.yml
|
486
486
|
Connecting to database specified by database.yml
|
487
|
+
Connecting to database specified by database.yml
|
488
|
+
[1m[36m (0.1ms)[0m [1mSELECT "schema_migrations"."version" FROM "schema_migrations" [0m
|
489
|
+
[1m[35m (0.2ms)[0m select sqlite_version(*)
|
490
|
+
[1m[36m (0.9ms)[0m [1mDROP TABLE "dummy_users"[0m
|
491
|
+
[1m[35m (0.9ms)[0m CREATE TABLE "dummy_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "username" varchar(255), "password_hash" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
|
492
|
+
[1m[36m (0.8ms)[0m [1mDROP TABLE "oauth_access_grants"[0m
|
493
|
+
[1m[35m (0.8ms)[0m CREATE TABLE "oauth_access_grants" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_owner_id" integer NOT NULL, "application_id" integer NOT NULL, "token" varchar(255) NOT NULL, "expires_in" integer NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "revoked_at" datetime, "scopes" varchar(255))
|
494
|
+
[1m[36m (0.8ms)[0m [1mCREATE UNIQUE INDEX "index_oauth_access_grants_on_token" ON "oauth_access_grants" ("token")[0m
|
495
|
+
[1m[35m (0.8ms)[0m DROP TABLE "oauth_access_tokens"
|
496
|
+
[1m[36m (0.8ms)[0m [1mCREATE TABLE "oauth_access_tokens" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_owner_id" integer, "application_id" integer, "token" varchar(255) NOT NULL, "refresh_token" varchar(255), "expires_in" integer, "revoked_at" datetime, "created_at" datetime NOT NULL, "scopes" varchar(255)) [0m
|
497
|
+
[1m[35m (0.8ms)[0m CREATE UNIQUE INDEX "index_oauth_access_tokens_on_refresh_token" ON "oauth_access_tokens" ("refresh_token")
|
498
|
+
[1m[36m (0.8ms)[0m [1mCREATE INDEX "index_oauth_access_tokens_on_resource_owner_id" ON "oauth_access_tokens" ("resource_owner_id")[0m
|
499
|
+
[1m[35m (0.7ms)[0m CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
|
500
|
+
[1m[36m (0.8ms)[0m [1mDROP TABLE "oauth_applications"[0m
|
501
|
+
[1m[35m (0.9ms)[0m CREATE TABLE "oauth_applications" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "uid" varchar(255) NOT NULL, "secret" varchar(255) NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
|
502
|
+
[1m[36m (0.8ms)[0m [1mCREATE UNIQUE INDEX "index_oauth_applications_on_uid" ON "oauth_applications" ("uid")[0m
|
503
|
+
[1m[35m (0.1ms)[0m SELECT version FROM "schema_migrations"
|
data/spec/dummy/log/test.log
CHANGED
@@ -685,3 +685,40 @@ Connecting to database specified by database.yml
|
|
685
685
|
[1m[35m (0.0ms)[0m rollback transaction
|
686
686
|
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
687
687
|
[1m[35m (0.0ms)[0m rollback transaction
|
688
|
+
Connecting to database specified by database.yml
|
689
|
+
[1m[36m (0.4ms)[0m [1mbegin transaction[0m
|
690
|
+
[1m[35mDummyUser Load (0.1ms)[0m SELECT "dummy_users".* FROM "dummy_users" WHERE "dummy_users"."id" IS NULL LIMIT 1
|
691
|
+
[1m[36m (0.0ms)[0m [1mrollback transaction[0m
|
692
|
+
[1m[35m (0.0ms)[0m begin transaction
|
693
|
+
[1m[36m (0.0ms)[0m [1mSAVEPOINT active_record_1[0m
|
694
|
+
[1m[35mSQL (3.1ms)[0m INSERT INTO "dummy_users" ("created_at", "password_hash", "updated_at", "username") VALUES (?, ?, ?, ?) [["created_at", Thu, 01 May 2014 21:01:30 UTC +00:00], ["password_hash", nil], ["updated_at", Thu, 01 May 2014 21:01:30 UTC +00:00], ["username", nil]]
|
695
|
+
[1m[36m (0.0ms)[0m [1mRELEASE SAVEPOINT active_record_1[0m
|
696
|
+
[1m[35mDummyUser Load (0.1ms)[0m SELECT "dummy_users".* FROM "dummy_users" WHERE "dummy_users"."id" = 1 LIMIT 1
|
697
|
+
[1m[36m (0.2ms)[0m [1mrollback transaction[0m
|
698
|
+
[1m[35m (0.0ms)[0m begin transaction
|
699
|
+
[1m[36m (0.0ms)[0m [1mSAVEPOINT active_record_1[0m
|
700
|
+
[1m[35mSQL (0.2ms)[0m INSERT INTO "dummy_users" ("created_at", "password_hash", "updated_at", "username") VALUES (?, ?, ?, ?) [["created_at", Thu, 01 May 2014 21:01:30 UTC +00:00], ["password_hash", nil], ["updated_at", Thu, 01 May 2014 21:01:30 UTC +00:00], ["username", nil]]
|
701
|
+
[1m[36m (0.0ms)[0m [1mRELEASE SAVEPOINT active_record_1[0m
|
702
|
+
[1m[35m (0.3ms)[0m rollback transaction
|
703
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
704
|
+
[1m[35m (0.0ms)[0m rollback transaction
|
705
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
706
|
+
[1m[35m (0.0ms)[0m rollback transaction
|
707
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
708
|
+
[1m[35m (0.0ms)[0m rollback transaction
|
709
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
710
|
+
[1m[35m (0.0ms)[0m rollback transaction
|
711
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
712
|
+
[1m[35m (0.0ms)[0m rollback transaction
|
713
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
714
|
+
[1m[35m (0.0ms)[0m rollback transaction
|
715
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
716
|
+
[1m[35m (0.0ms)[0m rollback transaction
|
717
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
718
|
+
[1m[35m (0.0ms)[0m rollback transaction
|
719
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
720
|
+
[1m[35m (0.0ms)[0m rollback transaction
|
721
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
722
|
+
[1m[35m (0.0ms)[0m rollback transaction
|
723
|
+
[1m[36m (0.0ms)[0m [1mbegin transaction[0m
|
724
|
+
[1m[35m (0.0ms)[0m rollback transaction
|