github enterprise in progress (but mostly done)

cstryker · cstryker · commit 3c91e2211b8c · 2019-03-07T22:13:45.000-08:00
diff --git a/api_server/lib/oauth2/oauth2_module.js b/api_server/lib/oauth2/oauth2_module.js
@@ -277,9 +277,11 @@ class OAuth2Module extends APIServerModule {
 		const instances = {};
 		if (this.oauthConfig.host && (this.apiConfig.appClientId || this.apiConfig.apiKey)) {
 			const host = this.oauthConfig.host.toLowerCase();
+			const apiHost = this.oauthConfig.apiHost.toLowerCase();
 			instances[host] = {
 				public: true,
 				host,
+				apiHost,
 				hasIssues: this.oauthConfig.hasIssues
 			};
 		}
diff --git a/api_server/modules/asana_auth/asana_auth.js b/api_server/modules/asana_auth/asana_auth.js
@@ -7,6 +7,7 @@ const OAuth2Module = require(process.env.CS_API_TOP + '/lib/oauth2/oauth2_module
 const OAUTH_CONFIG = {
 	provider: 'asana',
 	host: 'app.asana.com',
+	apiHost: 'app.asana.com',
 	authPath: '-/oauth_authorize',
 	tokenPath: '-/oauth_token',
 	exchangeFormat: 'form',
diff --git a/api_server/modules/bitbucket_auth/bitbucket_auth.js b/api_server/modules/bitbucket_auth/bitbucket_auth.js
@@ -7,6 +7,7 @@ const OAuth2Module = require(process.env.CS_API_TOP + '/lib/oauth2/oauth2_module
 const OAUTH_CONFIG = {
 	provider: 'bitbucket',
 	host: 'bitbucket.org',
+	apiHost: 'api.bitbucket.org/2.0',
 	authPath: 'site/oauth2/authorize',
 	tokenPath: 'site/oauth2/access_token',
 	exchangeFormat: 'form',
diff --git a/api_server/modules/codemarks/codemark_attributes.js b/api_server/modules/codemarks/codemark_attributes.js
@@ -102,6 +102,11 @@ module.exports = {
 		maxLength: 25,
 		description: 'External provider for this codemark (eg. github, trello)'
 	},
+	externalProviderHost: {
+		type: 'string',
+		maxLength: 200,
+		description: 'Host of the external provider, which may be an enterprise installation'
+	},
 	externalProviderUrl: {
 		type: 'string',
 		maxLength: 1000,
diff --git a/api_server/modules/codemarks/codemark_creator.js b/api_server/modules/codemarks/codemark_creator.js
@@ -71,7 +71,7 @@ class CodemarkCreator extends ModelCreator {
 				string: ['teamId', 'type']
 			},
 			optional: {
-				string: ['postId', 'streamId', 'parentPostId', 'providerType', 'status', 'color', 'title', 'text', 'externalProvider', 'externalProviderUrl'],
+				string: ['postId', 'streamId', 'parentPostId', 'providerType', 'status', 'color', 'title', 'text', 'externalProvider', 'externalProviderHost', 'externalProviderUrl'],
 				object: ['remoteCodeUrl', 'threadUrl'],
 				'array(object)': ['markers', 'externalAssignees'],
 				'array(string)': ['assignees'],
diff --git a/api_server/modules/codemarks/post_codemark_request.js b/api_server/modules/codemarks/post_codemark_request.js
@@ -124,7 +124,8 @@ class PostCodemarkRequest extends PostRequest {
 				'title': '<Title of the codemark>',
 				'assignees': '<Array of IDs representing users assigned to the codemark, for issues>',
 				'markers': '<Array of @@#marker objects#marker@@ representing markers to be created for this codemark>',
-				'externalProvider': '<For externally linked issues, the name of the provider servier (eg. jira, asana)>',
+				'externalProvider': '<For externally linked issues, the name of the provider service (eg. jira, asana)>',
+				'externalProviderHost': '<For externally linked issues, the host to the provdier service, which may be an enterprise installation>',
 				'externalProviderUrl': '<For externally linked issues, the URL to access the issue>',
 				'externalAssignees': '<For externally linked issues, array of assignees to the issue, expected to be objects with at least displayName>',
 				'remoteCodeUrl': '<Object referencing a link to the code block references by this codemark in an external provider, contains "name" and "url">',
diff --git a/api_server/modules/github_auth/github_auth.js b/api_server/modules/github_auth/github_auth.js
@@ -7,6 +7,7 @@ const OAuth2Module = require(process.env.CS_API_TOP + '/lib/oauth2/oauth2_module
 const OAUTH_CONFIG = {
 	provider: 'github',
 	host: 'github.com',
+	apiHost: 'api.github.com',
 	authPath: 'login/oauth/authorize',
 	tokenPath: 'login/oauth/access_token',
 	exchangeFormat: 'query',
diff --git a/api_server/modules/gitlab_auth/gitlab_auth.js b/api_server/modules/gitlab_auth/gitlab_auth.js
@@ -7,6 +7,7 @@ const OAuth2Module = require(process.env.CS_API_TOP + '/lib/oauth2/oauth2_module
 const OAUTH_CONFIG = {
 	provider: 'gitlab',
 	host: 'gitlab.com',
+	apiHost: 'gitlab.com/api/v4',
 	authPath: 'oauth/authorize',
 	tokenPath: 'oauth/token',
 	exchangeFormat: 'query',
diff --git a/api_server/modules/glip_auth/glip_auth.js b/api_server/modules/glip_auth/glip_auth.js
@@ -7,6 +7,7 @@ const OAuth2Module = require(process.env.CS_API_TOP + '/lib/oauth2/oauth2_module
 const OAUTH_CONFIG = {
 	provider: 'glip',
 	host: 'api.ringcentral.com',
+	apiHost: 'api.ringcentral.com',
 	authPath: 'restapi/oauth/authorize',
 	tokenPath: 'restapi/oauth/token',
 	exchangeFormat: 'form',
diff --git a/api_server/modules/jira_auth/jira_auth.js b/api_server/modules/jira_auth/jira_auth.js
@@ -7,6 +7,7 @@ const OAuth2Module = require(process.env.CS_API_TOP + '/lib/oauth2/oauth2_module
 const OAUTH_CONFIG = {
 	provider: 'jira',
 	host: 'auth.atlassian.com',
+	apiHost: 'api.atlassian.com',
 	authPath: 'authorize',
 	tokenPath: 'oauth/token',
 	exchangeFormat: 'json',
diff --git a/api_server/modules/msteams_auth/msteams_auth.js b/api_server/modules/msteams_auth/msteams_auth.js
@@ -7,6 +7,7 @@ const OAuth2Module = require(process.env.CS_API_TOP + '/lib/oauth2/oauth2_module
 const OAUTH_CONFIG = {
 	provider: 'msteams',
 	host: 'login.microsoftonline.com',
+	apiHost: 'graph.microsoft.com/v1.0',
 	authPath: 'common/oauth2/v2.0/authorize',
 	tokenPath: 'common/oauth2/v2.0/token',
 	exchangeFormat: 'form',
diff --git a/api_server/modules/slack_auth/slack_auth.js b/api_server/modules/slack_auth/slack_auth.js
@@ -8,6 +8,7 @@ const ProviderInfoAuthorizer = require('./provider_info_authorizer');
 const OAUTH_CONFIG = {
 	provider: 'slack',
 	host: 'slack.com',
+	apiHost: 'slack.com/api',
 	authPath: 'oauth/authorize',
 	tokenPath: 'api/oauth.access',
 	exchangeFormat: 'form',
diff --git a/api_server/modules/teams/team_attributes.js b/api_server/modules/teams/team_attributes.js
@@ -50,5 +50,10 @@ module.exports = {
 		type: 'string',
 		maxLength: 20,
 		serverOnly: true
+	},
+	providerHosts: {
+		type: 'object',
+		maxLength: 10000,
+		serverOnly: true
 	}
 };
diff --git a/api_server/modules/trello_auth/trello_auth.js b/api_server/modules/trello_auth/trello_auth.js
@@ -7,6 +7,7 @@ const OAuth2Module = require(process.env.CS_API_TOP + '/lib/oauth2/oauth2_module
 const OAUTH_CONFIG = {
 	provider: 'trello',
 	host: 'trello.com',
+	apiHost: 'api.trello.com/1',
 	authPath: '1/authorize',
 	scopes: 'read,write',
 	additionalAuthCodeParameters: {
diff --git a/api_server/modules/users/login_helper.js b/api_server/modules/users/login_helper.js
@@ -135,6 +135,7 @@ class LoginHelper {
 					prev.push({
 						name: provider,
 						host: instance.host,
+						apiHost: instance.apiHost,
 						isEnterprise: !instance.public,
 						hasIssues: instance.hasIssues
 					});
diff --git a/api_server/modules/users/provider_deauth_request.js b/api_server/modules/users/provider_deauth_request.js
@@ -45,6 +45,7 @@ class ProviderDeauthRequest extends RestfulRequest {
 			host = host.toLowerCase().replace(/\./g, '*');
 			key += `.hosts.${host}`;
 		}
+		// key += '.accessToken';
 		const op = {
 			$unset: {
 				[key]: true
diff --git a/api_server/modules/users/provider_token_request.js b/api_server/modules/users/provider_token_request.js
@@ -193,7 +193,10 @@ class ProviderTokenRequest extends RestfulRequest {
 		delete op.id;
 		delete op._id;
 		op.$set = op.$set || {};
-		op.$set[setKey] = this.tokenData;
+		for (let key of Object.keys(this.tokenData)) {
+			const dataKey = `${setKey}.${key}`;
+			op.$set[dataKey] = this.tokenData[key];
+		}
 		op.$set.modifiedAt = modifiedAt;
 
 		this.transforms.userUpdate = await new ModelSaver({
diff --git a/api_server/modules/users/test/provider_deauth/common_init.js b/api_server/modules/users/test/provider_deauth/common_init.js
@@ -83,6 +83,7 @@ class CommonInit {
 			this.data.host = host;
 			key += `.hosts.${host}`;
 		}
+		//key += '.accessToken';
 		this.message = this.expectedResponse = {
 			user: {
 				_id: this.currentUser.user.id, 	// DEPRECATE ME
