Skip to content

#90383: Issues in integrating FR iOS SDK along with AccessOne SDK #206

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
RabobankDigitalChannel wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

#90383: Issues in integrating FR iOS SDK along with AccessOne SDK #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95e3632
Changing the Token and AccessTokenfile names and references to FRToke…
May 12, 2023
1f06fca
Adding all the reference files
May 12, 2023
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
16 changes: 8 additions & 8 deletions FRAuth/FRAuth.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@
D586CF7823358EE0007A2194 /* ConfigError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF2223358EDF007A2194 /* ConfigError.swift */; };
D586CF7A23358EE0007A2194 /* TokenError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF2423358EDF007A2194 /* TokenError.swift */; };
D586CF8D23358EE0007A2194 /* NetworkReachabilityMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF3A23358EDF007A2194 /* NetworkReachabilityMonitor.swift */; };
D586CF8F23358EE0007A2194 /* AccessToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF3D23358EDF007A2194 /* AccessToken.swift */; };
D586CF8F23358EE0007A2194 /* FRAccessToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF3D23358EDF007A2194 /* FRAccessToken.swift */; };
D586CF9023358EE0007A2194 /* PKCE.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF3E23358EDF007A2194 /* PKCE.swift */; };
D586CF9123358EE0007A2194 /* Token.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF3F23358EDF007A2194 /* Token.swift */; };
D586CF9123358EE0007A2194 /* FRToken.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF3F23358EDF007A2194 /* FRToken.swift */; };
D586CF9223358EE0007A2194 /* TermsAndConditionsCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF4123358EDF007A2194 /* TermsAndConditionsCallback.swift */; };
D586CF9323358EE0007A2194 /* NameCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF4223358EDF007A2194 /* NameCallback.swift */; };
D586CF9423358EE0007A2194 /* PasswordCallback.swift in Sources */ = {isa = PBXBuildFile; fileRef = D586CF4323358EDF007A2194 /* PasswordCallback.swift */; };
Expand Down Expand Up @@ -402,9 +402,9 @@
D586CF2223358EDF007A2194 /* ConfigError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigError.swift; sourceTree = "<group>"; };
D586CF2423358EDF007A2194 /* TokenError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TokenError.swift; sourceTree = "<group>"; };
D586CF3A23358EDF007A2194 /* NetworkReachabilityMonitor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkReachabilityMonitor.swift; sourceTree = "<group>"; };
D586CF3D23358EDF007A2194 /* AccessToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccessToken.swift; sourceTree = "<group>"; };
D586CF3D23358EDF007A2194 /* FRAccessToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FRAccessToken.swift; sourceTree = "<group>"; };
D586CF3E23358EDF007A2194 /* PKCE.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PKCE.swift; sourceTree = "<group>"; };
D586CF3F23358EDF007A2194 /* Token.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Token.swift; sourceTree = "<group>"; };
D586CF3F23358EDF007A2194 /* FRToken.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FRToken.swift; sourceTree = "<group>"; };
D586CF4123358EDF007A2194 /* TermsAndConditionsCallback.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TermsAndConditionsCallback.swift; sourceTree = "<group>"; };
D586CF4223358EDF007A2194 /* NameCallback.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NameCallback.swift; sourceTree = "<group>"; };
D586CF4323358EDF007A2194 /* PasswordCallback.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PasswordCallback.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -981,9 +981,9 @@
D586CF3C23358EDF007A2194 /* OAuth2 */ = {
isa = PBXGroup;
children = (
D586CF3D23358EDF007A2194 /* AccessToken.swift */,
D586CF3D23358EDF007A2194 /* FRAccessToken.swift */,
D586CF3E23358EDF007A2194 /* PKCE.swift */,
D586CF3F23358EDF007A2194 /* Token.swift */,
D586CF3F23358EDF007A2194 /* FRToken.swift */,
);
path = OAuth2;
sourceTree = "<group>";
Expand Down Expand Up @@ -1719,7 +1719,7 @@
D5EC34FB247B329D0005A50C /* FRRequestInterceptorRegistry.swift in Sources */,
D5723C3F23F4C66A00557AA8 /* PolicyAdvice.swift in Sources */,
D53A8048262789BD0093B1CA /* Authenticator.swift in Sources */,
D586CF9123358EE0007A2194 /* Token.swift in Sources */,
D586CF9123358EE0007A2194 /* FRToken.swift in Sources */,
D5F3E10324D20FBF00536EA0 /* SuspendedTextOutputCallback.swift in Sources */,
3A1B43D0284510B700EAFC9D /* AtomicDictionary.swift in Sources */,
D586CF9823358EE0007A2194 /* ValidatedCreatePasswordCallback.swift in Sources */,
Expand Down Expand Up @@ -1752,7 +1752,7 @@
D586CFBB23358EE0007A2194 /* NetworkCollector.swift in Sources */,
D53A803F262789BD0093B1CA /* WAKLogger.swift in Sources */,
D53A8046262789BD0093B1CA /* CredentialStore.swift in Sources */,
D586CF8F23358EE0007A2194 /* AccessToken.swift in Sources */,
D586CF8F23358EE0007A2194 /* FRAccessToken.swift in Sources */,
D5723C3D23F4C65800557AA8 /* Node.swift in Sources */,
D5B2A38B23FCC19E00764370 /* ProfileCollector.swift in Sources */,
D586CFA123358EE0007A2194 /* Callback.swift in Sources */,
Expand Down
22 changes: 11 additions & 11 deletions FRAuth/FRAuth/Authentication/AuthService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ public class AuthService: NSObject {
/// - Parameter completion: NodeCompletion callback which returns the result of Node submission.
public func next<T>(completion: @escaping NodeCompletion<T>) {

if T.self as AnyObject? === Token.self {
next { (token: Token?, node, error) in
if T.self as AnyObject? === FRToken.self {
next { (token: FRToken?, node, error) in
completion(token as? T, node, error)
}
}
else if T.self as AnyObject? === AccessToken.self {
next { (token: AccessToken?, node, error) in
else if T.self as AnyObject? === FRAccessToken.self {
next { (token: FRAccessToken?, node, error) in
completion(token as? T, node, error)
}
}
Expand All @@ -137,7 +137,7 @@ public class AuthService: NSObject {
completion(currentUser, nil, nil)
}
else {
self.next { (accessToken: AccessToken?, node, error) in
self.next { (accessToken: FRAccessToken?, node, error) in
if let token = accessToken {
let user = FRUser(token: token)

Expand All @@ -151,14 +151,14 @@ public class AuthService: NSObject {
}


fileprivate func next(completion: @escaping NodeCompletion<AccessToken>) {
fileprivate func next(completion: @escaping NodeCompletion<FRAccessToken>) {

if let accessToken = try? self.keychainManager?.getAccessToken() {
FRLog.i("access_token retrieved from SessionManager; ignoring AuthService submit")
completion(accessToken, nil, nil)
}
else {
self.next { (token: Token?, node, error) in
self.next { (token: FRToken?, node, error) in

if let tokenId = token {
// If OAuth2Client is provided (for abstraction layer)
Expand Down Expand Up @@ -197,7 +197,7 @@ public class AuthService: NSObject {
}


fileprivate func next(completion: @escaping NodeCompletion<Token>) {
fileprivate func next(completion: @escaping NodeCompletion<FRToken>) {

// Construct Request object for AuthService flow with given serviceName
let request = self.buildAuthServiceRequest()
Expand Down Expand Up @@ -229,7 +229,7 @@ public class AuthService: NSObject {
}
}
else if let tokenId = response[OpenAM.tokenId] as? String {
let token = Token(tokenId)
let token = FRToken(tokenId)
if let keychainManager = self.keychainManager {
let currentSessionToken = keychainManager.getSSOToken()
if let _ = try? keychainManager.getAccessToken(), token.value != currentSessionToken?.value {
Expand Down Expand Up @@ -307,14 +307,14 @@ public class AuthService: NSObject {

@objc(nextWithAccessTokenCompletion:)
@available(swift, obsoleted: 1.0)
public func nextWithAccessTokenCompletion(completion: @escaping NodeCompletion<AccessToken>) {
public func nextWithAccessTokenCompletion(completion: @escaping NodeCompletion<FRAccessToken>) {
self.next(completion: completion)
}


@objc(nextWithTokenCompletion:)
@available(swift, obsoleted: 1.0)
public func nextWithTokenCompletion(completion: @escaping NodeCompletion<Token>) {
public func nextWithTokenCompletion(completion: @escaping NodeCompletion<FRToken>) {
self.next(completion: completion)
}
}
22 changes: 11 additions & 11 deletions FRAuth/FRAuth/Authentication/Node.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@ public class Node: NSObject {
/// - Parameter completion: NodeCompletion callback which returns the result of Node submission.
public func next<T>(completion:@escaping NodeCompletion<T>) {

if T.self as AnyObject? === Token.self {
next { (token: Token?, node, error) in
if T.self as AnyObject? === FRToken.self {
next { (token: FRToken?, node, error) in
completion(token as? T, node, error)
}
}
else if T.self as AnyObject? === AccessToken.self {
next { (token: AccessToken?, node, error) in
else if T.self as AnyObject? === FRAccessToken.self {
next { (token: FRAccessToken?, node, error) in
completion(token as? T, node, error)
}
}
Expand All @@ -187,7 +187,7 @@ public class Node: NSObject {
completion(currentUser, nil, nil)
}
else {
self.next { (accessToken: AccessToken?, node, error) in
self.next { (accessToken: FRAccessToken?, node, error) in
if let token = accessToken {
let user = FRUser(token: token)

Expand All @@ -204,14 +204,14 @@ public class Node: NSObject {
/// Submits current node, and returns AccessToken instance if result of node returns SSO TOken
///
/// - Parameter completion: NodeCompletion<AccessToken> callback that returns AccessToken upon completion
fileprivate func next(completion:@escaping NodeCompletion<AccessToken>) {
fileprivate func next(completion:@escaping NodeCompletion<FRAccessToken>) {
FRLog.v("Called")
if let accessToken = try? self.keychainManager?.getAccessToken() {
FRLog.i("access_token retrieved from SessionManager; ignoring Node submit")
completion(accessToken, nil, nil)
}
else {
self.next { (token: Token?, node, error) in
self.next { (token: FRToken?, node, error) in

if let tokenId = token {
// If OAuth2Client is provided (for abstraction layer)
Expand Down Expand Up @@ -252,7 +252,7 @@ public class Node: NSObject {
/// Submits current node, and returns Token instance if result of node returns SSO TOken
///
/// - Parameter completion: NodeCompletion<Token> callback that returns Token upon completion
fileprivate func next(completion:@escaping NodeCompletion<Token>) {
fileprivate func next(completion:@escaping NodeCompletion<FRToken>) {

let thisRequest = self.buildAuthServiceRequest()
FRRestClient.invoke(request: thisRequest, action: Action(type: .AUTHENTICATE, payload: ["tree": self.serviceName, "type": self.authIndexType])) { (result) in
Expand All @@ -271,7 +271,7 @@ public class Node: NSObject {
}
}
else if let tokenId = response[OpenAM.tokenId] as? String {
let token = Token(tokenId)
let token = FRToken(tokenId)
if let keychainManager = self.keychainManager {
let currentSessionToken = keychainManager.getSSOToken()
if let _ = try? keychainManager.getAccessToken(), token.value != currentSessionToken?.value {
Expand Down Expand Up @@ -357,14 +357,14 @@ public class Node: NSObject {

@objc(nextWithAccessTokenCompletion:)
@available(swift, obsoleted: 1.0)
public func nextWithAccessTokenCompletion(completion:@escaping NodeCompletion<AccessToken>) {
public func nextWithAccessTokenCompletion(completion:@escaping NodeCompletion<FRAccessToken>) {
self.next(completion: completion)
}


@objc(nextWithTokenCompletion:)
@available(swift, obsoleted: 1.0)
public func nextWithTokenCompletion(completion:@escaping NodeCompletion<Token>) {
public func nextWithTokenCompletion(completion:@escaping NodeCompletion<FRToken>) {
self.next(completion: completion)
}
}
18 changes: 9 additions & 9 deletions FRAuth/FRAuth/Config/OAuth2Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class OAuth2Client: NSObject, Codable {
/// - accessToken: AccessToken object to revoke
/// - completion: Completion callback to notify the result of operation
@objc
public func revoke(accessToken: AccessToken, completion: @escaping CompletionCallback) {
public func revoke(accessToken: FRAccessToken, completion: @escaping CompletionCallback) {
// Construct parameter for the request
var parameter:[String: String] = [:]
let token = accessToken.refreshToken ?? accessToken.value
Expand Down Expand Up @@ -118,7 +118,7 @@ public class OAuth2Client: NSObject, Codable {
FRRestClient.invoke(request: request, action: Action(type: .REFRESH_TOKEN)) { (result) in
switch result {
case .success(let response, _ ):
if let accessToken = AccessToken(tokenResponse: response) {
if let accessToken = FRAccessToken(tokenResponse: response) {
do {
try FRAuth.shared?.keychainManager.setAccessToken(token: accessToken)
}
Expand Down Expand Up @@ -152,14 +152,14 @@ public class OAuth2Client: NSObject, Codable {
/// - Parameter refreshToken: refresh_token to be consumed for requesting new OAuth2 token set
/// - Returns: AccessToken object if refreshing token was successful
/// - Throws: AuthError or TokenError
@objc public func refreshSync(refreshToken: String) throws -> AccessToken {
@objc public func refreshSync(refreshToken: String) throws -> FRAccessToken {

let request = self.buildRefreshRequest(refreshToken: refreshToken)
let result = FRRestClient.invokeSync(request: request, action: Action(type: .REFRESH_TOKEN))

switch result {
case .success(let response, _ ):
if let accessToken = AccessToken(tokenResponse: response) {
if let accessToken = FRAccessToken(tokenResponse: response) {
do {
try FRAuth.shared?.keychainManager.setAccessToken(token: accessToken)
}
Expand Down Expand Up @@ -192,7 +192,7 @@ public class OAuth2Client: NSObject, Codable {
/// - token: Token object (SSO Token) received from OpenAM through AuthService/Node authentication flow
/// - completion: Completion callback which returns set of token(s), or error upon completion of request
@objc
public func exchangeToken(token: Token, completion: @escaping TokenCompletionCallback) {
public func exchangeToken(token: FRToken, completion: @escaping TokenCompletionCallback) {

let ssoToken = token.value
let pkce = PKCE()
Expand All @@ -219,7 +219,7 @@ public class OAuth2Client: NSObject, Codable {
FRRestClient.invoke(request: request, action: Action(type: .EXCHANGE_TOKEN), completion: { (result) in
switch result {
case .success(let response, _):
if let accessToken = AccessToken(tokenResponse: response, sessionToken: ssoToken) {
if let accessToken = FRAccessToken(tokenResponse: response, sessionToken: ssoToken) {
completion(accessToken, nil)
}
else {
Expand Down Expand Up @@ -260,7 +260,7 @@ public class OAuth2Client: NSObject, Codable {
FRRestClient.invoke(request: request, action: Action(type: .EXCHANGE_TOKEN), completion: { (result) in
switch result {
case .success(let response, _):
if let accessToken = AccessToken(tokenResponse: response) {
if let accessToken = FRAccessToken(tokenResponse: response) {
completion(accessToken, nil)
}
else {
Expand All @@ -282,7 +282,7 @@ public class OAuth2Client: NSObject, Codable {
/// - Parameter token: Token object (SSO Token) received from OpenAM through AuthService/Node authentication flow
/// - Returns: AccessToken object if exchanging token was successful
/// - Throws: AuthError or TokenError
public func exchangeTokenSync(token: Token) throws -> AccessToken? {
public func exchangeTokenSync(token: FRToken) throws -> FRAccessToken? {
let ssoToken = token.value
let pkce = PKCE()
let request = self.buildAuthorizeRequest(ssoToken: ssoToken, pkce: pkce)
Expand All @@ -307,7 +307,7 @@ public class OAuth2Client: NSObject, Codable {
let result = FRRestClient.invokeSync(request: request, action: Action(type: .EXCHANGE_TOKEN))
switch result {
case .success(let response, _ ):
if let accessToken = AccessToken(tokenResponse: response, sessionToken: ssoToken) {
if let accessToken = FRAccessToken(tokenResponse: response, sessionToken: ssoToken) {
return accessToken
}
else {
Expand Down
2 changes: 1 addition & 1 deletion FRAuth/FRAuth/Constants/Typealias.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public typealias SocialLoginCompletionCallback = (_ token: String?, _ tokenType:
// MARK: - OAuth2Client

/// Callback definition for completion of exchanging access_token request
public typealias TokenCompletionCallback = (_ token: AccessToken?, _ error:Error?) -> Void
public typealias TokenCompletionCallback = (_ token: FRAccessToken?, _ error:Error?) -> Void


// MARK: - OAuth2 / OIDC
Expand Down
Loading