-
Notifications
You must be signed in to change notification settings - Fork 245
Add GIDAuthorizationFlowProcessor #282
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
1463c4a
Add GIDAuthorizationProcessor API and implementation.
Alex-4-Git e856b98
Merge branch 'refactorGSI' into pin-GIDAuthorizationFlowProcessor
Alex-4-Git 7003139
Use GIDAuthorizationFlowProcessor in GIDSignIn
Alex-4-Git 0e80a9d
Add test for GIDAuthorizationFlowProcessor.
Alex-4-Git ec80960
Improve style.
Alex-4-Git b674379
Improve documentation and style.
Alex-4-Git 0c9a202
Add OIDFakeExternalUserAgentSession for testing.
Alex-4-Git 17d20bb
Improve documentation and tests.
Alex-4-Git 3a8b8d1
Add self in block
Alex-4-Git 44c50b7
Remove scheme file.
Alex-4-Git 87fb523
Merge branch 'refactorGSI' into pin-GIDAuthorizationFlowProcessor
Alex-4-Git File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
58 changes: 58 additions & 0 deletions
58
GoogleSignIn/Sources/GIDAuthorizationFlowProcessor/API/GIDAuthorizationFlowProcessor.h
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,58 @@ | ||
| /* | ||
| * Copyright 2023 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| @class GIDSignInInternalOptions; | ||
| @class OIDAuthorizationResponse; | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /// The protocol to control the authorization flow. | ||
| @protocol GIDAuthorizationFlowProcessor <NSObject> | ||
|
|
||
| /// The state of the authorization flow. | ||
| @property(nonatomic, readonly, getter=isStarted) BOOL start; | ||
|
|
||
| /// Starts the authorization flow. | ||
Alex-4-Git marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /// | ||
| /// This method sends authorization request to AppAuth `OIDAuthorizationService` and gets back the | ||
| /// response or an error. | ||
| /// | ||
| /// @param options The `GIDSignInInternalOptions` object to provide serverClientID, hostedDomain, | ||
| /// clientID, scopes, loginHint and extraParams. | ||
| /// @param emmSupport The EMM support info string. | ||
| /// @param completion The block that is called on completion asynchronously. | ||
Alex-4-Git marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| /// authorizationResponse The response from `OIDAuthorizationService`. | ||
| /// error The error from `OIDAuthorizationService`. | ||
| - (void)startWithOptions:(GIDSignInInternalOptions *)options | ||
| emmSupport:(nullable NSString *)emmSupport | ||
| completion:(void (^)(OIDAuthorizationResponse *_Nullable authorizationResponse, | ||
| NSError *_Nullable error))completion; | ||
|
|
||
| /// Handles the custom URL scheme opened by SFSafariViewController and returns control to the | ||
| /// client on iOS 10. | ||
| /// | ||
| /// @param url The redirect URL invoked by the server. | ||
| /// @return YES if the passed URL matches the expected redirect URL and was consumed, NO otherwise. | ||
| - (BOOL)resumeExternalUserAgentFlowWithURL:(NSURL *)url; | ||
|
|
||
| /// Cancels the authorization flow. | ||
| - (void)cancelAuthenticationFlow; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END | ||
31 changes: 31 additions & 0 deletions
31
...nIn/Sources/GIDAuthorizationFlowProcessor/Implementations/GIDAuthorizationFlowProcessor.h
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,31 @@ | ||
| /* | ||
| * Copyright 2023 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| #import "GoogleSignIn/Sources/GIDAuthorizationFlowProcessor/API/GIDAuthorizationFlowProcessor.h" | ||
|
|
||
| @class OIDServiceConfiguration; | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| /// Concrete implementation of the protocol `GIDAuthorizationFlowProcessor`. | ||
| @interface GIDAuthorizationFlowProcessor : NSObject <GIDAuthorizationFlowProcessor> | ||
Alex-4-Git marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END | ||
|
|
||
134 changes: 134 additions & 0 deletions
134
...nIn/Sources/GIDAuthorizationFlowProcessor/Implementations/GIDAuthorizationFlowProcessor.m
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,134 @@ | ||
| /* | ||
| * Copyright 2023 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #import "GoogleSignIn/Sources/GIDAuthorizationFlowProcessor/Implementations/GIDAuthorizationFlowProcessor.h" | ||
|
|
||
| #import "GoogleSignIn/Sources/Public/GoogleSignIn/GIDConfiguration.h" | ||
|
|
||
| #import "GoogleSignIn/Sources/GIDEMMSupport.h" | ||
| #import "GoogleSignIn/Sources/GIDSignInCallbackSchemes.h" | ||
| #import "GoogleSignIn/Sources/GIDSignInInternalOptions.h" | ||
| #import "GoogleSignIn/Sources/GIDSignInPreferences.h" | ||
|
|
||
| #ifdef SWIFT_PACKAGE | ||
| @import AppAuth; | ||
| #else | ||
| #import <AppAuth/AppAuth.h> | ||
| #endif | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| // Parameters for the auth and token exchange endpoints. | ||
| static NSString *const kAudienceParameter = @"audience"; | ||
|
|
||
| static NSString *const kIncludeGrantedScopesParameter = @"include_granted_scopes"; | ||
| static NSString *const kLoginHintParameter = @"login_hint"; | ||
| static NSString *const kHostedDomainParameter = @"hd"; | ||
|
|
||
| @interface GIDAuthorizationFlowProcessor () | ||
|
|
||
| /// AppAuth external user-agent session state. | ||
| @property(nonatomic, nullable)id<OIDExternalUserAgentSession> currentAuthorizationFlow; | ||
|
|
||
| /// AppAuth configuration object. | ||
| @property(nonatomic)OIDServiceConfiguration *appAuthConfiguration; | ||
|
|
||
| @end | ||
|
|
||
| @implementation GIDAuthorizationFlowProcessor | ||
|
|
||
| # pragma mark - Public API | ||
|
|
||
| - (BOOL)isStarted { | ||
| return self.currentAuthorizationFlow != nil; | ||
| } | ||
|
|
||
| - (void)startWithOptions:(GIDSignInInternalOptions *)options | ||
| emmSupport:(nullable NSString *)emmSupport | ||
| completion:(void (^)(OIDAuthorizationResponse *_Nullable authorizationResponse, | ||
| NSError *_Nullable error))completion { | ||
| GIDSignInCallbackSchemes *schemes = | ||
| [[GIDSignInCallbackSchemes alloc] initWithClientIdentifier:options.configuration.clientID]; | ||
| NSString *urlString = [NSString stringWithFormat:@"%@:%@", | ||
| [schemes clientIdentifierScheme], kBrowserCallbackPath]; | ||
| NSURL *redirectURL = [NSURL URLWithString:urlString]; | ||
|
|
||
| NSMutableDictionary<NSString *, NSString *> *additionalParameters = [@{} mutableCopy]; | ||
| additionalParameters[kIncludeGrantedScopesParameter] = @"true"; | ||
| if (options.configuration.serverClientID) { | ||
| additionalParameters[kAudienceParameter] = options.configuration.serverClientID; | ||
| } | ||
| if (options.loginHint) { | ||
| additionalParameters[kLoginHintParameter] = options.loginHint; | ||
| } | ||
| if (options.configuration.hostedDomain) { | ||
| additionalParameters[kHostedDomainParameter] = options.configuration.hostedDomain; | ||
| } | ||
|
|
||
| #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST | ||
Alex-4-Git marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| [additionalParameters addEntriesFromDictionary: | ||
| [GIDEMMSupport parametersWithParameters:options.extraParams | ||
| emmSupport:emmSupport | ||
| isPasscodeInfoRequired:NO]]; | ||
| #elif TARGET_OS_OSX || TARGET_OS_MACCATALYST | ||
| [additionalParameters addEntriesFromDictionary:options.extraParams]; | ||
| #endif // TARGET_OS_OSX || TARGET_OS_MACCATALYST | ||
| additionalParameters[kSDKVersionLoggingParameter] = GIDVersion(); | ||
| additionalParameters[kEnvironmentLoggingParameter] = GIDEnvironment(); | ||
|
|
||
| NSURL *authorizationEndpointURL = [GIDSignInPreferences authorizationEndpointURL]; | ||
| NSURL *tokenEndpointURL = [GIDSignInPreferences tokenEndpointURL]; | ||
| OIDServiceConfiguration *appAuthConfiguration = | ||
| [[OIDServiceConfiguration alloc] initWithAuthorizationEndpoint:authorizationEndpointURL | ||
| tokenEndpoint:tokenEndpointURL]; | ||
| OIDAuthorizationRequest *request = | ||
| [[OIDAuthorizationRequest alloc] initWithConfiguration:appAuthConfiguration | ||
| clientId:options.configuration.clientID | ||
| scopes:options.scopes | ||
| redirectURL:redirectURL | ||
| responseType:OIDResponseTypeCode | ||
| additionalParameters:additionalParameters]; | ||
|
|
||
| _currentAuthorizationFlow = [OIDAuthorizationService | ||
| presentAuthorizationRequest:request | ||
| #if TARGET_OS_IOS || TARGET_OS_MACCATALYST | ||
| presentingViewController:options.presentingViewController | ||
| #elif TARGET_OS_OSX | ||
| presentingWindow:options.presentingWindow | ||
| #endif // TARGET_OS_OSX | ||
| callback:^(OIDAuthorizationResponse *authorizationResponse, | ||
| NSError *error) { | ||
| completion(authorizationResponse, error); | ||
| }]; | ||
| } | ||
|
|
||
| - (BOOL)resumeExternalUserAgentFlowWithURL:(NSURL *)url { | ||
| if ([self.currentAuthorizationFlow resumeExternalUserAgentFlowWithURL:url]) { | ||
| self.currentAuthorizationFlow = nil; | ||
| return YES; | ||
| } else { | ||
| return NO; | ||
| } | ||
| } | ||
|
|
||
| - (void)cancelAuthenticationFlow { | ||
| [self.currentAuthorizationFlow cancel]; | ||
| self.currentAuthorizationFlow = nil; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END | ||
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.
Uh oh!
There was an error while loading. Please reload this page.