Skip to content
This repository was archived by the owner on Nov 15, 2024. It is now read-only.

Commit 371f441

Browse files
authored
NR-252460 Staging: The passed signup token was not found (#428)
1 parent f84795d commit 371f441

File tree

7 files changed

+10
-15
lines changed

7 files changed

+10
-15
lines changed

api_server/modules/users/check_signup_request.js

+2-6
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class CheckSignupRequest extends RestfulRequest {
9898
user: this.user,
9999
loginType: this.loginType,
100100
dontSetFirstSession: this.signupToken.provider && !this.signupToken.teamId,
101-
nrAccountId: this.request.body.nrAccountId
101+
nrAccountId: this.request.body.nrAccountId,
102102
}).login();
103103
this.responseData.signupStatus = this.signupToken.signupStatus;
104104
this.responseData.provider = this.signupToken.provider;
@@ -125,7 +125,7 @@ class CheckSignupRequest extends RestfulRequest {
125125
}
126126
},
127127
returns: {
128-
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',
128+
summary: 'Returns an updated user object, plus access token and PubNub subscription key, and teams the user is on',
129129
looksLike: {
130130
user: '<@@#user object#user@@>',
131131
accessToken: '<user\'s access token, to be used in future requests>',
@@ -136,10 +136,6 @@ class CheckSignupRequest extends RestfulRequest {
136136
teams: [
137137
'<@@#team object#team@@>',
138138
'...'
139-
],
140-
repos: [
141-
'<@@#repo object#repo@@>',
142-
'...'
143139
]
144140
}
145141
},

api_server/modules/users/initial_data_fetcher.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class InitialDataFetcher {
2222
await this.getTeams(); // get the teams they are a member of
2323
await this.getCompanies(); // get the companies associated with these teams
2424
this.updateTeamPlans(); // copy company plan info to their teams
25-
await this.getRepos(); // get the repos owned by their teams
25+
// await this.getRepos(); // get the repos owned by their teams
2626
await this.getStreams(); // get streams owned by the teams
2727
return this.initialData;
2828
}

api_server/modules/users/test/confirmation/initial_data_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class InitialDataTest extends ConfirmationTest {
4545
// been invited to by accepting the invite ... so we should see NO team data in the initial data
4646
Assert(data.companies.length === 0, 'found companies in one-user-per-org response');
4747
Assert(data.teams.length === 0, 'found teams in one-user-per-org response');
48-
Assert(data.repos.length === 0, 'found repos in one-user-per-org response');
48+
Assert(!data.repos || data.repos.length === 0, 'found repos in one-user-per-org response');
4949
Assert(!data.streams, 'found streams in one-user-per-org response');
5050
if (!this.usingNRLogins) {
5151
Assert(data.user.eligibleJoinCompanies.length > 0, 'did not get an eligible join company in one-user-per-org response');

api_server/modules/users/test/login/initial_data_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class InitialDataTest extends LoginTest {
4848
this.validateMatchingObject(this.company.id, data.companies[0], 'company');
4949
Assert(data.teams.length === 1, 'no team in response');
5050
this.validateMatchingObject(this.team.id, data.teams[0], 'team');
51-
Assert(data.repos.length === 1, 'no repo in response');
52-
this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
51+
Assert(!data.repos, 'repo in response');
52+
// this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
5353
Assert(data.streams.length === 3, 'expected 3 streams');
5454
const teamStream = data.streams.find(stream => stream.isTeamStream);
5555
const fileStream = data.streams.find(stream => stream.type === 'file');

api_server/modules/users/test/login_by_code/initial_data_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class InitialDataTest extends LoginByCodeTest {
4040
this.validateMatchingObject(this.company.id, data.companies[0], 'company');
4141
Assert(data.teams.length === 1, 'no team in response');
4242
this.validateMatchingObject(this.team.id, data.teams[0], 'team');
43-
Assert(data.repos.length === 1, 'no repo in response');
44-
this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
43+
Assert(!data.repos, 'repo in response');
44+
// this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
4545
Assert(data.streams.length === 3, 'expected 3 streams');
4646
const teamStream = data.streams.find(stream => stream.isTeamStream);
4747
const fileStream = data.streams.find(stream => stream.type === 'file');

api_server/modules/users/test/raw_login/initial_data_test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ class InitialDataTest extends LoginTest {
4242
this.validateMatchingObject(this.company.id, data.companies[0], 'company');
4343
Assert(data.teams.length === 1, 'no team in response');
4444
this.validateMatchingObject(this.team.id, data.teams[0], 'team');
45-
Assert(data.repos.length === 1, 'no repo in response');
46-
this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
45+
Assert(!data.repos, 'repo in response');
46+
// this.validateMatchingObject(this.repo.id, data.repos[0], 'repo');
4747
Assert(data.streams.length === 3, 'expected 3 streams');
4848
const teamStream = data.streams.find(stream => stream.isTeamStream);
4949
const fileStream = data.streams.find(stream => stream.type === 'file');

api_server/modules/users/test/user_test_constants.js

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ const EXPECTED_LOGIN_RESPONSE = {
6363
pubnubKey: true,
6464

6565
teams: true,
66-
repos: true,
6766
isOnPrem: true,
6867
isProductionCloud: true,
6968
runtimeEnvironment: true,

0 commit comments

Comments
 (0)