omniauth-aai 0.6.8 → 0.6.9
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/generators/aai/templates/user.rb +17 -15
- data/lib/omniauth-aai/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: 34d1882cfde2f04a63e7078eb4a75fde89e0eda4
|
|
4
|
+
data.tar.gz: abca5c42f1b63dab8d9fd0cf0bdddc700b8bf7c0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: fef01337e15a26af5e0b1235289d155ffc7a4050190230049a14c73c684adff16e16aec1b86e3242c4903b5ca04303f7152716f045af2e46e09b84adcfa49f3f
|
|
7
|
+
data.tar.gz: 1afc814febb19cfd71ffb88a874fe20d49a9f9804da992a24c824d9e3f4e597b35d08e581651c804763eb7dcb323a3a421c3bbc9536c887a2759c7e68bca0e41
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
class User <%= options[:persist] ? "< ActiveRecord::Base" : "" %>
|
|
2
2
|
<% if options[:persist] -%>
|
|
3
|
-
# attr_accessible :uid
|
|
4
|
-
# attr_accessor :aai
|
|
5
3
|
PERSISTENT = true
|
|
6
4
|
|
|
7
5
|
def self.update_or_create_with_omniauth_aai(omniauth_aai)
|
|
@@ -20,24 +18,12 @@ class User <%= options[:persist] ? "< ActiveRecord::Base" : "" %>
|
|
|
20
18
|
end
|
|
21
19
|
end
|
|
22
20
|
|
|
23
|
-
<% else -%>
|
|
24
|
-
attr_accessor :aai, :uid
|
|
25
|
-
PERSISTENT = false
|
|
26
|
-
<% end -%>
|
|
27
|
-
|
|
28
21
|
def name
|
|
29
|
-
|
|
22
|
+
"#{first_name} #{last_name}"
|
|
30
23
|
rescue
|
|
31
24
|
nil
|
|
32
25
|
end
|
|
33
26
|
|
|
34
|
-
def email
|
|
35
|
-
aai[:info][:email]
|
|
36
|
-
rescue
|
|
37
|
-
nil
|
|
38
|
-
end
|
|
39
|
-
|
|
40
|
-
<% if options[:persist] -%>
|
|
41
27
|
def marshal
|
|
42
28
|
self.uid
|
|
43
29
|
end
|
|
@@ -49,7 +35,23 @@ class User <%= options[:persist] ? "< ActiveRecord::Base" : "" %>
|
|
|
49
35
|
def unmarshal(session_data)
|
|
50
36
|
self.reload
|
|
51
37
|
end
|
|
38
|
+
|
|
52
39
|
<% else -%>
|
|
40
|
+
attr_accessor :aai, :uid
|
|
41
|
+
PERSISTENT = false
|
|
42
|
+
|
|
43
|
+
def name
|
|
44
|
+
aai[:info][:name]
|
|
45
|
+
rescue
|
|
46
|
+
nil
|
|
47
|
+
end
|
|
48
|
+
|
|
49
|
+
def email
|
|
50
|
+
aai[:info][:email]
|
|
51
|
+
rescue
|
|
52
|
+
nil
|
|
53
|
+
end
|
|
54
|
+
|
|
53
55
|
def marshal
|
|
54
56
|
{
|
|
55
57
|
id: self.uid,
|
data/lib/omniauth-aai/version.rb
CHANGED