Allow a username different than the user part of a JID to be used for all SASL-based authentication methods.

Author: Jon Hjelle

Authentication/Digest-MD5/XMPPDigestMD5Authentication.m

@@ -70,10 +70,16 @@ + (NSString *)mechanismName
 @synthesize password;
 
 - (id)initWithStream:(XMPPStream *)stream password:(NSString *)inPassword
+{
+	return [self initWithStream:stream username:nil password:inPassword];
+}
+
+- (id)initWithStream:(XMPPStream *)stream username:(NSString *)inUsername password:(NSString *)inPassword
 {
 	if ((self = [super init]))
 	{
 		xmppStream = stream;
+		username = inUsername;
 		password = inPassword;
 	}
 	return self;
@@ -140,7 +146,10 @@ - (XMPPHandleAuthResponse)handleAuth1:(NSXMLElement *)authResponse
 	if (cnonce == nil)
 		cnonce = [XMPPStream generateUUID];
 
-	username = [myJID user];
+	if (username == nil)
+	{
+		username = [myJID user];
+	}
 
 	// Create and send challenge response element
 

Authentication/Plain/XMPPPlainAuthentication.h

@@ -9,13 +9,6 @@
 // 
 // See XMPPSASLAuthentication.h for more information.
 
-/**
- * Use this init method if the username used for authentication does not match the user part of the JID.
- * If inUsername is nil, the user part of the JID will be used. The standard init method will use the
- * user part of the JID as the username.
-**/
-- (id)initWithStream:(XMPPStream *)stream username:(NSString *)inUsername password:(NSString *)inPassword;
-
 @end
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Authentication/Plain/XMPPPlainAuthentication.m

@@ -34,6 +34,11 @@ + (NSString *)mechanismName
 	return @"PLAIN";
 }
 
+- (id)initWithStream:(XMPPStream *)stream password:(NSString *)inPassword
+{
+	return [self initWithStream:stream username:nil password:inPassword];
+}
+
 - (id)initWithStream:(XMPPStream *)stream username:(NSString *)inUsername password:(NSString *)inPassword
 {
 	if ((self = [super init]))
@@ -45,11 +50,6 @@ - (id)initWithStream:(XMPPStream *)stream username:(NSString *)inUsername passwo
 	return self;
 }
 
-- (id)initWithStream:(XMPPStream *)stream password:(NSString *)inPassword
-{
-	return [self initWithStream:stream username:nil password:inPassword];
-}
-
 - (BOOL)start:(NSError **)errPtr
 {
 	XMPPLogTrace();

Authentication/SCRAM-SHA-1/XMPPSCRAMSHA1Authentication.m

@@ -64,10 +64,22 @@ + (NSString *)mechanismName
 }
 
 - (id)initWithStream:(XMPPStream *)stream password:(NSString *)password
+{
+	return [self initWithStream:stream username:nil password:inPassword];
+}
+
+- (id)initWithStream:(XMPPStream *)stream username:(NSString *)inUsername password:(NSString *)inPassword
 {
     if ((self = [super init])) {
         xmppStream = stream;
-        _username = [XMPPStringPrep prepNode:[xmppStream.myJID user]];
+        if (inUsername)
+        {
+        	_username = inUsername;
+        }
+        else
+        {
+			_username = [XMPPStringPrep prepNode:[xmppStream.myJID user]];
+        }
         _password = [XMPPStringPrep prepPassword:password];
         _hashAlgorithm = kCCHmacAlgSHA1;
     }

Authentication/XMPPSASLAuthentication.h

@@ -58,6 +58,13 @@ typedef NS_ENUM(NSInteger, XMPPHandleAuthResponse) {
 **/
 - (id)initWithStream:(XMPPStream *)stream password:(NSString *)password;
 
+/**
+ * Use this init method if the username used for authentication does not match the user part of the JID.
+ * If username is nil, the user part of the JID will be used.
+ * The standard init method uses this init method, passing nil for the username.
+**/
+- (id)initWithStream:(XMPPStream *)stream username:(NSString *)username password:(NSString *)password;
+
 /**
  * Attempts to start the authentication process.
  * The auth mechanism should send whatever stanzas are needed to begin the authentication process.