Skip to content
This repository was archived by the owner on Nov 15, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions api_server/modules/users/check_signup_request.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ class CheckSignupRequest extends RestfulRequest {
user: this.user,
loginType: this.loginType,
dontSetFirstSession: this.signupToken.provider && !this.signupToken.teamId,
nrAccountId: this.request.body.nrAccountId
nrAccountId: this.request.body.nrAccountId,
}).login();
this.responseData.signupStatus = this.signupToken.signupStatus;
this.responseData.provider = this.signupToken.provider;
Expand All @@ -125,7 +125,7 @@ class CheckSignupRequest extends RestfulRequest {
}
},
returns: {
summary: 'Returns an updated user object, plus access token and PubNub subscription key, and teams the user is on as well as repos owned by those teams',
summary: 'Returns an updated user object, plus access token and PubNub subscription key, and teams the user is on',
looksLike: {
user: '<@@#user object#user@@>',
accessToken: '<user\'s access token, to be used in future requests>',
Expand All @@ -136,10 +136,6 @@ class CheckSignupRequest extends RestfulRequest {
teams: [
'<@@#team object#team@@>',
'...'
],
repos: [
'<@@#repo object#repo@@>',
'...'
]
}
},
Expand Down
2 changes: 1 addition & 1 deletion api_server/modules/users/initial_data_fetcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class InitialDataFetcher {
await this.getTeams(); // get the teams they are a member of
await this.getCompanies(); // get the companies associated with these teams
this.updateTeamPlans(); // copy company plan info to their teams
await this.getRepos(); // get the repos owned by their teams
// await this.getRepos(); // get the repos owned by their teams
await this.getStreams(); // get streams owned by the teams
return this.initialData;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class InitialDataTest extends ConfirmationTest {
// been invited to by accepting the invite ... so we should see NO team data in the initial data
Assert(data.companies.length === 0, 'found companies in one-user-per-org response');
Assert(data.teams.length === 0, 'found teams in one-user-per-org response');
Assert(data.repos.length === 0, 'found repos in one-user-per-org response');
Assert(!data.repos || data.repos.length === 0, 'found repos in one-user-per-org response');
Assert(!data.streams, 'found streams in one-user-per-org response');
if (!this.usingNRLogins) {
Assert(data.user.eligibleJoinCompanies.length > 0, 'did not get an eligible join company in one-user-per-org response');
Expand Down
4 changes: 2 additions & 2 deletions api_server/modules/users/test/login/initial_data_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ class InitialDataTest extends LoginTest {
this.validateMatchingObject(this.company.id, data.companies[0], 'company');
Assert(data.teams.length === 1, 'no team in response');
this.validateMatchingObject(this.team.id, data.teams[0], 'team');
Assert(data.repos.length === 1, 'no repo in response');
this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
Assert(!data.repos, 'repo in response');
// this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
Assert(data.streams.length === 3, 'expected 3 streams');
const teamStream = data.streams.find(stream => stream.isTeamStream);
const fileStream = data.streams.find(stream => stream.type === 'file');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ class InitialDataTest extends LoginByCodeTest {
this.validateMatchingObject(this.company.id, data.companies[0], 'company');
Assert(data.teams.length === 1, 'no team in response');
this.validateMatchingObject(this.team.id, data.teams[0], 'team');
Assert(data.repos.length === 1, 'no repo in response');
this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
Assert(!data.repos, 'repo in response');
// this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
Assert(data.streams.length === 3, 'expected 3 streams');
const teamStream = data.streams.find(stream => stream.isTeamStream);
const fileStream = data.streams.find(stream => stream.type === 'file');
Expand Down
4 changes: 2 additions & 2 deletions api_server/modules/users/test/raw_login/initial_data_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ class InitialDataTest extends LoginTest {
this.validateMatchingObject(this.company.id, data.companies[0], 'company');
Assert(data.teams.length === 1, 'no team in response');
this.validateMatchingObject(this.team.id, data.teams[0], 'team');
Assert(data.repos.length === 1, 'no repo in response');
this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
Assert(!data.repos, 'repo in response');
// this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
Assert(data.streams.length === 3, 'expected 3 streams');
const teamStream = data.streams.find(stream => stream.isTeamStream);
const fileStream = data.streams.find(stream => stream.type === 'file');
Expand Down
1 change: 0 additions & 1 deletion api_server/modules/users/test/user_test_constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ const EXPECTED_LOGIN_RESPONSE = {
pubnubKey: true,

teams: true,
repos: true,
isOnPrem: true,
isProductionCloud: true,
runtimeEnvironment: true,
Expand Down