@@ -263,7 +263,7 @@ def setUserPwd(self, user, pwd):
263
263
pwd (str): password of the connecting account
264
264
"""
265
265
def getSkypeToken (self ):
266
- self .liveLogin (user , pwd )
266
+ self .soapLogin (user , pwd )
267
267
self .getSkypeToken = MethodType (getSkypeToken , self )
268
268
269
269
def setTokenFile (self , path ):
@@ -361,6 +361,31 @@ def liveLogin(self, user, pwd):
361
361
Returns:
362
362
(str, datetime.datetime) tuple: Skype token, and associated expiry if known
363
363
364
+ Raises:
365
+ .SkypeAuthException: if the login request is rejected
366
+ .SkypeApiException: if the login form can't be processed
367
+ """
368
+ self .tokens ["skype" ], self .tokenExpiry ["skype" ] = SkypeLiveAuthProvider (self ).auth (user , pwd )
369
+ self .getUserId ()
370
+ self .getRegToken ()
371
+
372
+ def soapLogin (self , user , pwd ):
373
+ """
374
+ Perform a login with the given email address or Skype username, and its password, using the Microsoft account
375
+ SOAP login APIs.
376
+
377
+ .. note::
378
+ Microsoft accounts with two-factor authentication enabled are supported if an application-specific password
379
+ is provided. Skype accounts must be linked to a Microsoft account with an email address, otherwise
380
+ :class:`.SkypeAuthException` will be raised. See the exception definitions for other possible causes.
381
+
382
+ Args:
383
+ user (str): username or email address of the connecting account
384
+ pwd (str): password of the connecting account
385
+
386
+ Returns:
387
+ (str, datetime.datetime) tuple: Skype token, and associated expiry if known
388
+
364
389
Raises:
365
390
.SkypeAuthException: if the login request is rejected
366
391
.SkypeApiException: if the login form can't be processed
@@ -390,7 +415,7 @@ def guestLogin(self, url, name):
390
415
391
416
def getSkypeToken (self ):
392
417
"""
393
- A wrapper for :meth:`liveLogin` that applies the previously given username and password.
418
+ A wrapper for the default login provider that applies the previously given username and password.
394
419
395
420
Raises:
396
421
.SkypeAuthException: if credentials were never provided
0 commit comments