Subversion Repositories SmartDukaan

Rev

Rev 6394 | Rev 7039 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6394 Rev 7007
Line 75... Line 75...
75 
    user.mobile_number = user_to_add.mobileNumber
 75 
    user.mobile_number = user_to_add.mobileNumber
76 
    user.source = user_to_add.source
 76 
    user.source = user_to_add.source
77 
    user.source_start_time = to_py_date(user_to_add.sourceStartTime)
 77 
    user.source_start_time = to_py_date(user_to_add.sourceStartTime)
78 
    user.trust_level = 0
 78 
    user.trust_level = 0
79 
    user.active_since = datetime.datetime.now()
 79 
    user.active_since = datetime.datetime.now()
- 
 
 80 
    user.is_facebook_user = user_to_add.isFacebookUser
- 
 
 81 
    user.facebook_access_token = user_to_add.facebookAccessToken
- 
 
 82 
    user.facebook_id = user_to_add.facebookId
80 
    session.commit()
 83 
    session.commit()
81 
    return user
 84 
    return user
82 
 
 85 
 
83 
#===============================================================================
 86 
#===============================================================================
84 
# Need to provide the update apis here for relevant fields in PrimaryInfo.
 87 
# Need to provide the update apis here for relevant fields in PrimaryInfo.
Line 94... Line 97...
94 
    user.jsession_id = user_to_update.jsessionId
 97 
    user.jsession_id = user_to_update.jsessionId
95 
    user.is_anonymous = user_to_update.isAnonymous
 98 
    user.is_anonymous = user_to_update.isAnonymous
96 
    user.sex = user_to_update.sex
 99 
    user.sex = user_to_update.sex
97 
    user.date_of_birth = user_to_update.dateOfBirth
 100 
    user.date_of_birth = user_to_update.dateOfBirth
98 
    user.mobile_number = user_to_update.mobileNumber
 101 
    user.mobile_number = user_to_update.mobileNumber
- 
 
 102 
    user.is_facebook_user = user_to_update.isFacebookUser
- 
 
 103 
    if user_to_update.facebookAccessToken is not None:
- 
 
 104 
        user.facebook_access_token = user_to_update.facebookAccessToken
- 
 
 105 
    if user_to_update.facebookId is not None:
- 
 
 106 
        user.facebook_id = user_to_update.facebookId
99 
    session.commit()
 107 
    session.commit()
100 
    return user
 108 
    return user
101 
 
 109 
 
102 
def authenticate_user(user_handle, password):
 110 
def authenticate_user(user_handle, password):
103 
    user = User.get_by(email=user_handle)
 111 
    user = User.get_by(email=user_handle)
Line 478... Line 486...
478
486
479 
    for email in emails:
 487 
    for email in emails:
480 
        email_addresses.append(str(email[0]))
 488 
        email_addresses.append(str(email[0]))
481
489
482 
    return email_addresses
 490 
    return email_addresses
- 
 
 491 
 
- 
 
 492 
def mark_user_as_fb_user(userId):
- 
 
 493 
    user = User.query.filter_by(id = userId).first()
- 
 
 494 
    user.isFacebookUser = True
- 
 
 495 
    session.commit()
483
496
484 
def close_session():
 497 
def close_session():
485 
    if session.is_active:
 498 
    if session.is_active:
486 
        print "session is active. closing it."
 499 
        print "session is active. closing it."
487 
        session.close()
 500 
        session.close()