← Back to branch summary

~ltrager/maas/remove_di_from_kernel_opts

« back to all changes in this revision

Viewing changes to src/maasserver/models/user.py

  • Committer: Lee Trager
  • Date: 2016-10-22 06:06:12 UTC
  • mfrom: (5457.1.44 maas)
  • Revision ID: lee.trager@canonical.com-20161022060612-ukar20f6ffs45nas
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/models/user.py
29
29
GENERIC_CONSUMER = 'MAAS consumer'
30
30
 
31
31
 
32
 
def create_auth_token(user):
 
32
def create_auth_token(user, consumer_name=None):
33
33
    """Create new Token and Consumer (OAuth authorisation) for `user`.
34
34
 
35
35
    :param user: The user to create a token for.
36
36
    :type user: User
 
37
    :param consumer_name: Name of the consumer to be assigned to the newly
 
38
     generated token.
37
39
    :return: The created Token.
38
40
    :rtype: piston.models.Token
39
41
 
40
42
    """
 
43
    if consumer_name is None:
 
44
        consumer_name = GENERIC_CONSUMER
41
45
    consumer = Consumer.objects.create(
42
 
        user=user, name=GENERIC_CONSUMER, status='accepted')
 
46
        user=user, name=consumer_name, status='accepted')
43
47
    consumer.generate_random_codes()
44
48
    # This is a 'generic' consumer aimed to service many clients, hence
45
49
    # we don't authenticate the consumer with key/secret key.