[Don't Merge] Swiftify AuthInfo #3904
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| // | ||
| // AuthInfo.swift | ||
| // SalesforceSDKCore | ||
| // | ||
| // Copyright (c) 2012-present, salesforce.com, inc. All rights reserved. | ||
| // | ||
| // Redistribution and use of this software in source and binary forms, with or without modification, | ||
| // are permitted provided that the following conditions are met: | ||
| // * Redistributions of source code must retain the above copyright notice, this list of conditions | ||
| // and the following disclaimer. | ||
| // * Redistributions in binary form must reproduce the above copyright notice, this list of | ||
| // conditions and the following disclaimer in the documentation and/or other materials provided | ||
| // with the distribution. | ||
| // * Neither the name of salesforce.com, inc. nor the names of its contributors may be used to | ||
| // endorse or promote products derived from this software without specific prior written | ||
| // permission of salesforce.com, inc. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR | ||
| // IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND | ||
| // FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR | ||
| // CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| // DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
| // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY | ||
| // WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| @objc(SFOAuthType) | ||
| public enum AuthType: Int { | ||
| case unknown = 0 | ||
| case userAgent | ||
| case refresh | ||
| case advancedBrowser | ||
| case jwtTokenExchange | ||
| case IDP | ||
| case webServer | ||
| case native | ||
|
|
||
| public var description: String { | ||
| switch self { | ||
| case .userAgent: return "SFOAuthTypeUserAgent" | ||
| case .webServer: return "SFOAuthTypeWebServer" | ||
| case .refresh: return "SFOAuthTypeRefresh" | ||
| case .advancedBrowser: return "SFOAuthTypeAdvancedBrowser" | ||
| case .jwtTokenExchange: return "SFOAuthTypeJwtTokenExchange" | ||
| case .native: return "SFOAuthTypeNative" | ||
| case .IDP: return "SFOAuthTypeIDP" | ||
| case .unknown: fallthrough | ||
| @unknown default: return "SFOAuthTypeUnknown" | ||
| } | ||
| } | ||
|
|
||
| // Static constants for Objective-C bridging | ||
| public static let SFOAuthTypeUnknown = AuthType.unknown | ||
| public static let SFOAuthTypeUserAgent = AuthType.userAgent | ||
| public static let SFOAuthTypeRefresh = AuthType.refresh | ||
| public static let SFOAuthTypeAdvancedBrowser = AuthType.advancedBrowser | ||
| public static let SFOAuthTypeJwtTokenExchange = AuthType.jwtTokenExchange | ||
| public static let SFOAuthTypeIDP = AuthType.IDP | ||
| public static let SFOAuthTypeWebServer = AuthType.webServer | ||
| public static let SFOAuthTypeNative = AuthType.native | ||
| } | ||
|
|
||
| @objc(SFOAuthInfo) | ||
| @objcMembers | ||
| public class AuthInfo: NSObject { | ||
| public let authType: AuthType | ||
|
|
||
| public var authTypeDescription: String { | ||
| return authType.description | ||
| } | ||
|
|
||
| // Main Swift initializer | ||
| @objc(initWithAuthType:) | ||
| public init(authType: AuthType) { | ||
| self.authType = authType | ||
| super.init() | ||
| } | ||
|
|
||
| // Default initializer for Swift and Objective-C | ||
| @objc public override init() { | ||
| self.authType = .unknown | ||
| super.init() | ||
| } | ||
|
|
||
| // Objective-C class factory method | ||
| @objc(infoWithAuthType:) | ||
| public class func info(withAuthType authType: AuthType) -> AuthInfo { | ||
|
Member
There was a problem hiding this comment. What's the use case for this vs init at line 77? I got confused by the comments because I thought one was for Objective-C and one was for Swift but they look like they're both available for both languages
Contributor
Author
There was a problem hiding this comment. your right. I think I tried to put this up before the weekend and missed a couple things. I'll clean this up again. |
||
| return AuthInfo(authType: authType) | ||
| } | ||
|
|
||
| // Expose the raw value for Objective-C | ||
| @objc public var authTypeRawValue: Int { | ||
| return authType.rawValue | ||
| } | ||
|
|
||
| // Expose the description for Objective-C | ||
| @objc public override var description: String { | ||
| return "<SFOAuthInfo: \(Unmanaged.passUnretained(self).toOpaque()), authType=\(authTypeDescription)>" | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks like a breaking change because a case in Swift would currently be
AuthInfo.AuthType.IDPvsAuthType.IDP, but maybe we could do it in 14.0 as in-place change instead of having a deprecation path since it's more of a straight forward rename?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, that’s why we have the static constants below, from line 55 to 63. In Objective-C, they can still call SFOAuthTypeIDP. But yeah, not a 13.x change for sure.