Skip to content

Midships 4.7.0 #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuxiang-midships wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Midships 4.7.0 #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e894681
Merge pull request #278 from ForgeRock/develop
spetrov Apr 25, 2024
94dd1b2
Merge pull request #280 from ForgeRock/develop
spetrov Apr 25, 2024
a0ec7cc
Merge pull request #289 from ForgeRock/develop
spetrov Jul 8, 2024
daccd0e
Merge pull request #310 from ForgeRock/develop
vahancouver Oct 15, 2024
894c6b4
Expose TokenManager Instance via FRAuth
yuxiang-midships Jan 20, 2025
e2cc039
Expose clearCredential method in Token Manager
yuxiang-midships Jan 20, 2025
c05f05d
Add persistAccess token method in TokenManager
yuxiang-midships Jan 20, 2025
b6fa6e0
Expose oAuth2 Client via token manager
Feb 12, 2025
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
2 changes: 1 addition & 1 deletion FRAuth/FRAuth/FRAuth.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public final class FRAuth: NSObject {
/// OAuth2Client instance for FRAuth; OAuth2Client values are retrieved from .plist configuration file
var oAuth2Client: OAuth2Client?
/// TokenManager instance for FRAuth to perform any token related operation
var tokenManager: TokenManager?
public var tokenManager: TokenManager?

@vahancouver vahancouver Feb 21, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the copyright header to reflect the latest changes year

/// SessionManager instance for FRAuth to perform manage, and persist session
var sessionManager: SessionManager
/// KeychainManager instance for FRAuth to perform any keychain related operation to persist and/or retrieve credentials
Expand Down
12 changes: 8 additions & 4 deletions FRAuth/FRAuth/Manager/TokenManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ import Foundation


/// TokenManager class is a management class responsible for persisting, retrieving, and refreshing OAuth2 token(s)
struct TokenManager {
public struct TokenManager {

@vahancouver vahancouver Feb 21, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update the copyright header to reflect the latest changes year


var oAuth2Client: OAuth2Client
public var oAuth2Client: OAuth2Client

@george-bafaloukas-forgerock george-bafaloukas-forgerock Feb 21, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add code doc for the public oAuth2Client

var keychainManager: KeychainManager

/// Initializes TokenMAnager instance with optional Access Group for shared Keychain Group identifier
///
/// - Parameters:
/// - oAuth2Client: OAuth2Client instance for OAuth2 token protocols
/// - keychainManager: KeychainManager instance for secure credentials management
public init(oAuth2Client: OAuth2Client, keychainManager: KeychainManager) {
init(oAuth2Client: OAuth2Client, keychainManager: KeychainManager) {

@vahancouver vahancouver Feb 21, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

was public meant to be removed here?

self.oAuth2Client = oAuth2Client
self.keychainManager = keychainManager
}
Expand Down Expand Up @@ -357,7 +357,7 @@ struct TokenManager {


/// Clears all credentials locally as there is no more valid credentials to renew user's session
func clearCredentials() {
public func clearCredentials() {
self.keychainManager.cookieStore.deleteAll()
let _ = try? self.keychainManager.setAccessToken(token: nil)
self.keychainManager.setSSOToken(ssoToken: nil)
Expand All @@ -366,6 +366,10 @@ struct TokenManager {
Browser.currentBrowser = nil
}

public func persistToken(token: AccessToken) {

@george-bafaloukas-forgerock george-bafaloukas-forgerock Feb 21, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add code doc for the persistToken method

let _ = try? self.keychainManager.setAccessToken(token: token)
}


/// Revoke given Access Token without using the Refresh Token
func revokeToken(_ token: AccessToken, completion: @escaping CompletionCallback) {
Expand Down