+ * + * Typically, servers require no attributes when creating new accounts, or just + * the user's email address. + * + * @return the required account attributes. + */ public Iterator getAccountAttributes() { try { if (info == null) { @@ -54,30 +135,52 @@ public class AccountManager { return Collections.EMPTY_LIST.iterator(); } + /** + * Creates a new account using the specified username and password. The server may + * require a number of extra account attributes such as an email address and phone + * number. In that case, Smack will attempt to automatically set all required + * attributes with blank values, which may or may not be accepted by the server. + * Therefore, it's recommended to check the required account attributes and to let + * the end-user populate them with real values instead. + * + * @param username the username. + * @param password the password. + * @throws XMPPException if an error occurs creating the account. + */ public void createAccount(String username, String password) throws XMPPException { - if (!supportsAccountCreation()) { - throw new XMPPException("Server does not support account creation."); + // Create a map for all the required attributes, but give them blank values. + Map attributes = new HashMap(); + for (Iterator i=getAccountAttributes(); i.hasNext(); ) { + String attributeName = (String)i.next(); + attributes.put(attributeName, ""); } + createAccount(username, password, attributes); } + /** + * Creates a new account using the specified username, password and account attributes. + * The attributes Map must contain only String name/value pairs and must also have values + * for all required attributes. + * + * @param username the username. + * @param password the password. + * @param attributes the account attributes. + * @throws XMPPException if an error occurs creating the account. + * @see #getAccountAttributes() + */ public void createAccount(String username, String password, Map attributes) throws XMPPException { - - } - - public void deleteAccount() throws XMPPException { - if (!connection.isAuthenticated()) { - throw new IllegalStateException("Must be logged in to delete a account."); + if (!supportsAccountCreation()) { + throw new XMPPException("Server does not support account creation."); } Registration reg = new Registration(); reg.setType(IQ.Type.SET); - Map attributes = new HashMap(); - // To delete an account, we add a single attribute, "remove", that is blank. - attributes.put("remove", ""); + reg.setUsername(username); + reg.setPassword(password); reg.setAttributes(attributes); PacketFilter filter = new AndFilter(new PacketIDFilter(reg.getPacketID()), - new PacketTypeFilter(Registration.class)); + new PacketTypeFilter(IQ.class)); PacketCollector collector = connection.createPacketCollector(filter); connection.sendPacket(reg); IQ result = (IQ)collector.nextResult(5000); @@ -89,6 +192,68 @@ public class AccountManager { } } + /** + * Changes the password of the currently logged-in account. This operation can only + * be performed after a successful login operation has been completed. Not all servers + * support changing passwords; an XMPPException will be thrown when that is the case. + * + * @throws IllegalStateException if not currently logged-in to the server. + * @throws XMPPException if an error occurs when changing the password. + */ + public void changePassword(String newPassword) throws XMPPException { + Registration reg = new Registration(); + reg.setType(IQ.Type.SET); + reg.setUsername(connection.getUsername()); + reg.setPassword(newPassword); + PacketFilter filter = new AndFilter(new PacketIDFilter(reg.getPacketID()), + new PacketTypeFilter(IQ.class)); + PacketCollector collector = connection.createPacketCollector(filter); + connection.sendPacket(reg); + IQ result = (IQ)collector.nextResult(5000); + if (result == null) { + throw new XMPPException("No response from server."); + } + else if (result.getType() == IQ.Type.ERROR) { + throw new XMPPException(result.getError()); + } + } + + /** + * Deletes the currently logged-in account from the server. This operation can only + * be performed after a successful login operation has been completed. Not all servers + * support deleting accounts; an XMPPException will be thrown when that is the case. + * + * @throws IllegalStateException if not currently logged-in to the server. + * @throws XMPPException if an error occurs when deleting the account. + */ + public void deleteAccount() throws XMPPException { + if (!connection.isAuthenticated()) { + throw new IllegalStateException("Must be logged in to delete a account."); + } + Registration reg = new Registration(); + reg.setType(IQ.Type.SET); + Map attributes = new HashMap(); + // To delete an account, we add a single attribute, "remove", that is blank. + attributes.put("remove", ""); + reg.setAttributes(attributes); + PacketFilter filter = new AndFilter(new PacketIDFilter(reg.getPacketID()), + new PacketTypeFilter(IQ.class)); + PacketCollector collector = connection.createPacketCollector(filter); + connection.sendPacket(reg); + IQ result = (IQ)collector.nextResult(5000); + if (result == null) { + throw new XMPPException("No response from server."); + } + else if (result.getType() == IQ.Type.ERROR) { + throw new XMPPException(result.getError()); + } + } + + /** + * Gets the account registration info from the server. + * + * @throws XMPPException if an error occurs. + */ private synchronized void getRegistrationInfo() throws XMPPException { Registration reg = new Registration(); PacketFilter filter = new AndFilter(new PacketIDFilter(reg.getPacketID()), diff --git a/source/org/jivesoftware/smack/XMPPConnection.java b/source/org/jivesoftware/smack/XMPPConnection.java index 00df24970..d657222cb 100644 --- a/source/org/jivesoftware/smack/XMPPConnection.java +++ b/source/org/jivesoftware/smack/XMPPConnection.java @@ -101,6 +101,8 @@ public class XMPPConnection { protected Socket socket; String connectionID; + private String username = null; + private String resource = null; private boolean connected = false; private boolean authenticated = false; @@ -183,6 +185,31 @@ public class XMPPConnection { return port; } + /** + * Returns the username that was used to login or null if not logged in yet. + * + * @return the username used to login. + */ + public String getUsername() { + if (!isAuthenticated()) { + return null; + } + return username; + } + + /** + * Returns the resource that was used to login or null if not logged in yet. + * If no resource was used to login, the default resource "Smack" will be returned. + * + * @return the resource used to login. + */ + public String getResource() { + if (!isAuthenticated()) { + return null; + } + return resource; + } + /** * Logs in to the server using the strongest authentication mode supported by * the server, then set our presence to available. If more than five seconds @@ -219,6 +246,8 @@ public class XMPPConnection { if (authenticated) { throw new IllegalStateException("Already logged in to server."); } + this.username = username; + this.resource = resource; // If we send an authentication packet in "get" mode with just the username, // the server will return the list of authentication protocols it supports. Authentication discoveryAuth = new Authentication(); @@ -302,8 +331,9 @@ public class XMPPConnection { } /** - * Returns an account manager instance for this - * @return + * Returns an account manager instance for this connection. + * + * @return an account manager for this connection. */ public synchronized AccountManager getAccountManager() { if (accountManager == null) {