@@ -35,15 +35,13 @@ - (dispatch_queue_t)methodQueue
35
35
additionalParameters: additionalParameters
36
36
resolve: resolve
37
37
reject: reject];
38
-
39
38
} else {
40
39
[OIDAuthorizationService discoverServiceConfigurationForIssuer: [NSURL URLWithString: issuer]
41
40
completion: ^(OIDServiceConfiguration *_Nullable configuration, NSError *_Nullable error) {
42
41
if (!configuration) {
43
42
reject (@" RNAppAuth Error" , [error localizedDescription ], error);
44
43
return ;
45
44
}
46
-
47
45
[self authorizeWithConfiguration: configuration
48
46
redirectUrl: redirectUrl
49
47
clientId: clientId
@@ -80,7 +78,6 @@ - (dispatch_queue_t)methodQueue
80
78
additionalParameters: additionalParameters
81
79
resolve: resolve
82
80
reject: reject];
83
-
84
81
} else {
85
82
// otherwise hit up the discovery endpoint
86
83
[OIDAuthorizationService discoverServiceConfigurationForIssuer: [NSURL URLWithString: issuer]
@@ -110,13 +107,13 @@ - (OIDServiceConfiguration *) createServiceConfiguration: (NSDictionary *) servi
110
107
NSURL *authorizationEndpoint = [NSURL URLWithString: [serviceConfiguration objectForKey: @" authorizationEndpoint" ]];
111
108
NSURL *tokenEndpoint = [NSURL URLWithString: [serviceConfiguration objectForKey: @" tokenEndpoint" ]];
112
109
NSURL *registrationEndpoint = [NSURL URLWithString: [serviceConfiguration objectForKey: @" registrationEndpoint" ]];
113
-
110
+
114
111
OIDServiceConfiguration *configuration =
115
112
[[OIDServiceConfiguration alloc ]
116
113
initWithAuthorizationEndpoint: authorizationEndpoint
117
114
tokenEndpoint: tokenEndpoint
118
115
registrationEndpoint: registrationEndpoint];
119
-
116
+
120
117
return configuration;
121
118
}
122
119
@@ -141,10 +138,10 @@ - (void)authorizeWithConfiguration: (OIDServiceConfiguration *) configuration
141
138
redirectURL: [NSURL URLWithString: redirectUrl]
142
139
responseType: OIDResponseTypeCode
143
140
additionalParameters: additionalParameters];
144
-
141
+
145
142
// performs authentication request
146
143
id <UIApplicationDelegate, RNAppAuthAuthorizationFlowManager> appDelegate = (id <UIApplicationDelegate, RNAppAuthAuthorizationFlowManager>)[UIApplication sharedApplication ].delegate ;
147
-
144
+
148
145
id <OIDAuthorizationFlowSession> currentSession =
149
146
[OIDAuthState authStateByPresentingAuthorizationRequest: request
150
147
presentingViewController: appDelegate.window.rootViewController
@@ -155,7 +152,7 @@ - (void)authorizeWithConfiguration: (OIDServiceConfiguration *) configuration
155
152
} else {
156
153
reject (@" RNAppAuth Error" , [error localizedDescription ], error);
157
154
}
158
-
155
+
159
156
}]; // end [OIDAuthState authStateByPresentingAuthorizationRequest:request
160
157
if ([[appDelegate class ] conformsToProtocol: @protocol (RNAppAuthAuthorizationFlowManager)]
161
158
&& [appDelegate respondsToSelector: @selector (setCurrentAuthorizationFlowSession: )]) {
@@ -179,7 +176,7 @@ - (void)refreshWithConfiguration: (OIDServiceConfiguration *)configuration
179
176
additionalParameters : (NSDictionary *_Nullable) additionalParameters
180
177
resolve : (RCTPromiseResolveBlock) resolve
181
178
reject : (RCTPromiseRejectBlock) reject {
182
-
179
+
183
180
OIDTokenRequest *tokenRefreshRequest =
184
181
[[OIDTokenRequest alloc ] initWithConfiguration: configuration
185
182
grantType: @" refresh_token"
@@ -191,7 +188,7 @@ - (void)refreshWithConfiguration: (OIDServiceConfiguration *)configuration
191
188
refreshToken: refreshToken
192
189
codeVerifier: nil
193
190
additionalParameters: additionalParameters];
194
-
191
+
195
192
[OIDAuthorizationService performTokenRequest: tokenRefreshRequest
196
193
callback: ^(OIDTokenResponse *_Nullable response,
197
194
NSError *_Nullable error) {
@@ -201,7 +198,6 @@ - (void)refreshWithConfiguration: (OIDServiceConfiguration *)configuration
201
198
reject (@" RNAppAuth Error" , [error localizedDescription ], error);
202
199
}
203
200
}];
204
-
205
201
}
206
202
207
203
/*
@@ -212,7 +208,7 @@ - (NSDictionary*)formatResponse: (OIDTokenResponse*) response {
212
208
dateFormat.timeZone = [NSTimeZone timeZoneWithAbbreviation: @" UTC" ];
213
209
[dateFormat setLocale: [NSLocale localeWithLocaleIdentifier: @" en_US_POSIX" ]];
214
210
[dateFormat setDateFormat: @" yyyy-MM-dd'T'HH:mm:ss'Z'" ];
215
-
211
+
216
212
return @{@" accessToken" : response.accessToken ? response.accessToken : @" " ,
217
213
@" accessTokenExpirationDate" : response.accessTokenExpirationDate ? [dateFormat stringFromDate: response.accessTokenExpirationDate] : @" " ,
218
214
@" additionalParameters" : response.additionalParameters ,
0 commit comments