Merge pull request #49 from swdotcom/migrate-auth-endpoints

migrate auth endpoints and remove local integrations

Author: xavluiz

Default.sublime-commands

@@ -17,7 +17,7 @@
     },
     {
         "command": "show_tree_view",
-        "caption": "Code Time: More Options"
+        "caption": "Code Time: Menu"
     },
     {
         "command": "switch_account",

Main.sublime-menu

@@ -27,7 +27,7 @@
                     },
                     {
                         "command": "show_tree_view",
-                        "caption": "More Options"
+                        "caption": "Menu"
                     },
                     {
                         "command": "switch_account",

lib/CommonUtil.py

@@ -173,25 +173,6 @@ def getSoftwareDirName():
 def sublime_variables(view):
     view.window().extract_variables()
 
-def getIntegrationsFile():
-    file = getSoftwareDir(True)
-    return os.path.join(file, 'integrations.json')
-
-def getIntegrations():
-    try:
-        with open(getIntegrationsFile(), encoding='utf-8') as integrationsFile:
-            loadedIntegrationsFile = json.load(integrationsFile)
-            return loadedIntegrationsFile
-    except Exception:
-        return []
-
-def syncIntegrations(integrations_data):
-    content = json.dumps(integrations_data)
-
-    integrationsFile = getIntegrationsFile()
-    with open(integrationsFile, 'w') as f:
-        f.write(content)
-
 def getWebUrl():
     return getValue("software_dashboard_url", "https://app.software.com")
 

lib/SlackManager.py

@@ -19,222 +19,39 @@
 pendingCallback = None
 
 def getSlackWorkspaces():
-	integrations = getIntegrations()
-	workspaces = [x for x in integrations if (x['name'].lower() == 'slack' and x['status'].lower() == 'active')]
-	return workspaces if workspaces is not None and len(workspaces) > 0 else []
+    currentUser = getUser(False)
+
+    if (currentUser):
+        integrations =  currentUser.get("integration_connections", [])
+
+        workspaces = [x for x in integrations if (x['integration_type_id'] == 14 and x['status'].lower() == 'active')]
+        return workspaces if workspaces is not None and len(workspaces) > 0 else []
+
+    return []
 
 def hasSlackWorkspaces():
 	return True if len(getSlackWorkspaces()) > 0 else False
 
 def disconnectSlackWorkspace():
-	result = checkSlackConnection(False)
-	if (result is False):
-		# show a prompt there are no slack workspaces to disconnect
-		sublime.message_dialog("No Slack workspaces found to disconnect")
-
-	# set the pending callback
-	global pendingCallback
-	pendingCallback = disconnectSlackWorkspaceCallback
-	showSlackWorkspaceSelection()
-
-def disconnectSlackWorkspaceCallback(workspace):
-	if (workspace is not None):
-		removeSlackIntegration(workspace['authId'])
-	else:
-		clearPendingCallback()
+	launchSlackSettings()
 
 def connectSlackWorkspace():
-	is_registered = checkRegistration(True)
-	if (is_registered is False):
-		return
-
-	params = {}
-	params["plugin"] = getPluginType()
-	params["plugin_uuid"] = getPluginUuid()
-	params["pluginVersion"] = getVersion()
-	params["plugin_id"] = getPluginId()
-	params["auth_callback_state"] = getAuthCallbackState()
-	params["integrate"] = "slack"
-	params["plugin_token"] = getItem("jwt")
+	launchSlackSettings()
 
+	t = Timer(10, refetchSlackConnectStatusLazily, [40])
+	t.start()
 
-	api_endpoint = getApiEndpoint()
+def launchSlackSettings():
 	scheme = "https"
-	if('localhost' in api_endpoint):
+	if('localhost' in getApiEndpoint()):
 		scheme = "http"
-	url = scheme + "://" + api_endpoint + "/auth/slack?" + urlencode(params)
+	url = scheme + "://" + getWebUrl() + "data_sources/integration_types/slack"
 	webbrowser.open(url)
 
-	t = Timer(10, refetchSlackConnectStatusLazily, [40])
-	t.start()
-
-def getSlackDnDInfo():
-	workspaces = getSlackWorkspaces()
-	for i in range(len(workspaces)):
-		workspace = workspaces[i]
-		resp = api_call('dnd.info', {'token': workspace["access_token"]})
-		if (resp['ok'] is True):
-			# return the 1st one
-			return resp
-
-	return None
-
-def getSlackStatus():
-	workspaces = getSlackWorkspaces()
-	for i in range(len(workspaces)):
-		workspace = workspaces[i]
-		resp = api_call('users.profile.get', {'token': workspace["access_token"]})
-		if (resp['ok'] is True):
-			# return the 1st one
-			return resp
-
-	return None
-
-def getSlackPresence():
-	workspaces = getSlackWorkspaces()
-	for i in range(len(workspaces)):
-		workspace = workspaces[i]
-		resp = api_call('users.getPresence', {'token': workspace["access_token"]})
-		if (resp['ok'] is True):
-			# return the 1st one
-			return resp
-
-	return None
-
-# accepted states: "auto" or "away"
-def toggleSlackPresence(state):
-	is_registered = checkRegistration(True)
-	if (is_registered is False):
-		return
-
-	is_connected = checkSlackConnection(True)
-	if (is_connected is False):
-		return
-
-	updated = False
-	workspaces = getSlackWorkspaces()
-	for i in range(len(workspaces)):
-		workspace = workspaces[i]
-		resp = api_call('users.setPresence', {'token': workspace["access_token"], 'presence': state})
-		if (resp['ok'] is True):
-			updated = True
-
-	if (updated is True):
-		sublime.message_dialog("Slack presence updated")
-
-def updateSlackStatusText(message):
-	updated = False
-	workspaces = getSlackWorkspaces()
-	for i in range(len(workspaces)):
-		workspace = workspaces[i]
-		resp = api_call('users.profile.set', {'token': workspace["access_token"], 'profile': {'status_text': message, 'status_emoji': "", 'status_expiration': 0}})
-		if (resp['ok'] is True):
-			updated = True
-
-	if (updated is True):
-		sublime.message_dialog("Slack status message updated")
-
-def clearSlackStatusText():
-	updated = False
-	workspaces = getSlackWorkspaces()
-	for i in range(len(workspaces)):
-		workspace = workspaces[i]
-		resp = api_call('users.profile.set', {'token': workspace["access_token"], 'profile': {'status_text': "", 'status_emoji': ""}})
-		if (resp['ok'] is True):
-			updated = True
-
-	if (updated is True):
-		sublime.message_dialog("Slack status message cleared")
-
 #######################################################################################
 # PRIVATE METHODS
 #######################################################################################
 
-# done
-def showSlackWorkspaceSelection():
-	workspaces = getSlackWorkspaces()
-	# create the options
-	options = []
-	for i in range(len(workspaces)):
-		workspace = workspaces[i]
-		options.append(workspace['team_domain'] + " (" + workspace['team_name'] + ")")
-
-	# show a prompt of which workspace to get the access token from
-	sublime.active_window().show_quick_panel(options, showSlackWorkspaceSelectionHandler)
-
-# done
-def showSlackWorkspaceSelectionHandler(result_idx):
-	# -1 means nothing was selected
-	if (result_idx == -1):
-		global pendingCallback
-		pendingCallback = None
-		return
-
-	workspaces = getSlackWorkspaces()
-	if (len(workspaces) > result_idx):
-		# perform the waiting callback
-		pendingCallback(workspaces[result_idx])
-	else:
-		clearPendingCallback()
-
-# done
-def checkSlackConnection(show_connect=True):
-	if (hasSlackWorkspaces() is False):
-		clearPendingCallback()
-		if (show_connect is True):
-			# show the prompt
-			options = ['Connect a Slack workspace to continue', 'Not now']
-			sublime.active_window().show_quick_panel(options, connectSlackPromptHandler)
-		return False
-	else:
-		return True
-
-# done
-def connectSlackPromptHandler(result_idx):
-	# zero means they've selected to connect slack
-	if (result_idx != 0):
-		clearPendingCallback()
-	else:
-		# connect
-		connectSlackWorkspace()
-
-# done
-def removeSlackIntegration(auth_id):
-	new_workspaces = [x for x in getSlackWorkspaces() if (x['authId'] != auth_id)]
-	syncIntegrations(new_workspaces)
-	clearPendingCallback()
-
-def clearPendingCallback():
-	global pendingCallback
-	pendingCallback = None
-
-def checkRegistration(show_signup=True):
-	name = getItem("name")
-	if (name is None):
-		clearPendingCallback()
-		if (show_signup is True):
-			# show the signup confirm
-			options = ['Connecting Slack requires a registered account. Sign up or log in to continue.', 'Not now']
-			sublime.active_window().show_quick_panel(options, signupPromptHandler)
-		return False
-	
-	return True
-
-def signupPromptHandler(result_idx):
-	# zero means they've selected to sign up
-	if (result_idx == 0):
-		# show the sign up flow
-		signupOptions = ['Google', 'GitHub', 'Email']
-		sublime.active_window().show_quick_panel(signupOptions, authSelectionHandler)
-
-def authSelectionHandler(result_idx):
-	if (result_idx == 0):
-		launchLoginUrl('google', False)
-	elif (result_idx == 1):
-		launchLoginUrl('github', False)
-	elif (result_idx == 2):
-		launchLoginUrl('software', False)
-
 def refetchSlackConnectStatusLazily(try_count=40):
 	foundSlackAuth = getSlackAuth()
 	if (foundSlackAuth is False):
@@ -249,12 +66,8 @@ def refetchSlackConnectStatusLazily(try_count=40):
 		sublime.message_dialog("Successfully connected to Slack")
 
 def getSlackAuth():
-	foundNewIntegration = False
-	userState = getUserRegistrationState(True)
-
-	if (userState["user"] is not None):
-		foundNewIntegration = updateSlackIntegrationsFromUser(userState["user"])
+	curentUser = getUser(True)
 
-	return foundNewIntegration
+	return hasSlackWorkspaces()
 
 

lib/SoftwareHttp.py

@@ -9,6 +9,7 @@
 lastMsg = None
 windowView = None
 version = None
+currentUser = None
 
 def toggleStatus():
     global lastMsg
@@ -170,17 +171,24 @@ def createAnonymousUser():
             logIt("Code Time: Unable to complete anonymous user creation: %s" % ex)
     return None
 
-def getUser():
+def getUser(refreshUser=True):
+    global currentUser
+
+    if refreshUser is False and currentUser is not None:
+        return currentUser
+
     jwt = getItem("jwt")
     if (jwt):
         api = "/users/me"
         response = requestIt("GET", api, None, jwt)
         if (isResponseOk(response)):
             try:
                 responseObj = json.loads(response.read().decode('utf-8'))
-                user = responseObj.get("data", None)
-                return user
+                currentUser = responseObj.get("data", None)
+                return currentUser
             except Exception as ex:
                 logIt("Code Time: Unable to retrieve user: %s" % ex)
     return None
 
+
+