Skip to content

Commit 9db9b3b

Browse files
cristiand391cristiand391
authored
feat: show client apps W-18394868 (#1444)
* feat: show client apps * chore: bump core
1 parent b98a926 commit 9db9b3b

File tree

8 files changed

+115
-19
lines changed

8 files changed

+115
-19
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {
88
"@oclif/core": "^4.3.0",
99
"@oclif/multi-stage-output": "^0.8.13",
10-
"@salesforce/core": "^8.12.0",
10+
"@salesforce/core": "^8.13.0",
1111
"@salesforce/kit": "^3.2.3",
1212
"@salesforce/sf-plugins-core": "^12.2.2",
1313
"@salesforce/source-deploy-retrieve": "^12.19.7",

‎schemas/org-create-scratch.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,32 @@
219219
"AuthFields": {
220220
"type": "object",
221221
"properties": {
222+
"clientApps": {
223+
"type": "object",
224+
"additionalProperties": {
225+
"type": "object",
226+
"properties": {
227+
"clientId": {
228+
"type": "string"
229+
},
230+
"clientSecret": {
231+
"type": "string"
232+
},
233+
"accessToken": {
234+
"type": "string"
235+
},
236+
"refreshToken": {
237+
"type": "string"
238+
},
239+
"oauthFlow": {
240+
"type": "string",
241+
"const": "web"
242+
}
243+
},
244+
"required": ["clientId", "accessToken", "refreshToken", "oauthFlow"],
245+
"additionalProperties": false
246+
}
247+
},
222248
"accessToken": {
223249
"type": "string"
224250
},

‎schemas/org-display.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@
3636
"sfdxAuthUrl": {
3737
"type": "string"
3838
},
39+
"clientApps": {
40+
"type": "string"
41+
},
3942
"createdBy": {
4043
"type": "string"
4144
},

‎schemas/org-list.json‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,32 @@
8383
"string": {
8484
"type": "string"
8585
},
86+
"clientApps": {
87+
"type": "object",
88+
"additionalProperties": {
89+
"type": "object",
90+
"properties": {
91+
"clientId": {
92+
"type": "string"
93+
},
94+
"clientSecret": {
95+
"type": "string"
96+
},
97+
"accessToken": {
98+
"type": "string"
99+
},
100+
"refreshToken": {
101+
"type": "string"
102+
},
103+
"oauthFlow": {
104+
"type": "string",
105+
"const": "web"
106+
}
107+
},
108+
"required": ["clientId", "accessToken", "refreshToken", "oauthFlow"],
109+
"additionalProperties": false
110+
}
111+
},
86112
"alias": {
87113
"type": "string"
88114
},
@@ -219,6 +245,32 @@
219245
"string": {
220246
"type": "string"
221247
},
248+
"clientApps": {
249+
"type": "object",
250+
"additionalProperties": {
251+
"type": "object",
252+
"properties": {
253+
"clientId": {
254+
"type": "string"
255+
},
256+
"clientSecret": {
257+
"type": "string"
258+
},
259+
"accessToken": {
260+
"type": "string"
261+
},
262+
"refreshToken": {
263+
"type": "string"
264+
},
265+
"oauthFlow": {
266+
"type": "string",
267+
"const": "web"
268+
}
269+
},
270+
"required": ["clientId", "accessToken", "refreshToken", "oauthFlow"],
271+
"additionalProperties": false
272+
}
273+
},
222274
"alias": {
223275
"type": "string"
224276
},

‎schemas/org-resume-scratch.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,32 @@
219219
"AuthFields": {
220220
"type": "object",
221221
"properties": {
222+
"clientApps": {
223+
"type": "object",
224+
"additionalProperties": {
225+
"type": "object",
226+
"properties": {
227+
"clientId": {
228+
"type": "string"
229+
},
230+
"clientSecret": {
231+
"type": "string"
232+
},
233+
"accessToken": {
234+
"type": "string"
235+
},
236+
"refreshToken": {
237+
"type": "string"
238+
},
239+
"oauthFlow": {
240+
"type": "string",
241+
"const": "web"
242+
}
243+
},
244+
"required": ["clientId", "accessToken", "refreshToken", "oauthFlow"],
245+
"additionalProperties": false
246+
}
247+
},
222248
"accessToken": {
223249
"type": "string"
224250
},

‎src/commands/org/display.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ export class OrgDisplayCommand extends SfCommand<OrgDisplayReturn> {
7878
: await OrgListUtil.determineConnectedStatusForNonScratchOrg(fields.username),
7979
sfdxAuthUrl: flags.verbose && fields.refreshToken ? authInfo.getSfdxAuthUrl() : undefined,
8080
alias: await getAliasByUsername(fields.username),
81+
clientApps: fields.clientApps ? Object.keys(fields.clientApps).join(',') : undefined,
8182
};
8283
this.warn(sharedMessages.getMessage('SecurityWarning'));
8384
this.print(returnValue);

‎src/shared/orgTypes.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export type OrgDisplayReturn = Partial<ScratchOrgFields> & {
2121
// non-scratch orgs
2222
connectedStatus?: string;
2323
sfdxAuthUrl?: string;
24+
clientApps?: string;
2425
};
2526

2627
export type OrgOpenOutput = {

‎yarn.lock‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1685,10 +1685,10 @@
16851685
strip-ansi "6.0.1"
16861686
ts-retry-promise "^0.8.1"
16871687

1688-
"@salesforce/core@^8.10.0", "@salesforce/core@^8.11.0", "@salesforce/core@^8.11.1", "@salesforce/core@^8.12.0", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0":
1689-
version "8.12.0"
1690-
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.12.0.tgz#a458cc3e39f4e7df57d94f0deaaa0fd0660b18c9"
1691-
integrity sha512-LJIjoQ3UQJ1r/xxdQcaG5bU8MfxeO/LJhrfK/7LZeHVtp1iOIgedbwPuVNzTzYciDWh8elborarrPM4uWjtu5g==
1688+
"@salesforce/core@^8.10.0", "@salesforce/core@^8.11.0", "@salesforce/core@^8.11.1", "@salesforce/core@^8.13.0", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0":
1689+
version "8.13.0"
1690+
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.13.0.tgz#ffc00a776c60a401d4385abfeb6cd7fee0d90f3b"
1691+
integrity sha512-FyAn0UGa93D0N++8poeJt7yEaWQH++qxrv/Wf4TjNaUCLoh19g57lrXuos3qDJPr8Ut4x6QjVxEc49XLy+vBkw==
16921692
dependencies:
16931693
"@jsforce/jsforce-node" "^3.8.2"
16941694
"@salesforce/kit" "^3.2.2"
@@ -4459,11 +4459,6 @@ faye@^1.4.0:
44594459
tough-cookie "*"
44604460
tunnel-agent "*"
44614461

4462-
fdir@^6.4.2:
4463-
version "6.4.2"
4464-
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
4465-
integrity sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==
4466-
44674462
fdir@^6.4.4:
44684463
version "6.4.5"
44694464
resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.5.tgz#328e280f3a23699362f95f2e82acf978a0c0cb49"
@@ -7811,22 +7806,14 @@ tiny-jsonc@^1.0.2:
78117806
resolved "https://registry.yarnpkg.com/tiny-jsonc/-/tiny-jsonc-1.0.2.tgz#208df4c437684199cc724f31c2b91ee39c349678"
78127807
integrity sha512-f5QDAfLq6zIVSyCZQZhhyl0QS6MvAyTxgz4X4x3+EoCktNWEYJ6PeoEA97fyb98njpBNNi88ybpD7m+BDFXaCw==
78137808

7814-
tinyglobby@^0.2.13:
7809+
tinyglobby@^0.2.13, tinyglobby@^0.2.9:
78157810
version "0.2.14"
78167811
resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.14.tgz#5280b0cf3f972b050e74ae88406c0a6a58f4079d"
78177812
integrity sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==
78187813
dependencies:
78197814
fdir "^6.4.4"
78207815
picomatch "^4.0.2"
78217816

7822-
tinyglobby@^0.2.9:
7823-
version "0.2.10"
7824-
resolved "https://registry.yarnpkg.com/tinyglobby/-/tinyglobby-0.2.10.tgz#e712cf2dc9b95a1f5c5bbd159720e15833977a0f"
7825-
integrity sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==
7826-
dependencies:
7827-
fdir "^6.4.2"
7828-
picomatch "^4.0.2"
7829-
78307817
tldts-core@^6.1.47:
78317818
version "6.1.47"
78327819
resolved "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.47.tgz"

0 commit comments

Comments
 (0)