entrance 0.6.1 → 0.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/entrance/addons/omniauth.rb +9 -5
- data/lib/entrance/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5996654ada4c04abee0bd9be2fb49379d060b094
|
|
4
|
+
data.tar.gz: c1055a74b922e5680f4788a63efa5f064318e8c6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7cf71af823d741af14300925be03be29759eda16a6e46c9e49fd248d7da8cccdd2485e1951265c91a71177f55bf50bea728ef10372a2e29be0de134ee3aa177c
|
|
7
|
+
data.tar.gz: eeb59011f0fb6b7edc0134eab2f15e507f5be29860138130fcc09a24490debdf19e06e9ca9020d6a3b221df25b322542b5e0cd234f91bf95d8a5fb04bd7d2ed8
|
|
@@ -92,11 +92,15 @@ module Entrance
|
|
|
92
92
|
def log(str)
|
|
93
93
|
logger.info(str) rescue nil
|
|
94
94
|
end
|
|
95
|
-
|
|
95
|
+
|
|
96
96
|
def omniauth_params
|
|
97
97
|
@omniauth_params
|
|
98
98
|
end
|
|
99
99
|
|
|
100
|
+
def model
|
|
101
|
+
::Entrance.model
|
|
102
|
+
end
|
|
103
|
+
|
|
100
104
|
def valid_user?(user)
|
|
101
105
|
if user.respond_to?(:can_login?) and !user.can_login?
|
|
102
106
|
return false
|
|
@@ -112,14 +116,14 @@ module Entrance
|
|
|
112
116
|
def find_user_with_username(username)
|
|
113
117
|
query = {}
|
|
114
118
|
query[::Entrance.fields.username] = username # .to_s.downcase.strip
|
|
115
|
-
|
|
119
|
+
model.where(query).first
|
|
116
120
|
end
|
|
117
121
|
|
|
118
122
|
def find_user_with_provider_and_uid(provider, uid)
|
|
119
123
|
query = {}
|
|
120
124
|
query[::Entrance.fields.auth_provider] = provider
|
|
121
125
|
query[::Entrance.fields.auth_uid] = uid
|
|
122
|
-
|
|
126
|
+
model.where(query).first
|
|
123
127
|
end
|
|
124
128
|
|
|
125
129
|
def set_auth_credentials(user, provider, uid)
|
|
@@ -136,7 +140,7 @@ module Entrance
|
|
|
136
140
|
data = {}
|
|
137
141
|
data[::Entrance.fields.name] = name
|
|
138
142
|
data[::Entrance.fields.username] = email
|
|
139
|
-
user =
|
|
143
|
+
user = model.new(data)
|
|
140
144
|
set_auth_credentials(user, provider, uid)
|
|
141
145
|
|
|
142
146
|
if user.valid?
|
|
@@ -151,7 +155,7 @@ module Entrance
|
|
|
151
155
|
# does not check if user is banned or not (the /callback route does that)
|
|
152
156
|
def auth_or_create(auth, params = {})
|
|
153
157
|
@omniauth_params = params
|
|
154
|
-
|
|
158
|
+
|
|
155
159
|
provider, uid = auth['provider'], auth['uid']
|
|
156
160
|
info = auth['info'] || {}
|
|
157
161
|
|
data/lib/entrance/version.rb
CHANGED