@microsoft/power-apps-native-auth 0.3.6 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -20,6 +20,7 @@ import org.json.JSONObject
20
20
  import java.io.File
21
21
  import java.security.MessageDigest
22
22
  import java.util.concurrent.atomic.AtomicBoolean
23
+ import java.util.concurrent.atomic.AtomicInteger
23
24
 
24
25
  private const val TAG = "ExpoMsalIntune"
25
26
  private const val AUTH_PREFS = "powerapps.native.auth"
@@ -28,6 +29,8 @@ private const val FORCE_ACCOUNT_SELECTION = "force_account_selection"
28
29
  class ExpoMsalIntuneModule : Module() {
29
30
 
30
31
  private var pca: IMultipleAccountPublicClientApplication? = null
32
+ private val initializationGeneration = AtomicInteger(0)
33
+ private val initializationLock = Any()
31
34
 
32
35
  override fun definition() = ModuleDefinition {
33
36
  Name("ExpoMsalIntune")
@@ -48,6 +51,9 @@ class ExpoMsalIntuneModule : Module() {
48
51
  // currentActivity is null during early JS startup.
49
52
  val appCtx = appContext.reactContext?.applicationContext
50
53
  ?: return@AsyncFunction promise.reject("E_NO_CONTEXT", "No application context available", null)
54
+ val generation = synchronized(initializationLock) {
55
+ initializationGeneration.incrementAndGet()
56
+ }
51
57
 
52
58
  val configJson = buildMsalConfigJson(
53
59
  clientId = clientId,
@@ -62,7 +68,7 @@ class ExpoMsalIntuneModule : Module() {
62
68
  // cache (overwriting each time). Using a fixed name avoids accumulating
63
69
  // temp files: deleteOnExit() is a no-op on Android since the JVM shutdown
64
70
  // hook never runs when the process is killed by the OS.
65
- val configFile = File(appCtx.cacheDir, "msal_config.json")
71
+ val configFile = File(appCtx.cacheDir, "msal_config_$generation.json")
66
72
  configFile.writeText(configJson.toString())
67
73
  Log.d(TAG, "initializeClient: config written, starting PCA creation")
68
74
 
@@ -116,17 +122,36 @@ class ExpoMsalIntuneModule : Module() {
116
122
 
117
123
  val timeoutRunnable = Runnable {
118
124
  if (settled.compareAndSet(false, true)) {
119
- Log.w(TAG, "initializeClient: PCA creation timed out after 8s — clearing cache and retrying")
120
- clearMsalCache()
125
+ val shouldRetry = synchronized(initializationLock) {
126
+ if (initializationGeneration.get() != generation) false
127
+ else {
128
+ Log.w(TAG, "initializeClient: PCA creation timed out after 8s — clearing cache and retrying")
129
+ clearMsalCache()
130
+ true
131
+ }
132
+ }
133
+ if (!shouldRetry) {
134
+ promise.reject("E_MSAL_INIT_SUPERSEDED", "MSAL initialization was superseded", null)
135
+ return@Runnable
136
+ }
121
137
  createPca(
122
138
  onSuccess = { app ->
123
139
  Log.d(TAG, "initializeClient: PCA onCreated after cache clear")
124
- pca = app
125
- promise.resolve(null)
140
+ val published = synchronized(initializationLock) {
141
+ if (initializationGeneration.get() != generation) false
142
+ else {
143
+ pca = app
144
+ configFile.copyTo(File(appCtx.cacheDir, "msal_config.json"), overwrite = true)
145
+ true
146
+ }
147
+ }
148
+ if (published) promise.resolve(null)
149
+ else promise.reject("E_MSAL_INIT_SUPERSEDED", "MSAL initialization was superseded", null)
126
150
  },
127
151
  onFailure = { ex ->
128
152
  Log.e(TAG, "initializeClient: PCA onError after cache clear: ${ex.message}")
129
- promise.reject("E_MSAL_INIT", ex.message, ex)
153
+ val code = if (initializationGeneration.get() == generation) "E_MSAL_INIT" else "E_MSAL_INIT_SUPERSEDED"
154
+ promise.reject(code, if (code == "E_MSAL_INIT") ex.message else "MSAL initialization was superseded", ex)
130
155
  }
131
156
  )
132
157
  }
@@ -137,14 +162,23 @@ class ExpoMsalIntuneModule : Module() {
137
162
  onSuccess = { app ->
138
163
  if (settled.compareAndSet(false, true)) {
139
164
  mainHandler.removeCallbacks(timeoutRunnable)
140
- pca = app
141
- promise.resolve(null)
165
+ val published = synchronized(initializationLock) {
166
+ if (initializationGeneration.get() != generation) false
167
+ else {
168
+ pca = app
169
+ configFile.copyTo(File(appCtx.cacheDir, "msal_config.json"), overwrite = true)
170
+ true
171
+ }
172
+ }
173
+ if (published) promise.resolve(null)
174
+ else promise.reject("E_MSAL_INIT_SUPERSEDED", "MSAL initialization was superseded", null)
142
175
  }
143
176
  },
144
177
  onFailure = { ex ->
145
178
  if (settled.compareAndSet(false, true)) {
146
179
  mainHandler.removeCallbacks(timeoutRunnable)
147
- promise.reject("E_MSAL_INIT", ex.message, ex)
180
+ val code = if (initializationGeneration.get() == generation) "E_MSAL_INIT" else "E_MSAL_INIT_SUPERSEDED"
181
+ promise.reject(code, if (code == "E_MSAL_INIT") ex.message else "MSAL initialization was superseded", ex)
148
182
  }
149
183
  }
150
184
  )
@@ -161,6 +195,7 @@ class ExpoMsalIntuneModule : Module() {
161
195
 
162
196
  val client = pca
163
197
  ?: return@AsyncFunction promise.reject("E_NOT_INIT", notInitMsg, null)
198
+ val generation = initializationGeneration.get()
164
199
  val activity = appContext.activityProvider?.currentActivity
165
200
  ?: return@AsyncFunction promise.reject("E_NO_ACTIVITY", "No activity available", null)
166
201
 
@@ -183,13 +218,25 @@ class ExpoMsalIntuneModule : Module() {
183
218
  }
184
219
  .withCallback(object : AuthenticationCallback {
185
220
  override fun onSuccess(result: IAuthenticationResult) {
221
+ if (initializationGeneration.get() != generation) {
222
+ promise.reject("E_MSAL_INTERACTIVE_SUPERSEDED", "MSAL interactive authentication was superseded", null)
223
+ return
224
+ }
186
225
  authPrefs.edit().remove(FORCE_ACCOUNT_SELECTION).apply()
187
226
  promise.resolve(serializeResult(result))
188
227
  }
189
228
  override fun onError(exception: MsalException) {
229
+ if (initializationGeneration.get() != generation) {
230
+ promise.reject("E_MSAL_INTERACTIVE_SUPERSEDED", "MSAL interactive authentication was superseded", null)
231
+ return
232
+ }
190
233
  promise.reject("E_MSAL_INTERACTIVE", exception.message, exception)
191
234
  }
192
235
  override fun onCancel() {
236
+ if (initializationGeneration.get() != generation) {
237
+ promise.reject("E_MSAL_INTERACTIVE_SUPERSEDED", "MSAL interactive authentication was superseded", null)
238
+ return
239
+ }
193
240
  promise.reject("E_MSAL_CANCELLED", "User cancelled sign-in", null)
194
241
  }
195
242
  })
@@ -481,9 +528,11 @@ class ExpoMsalIntuneModule : Module() {
481
528
  }
482
529
 
483
530
  mapOf(
531
+ "authContractVersion" to str("powerapps_auth_contract_version"),
484
532
  "clientId" to str("adal_client_id"),
485
533
  "redirectUri" to str("adal_redirect_uri"),
486
534
  "tenantId" to str("adal_tenant_id"),
535
+ "tenantMode" to str("powerapps_tenant_mode"),
487
536
  )
488
537
  }
489
538
 
@@ -4,6 +4,14 @@ import IntuneMAMSwift
4
4
 
5
5
  // MARK: - Error helpers
6
6
 
7
+ private let expoMsalIntuneErrorDomain = "ExpoMsalIntune"
8
+ private let msalInitErrorCode = 1001
9
+ private let noViewControllerErrorCode = 1002
10
+ private let msalInteractiveErrorCode = 1003
11
+ private let msalSilentInteractionRequiredErrorCode = 1004
12
+ private let msalSilentErrorCode = 1005
13
+ private let msalSignoutErrorCode = 1006
14
+
7
15
  private enum MsalIntuneError: Error {
8
16
  case notInitialized
9
17
  case accountNotFound(String)
@@ -37,6 +45,8 @@ extension MsalIntuneError: LocalizedError {
37
45
  public class ExpoMsalIntuneModule: Module {
38
46
  private static let forceAccountSelectionKey = "powerapps.native.auth.forceAccountSelection"
39
47
  private var pca: MSALPublicClientApplication?
48
+ private var initializationGeneration: UInt64 = 0
49
+ private let initializationLock = NSLock()
40
50
  /// Stored at initializeClient time; controls which WebView type is used for
41
51
  /// interactive sign-in. true → WKWebView (no Info.plist URL scheme needed).
42
52
  /// false → ASWebAuthenticationSession (requires msauth.{bundleId}://auth scheme).
@@ -56,13 +66,13 @@ public class ExpoMsalIntuneModule: Module {
56
66
  // -----------------------------------------------------------------------
57
67
  AsyncFunction("initializeClient") {
58
68
  (clientId: String, authority: String, redirectUri: String, useEmbeddedWebView: Bool, useBroker: Bool) in
69
+ self.initializationLock.lock()
70
+ defer { self.initializationLock.unlock() }
71
+ self.initializationGeneration &+= 1
72
+ let generation = self.initializationGeneration
59
73
 
60
74
  guard let authorityURL = URL(string: authority) else {
61
- throw NSError(
62
- domain: "ExpoMsalIntune",
63
- code: -1,
64
- userInfo: [NSLocalizedDescriptionKey: "Invalid authority URL: \(authority)"]
65
- )
75
+ throw Self.nativeError(code: -1, message: "Invalid authority URL: \(authority)")
66
76
  }
67
77
 
68
78
  // The E2E release artifact must keep authentication inside the app so
@@ -102,12 +112,19 @@ public class ExpoMsalIntuneModule: Module {
102
112
  // The wrap pipeline adds the required msauth.{bundleId}://auth URL scheme
103
113
  // to Info.plist and CFBundleURLTypes — that's what makes the broker
104
114
  // callback possible at runtime.
105
- MSALGlobalConfig.brokerAvailability = useBroker ? .auto : .none
115
+ MSALGlobalConfig.brokerAvailability = self.useBroker ? .auto : .none
106
116
  do {
107
- self.pca = try MSALPublicClientApplication(configuration: config)
117
+ let initializedPca = try MSALPublicClientApplication(configuration: config)
118
+ guard self.initializationGeneration == generation else {
119
+ throw MsalIntuneError.intuneError("MSAL initialization was superseded")
120
+ }
121
+ self.pca = initializedPca
108
122
  } catch let err as NSError {
109
- let details = "domain=\(err.domain) code=\(err.code) userInfo=\(err.userInfo)"
110
- throw MsalIntuneError.intuneError("MSAL PCA init failed: \(details)")
123
+ throw Self.nativeMsalError(
124
+ code: msalInitErrorCode,
125
+ operation: "MSAL PCA init",
126
+ error: err
127
+ )
111
128
  }
112
129
 
113
130
  // Persist the resolved MSAL parameters so out-of-process / background
@@ -115,12 +132,15 @@ public class ExpoMsalIntuneModule: Module {
115
132
  // can recreate a PCA that shares this app's Keychain token cache. Mirrors
116
133
  // the Android module, which writes msal_config.json to the cache dir.
117
134
  // The geolocation reader expects flat keys: clientId / redirectUri / authority.
135
+ guard self.initializationGeneration == generation else {
136
+ throw MsalIntuneError.intuneError("MSAL initialization was superseded")
137
+ }
118
138
  Self.writeMsalConfig(
119
139
  clientId: clientId,
120
140
  redirectUri: iosRedirectUri,
121
141
  authority: authority,
122
- useEmbeddedWebView: useEmbeddedWebView,
123
- useBroker: useBroker
142
+ useEmbeddedWebView: self.useEmbeddedWebView,
143
+ useBroker: self.useBroker
124
144
  )
125
145
  }
126
146
 
@@ -131,6 +151,9 @@ public class ExpoMsalIntuneModule: Module {
131
151
  (scopes: [String], loginHint: String?, prompt: String?) async throws -> [String: Any] in
132
152
 
133
153
  guard let pca = self.pca else { throw MsalIntuneError.notInitialized }
154
+ self.initializationLock.lock()
155
+ let generation = self.initializationGeneration
156
+ self.initializationLock.unlock()
134
157
 
135
158
  return try await withCheckedThrowingContinuation { continuation in
136
159
  // topViewController() and pca.acquireToken() both require the main
@@ -139,8 +162,8 @@ public class ExpoMsalIntuneModule: Module {
139
162
  DispatchQueue.main.async {
140
163
  guard let viewController = self.topViewController() else {
141
164
  continuation.resume(throwing: NSError(
142
- domain: "ExpoMsalIntune",
143
- code: -2,
165
+ domain: expoMsalIntuneErrorDomain,
166
+ code: noViewControllerErrorCode,
144
167
  userInfo: [NSLocalizedDescriptionKey: "No view controller available for interactive sign-in"]
145
168
  ))
146
169
  return
@@ -166,9 +189,19 @@ public class ExpoMsalIntuneModule: Module {
166
189
  }
167
190
 
168
191
  pca.acquireToken(with: params) { result, error in
192
+ self.initializationLock.lock()
193
+ let isCurrentGeneration = self.initializationGeneration == generation
194
+ self.initializationLock.unlock()
195
+ guard isCurrentGeneration else {
196
+ continuation.resume(throwing: MsalIntuneError.intuneError("MSAL interactive authentication was superseded"))
197
+ return
198
+ }
169
199
  if let error = error as NSError? {
170
- let details = "domain=\(error.domain) code=\(error.code) userInfo=\(error.userInfo)"
171
- continuation.resume(throwing: MsalIntuneError.intuneError("MSAL acquireToken failed: \(details)"))
200
+ continuation.resume(throwing: Self.nativeMsalError(
201
+ code: msalInteractiveErrorCode,
202
+ operation: "MSAL acquireToken",
203
+ error: error
204
+ ))
172
205
  return
173
206
  }
174
207
  guard let result = result else {
@@ -203,9 +236,17 @@ public class ExpoMsalIntuneModule: Module {
203
236
  // fall back to interactive.
204
237
  if nsError.domain == MSALErrorDomain,
205
238
  nsError.code == MSALError.interactionRequired.rawValue {
206
- continuation.resume(throwing: MsalIntuneError.interactionRequired)
239
+ continuation.resume(throwing: Self.nativeMsalError(
240
+ code: msalSilentInteractionRequiredErrorCode,
241
+ operation: "MSAL acquireTokenSilent interactionRequired",
242
+ error: nsError
243
+ ))
207
244
  } else {
208
- continuation.resume(throwing: error)
245
+ continuation.resume(throwing: Self.nativeMsalError(
246
+ code: msalSilentErrorCode,
247
+ operation: "MSAL acquireTokenSilent",
248
+ error: nsError
249
+ ))
209
250
  }
210
251
  return
211
252
  }
@@ -291,7 +332,11 @@ public class ExpoMsalIntuneModule: Module {
291
332
 
292
333
  pca.signout(with: account, signoutParameters: params) { _, error in
293
334
  if let error = error {
294
- continuation.resume(throwing: error)
335
+ continuation.resume(throwing: Self.nativeMsalError(
336
+ code: msalSignoutErrorCode,
337
+ operation: "MSAL signout",
338
+ error: error as NSError
339
+ ))
295
340
  } else {
296
341
  continuation.resume()
297
342
  }
@@ -336,9 +381,11 @@ public class ExpoMsalIntuneModule: Module {
336
381
  let info = Bundle.main.infoDictionary ?? [:]
337
382
  let mam = info["IntuneMAMSettings"] as? [String: Any] ?? [:]
338
383
  return [
384
+ "authContractVersion": mam["PowerAppsAuthContractVersion"] as? String ?? "",
339
385
  "clientId": mam["ADALClientId"] as? String ?? "",
340
386
  "redirectUri": mam["ADALRedirectUri"] as? String ?? "",
341
387
  "tenantId": mam["ADALTenantId"] as? String ?? "",
388
+ "tenantMode": mam["PowerAppsTenantMode"] as? String ?? "",
342
389
  ]
343
390
  }
344
391
 
@@ -356,6 +403,26 @@ public class ExpoMsalIntuneModule: Module {
356
403
 
357
404
  // MARK: - Private helpers
358
405
 
406
+ private static func nativeError(code: Int, message: String) -> NSError {
407
+ NSError(
408
+ domain: expoMsalIntuneErrorDomain,
409
+ code: code,
410
+ userInfo: [NSLocalizedDescriptionKey: message]
411
+ )
412
+ }
413
+
414
+ private static func nativeMsalError(code: Int, operation: String, error: NSError) -> NSError {
415
+ let message = "\(operation) failed: domain=\(error.domain) code=\(error.code) message=\(error.localizedDescription)"
416
+ return NSError(
417
+ domain: expoMsalIntuneErrorDomain,
418
+ code: code,
419
+ userInfo: [
420
+ NSLocalizedDescriptionKey: message,
421
+ NSUnderlyingErrorKey: error,
422
+ ]
423
+ )
424
+ }
425
+
359
426
  private func cacheOperationsPca() throws -> MSALPublicClientApplication? {
360
427
  if let pca {
361
428
  return pca
@@ -440,10 +507,13 @@ public class ExpoMsalIntuneModule: Module {
440
507
  let str = String(data: data, encoding: .utf8) {
441
508
  claims = str
442
509
  }
510
+ let tenantId = account.accountClaims?["tid"] as? String
511
+ ?? account.tenantProfiles?.first?.tenantId
512
+ ?? ""
443
513
  return [
444
514
  "identifier": account.identifier ?? "",
445
515
  "username": account.username ?? "",
446
- "tenantId": account.tenantProfiles?.first?.tenantId ?? "",
516
+ "tenantId": tenantId,
447
517
  "claims": claims,
448
518
  ]
449
519
  }
package/lib/NOTICE.txt CHANGED
@@ -2,4 +2,4 @@ NOTICES
2
2
 
3
3
  This repository incorporates material as listed below or described in the code.
4
4
 
5
- @microsoft/power-apps-native-auth@0.3.6 has no production third-party dependencies.
5
+ @microsoft/power-apps-native-auth@0.4.0 has no production third-party dependencies.
@@ -84,9 +84,11 @@ export interface NativeExpoMsalIntuneModule {
84
84
  * when the returned clientId is empty or still contains a placeholder tag.
85
85
  */
86
86
  getWrapConfig(): {
87
+ authContractVersion: string;
87
88
  clientId: string;
88
89
  redirectUri: string;
89
90
  tenantId: string;
91
+ tenantMode: string;
90
92
  };
91
93
  }
92
94
  declare const ExpoMsalIntuneModule: NativeExpoMsalIntuneModule;
@@ -106,9 +106,11 @@ export declare function computeMsalRedirectUri(): string;
106
106
  * ```
107
107
  */
108
108
  export declare function getWrapConfig(): {
109
+ authContractVersion: string;
109
110
  clientId: string;
110
111
  redirectUri: string;
111
112
  tenantId: string;
113
+ tenantMode: string;
112
114
  };
113
115
  export default PublicClientApplication;
114
116
  /**
@@ -84,9 +84,11 @@ export interface NativeExpoMsalIntuneModule {
84
84
  * when the returned clientId is empty or still contains a placeholder tag.
85
85
  */
86
86
  getWrapConfig(): {
87
+ authContractVersion: string;
87
88
  clientId: string;
88
89
  redirectUri: string;
89
90
  tenantId: string;
91
+ tenantMode: string;
90
92
  };
91
93
  }
92
94
  declare const ExpoMsalIntuneModule: NativeExpoMsalIntuneModule;
@@ -106,9 +106,11 @@ export declare function computeMsalRedirectUri(): string;
106
106
  * ```
107
107
  */
108
108
  export declare function getWrapConfig(): {
109
+ authContractVersion: string;
109
110
  clientId: string;
110
111
  redirectUri: string;
111
112
  tenantId: string;
113
+ tenantMode: string;
112
114
  };
113
115
  export default PublicClientApplication;
114
116
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@microsoft/power-apps-native-auth",
3
- "version": "0.3.6",
3
+ "version": "0.4.0",
4
4
  "description": "Expo native module: MSAL authentication + Microsoft Intune MAM for iOS and Android",
5
5
  "author": "Microsoft Corporation",
6
6
  "license": "SEE LICENSE IN LICENSE",
@@ -37,8 +37,8 @@
37
37
  "expo-module.config.json"
38
38
  ],
39
39
  "scripts": {
40
- "prepack": "bob build && node ../../scripts/notices.js",
41
- "build": "bob build && node ../../scripts/notices.js",
40
+ "prepack": "bob build && node ../../scripts/package-build/notices.js",
41
+ "build": "bob build && node ../../scripts/package-build/notices.js",
42
42
  "type-check": "tsc --noEmit",
43
43
  "setup:ios": "node scripts/setup-ios-frameworks.js",
44
44
  "setup:android": "node scripts/setup-android-sdk.js",
@@ -51,6 +51,7 @@
51
51
  "react-native": ">=0.83.4"
52
52
  },
53
53
  "devDependencies": {
54
+ "@microsoft/power-apps-cli": "0.15.3",
54
55
  "expo-modules-core": "55.0.25",
55
56
  "typescript": "5.9.3"
56
57
  },
package/plugin/index.js CHANGED
@@ -444,6 +444,8 @@ const WRAP_PLACEHOLDER_STRINGS = [
444
444
  // For typical customer setups the app owner's tenant equals the AAD app
445
445
  // registration tenant, which is what MSAL's authority URL requires.
446
446
  { name: 'adal_tenant_id', value: 'ADAL_TENANT_ID_TAG' },
447
+ { name: 'powerapps_auth_contract_version', value: '2' },
448
+ { name: 'powerapps_tenant_mode', value: 'POWERAPPS_TENANT_MODE_TAG' },
447
449
  ];
448
450
 
449
451
  function withWrapStringPlaceholders(config) {
@@ -465,6 +467,9 @@ function withWrapStringPlaceholders(config) {
465
467
  if (name === 'adal_tenant_id' && process.env.ADAL_TENANT_ID) {
466
468
  return { name, value: process.env.ADAL_TENANT_ID };
467
469
  }
470
+ if (name === 'powerapps_tenant_mode' && process.env.POWERAPPS_TENANT_MODE) {
471
+ return { name, value: process.env.POWERAPPS_TENANT_MODE };
472
+ }
468
473
  return { name, value };
469
474
  });
470
475
 
@@ -22,6 +22,7 @@ function withIntuneMAMSettings(config) {
22
22
  return withInfoPlist(config, (mod) => {
23
23
  const clientId = process.env.ADAL_CLIENT_ID;
24
24
  const tenantId = process.env.ADAL_TENANT_ID;
25
+ const tenantMode = process.env.POWERAPPS_TENANT_MODE;
25
26
  const redirectUri = process.env.IOS_ADAL_REDIRECT_URI;
26
27
  const bundleId = config.ios?.bundleIdentifier;
27
28
  const isDevBuild = process.env.DEV_CLIENT === 'true' ||
@@ -38,6 +39,8 @@ function withIntuneMAMSettings(config) {
38
39
  ADALRedirectUri: redirectUri ?? `msauth.${bundleId}://auth`,
39
40
  ADALTenantId: tenantId ?? '',
40
41
  ADALAuthority: `https://login.microsoftonline.com/${tenantId ?? ''}`,
42
+ PowerAppsAuthContractVersion: '2',
43
+ PowerAppsTenantMode: tenantMode ?? 'single',
41
44
  };
42
45
  } else {
43
46
  // Release build without env vars (wrap pipeline base IPA).
@@ -48,6 +51,8 @@ function withIntuneMAMSettings(config) {
48
51
  ADALClientId: 'ADAL_CLIENT_ID_TAG',
49
52
  ADALRedirectUri: 'ADAL_REDIRECT_URI_TAG',
50
53
  ADALTenantId: 'ADAL_TENANT_ID_TAG',
54
+ PowerAppsAuthContractVersion: '2',
55
+ PowerAppsTenantMode: 'POWERAPPS_TENANT_MODE_TAG',
51
56
  };
52
57
  }
53
58