Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-blk
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
1
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
htoooth
9 years ago
Commit
6e827f78bf32febc59354dcc7b1bd413fd75246d
1 parent
a9a727b7
修复第三方错误
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
apps/passport/controllers/login.js
apps/passport/controllers/login.js
View file @
6e827f7
...
...
@@ -17,7 +17,7 @@ const helpers = global.yoho.helpers;
const
log
=
global
.
yoho
.
logger
;
const
config
=
global
.
yoho
.
config
;
const
cache
=
global
.
yoho
.
cache
;
const
l
oginService
=
require
(
'../models/login-service'
);
const
L
oginService
=
require
(
'../models/login-service'
);
const
PassportHelper
=
require
(
'../models/passport-helper'
);
const
loginPageURL
=
`
$
{
config
.
siteUrl
}
/passport/
login
`
;
...
...
@@ -38,7 +38,7 @@ function doPassportCallback(req, res, user) {
}
if
(
user
.
openId
&&
user
.
nickname
)
{
let
signinByOpenID
=
loginService
.
signinByOpenID
(
let
signinByOpenID
=
LoginService
.
signinByOpenIDAsync
(
user
.
nickname
,
user
.
openId
,
user
.
sourceType
,
shoppingKey
,
user
.
unionId
);
return
signinByOpenID
.
then
((
result
)
=>
{
...
...
@@ -53,7 +53,7 @@ function doPassportCallback(req, res, user) {
refer
:
refer
});
}
else
if
(
result
.
code
===
200
&&
result
.
data
.
uid
)
{
return
l
oginService
.
syncUserSession
(
result
.
data
.
uid
,
req
,
res
).
then
(()
=>
{
return
L
oginService
.
syncUserSession
(
result
.
data
.
uid
,
req
,
res
).
then
(()
=>
{
return
refer
;
});
}
...
...
@@ -153,7 +153,7 @@ const local = {
let
refer
=
req
.
cookies
.
refer
;
if
(
isRemember
)
{
yield
l
oginService
.
rememberAccount
({
yield
L
oginService
.
rememberAccount
({
area
:
req
.
body
.
areaCode
||
'86'
,
account
:
req
.
body
.
account
,
password
:
req
.
body
.
password
...
...
@@ -170,7 +170,7 @@ const local = {
refer
=
`
$
{
config
.
siteUrl
}
`
;
}
yield
l
oginService
.
syncUserSession
(
user
.
uid
,
req
,
res
).
then
(()
=>
{
yield
L
oginService
.
syncUserSession
(
user
.
uid
,
req
,
res
).
then
(()
=>
{
res
.
json
({
code
:
200
,
data
:
{
...
...
Please
register
or
login
to post a comment