Subversion Repositories SmartDukaan

Rev

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

Rev 7007 Rev 7039
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
 - 
 
83 
    session.commit()
 80 
    session.commit()
84 
    return user
 81 
    return user
85 
 
 82 
 
86 
#===============================================================================
 83 
#===============================================================================
87 
# Need to provide the update apis here for relevant fields in PrimaryInfo.
 84 
# Need to provide the update apis here for relevant fields in PrimaryInfo.
Line 97... Line 94...
97 
    user.jsession_id = user_to_update.jsessionId
 94 
    user.jsession_id = user_to_update.jsessionId
98 
    user.is_anonymous = user_to_update.isAnonymous
 95 
    user.is_anonymous = user_to_update.isAnonymous
99 
    user.sex = user_to_update.sex
 96 
    user.sex = user_to_update.sex
100 
    user.date_of_birth = user_to_update.dateOfBirth
 97 
    user.date_of_birth = user_to_update.dateOfBirth
101 
    user.mobile_number = user_to_update.mobileNumber
 98 
    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
 - 
 
107 
    session.commit()
 99 
    session.commit()
108 
    return user
 100 
    return user
109 
 
 101 
 
110 
def authenticate_user(user_handle, password):
 102 
def authenticate_user(user_handle, password):
111 
    user = User.get_by(email=user_handle)
 103 
    user = User.get_by(email=user_handle)
Line 486... Line 478...
486
478
487 
    for email in emails:
 479 
    for email in emails:
488 
        email_addresses.append(str(email[0]))
 480 
        email_addresses.append(str(email[0]))
489
481
490 
    return email_addresses
 482 
    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()
 - 
 
496
483
497 
def close_session():
 484 
def close_session():
498 
    if session.is_active:
 485 
    if session.is_active:
499 
        print "session is active. closing it."
 486 
        print "session is active. closing it."
500 
        session.close()
 487 
        session.close()