libtransport.git Changeset - 2e508b97c36f

Changeset - 2e508b97c36f

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 9 years ago 2016-01-27 15:54:31
jkaluza@redhat.com

Slack: get_oauth2_url now stores uin/password in the state data and use them when registering the user - this makes the registration easier from web interface side

3 files changed with 33 insertions and 23 deletions:

spectrum/src/frontends/slack/SlackSession.cpp

spectrum/src/frontends/slack/SlackUserRegistration.cpp

spectrum_manager/src/APIServer.cpp

0 comments (0 inline, 0 general)

spectrum/src/frontends/slack/SlackSession.cpp

➞

Show inline comments

 		msg += "```.spectrum2 register <3rdPartyNetworkAccount> <3rdPartyPassword> <#SlackChannel>``` Registers 3rd-party account for transportation.";
 		m_rtm->sendMessage(m_ownerChannel, msg);
+	}
 	else {
 		m_rtm->sendMessage(m_ownerChannel, "Unknown command. Use `.spectrum2 help` for help.");
+	}
 // 	else {
 // 		m_rtm->sendMessage(m_ownerChannel, "Unknown command. Use `.spectrum2 help` for help.");
 // 	}
+}
 void SlackSession::handleDisconnected() {

spectrum/src/frontends/slack/SlackUserRegistration.cpp

➞

Show inline comments

 		return "The token you have provided is invalid";
+	}
 	std::string slackChannel;
 	std::string uin;
 	std::string password;
 	if (data.size() == 4) {
 		slackChannel = data[1];
 		uin = data[2];
 		password = data[3];
+	}
 	UserInfo user;
 	user.uin = "";
 	user.password = "";
 	user.id = 0;
 	m_storageBackend->getUser(domain, user);
 	value = user.jid;
 	user.jid = domain;
 	user.uin = uin;
 	user.password = password;
 	user.language = "en";
 	user.encoding = "";
 	user.vip = 0;
 	m_storageBackend->getUser(user.jid, user);
 	if (!value.empty()) {
 		m_storageBackend->getUserSetting(user.id, "slack_channel", type, value);
 	if (!slackChannel.empty()) {
 		m_storageBackend->getUserSetting(user.id, "slack_channel", type, slackChannel);
+	}
 	value = token;

spectrum_manager/src/APIServer.cpp

➞

Show inline comments

 		send_ack(conn, true, "Insufficient data.");
+	}
 	else {
 		std::string response = server->send_command(instance, "register " + jid + " " + uin + " " + password);
 		// Check if the frontend wants to use OAuth2 (Slack for example).
 		std::string response = server->send_command(instance, "get_oauth2_url " + jid + " " + uin + " " + password);
 		if (!response.empty()) {
 			std::string value = jid;
 			int type = (int) TYPE_STRING;
 			m_storage->updateUserSetting(info.id, instance, value);
 			Document json;
 			json.SetObject();
 			json.AddMember("error", false, json.GetAllocator());
 			json.AddMember("oauth2_url", response.c_str(), json.GetAllocator());
 			send_json(conn, json);
+		}
 		else {
 			send_ack(conn, true, response);
 			return;
+		}
 		Document json;
 		json.SetObject();
 		json.AddMember("error", false, json.GetAllocator());
 		response = server->send_command(instance, "get_oauth2_url " + jid);
 		if (!response.empty()) {
 			json.AddMember("oauth2_url", response.c_str(), json.GetAllocator());
 			response = server->send_command(instance, "register " + jid + " " + uin + " " + password);
 			if (!response.empty()) {
 				std::string value = jid;
 				int type = (int) TYPE_STRING;
 				m_storage->updateUserSetting(info.id, instance, value);
+			}
 			else {
 				send_ack(conn, true, response);
 				return;
+			}
+		}
 		send_json(conn, json);
+	}
+}

0 comments (0 inline, 0 general)