Added support for ltpa token #219

enamkhan · 2025-01-29T13:57:38Z

This pr is a work in progress to add support for a using the ltpa token.

#217

How to Test

Review Checklist
I certify that I have:

tested my changes
added/updated automated tests
updated the changelog
followed the contribution guidelines

Additional Comments

enamkhan · 2025-01-29T13:58:26Z

@davenice I'm just going to refactor now and remove the profile config.

codecov-commenter · 2025-01-29T13:58:26Z

Codecov Report

Attention: Patch coverage is 13.33333% with 78 lines in your changes missing coverage. Please review.

Project coverage is 31.29%. Comparing base (1087db6) to head (50424cb).
Report is 12 commits behind head on main.

Files with missing lines	Patch %	Lines
packages/vsce/src/trees/CICSTree.ts	13.95%	37 Missing ⚠️
packages/vsce/src/utils/profileUtils.ts	26.31%	14 Missing ⚠️
packages/vsce/src/trees/CICSRegionsContainer.ts	0.00%	4 Missing ⚠️
...trees/CICSCombinedTrees/CICSCombinedLibraryTree.ts	0.00%	2 Missing ⚠️
...ees/CICSCombinedTrees/CICSCombinedLocalFileTree.ts	0.00%	2 Missing ⚠️
...rees/CICSCombinedTrees/CICSCombinedPipelineTree.ts	0.00%	2 Missing ⚠️
...trees/CICSCombinedTrees/CICSCombinedProgramTree.ts	0.00%	2 Missing ⚠️
.../CICSCombinedTrees/CICSCombinedTCPIPServiceTree.ts	0.00%	2 Missing ⚠️
...rc/trees/CICSCombinedTrees/CICSCombinedTaskTree.ts	0.00%	2 Missing ⚠️
...s/CICSCombinedTrees/CICSCombinedTransactionTree.ts	0.00%	2 Missing ⚠️
... and 5 more

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #219      +/-   ##
==========================================
+ Coverage   28.56%   31.29%   +2.72%     
==========================================
  Files         147      147              
  Lines        5031     5059      +28     
  Branches      882      884       +2     
==========================================
+ Hits         1437     1583     +146     
+ Misses       3594     3476     -118

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

packages/vsce/src/trees/CICSTree.ts

packages/vsce/src/trees/CICSCombinedTrees/CICSCombinedLibraryTree.ts

packages/vsce/src/utils/profileManagement.ts

Signed-off-by: enam-khan <[email protected]>

packages/vsce/__tests__/__unit__/trees/CICSSessionTree.unit.test.ts

packages/vsce/src/trees/CICSSessionTree.ts

Signed-off-by: enam-khan <[email protected]>

AndrewTwydell

In a lot of the resource trees (CICSProgramTree), we're not using the new getters to get the session - might be nice if possible?

Might be nice to be able to do this.getSession() here like the combination trees.

cics-for-zowe-client/packages/vsce/src/trees/CICSProgramTree.ts

Line 48 in df6656b

    
           const programResponse = await getResource(this.parentRegion.parentSession.session, {

AndrewTwydell · 2025-02-05T11:33:13Z

packages/vsce/src/utils/profileManagement.ts

@@ -282,9 +268,8 @@ export class ProfileManagement {
  /**
   * Return all the regions in a given plex
   */
-  public static async getRegionInfoInPlex(plex: CICSPlexTree): Promise<any[]> {
+  public static async getRegionInfoInPlex(plex: CICSPlexTree, session: Session): Promise<any[]> {


We can probably get the session (2nd arg) from the plex tree (1st arg) using getParent or getSession, or a combination, right? Although it's not exactly messy currently so optional.

AndrewTwydell · 2025-02-05T11:35:18Z

packages/vsce/src/trees/CICSCombinedTrees/CICSCombinedWebServiceTree.ts

@@ -204,4 +209,8 @@ export class CICSCombinedWebServiceTree extends TreeItem {
  public getParent() {
    return this.parentPlex;
  }
+
+  public getSession() {
+    return this.getParent().getParent().getSession();


Can this just be this.getParent().getSession() as the parent's getSession will also keep going up the tree??

If so, same for all combination trees

Signed-off-by: enam-khan <[email protected]>

zFernand0

LGTM! 😋

Haven't had a chance to test this, but the changes make sense to me! 😋

zFernand0 · 2025-02-09T22:39:10Z

packages/vsce/src/trees/CICSCombinedTrees/CICSCombinedTCPIPServiceTree.ts

It feels like we have to make the same/similar changes across all/most CICSCombinedTrees.
Wondering if there is some consolidation that can be done (in a future PR) to create a BaseCombinedTree class that the others extend 😋

This refactor is actually in progress in this PR. Because all the resource and combined resource trees are practically identical, we can use common tree classes for them all :D

zFernand0 · 2025-02-09T22:43:37Z

packages/vsce/src/trees/CICSSessionTree.ts

    this.session = new imperative.Session({
-      type: "basic",
+      type: SessConstants.AUTH_TYPE_TOKEN,
+      storeCookie: true,


I know I mentioned that perhaps we could move some of the LTPA token support to the CLI.
However, it makes sense the way this is being done here since (as you mentioned on the last standup) this is all handled by Imperative.

Curious if the CICs plug-in could make use the the LTPA token when the CLI is in Daemon mode. 😋
No need to worry about testing this, since people haven't asked for this feature yet 😋

enamkhan requested review from AndrewTwydell and davenice January 29, 2025 13:57

github-actions bot assigned enamkhan Jan 29, 2025

github-advanced-security bot found potential problems Jan 29, 2025

View reviewed changes

packages/vsce/src/trees/CICSTree.ts Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Jan 30, 2025

View reviewed changes

packages/vsce/src/trees/CICSCombinedTrees/CICSCombinedLibraryTree.ts Fixed Show fixed Hide fixed

packages/vsce/src/utils/profileManagement.ts Fixed Show fixed Hide fixed

enamkhan added 8 commits February 3, 2025 15:24

Added support for ltpa token

ab217f6

Signed-off-by: enam-khan <[email protected]>

Removed toggle from profile config

c1eb72a

Signed-off-by: enam-khan <[email protected]>

Removed unused import

a05135d

Signed-off-by: enam-khan <[email protected]>

Update

c3d4a70

Signed-off-by: enam-khan <[email protected]>

Removed some unused imports

305162d

Signed-off-by: enam-khan <[email protected]>

Added unit tests for CICSSession

c414dde

Signed-off-by: enam-khan <[email protected]>

Updated changelog

456e620

Signed-off-by: enam-khan <[email protected]>

Updated test

fd79504

Signed-off-by: enam-khan <[email protected]>

enamkhan force-pushed the khane-use-ltpa-token branch from f88f1d5 to fd79504 Compare February 3, 2025 15:24

Some cleanup

7a3eb2a

Signed-off-by: enam-khan <[email protected]>

github-advanced-security bot found potential problems Feb 4, 2025

View reviewed changes

packages/vsce/__tests__/__unit__/trees/CICSSessionTree.unit.test.ts Fixed Show fixed Hide fixed

packages/vsce/src/trees/CICSSessionTree.ts Fixed Show fixed Hide fixed

Removed unused imports

1cd8078

Signed-off-by: enam-khan <[email protected]>

enamkhan force-pushed the khane-use-ltpa-token branch from 7c4bd64 to 1cd8078 Compare February 4, 2025 13:22

More unused imports

0989af4

Signed-off-by: enam-khan <[email protected]>

AndrewTwydell reviewed Feb 5, 2025

View reviewed changes

JTonda requested a review from zFernand0 February 6, 2025 16:05

Updated loadProfile

50424cb

Signed-off-by: enam-khan <[email protected]>

zFernand0 reviewed Feb 9, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added support for ltpa token #219

Added support for ltpa token #219

enamkhan commented Jan 29, 2025 •

edited

Loading

enamkhan commented Jan 29, 2025

codecov-commenter commented Jan 29, 2025 •

edited

Loading

AndrewTwydell left a comment

AndrewTwydell Feb 5, 2025

AndrewTwydell Feb 5, 2025

AndrewTwydell Feb 5, 2025

zFernand0 left a comment

zFernand0 Feb 9, 2025

AndrewTwydell Feb 10, 2025

zFernand0 Feb 9, 2025

Added support for ltpa token #219

Are you sure you want to change the base?

Added support for ltpa token #219

Conversation

enamkhan commented Jan 29, 2025 • edited Loading

enamkhan commented Jan 29, 2025

codecov-commenter commented Jan 29, 2025 • edited Loading

Codecov Report

AndrewTwydell left a comment

Choose a reason for hiding this comment

AndrewTwydell Feb 5, 2025

Choose a reason for hiding this comment

AndrewTwydell Feb 5, 2025

Choose a reason for hiding this comment

AndrewTwydell Feb 5, 2025

Choose a reason for hiding this comment

zFernand0 left a comment

Choose a reason for hiding this comment

LGTM! 😋

zFernand0 Feb 9, 2025

Choose a reason for hiding this comment

AndrewTwydell Feb 10, 2025

Choose a reason for hiding this comment

zFernand0 Feb 9, 2025

Choose a reason for hiding this comment

enamkhan commented Jan 29, 2025 •

edited

Loading

codecov-commenter commented Jan 29, 2025 •

edited

Loading