xmppify 0.0.22 → 0.0.23
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/omniauth_callbacks_controller.rb +8 -8
- data/lib/xmppify/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: 3582b17544b1bd1879179a5844686e882b42d5c5
|
4
|
+
data.tar.gz: 3cd80ed67114ccee271bbf944022b25511c87a02
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 625102debe253e83ebe547ca56c1eadff868e2e592abaaac312bc98fa8f6c6ace4021b2c3f48dfd3557deeed02218cf2ab0d09494ee704471152c931c4245ab6
|
7
|
+
data.tar.gz: 61fa42630c906bbb3a64241b77a774573e6fb952adcaa258ce42bece8861b42656c1ce9adb1bd77f3cdcafbeb87f88592252c21e4e328660e5d17dc2c3fd8226
|
@@ -5,9 +5,9 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
|
5
5
|
@user = User.find_or_create_for_doorkeeper_oauth(oauth_data)
|
6
6
|
@user.update_doorkeeper_credentials(oauth_data)
|
7
7
|
@user.save
|
8
|
-
sign_in_as @user
|
9
|
-
ap
|
10
|
-
flash[:attacher] = attacher(
|
8
|
+
xmpp_credentials = sign_in_as @user
|
9
|
+
ap xmpp_credentials
|
10
|
+
flash[:attacher] = attacher(xmpp_credentials)
|
11
11
|
if @user.identities.find_by(provider:"github").nil?
|
12
12
|
@user.identities.create(provider:"github",auth_token:oauth_data.info.github_auth_token,email:oauth_data.info.github_email)
|
13
13
|
end
|
@@ -18,14 +18,14 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
|
18
18
|
private
|
19
19
|
|
20
20
|
def sign_in_as(user)
|
21
|
-
|
21
|
+
return user.connect
|
22
22
|
end
|
23
23
|
|
24
|
-
def attacher(
|
24
|
+
def attacher(xmpp_credentials)
|
25
25
|
{
|
26
|
-
jid:
|
27
|
-
id:
|
28
|
-
rid:
|
26
|
+
jid: xmpp_credentials.jid,
|
27
|
+
id: xmpp_credentials.sid,
|
28
|
+
rid: xmpp_credentials.rid
|
29
29
|
}
|
30
30
|
end
|
31
31
|
end
|
data/lib/xmppify/version.rb
CHANGED