@oxyhq/services 5.16.38 → 5.16.40
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.
- package/lib/commonjs/core/mixins/OxyServices.auth.js +10 -3
- package/lib/commonjs/core/mixins/OxyServices.auth.js.map +1 -1
- package/lib/commonjs/index.js +0 -7
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js +99 -53
- package/lib/commonjs/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/module/core/mixins/OxyServices.auth.js +10 -3
- package/lib/module/core/mixins/OxyServices.auth.js.map +1 -1
- package/lib/module/index.js +1 -1
- package/lib/module/index.js.map +1 -1
- package/lib/module/ui/context/hooks/useAuthOperations.js +99 -53
- package/lib/module/ui/context/hooks/useAuthOperations.js.map +1 -1
- package/lib/typescript/core/mixins/OxyServices.auth.d.ts +2 -1
- package/lib/typescript/core/mixins/OxyServices.auth.d.ts.map +1 -1
- package/lib/typescript/core/mixins/index.d.ts +1 -1
- package/lib/typescript/index.d.ts +2 -1
- package/lib/typescript/index.d.ts.map +1 -1
- package/lib/typescript/ui/context/OxyContext.d.ts +3 -3
- package/lib/typescript/ui/context/OxyContext.d.ts.map +1 -1
- package/lib/typescript/ui/context/hooks/useAuthOperations.d.ts +2 -2
- package/lib/typescript/ui/context/hooks/useAuthOperations.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/core/mixins/OxyServices.auth.ts +12 -3
- package/src/index.ts +1 -1
- package/src/ui/context/OxyContext.tsx +3 -3
- package/src/ui/context/hooks/useAuthOperations.ts +95 -54
|
@@ -225,18 +225,27 @@ export const useAuthOperations = ({
|
|
|
225
225
|
}, [applyLanguagePreference, logger, loginSuccess, onAuthStateChange, oxyServices, saveActiveSessionId, setActiveSessionId, switchSession, updateSessions, storage]);
|
|
226
226
|
|
|
227
227
|
/**
|
|
228
|
-
* Create a new identity (offline-first)
|
|
229
|
-
*
|
|
228
|
+
* Create a new identity (offline-first).
|
|
229
|
+
*
|
|
230
|
+
* Generates cryptographic keys locally without requiring server connection.
|
|
231
|
+
* Identity is based on the public/private key pair - no username or email required.
|
|
232
|
+
*
|
|
233
|
+
* IMPORTANT: This function only clears session data if the identity actually changes
|
|
234
|
+
* (i.e., a new key pair is generated). Retrying registration with the same identity
|
|
235
|
+
* will NOT clear session data.
|
|
236
|
+
*
|
|
237
|
+
* @param username - Optional username to set during registration (if online)
|
|
238
|
+
* @returns Object with synced status indicating if identity was registered with server
|
|
230
239
|
*/
|
|
231
|
-
const createIdentity = useCallback(async
|
|
240
|
+
const createIdentity = useCallback(async username => {
|
|
232
241
|
if (!storage) throw new Error('Storage not initialized');
|
|
233
242
|
setAuthState({
|
|
234
243
|
isLoading: true,
|
|
235
244
|
error: null
|
|
236
245
|
});
|
|
237
246
|
try {
|
|
238
|
-
//
|
|
239
|
-
//
|
|
247
|
+
// Get old public key before creating new identity
|
|
248
|
+
// This is used to detect if identity actually changed
|
|
240
249
|
const oldPublicKey = await KeyManager.getPublicKey().catch(() => null);
|
|
241
250
|
if (__DEV__ && logger) {
|
|
242
251
|
logger('Creating new identity', {
|
|
@@ -256,39 +265,61 @@ export const useAuthOperations = ({
|
|
|
256
265
|
});
|
|
257
266
|
}
|
|
258
267
|
|
|
259
|
-
//
|
|
268
|
+
// Only clear sessions if identity actually changed
|
|
269
|
+
// This prevents clearing sessions on registration retries
|
|
260
270
|
await clearSessionsIfIdentityChanged(oldPublicKey, publicKey);
|
|
261
271
|
|
|
262
|
-
// Mark as not synced
|
|
272
|
+
// Mark as not synced initially
|
|
263
273
|
await storage.setItem('oxy_identity_synced', 'false');
|
|
264
274
|
setIdentitySynced(false);
|
|
265
275
|
|
|
266
|
-
//
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
276
|
+
// If username provided, try to register immediately (online only)
|
|
277
|
+
if (username) {
|
|
278
|
+
// Validate username format before attempting registration
|
|
279
|
+
const trimmedUsername = username.trim();
|
|
280
|
+
if (trimmedUsername && /^[a-zA-Z0-9]{3,30}$/.test(trimmedUsername)) {
|
|
281
|
+
try {
|
|
282
|
+
const {
|
|
283
|
+
signature,
|
|
284
|
+
timestamp
|
|
285
|
+
} = await SignatureService.createRegistrationSignature();
|
|
286
|
+
await oxyServices.register(publicKey, signature, timestamp, trimmedUsername);
|
|
287
|
+
|
|
288
|
+
// Mark as synced (Zustand store + storage)
|
|
289
|
+
await storage.setItem('oxy_identity_synced', 'true');
|
|
290
|
+
setIdentitySynced(true);
|
|
291
|
+
if (__DEV__ && logger) {
|
|
292
|
+
logger('Identity synced with server successfully with username');
|
|
293
|
+
}
|
|
294
|
+
return {
|
|
295
|
+
synced: true
|
|
296
|
+
};
|
|
297
|
+
} catch (syncError) {
|
|
298
|
+
// Offline or server error - identity created locally but not synced
|
|
299
|
+
if (__DEV__ && logger) {
|
|
300
|
+
logger('Identity created locally with username (offline), will sync when online', syncError);
|
|
301
|
+
}
|
|
302
|
+
return {
|
|
303
|
+
synced: false
|
|
304
|
+
};
|
|
305
|
+
}
|
|
306
|
+
} else {
|
|
307
|
+
// Invalid username format - log the issue
|
|
308
|
+
if (__DEV__ && logger) {
|
|
309
|
+
logger('Invalid username format, identity created without username', {
|
|
310
|
+
providedUsername: username.substring(0, 20)
|
|
311
|
+
});
|
|
312
|
+
}
|
|
287
313
|
}
|
|
288
|
-
return {
|
|
289
|
-
synced: false
|
|
290
|
-
};
|
|
291
314
|
}
|
|
315
|
+
|
|
316
|
+
// No username provided or invalid format - defer registration until later
|
|
317
|
+
if (__DEV__ && logger) {
|
|
318
|
+
logger('Identity created locally without username, will register during sync');
|
|
319
|
+
}
|
|
320
|
+
return {
|
|
321
|
+
synced: false
|
|
322
|
+
};
|
|
292
323
|
} catch (error) {
|
|
293
324
|
// CRITICAL: Never delete identity on error - it may have been successfully created
|
|
294
325
|
// Only log the error and let the user recover using their backup file
|
|
@@ -304,7 +335,7 @@ export const useAuthOperations = ({
|
|
|
304
335
|
await storage.setItem('oxy_identity_synced', 'false').catch(() => {});
|
|
305
336
|
setIdentitySynced(false);
|
|
306
337
|
if (__DEV__ && logger) {
|
|
307
|
-
logger('Identity was created but sync failed - user can sync later
|
|
338
|
+
logger('Identity was created but sync failed - user can sync later');
|
|
308
339
|
}
|
|
309
340
|
} else {
|
|
310
341
|
// No identity exists - this was a generation failure, safe to clean up sync flag
|
|
@@ -341,10 +372,18 @@ export const useAuthOperations = ({
|
|
|
341
372
|
}, [storage, setIdentitySynced]);
|
|
342
373
|
|
|
343
374
|
/**
|
|
344
|
-
* Sync local identity with server
|
|
345
|
-
*
|
|
375
|
+
* Sync local identity with server.
|
|
376
|
+
*
|
|
377
|
+
* Registers the identity with the server if not already registered.
|
|
378
|
+
* This function is idempotent - calling it multiple times is safe.
|
|
379
|
+
*
|
|
380
|
+
* TanStack Query handles offline mutations automatically, so this will
|
|
381
|
+
* retry automatically when connection is restored.
|
|
382
|
+
*
|
|
383
|
+
* @param username - Optional username to set during sync/registration
|
|
384
|
+
* @returns User object after successful sync and sign-in
|
|
346
385
|
*/
|
|
347
|
-
const syncIdentity = useCallback(async
|
|
386
|
+
const syncIdentity = useCallback(async username => {
|
|
348
387
|
if (!storage) throw new Error('Storage not initialized');
|
|
349
388
|
setAuthState({
|
|
350
389
|
isLoading: true,
|
|
@@ -361,6 +400,7 @@ export const useAuthOperations = ({
|
|
|
361
400
|
const alreadySynced = await storage.getItem('oxy_identity_synced');
|
|
362
401
|
if (alreadySynced === 'true') {
|
|
363
402
|
setIdentitySynced(true);
|
|
403
|
+
// Identity is already synced, just sign in
|
|
364
404
|
return await performSignIn(publicKey);
|
|
365
405
|
}
|
|
366
406
|
|
|
@@ -374,7 +414,7 @@ export const useAuthOperations = ({
|
|
|
374
414
|
signature,
|
|
375
415
|
timestamp
|
|
376
416
|
} = await SignatureService.createRegistrationSignature();
|
|
377
|
-
await oxyServices.register(publicKey, signature, timestamp);
|
|
417
|
+
await oxyServices.register(publicKey, signature, timestamp, username);
|
|
378
418
|
}
|
|
379
419
|
|
|
380
420
|
// Mark as synced (Zustand store + storage)
|
|
@@ -384,13 +424,6 @@ export const useAuthOperations = ({
|
|
|
384
424
|
// Sign in
|
|
385
425
|
const user = await performSignIn(publicKey);
|
|
386
426
|
|
|
387
|
-
// Check if user has username - required for syncing
|
|
388
|
-
if (!user.username) {
|
|
389
|
-
const usernameError = new Error('USERNAME_REQUIRED');
|
|
390
|
-
usernameError.code = 'USERNAME_REQUIRED';
|
|
391
|
-
throw usernameError;
|
|
392
|
-
}
|
|
393
|
-
|
|
394
427
|
// TanStack Query will automatically retry any pending mutations
|
|
395
428
|
|
|
396
429
|
return user;
|
|
@@ -415,9 +448,21 @@ export const useAuthOperations = ({
|
|
|
415
448
|
}, [oxyServices, storage, setAuthState, performSignIn, loginFailure, onError, logger, setSyncing, setIdentitySynced]);
|
|
416
449
|
|
|
417
450
|
/**
|
|
418
|
-
* Import identity from backup file
|
|
451
|
+
* Import identity from encrypted backup file.
|
|
452
|
+
*
|
|
453
|
+
* Restores a previously created identity from an encrypted backup.
|
|
454
|
+
* The backup is decrypted using the provided password.
|
|
455
|
+
*
|
|
456
|
+
* IMPORTANT: This function clears session data only if importing a different
|
|
457
|
+
* identity than the one currently stored. Re-importing the same identity
|
|
458
|
+
* will NOT clear session data.
|
|
459
|
+
*
|
|
460
|
+
* @param backupData - The encrypted backup data object
|
|
461
|
+
* @param password - Password to decrypt the backup
|
|
462
|
+
* @param username - Optional username to set during registration if not yet registered
|
|
463
|
+
* @returns Object with synced status indicating if identity was registered with server
|
|
419
464
|
*/
|
|
420
|
-
const importIdentity = useCallback(async (backupData, password) => {
|
|
465
|
+
const importIdentity = useCallback(async (backupData, password, username) => {
|
|
421
466
|
if (!storage) throw new Error('Storage not initialized');
|
|
422
467
|
|
|
423
468
|
// Validate arguments - ensure backupData is an object, not a string (old signature)
|
|
@@ -435,8 +480,8 @@ export const useAuthOperations = ({
|
|
|
435
480
|
error: null
|
|
436
481
|
});
|
|
437
482
|
try {
|
|
438
|
-
//
|
|
439
|
-
//
|
|
483
|
+
// Get old public key before importing identity
|
|
484
|
+
// This is used to detect if identity actually changed
|
|
440
485
|
const oldPublicKey = await KeyManager.getPublicKey().catch(() => null);
|
|
441
486
|
if (__DEV__ && logger) {
|
|
442
487
|
logger('Importing identity from backup', {
|
|
@@ -484,10 +529,11 @@ export const useAuthOperations = ({
|
|
|
484
529
|
throw new Error('Backup file is corrupted or password is incorrect');
|
|
485
530
|
}
|
|
486
531
|
|
|
487
|
-
//
|
|
532
|
+
// Only clear sessions if identity actually changed
|
|
533
|
+
// This prevents clearing sessions when re-importing the same identity
|
|
488
534
|
await clearSessionsIfIdentityChanged(oldPublicKey, publicKey);
|
|
489
535
|
|
|
490
|
-
// Mark as not synced
|
|
536
|
+
// Mark as not synced initially (will check server status below)
|
|
491
537
|
await storage.setItem('oxy_identity_synced', 'false');
|
|
492
538
|
setIdentitySynced(false);
|
|
493
539
|
|
|
@@ -498,19 +544,19 @@ export const useAuthOperations = ({
|
|
|
498
544
|
registered
|
|
499
545
|
} = await oxyServices.checkPublicKeyRegistered(publicKey);
|
|
500
546
|
if (registered) {
|
|
501
|
-
// Identity exists, mark as synced
|
|
547
|
+
// Identity exists on server, mark as synced
|
|
502
548
|
await storage.setItem('oxy_identity_synced', 'true');
|
|
503
549
|
setIdentitySynced(true);
|
|
504
550
|
return {
|
|
505
551
|
synced: true
|
|
506
552
|
};
|
|
507
553
|
} else {
|
|
508
|
-
// Need to register this identity
|
|
554
|
+
// Need to register this identity
|
|
509
555
|
const {
|
|
510
556
|
signature,
|
|
511
557
|
timestamp
|
|
512
558
|
} = await SignatureService.createRegistrationSignature();
|
|
513
|
-
await oxyServices.register(publicKey, signature, timestamp);
|
|
559
|
+
await oxyServices.register(publicKey, signature, timestamp, username);
|
|
514
560
|
await storage.setItem('oxy_identity_synced', 'true');
|
|
515
561
|
setIdentitySynced(true);
|
|
516
562
|
return {
|
|
@@ -518,7 +564,7 @@ export const useAuthOperations = ({
|
|
|
518
564
|
};
|
|
519
565
|
}
|
|
520
566
|
} catch (syncError) {
|
|
521
|
-
// Offline - identity restored locally but not synced
|
|
567
|
+
// Offline or server error - identity restored locally but not synced
|
|
522
568
|
if (__DEV__) {
|
|
523
569
|
console.log('[Auth] Identity imported locally, will sync when online:', syncError);
|
|
524
570
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","DeviceManager","fetchSessionsWithFallback","handleAuthError","isInvalidSessionError","KeyManager","SignatureService","LOGIN_ERROR_CODE","REGISTER_ERROR_CODE","LOGOUT_ERROR_CODE","LOGOUT_ALL_ERROR_CODE","useAuthOperations","oxyServices","storage","sessions","activeSessionId","setActiveSessionId","updateSessions","saveActiveSessionId","clearSessionState","switchSession","applyLanguagePreference","onAuthStateChange","onError","loginSuccess","loginFailure","logoutStore","setAuthState","setIdentitySynced","setSyncing","logger","clearSessionsIfIdentityChanged","oldPublicKey","newPublicKey","__DEV__","substring","invalidateCache","performSignIn","publicKey","deviceFingerprintObj","getDeviceFingerprint","deviceFingerprint","JSON","stringify","deviceInfo","getDeviceInfo","deviceName","getDefaultDeviceName","challenge","isOffline","challengeResponse","requestChallenge","error","errorMessage","Error","message","String","isNetworkError","includes","code","status","generateChallenge","signature","timestamp","signChallenge","fullUser","sessionResponse","localSessionId","Date","now","Math","random","toString","substr","localDeviceId","expiresAt","toISOString","id","username","privacySettings","sessionId","deviceId","user","offlineSession","lastActive","userId","isCurrent","merge","setItem","verifyChallenge","getTokenBySession","getUserBySession","test","console","warn","allDeviceSessions","fallbackDeviceId","fallbackUserId","existingSession","find","session","logoutSession","logoutError","filter","createIdentity","isLoading","getPublicKey","catch","hadPreviousIdentity","privateKey","generateKeyPair","importKeyPair","createRegistrationSignature","register","synced","syncError","hasIdentity","removeItem","defaultMessage","setAuthError","msg","isIdentitySyncedFn","getItem","isSynced","syncIdentity","alreadySynced","registered","checkPublicKeyRegistered","usernameError","importIdentity","backupData","password","Array","isArray","encrypted","salt","iv","backupPublicKey","Crypto","saltBytes","Uint8Array","match","map","byte","parseInt","ivBytes","saltHex","from","b","padStart","join","key","i","digestStringAsync","CryptoDigestAlgorithm","SHA256","keyBytes","length","encryptedBytes","Buffer","decryptedBytes","TextDecoder","decode","log","signIn","logout","targetSessionId","sessionToLogout","filteredSessions","isInvalid","undefined","logoutAll","logoutAllSessions","isIdentitySynced"],"sourceRoot":"../../../../../src","sources":["ui/context/hooks/useAuthOperations.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["useCallback","DeviceManager","fetchSessionsWithFallback","handleAuthError","isInvalidSessionError","KeyManager","SignatureService","LOGIN_ERROR_CODE","REGISTER_ERROR_CODE","LOGOUT_ERROR_CODE","LOGOUT_ALL_ERROR_CODE","useAuthOperations","oxyServices","storage","sessions","activeSessionId","setActiveSessionId","updateSessions","saveActiveSessionId","clearSessionState","switchSession","applyLanguagePreference","onAuthStateChange","onError","loginSuccess","loginFailure","logoutStore","setAuthState","setIdentitySynced","setSyncing","logger","clearSessionsIfIdentityChanged","oldPublicKey","newPublicKey","__DEV__","substring","invalidateCache","performSignIn","publicKey","deviceFingerprintObj","getDeviceFingerprint","deviceFingerprint","JSON","stringify","deviceInfo","getDeviceInfo","deviceName","getDefaultDeviceName","challenge","isOffline","challengeResponse","requestChallenge","error","errorMessage","Error","message","String","isNetworkError","includes","code","status","generateChallenge","signature","timestamp","signChallenge","fullUser","sessionResponse","localSessionId","Date","now","Math","random","toString","substr","localDeviceId","expiresAt","toISOString","id","username","privacySettings","sessionId","deviceId","user","offlineSession","lastActive","userId","isCurrent","merge","setItem","verifyChallenge","getTokenBySession","getUserBySession","test","console","warn","allDeviceSessions","fallbackDeviceId","fallbackUserId","existingSession","find","session","logoutSession","logoutError","filter","createIdentity","isLoading","getPublicKey","catch","hadPreviousIdentity","privateKey","generateKeyPair","importKeyPair","trimmedUsername","trim","createRegistrationSignature","register","synced","syncError","providedUsername","hasIdentity","removeItem","defaultMessage","setAuthError","msg","isIdentitySyncedFn","getItem","isSynced","syncIdentity","alreadySynced","registered","checkPublicKeyRegistered","importIdentity","backupData","password","Array","isArray","encrypted","salt","iv","backupPublicKey","Crypto","saltBytes","Uint8Array","match","map","byte","parseInt","ivBytes","saltHex","from","b","padStart","join","key","i","digestStringAsync","CryptoDigestAlgorithm","SHA256","keyBytes","length","encryptedBytes","Buffer","decryptedBytes","TextDecoder","decode","log","signIn","logout","targetSessionId","sessionToLogout","filteredSessions","isInvalid","undefined","logoutAll","logoutAllSessions","isIdentitySynced"],"sourceRoot":"../../../../../src","sources":["ui/context/hooks/useAuthOperations.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -39,8 +39,9 @@ export declare function OxyServicesAuthMixin<T extends typeof OxyServicesBase>(B
|
|
|
39
39
|
* @param publicKey - The user's ECDSA public key (hex)
|
|
40
40
|
* @param signature - Signature of the registration request
|
|
41
41
|
* @param timestamp - Timestamp when the signature was created
|
|
42
|
+
* @param username - Optional username to set during registration
|
|
42
43
|
*/
|
|
43
|
-
register(publicKey: string, signature: string, timestamp: number): Promise<{
|
|
44
|
+
register(publicKey: string, signature: string, timestamp: number, username?: string): Promise<{
|
|
44
45
|
message: string;
|
|
45
46
|
user: User;
|
|
46
47
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxyServices.auth.d.ts","sourceRoot":"","sources":["../../../../src/core/mixins/OxyServices.auth.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAG3D,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,OAAO,eAAe,EAAE,IAAI,EAAE,CAAC;kBAErD,GAAG,EAAE;QAI1B
|
|
1
|
+
{"version":3,"file":"OxyServices.auth.d.ts","sourceRoot":"","sources":["../../../../src/core/mixins/OxyServices.auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -756,7 +756,7 @@ export declare function composeOxyServices(): {
|
|
|
756
756
|
__resetTokensForTests(): void;
|
|
757
757
|
} & {
|
|
758
758
|
new (...args: any[]): {
|
|
759
|
-
register(publicKey: string, signature: string, timestamp: number): Promise<{
|
|
759
|
+
register(publicKey: string, signature: string, timestamp: number, username?: string): Promise<{
|
|
760
760
|
message: string;
|
|
761
761
|
user: import("..").User;
|
|
762
762
|
}>;
|
|
@@ -34,7 +34,8 @@ export { OxyLogo, FollowButton } from './ui';
|
|
|
34
34
|
export * from './utils/apiUtils';
|
|
35
35
|
export { ErrorCodes, createApiError, handleHttpError, validateRequiredFields, retryWithBackoff } from './utils/errorUtils';
|
|
36
36
|
export * from './utils/validationUtils';
|
|
37
|
-
export { logger, LogLevel,
|
|
37
|
+
export { logger, LogLevel, logAuth, logApi, logSession, logUser, logDevice, logPayment, logPerformance } from './utils/loggerUtils';
|
|
38
|
+
export type { LogContext } from './utils/loggerUtils';
|
|
38
39
|
export * from './utils/asyncUtils';
|
|
39
40
|
export * from './utils/hookUtils';
|
|
40
41
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,17 +21,17 @@ export interface OxyContextState {
|
|
|
21
21
|
currentLanguageMetadata: ReturnType<typeof useLanguageManagement>['metadata'];
|
|
22
22
|
currentLanguageName: string;
|
|
23
23
|
currentNativeLanguageName: string;
|
|
24
|
-
createIdentity: () => Promise<{
|
|
24
|
+
createIdentity: (username?: string) => Promise<{
|
|
25
25
|
synced: boolean;
|
|
26
26
|
}>;
|
|
27
|
-
importIdentity: (backupData: BackupData, password: string) => Promise<{
|
|
27
|
+
importIdentity: (backupData: BackupData, password: string, username?: string) => Promise<{
|
|
28
28
|
synced: boolean;
|
|
29
29
|
}>;
|
|
30
30
|
signIn: (deviceName?: string) => Promise<User>;
|
|
31
31
|
hasIdentity: () => Promise<boolean>;
|
|
32
32
|
getPublicKey: () => Promise<string | null>;
|
|
33
33
|
isIdentitySynced: () => Promise<boolean>;
|
|
34
|
-
syncIdentity: () => Promise<User>;
|
|
34
|
+
syncIdentity: (username?: string) => Promise<User>;
|
|
35
35
|
deleteIdentityAndClearAccount: (skipBackup?: boolean, force?: boolean, userConfirmed?: boolean) => Promise<void>;
|
|
36
36
|
storeTransferCode: (transferId: string, code: string, sourceDeviceId: string | null, publicKey: string) => Promise<void>;
|
|
37
37
|
getTransferCode: (transferId: string) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OxyContext.d.ts","sourceRoot":"","sources":["../../../../src/ui/context/OxyContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EASL,KAAK,SAAS,EACf,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAK1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AAMvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAItD,OAAO,EAAc,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAQ3D,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,uBAAuB,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,UAAU,CAAC,CAAC;IAC9E,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yBAAyB,EAAE,MAAM,CAAC;IAGlC,cAAc,EAAE,MAAM,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"OxyContext.d.ts","sourceRoot":"","sources":["../../../../src/ui/context/OxyContext.tsx"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ export interface UseAuthOperationsOptions {
|
|
|
29
29
|
}
|
|
30
30
|
export interface UseAuthOperationsResult {
|
|
31
31
|
/** Create a new identity locally (offline-first) and optionally sync with server */
|
|
32
|
-
createIdentity: () => Promise<{
|
|
32
|
+
createIdentity: (username?: string) => Promise<{
|
|
33
33
|
synced: boolean;
|
|
34
34
|
}>;
|
|
35
35
|
/** Import an existing identity from backup file data */
|
|
@@ -49,7 +49,7 @@ export interface UseAuthOperationsResult {
|
|
|
49
49
|
/** Check if identity is synced with server */
|
|
50
50
|
isIdentitySynced: () => Promise<boolean>;
|
|
51
51
|
/** Sync local identity with server (when online) */
|
|
52
|
-
syncIdentity: () => Promise<User>;
|
|
52
|
+
syncIdentity: (username?: string) => Promise<User>;
|
|
53
53
|
}
|
|
54
54
|
/**
|
|
55
55
|
* Authentication operations using public key cryptography.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAuthOperations.d.ts","sourceRoot":"","sources":["../../../../../src/ui/context/hooks/useAuthOperations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,aAAa,EAAwB,MAAM,yBAAyB,CAAC;AAInF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAgC,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAEhF,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACjC,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,kBAAkB,EAAE,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,KAAK,IAAI,CAAC;IACvD,cAAc,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IACnF,mBAAmB,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,iBAAiB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,uBAAuB,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACvD,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC;IAChD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpC,YAAY,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACnC,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,YAAY,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC;IAElD,iBAAiB,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC7C,UAAU,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACvC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CACrD;AAED,MAAM,WAAW,uBAAuB;IACtC,oFAAoF;IACpF,cAAc,EAAE,MAAM,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"useAuthOperations.d.ts","sourceRoot":"","sources":["../../../../../src/ui/context/hooks/useAuthOperations.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oxyhq/services",
|
|
3
|
-
"version": "5.16.
|
|
3
|
+
"version": "5.16.40",
|
|
4
4
|
"description": "Reusable OxyHQ module to handle authentication, user management, karma system, device-based session management and more 🚀",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"module": "lib/module/index.js",
|
|
@@ -49,18 +49,27 @@ export function OxyServicesAuthMixin<T extends typeof OxyServicesBase>(Base: T)
|
|
|
49
49
|
* @param publicKey - The user's ECDSA public key (hex)
|
|
50
50
|
* @param signature - Signature of the registration request
|
|
51
51
|
* @param timestamp - Timestamp when the signature was created
|
|
52
|
+
* @param username - Optional username to set during registration
|
|
52
53
|
*/
|
|
53
54
|
async register(
|
|
54
55
|
publicKey: string,
|
|
55
56
|
signature: string,
|
|
56
|
-
timestamp: number
|
|
57
|
+
timestamp: number,
|
|
58
|
+
username?: string
|
|
57
59
|
): Promise<{ message: string; user: User }> {
|
|
58
60
|
try {
|
|
59
|
-
const
|
|
61
|
+
const payload: any = {
|
|
60
62
|
publicKey,
|
|
61
63
|
signature,
|
|
62
64
|
timestamp,
|
|
63
|
-
}
|
|
65
|
+
};
|
|
66
|
+
|
|
67
|
+
// Include username if provided
|
|
68
|
+
if (username && username.trim()) {
|
|
69
|
+
payload.username = username.trim();
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
const res = await this.makeRequest<{ message: string; user: User }>('POST', '/api/auth/register', payload, { cache: false });
|
|
64
73
|
|
|
65
74
|
if (!res || (typeof res === 'object' && Object.keys(res).length === 0)) {
|
|
66
75
|
throw new OxyAuthenticationError('Registration failed', 'REGISTER_FAILED', 400);
|
package/src/index.ts
CHANGED
|
@@ -198,7 +198,6 @@ export * from './utils/validationUtils';
|
|
|
198
198
|
export {
|
|
199
199
|
logger,
|
|
200
200
|
LogLevel,
|
|
201
|
-
LogContext,
|
|
202
201
|
logAuth,
|
|
203
202
|
logApi,
|
|
204
203
|
logSession,
|
|
@@ -207,5 +206,6 @@ export {
|
|
|
207
206
|
logPayment,
|
|
208
207
|
logPerformance
|
|
209
208
|
} from './utils/loggerUtils';
|
|
209
|
+
export type { LogContext } from './utils/loggerUtils';
|
|
210
210
|
export * from './utils/asyncUtils';
|
|
211
211
|
export * from './utils/hookUtils';
|
|
@@ -54,13 +54,13 @@ export interface OxyContextState {
|
|
|
54
54
|
currentNativeLanguageName: string;
|
|
55
55
|
|
|
56
56
|
// Identity management (public key authentication - offline-first)
|
|
57
|
-
createIdentity: () => Promise<{ synced: boolean }>;
|
|
58
|
-
importIdentity: (backupData: BackupData, password: string) => Promise<{ synced: boolean }>;
|
|
57
|
+
createIdentity: (username?: string) => Promise<{ synced: boolean }>;
|
|
58
|
+
importIdentity: (backupData: BackupData, password: string, username?: string) => Promise<{ synced: boolean }>;
|
|
59
59
|
signIn: (deviceName?: string) => Promise<User>;
|
|
60
60
|
hasIdentity: () => Promise<boolean>;
|
|
61
61
|
getPublicKey: () => Promise<string | null>;
|
|
62
62
|
isIdentitySynced: () => Promise<boolean>;
|
|
63
|
-
syncIdentity: () => Promise<User>;
|
|
63
|
+
syncIdentity: (username?: string) => Promise<User>;
|
|
64
64
|
deleteIdentityAndClearAccount: (skipBackup?: boolean, force?: boolean, userConfirmed?: boolean) => Promise<void>;
|
|
65
65
|
storeTransferCode: (transferId: string, code: string, sourceDeviceId: string | null, publicKey: string) => Promise<void>;
|
|
66
66
|
getTransferCode: (transferId: string) => { code: string; sourceDeviceId: string | null; publicKey: string; timestamp: number; state: 'pending' | 'completed' | 'failed' } | null;
|