@oxyhq/services 5.16.38 → 5.16.39
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 +56 -38
- 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 +56 -38
- 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 +52 -39
|
@@ -25,14 +25,21 @@ function OxyServicesAuthMixin(Base) {
|
|
|
25
25
|
* @param publicKey - The user's ECDSA public key (hex)
|
|
26
26
|
* @param signature - Signature of the registration request
|
|
27
27
|
* @param timestamp - Timestamp when the signature was created
|
|
28
|
+
* @param username - Optional username to set during registration
|
|
28
29
|
*/
|
|
29
|
-
async register(publicKey, signature, timestamp) {
|
|
30
|
+
async register(publicKey, signature, timestamp, username) {
|
|
30
31
|
try {
|
|
31
|
-
const
|
|
32
|
+
const payload = {
|
|
32
33
|
publicKey,
|
|
33
34
|
signature,
|
|
34
35
|
timestamp
|
|
35
|
-
}
|
|
36
|
+
};
|
|
37
|
+
|
|
38
|
+
// Include username if provided
|
|
39
|
+
if (username && username.trim()) {
|
|
40
|
+
payload.username = username.trim();
|
|
41
|
+
}
|
|
42
|
+
const res = await this.makeRequest('POST', '/api/auth/register', payload, {
|
|
36
43
|
cache: false
|
|
37
44
|
});
|
|
38
45
|
if (!res || typeof res === 'object' && Object.keys(res).length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_OxyServices","require","OxyServicesAuthMixin","Base","constructor","args","register","publicKey","signature","timestamp","res","makeRequest","cache","Object","keys","length","OxyAuthenticationError","error","handleError","requestChallenge","verifyChallenge","challenge","deviceName","deviceFingerprint","checkPublicKeyRegistered","encodeURIComponent","undefined","getUserByPublicKey","cacheTTL","getUserBySession","sessionId","getUsersBySessions","sessionIds","Array","isArray","uniqueSessionIds","from","Set","sort","deduplicate","getTokenBySession","retry","setTokens","accessToken","getSessionsBySessionId","logoutSession","targetSessionId","url","logoutAllSessions","validateSession","options","urlParams","useHeaderValidation","checkUsernameAvailability","
|
|
1
|
+
{"version":3,"names":["_OxyServices","require","OxyServicesAuthMixin","Base","constructor","args","register","publicKey","signature","timestamp","username","payload","trim","res","makeRequest","cache","Object","keys","length","OxyAuthenticationError","error","handleError","requestChallenge","verifyChallenge","challenge","deviceName","deviceFingerprint","checkPublicKeyRegistered","encodeURIComponent","undefined","getUserByPublicKey","cacheTTL","getUserBySession","sessionId","getUsersBySessions","sessionIds","Array","isArray","uniqueSessionIds","from","Set","sort","deduplicate","getTokenBySession","retry","setTokens","accessToken","getSessionsBySessionId","logoutSession","targetSessionId","url","logoutAllSessions","validateSession","options","urlParams","useHeaderValidation","checkUsernameAvailability","checkEmailAvailability","email","signUp","password","signIn"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.auth.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/commonjs/index.js
CHANGED
|
@@ -80,7 +80,6 @@ var _exportNames = {
|
|
|
80
80
|
retryWithBackoff: true,
|
|
81
81
|
logger: true,
|
|
82
82
|
LogLevel: true,
|
|
83
|
-
LogContext: true,
|
|
84
83
|
logAuth: true,
|
|
85
84
|
logApi: true,
|
|
86
85
|
logSession: true,
|
|
@@ -113,12 +112,6 @@ Object.defineProperty(exports, "KeyManager", {
|
|
|
113
112
|
return _crypto.KeyManager;
|
|
114
113
|
}
|
|
115
114
|
});
|
|
116
|
-
Object.defineProperty(exports, "LogContext", {
|
|
117
|
-
enumerable: true,
|
|
118
|
-
get: function () {
|
|
119
|
-
return _loggerUtils.LogContext;
|
|
120
|
-
}
|
|
121
|
-
});
|
|
122
115
|
Object.defineProperty(exports, "LogLevel", {
|
|
123
116
|
enumerable: true,
|
|
124
117
|
get: function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["require","_crypto","_core","_OxyContext","_OxyProvider","_interopRequireDefault","_deviceManager","_languageUtils","_interfaces","_authStore","_assetStore","_useSessionSocket","_useAssets","_useFileDownloadUrl","_auth","_queries","_mutations","_OxySignInButton","_ui","_apiUtils","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_errorUtils","_validationUtils","_loggerUtils","_asyncUtils","_hookUtils","e","__esModule","default"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"
|
|
1
|
+
{"version":3,"names":["require","_crypto","_core","_OxyContext","_OxyProvider","_interopRequireDefault","_deviceManager","_languageUtils","_interfaces","_authStore","_assetStore","_useSessionSocket","_useAssets","_useFileDownloadUrl","_auth","_queries","_mutations","_OxySignInButton","_ui","_apiUtils","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","_errorUtils","_validationUtils","_loggerUtils","_asyncUtils","_hookUtils","e","__esModule","default"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -232,8 +232,13 @@ const useAuthOperations = ({
|
|
|
232
232
|
/**
|
|
233
233
|
* Create a new identity (offline-first)
|
|
234
234
|
* Identity is purely cryptographic - no username or email required
|
|
235
|
+
*
|
|
236
|
+
* This function generates keys locally and does NOT register with the server yet.
|
|
237
|
+
* Registration will happen during syncIdentity() or when username is provided.
|
|
238
|
+
*
|
|
239
|
+
* @param username - Optional username to set during registration (if online)
|
|
235
240
|
*/
|
|
236
|
-
const createIdentity = (0, _react.useCallback)(async
|
|
241
|
+
const createIdentity = (0, _react.useCallback)(async username => {
|
|
237
242
|
if (!storage) throw new Error('Storage not initialized');
|
|
238
243
|
setAuthState({
|
|
239
244
|
isLoading: true,
|
|
@@ -264,36 +269,50 @@ const useAuthOperations = ({
|
|
|
264
269
|
// Clear sessions if identity changed (prevents data leakage)
|
|
265
270
|
await clearSessionsIfIdentityChanged(oldPublicKey, publicKey);
|
|
266
271
|
|
|
267
|
-
// Mark as not synced
|
|
272
|
+
// Mark as not synced initially
|
|
268
273
|
await storage.setItem('oxy_identity_synced', 'false');
|
|
269
274
|
setIdentitySynced(false);
|
|
270
275
|
|
|
271
|
-
//
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
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 _crypto.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
|
+
}
|
|
292
306
|
}
|
|
293
|
-
return {
|
|
294
|
-
synced: false
|
|
295
|
-
};
|
|
296
307
|
}
|
|
308
|
+
|
|
309
|
+
// No username provided - defer registration until later
|
|
310
|
+
if (__DEV__ && logger) {
|
|
311
|
+
logger('Identity created locally without username, will register during sync');
|
|
312
|
+
}
|
|
313
|
+
return {
|
|
314
|
+
synced: false
|
|
315
|
+
};
|
|
297
316
|
} catch (error) {
|
|
298
317
|
// CRITICAL: Never delete identity on error - it may have been successfully created
|
|
299
318
|
// Only log the error and let the user recover using their backup file
|
|
@@ -309,7 +328,7 @@ const useAuthOperations = ({
|
|
|
309
328
|
await storage.setItem('oxy_identity_synced', 'false').catch(() => {});
|
|
310
329
|
setIdentitySynced(false);
|
|
311
330
|
if (__DEV__ && logger) {
|
|
312
|
-
logger('Identity was created but sync failed - user can sync later
|
|
331
|
+
logger('Identity was created but sync failed - user can sync later');
|
|
313
332
|
}
|
|
314
333
|
} else {
|
|
315
334
|
// No identity exists - this was a generation failure, safe to clean up sync flag
|
|
@@ -348,8 +367,10 @@ const useAuthOperations = ({
|
|
|
348
367
|
/**
|
|
349
368
|
* Sync local identity with server (call when online)
|
|
350
369
|
* TanStack Query handles offline mutations automatically
|
|
370
|
+
*
|
|
371
|
+
* @param username - Optional username to set during sync
|
|
351
372
|
*/
|
|
352
|
-
const syncIdentity = (0, _react.useCallback)(async
|
|
373
|
+
const syncIdentity = (0, _react.useCallback)(async username => {
|
|
353
374
|
if (!storage) throw new Error('Storage not initialized');
|
|
354
375
|
setAuthState({
|
|
355
376
|
isLoading: true,
|
|
@@ -379,7 +400,7 @@ const useAuthOperations = ({
|
|
|
379
400
|
signature,
|
|
380
401
|
timestamp
|
|
381
402
|
} = await _crypto.SignatureService.createRegistrationSignature();
|
|
382
|
-
await oxyServices.register(publicKey, signature, timestamp);
|
|
403
|
+
await oxyServices.register(publicKey, signature, timestamp, username);
|
|
383
404
|
}
|
|
384
405
|
|
|
385
406
|
// Mark as synced (Zustand store + storage)
|
|
@@ -389,13 +410,6 @@ const useAuthOperations = ({
|
|
|
389
410
|
// Sign in
|
|
390
411
|
const user = await performSignIn(publicKey);
|
|
391
412
|
|
|
392
|
-
// Check if user has username - required for syncing
|
|
393
|
-
if (!user.username) {
|
|
394
|
-
const usernameError = new Error('USERNAME_REQUIRED');
|
|
395
|
-
usernameError.code = 'USERNAME_REQUIRED';
|
|
396
|
-
throw usernameError;
|
|
397
|
-
}
|
|
398
|
-
|
|
399
413
|
// TanStack Query will automatically retry any pending mutations
|
|
400
414
|
|
|
401
415
|
return user;
|
|
@@ -421,8 +435,12 @@ const useAuthOperations = ({
|
|
|
421
435
|
|
|
422
436
|
/**
|
|
423
437
|
* Import identity from backup file data (offline-first)
|
|
438
|
+
*
|
|
439
|
+
* @param backupData - The backup data to import
|
|
440
|
+
* @param password - Password to decrypt the backup
|
|
441
|
+
* @param username - Optional username to set during registration
|
|
424
442
|
*/
|
|
425
|
-
const importIdentity = (0, _react.useCallback)(async (backupData, password) => {
|
|
443
|
+
const importIdentity = (0, _react.useCallback)(async (backupData, password, username) => {
|
|
426
444
|
if (!storage) throw new Error('Storage not initialized');
|
|
427
445
|
|
|
428
446
|
// Validate arguments - ensure backupData is an object, not a string (old signature)
|
|
@@ -515,7 +533,7 @@ const useAuthOperations = ({
|
|
|
515
533
|
signature,
|
|
516
534
|
timestamp
|
|
517
535
|
} = await _crypto.SignatureService.createRegistrationSignature();
|
|
518
|
-
await oxyServices.register(publicKey, signature, timestamp);
|
|
536
|
+
await oxyServices.register(publicKey, signature, timestamp, username);
|
|
519
537
|
await storage.setItem('oxy_identity_synced', 'true');
|
|
520
538
|
setIdentitySynced(true);
|
|
521
539
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_deviceManager","_sessionHelpers","_errorHandlers","_crypto","_interopRequireWildcard","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","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","useCallback","oldPublicKey","newPublicKey","__DEV__","substring","KeyManager","invalidateCache","performSignIn","publicKey","deviceFingerprintObj","DeviceManager","getDeviceFingerprint","deviceFingerprint","JSON","stringify","deviceInfo","getDeviceInfo","deviceName","getDefaultDeviceName","challenge","isOffline","challengeResponse","requestChallenge","error","errorMessage","Error","message","String","isNetworkError","includes","code","status","SignatureService","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","fetchSessionsWithFallback","fallbackDeviceId","fallbackUserId","existingSession","find","session","logoutSession","logoutError","filter","createIdentity","isLoading","getPublicKey","catch","hadPreviousIdentity","privateKey","generateKeyPair","importKeyPair","createRegistrationSignature","register","synced","syncError","hasIdentity","removeItem","handleAuthError","defaultMessage","setAuthError","msg","isIdentitySyncedFn","getItem","isSynced","syncIdentity","alreadySynced","registered","checkPublicKeyRegistered","usernameError","importIdentity","backupData","password","Array","isArray","encrypted","salt","iv","backupPublicKey","Crypto","Promise","resolve","then","saltBytes","Uint8Array","match","map","byte","parseInt","ivBytes","saltHex","from","b","padStart","join","key","digestStringAsync","CryptoDigestAlgorithm","SHA256","keyBytes","length","encryptedBytes","Buffer","decryptedBytes","TextDecoder","decode","log","signIn","logout","targetSessionId","sessionToLogout","filteredSessions","isInvalid","isInvalidSessionError","undefined","logoutAll","logoutAllSessions","isIdentitySynced","exports"],"sourceRoot":"../../../../../src","sources":["ui/context/hooks/useAuthOperations.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","require","_deviceManager","_sessionHelpers","_errorHandlers","_crypto","_interopRequireWildcard","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","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","useCallback","oldPublicKey","newPublicKey","__DEV__","substring","KeyManager","invalidateCache","performSignIn","publicKey","deviceFingerprintObj","DeviceManager","getDeviceFingerprint","deviceFingerprint","JSON","stringify","deviceInfo","getDeviceInfo","deviceName","getDefaultDeviceName","challenge","isOffline","challengeResponse","requestChallenge","error","errorMessage","Error","message","String","isNetworkError","includes","code","status","SignatureService","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","fetchSessionsWithFallback","fallbackDeviceId","fallbackUserId","existingSession","find","session","logoutSession","logoutError","filter","createIdentity","isLoading","getPublicKey","catch","hadPreviousIdentity","privateKey","generateKeyPair","importKeyPair","trimmedUsername","trim","createRegistrationSignature","register","synced","syncError","hasIdentity","removeItem","handleAuthError","defaultMessage","setAuthError","msg","isIdentitySyncedFn","getItem","isSynced","syncIdentity","alreadySynced","registered","checkPublicKeyRegistered","importIdentity","backupData","password","Array","isArray","encrypted","salt","iv","backupPublicKey","Crypto","Promise","resolve","then","saltBytes","Uint8Array","match","map","byte","parseInt","ivBytes","saltHex","from","b","padStart","join","key","digestStringAsync","CryptoDigestAlgorithm","SHA256","keyBytes","length","encryptedBytes","Buffer","decryptedBytes","TextDecoder","decode","log","signIn","logout","targetSessionId","sessionToLogout","filteredSessions","isInvalid","isInvalidSessionError","undefined","logoutAll","logoutAllSessions","isIdentitySynced","exports"],"sourceRoot":"../../../../../src","sources":["ui/context/hooks/useAuthOperations.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -21,14 +21,21 @@ export function OxyServicesAuthMixin(Base) {
|
|
|
21
21
|
* @param publicKey - The user's ECDSA public key (hex)
|
|
22
22
|
* @param signature - Signature of the registration request
|
|
23
23
|
* @param timestamp - Timestamp when the signature was created
|
|
24
|
+
* @param username - Optional username to set during registration
|
|
24
25
|
*/
|
|
25
|
-
async register(publicKey, signature, timestamp) {
|
|
26
|
+
async register(publicKey, signature, timestamp, username) {
|
|
26
27
|
try {
|
|
27
|
-
const
|
|
28
|
+
const payload = {
|
|
28
29
|
publicKey,
|
|
29
30
|
signature,
|
|
30
31
|
timestamp
|
|
31
|
-
}
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
// Include username if provided
|
|
35
|
+
if (username && username.trim()) {
|
|
36
|
+
payload.username = username.trim();
|
|
37
|
+
}
|
|
38
|
+
const res = await this.makeRequest('POST', '/api/auth/register', payload, {
|
|
32
39
|
cache: false
|
|
33
40
|
});
|
|
34
41
|
if (!res || typeof res === 'object' && Object.keys(res).length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["OxyAuthenticationError","OxyServicesAuthMixin","Base","constructor","args","register","publicKey","signature","timestamp","res","makeRequest","cache","Object","keys","length","error","handleError","requestChallenge","verifyChallenge","challenge","deviceName","deviceFingerprint","checkPublicKeyRegistered","encodeURIComponent","undefined","getUserByPublicKey","cacheTTL","getUserBySession","sessionId","getUsersBySessions","sessionIds","Array","isArray","uniqueSessionIds","from","Set","sort","deduplicate","getTokenBySession","retry","setTokens","accessToken","getSessionsBySessionId","logoutSession","targetSessionId","url","logoutAllSessions","validateSession","options","urlParams","useHeaderValidation","checkUsernameAvailability","
|
|
1
|
+
{"version":3,"names":["OxyAuthenticationError","OxyServicesAuthMixin","Base","constructor","args","register","publicKey","signature","timestamp","username","payload","trim","res","makeRequest","cache","Object","keys","length","error","handleError","requestChallenge","verifyChallenge","challenge","deviceName","deviceFingerprint","checkPublicKeyRegistered","encodeURIComponent","undefined","getUserByPublicKey","cacheTTL","getUserBySession","sessionId","getUsersBySessions","sessionIds","Array","isArray","uniqueSessionIds","from","Set","sort","deduplicate","getTokenBySession","retry","setTokens","accessToken","getSessionsBySessionId","logoutSession","targetSessionId","url","logoutAllSessions","validateSession","options","urlParams","useHeaderValidation","checkUsernameAvailability","checkEmailAvailability","email","signUp","password","signIn"],"sourceRoot":"../../../../src","sources":["core/mixins/OxyServices.auth.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/index.js
CHANGED
|
@@ -68,7 +68,7 @@ export { OxyLogo, FollowButton } from './ui';
|
|
|
68
68
|
export * from './utils/apiUtils';
|
|
69
69
|
export { ErrorCodes, createApiError, handleHttpError, validateRequiredFields, retryWithBackoff } from './utils/errorUtils';
|
|
70
70
|
export * from './utils/validationUtils';
|
|
71
|
-
export { logger, LogLevel,
|
|
71
|
+
export { logger, LogLevel, logAuth, logApi, logSession, logUser, logDevice, logPayment, logPerformance } from './utils/loggerUtils';
|
|
72
72
|
export * from './utils/asyncUtils';
|
|
73
73
|
export * from './utils/hookUtils';
|
|
74
74
|
//# sourceMappingURL=index.js.map
|
package/lib/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["KeyManager","SignatureService","OxyServices","OxyAuthenticationError","OxyAuthenticationTimeoutError","OXY_CLOUD_URL","oxyClient","OxyContextProvider","useOxy","default","OxyProvider","DeviceManager","SUPPORTED_LANGUAGES","getLanguageMetadata","getLanguageName","getNativeLanguageName","normalizeLanguageCode","SECURITY_EVENT_SEVERITY_MAP","useAuthStore","useAssetStore","useAssets","useAssetsStore","useAsset","useUploadProgress","useAssetLoading","useAssetErrors","useAssetsByApp","useAssetsByEntity","useAssetUsageCount","useIsAssetLinked","useSessionSocket","setOxyAssetInstance","useFileDownloadUrl","setOxyFileUrlInstance","useUsernameValidation","USERNAME_MIN_LENGTH","USERNAME_REGEX","USERNAME_FORMAT_ERROR","USERNAME_DEBOUNCE_MS","useUserProfile","useUserProfiles","useCurrentUser","useUserById","useUserByUsername","useUsersBySessions","usePrivacySettings","useBlockedUsers","useRestrictedUsers","useSessions","useSession","useDeviceSessions","useUserDevices","useSecurityInfo","useSecurityActivity","useRecentSecurityActivity","useUpdateProfile","useUploadAvatar","useUpdateAccountSettings","useUpdatePrivacySettings","useUploadFile","useUnblockUser","useUnrestrictUser","useSwitchSession","useLogoutSession","useLogoutAll","useUpdateDeviceName","useRemoveDevice","OxySignInButton","OxyLogo","FollowButton","ErrorCodes","createApiError","handleHttpError","validateRequiredFields","retryWithBackoff","logger","LogLevel","
|
|
1
|
+
{"version":3,"names":["KeyManager","SignatureService","OxyServices","OxyAuthenticationError","OxyAuthenticationTimeoutError","OXY_CLOUD_URL","oxyClient","OxyContextProvider","useOxy","default","OxyProvider","DeviceManager","SUPPORTED_LANGUAGES","getLanguageMetadata","getLanguageName","getNativeLanguageName","normalizeLanguageCode","SECURITY_EVENT_SEVERITY_MAP","useAuthStore","useAssetStore","useAssets","useAssetsStore","useAsset","useUploadProgress","useAssetLoading","useAssetErrors","useAssetsByApp","useAssetsByEntity","useAssetUsageCount","useIsAssetLinked","useSessionSocket","setOxyAssetInstance","useFileDownloadUrl","setOxyFileUrlInstance","useUsernameValidation","USERNAME_MIN_LENGTH","USERNAME_REGEX","USERNAME_FORMAT_ERROR","USERNAME_DEBOUNCE_MS","useUserProfile","useUserProfiles","useCurrentUser","useUserById","useUserByUsername","useUsersBySessions","usePrivacySettings","useBlockedUsers","useRestrictedUsers","useSessions","useSession","useDeviceSessions","useUserDevices","useSecurityInfo","useSecurityActivity","useRecentSecurityActivity","useUpdateProfile","useUploadAvatar","useUpdateAccountSettings","useUpdatePrivacySettings","useUploadFile","useUnblockUser","useUnrestrictUser","useSwitchSession","useLogoutSession","useLogoutAll","useUpdateDeviceName","useRemoveDevice","OxySignInButton","OxyLogo","FollowButton","ErrorCodes","createApiError","handleHttpError","validateRequiredFields","retryWithBackoff","logger","LogLevel","logAuth","logApi","logSession","logUser","logDevice","logPayment","logPerformance"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA;AACA;AACA,OAAO,mBAAmB;;AAE1B;AACA,SACEA,UAAU,EACVC,gBAAgB,QACX,UAAU;;AAEjB;AACA,SAASC,WAAW,EAAEC,sBAAsB,EAAEC,6BAA6B,QAAQ,QAAQ;AAC3F,SAASC,aAAa,EAAEC,SAAS,QAAQ,QAAQ;AAOjD;AACA,SACEC,kBAAkB;AAAE;AACpBC,MAAM,QACD,yBAAyB;;AAEhC;AACA,SAASC,OAAO,IAAIC,WAAW,QAAQ,6BAA6B;;AAEpE;AACA,SAASC,aAAa,QAAQ,uBAAuB;AAGrD;AACA,SACEC,mBAAmB,EACnBC,mBAAmB,EACnBC,eAAe,EACfC,qBAAqB,EACrBC,qBAAqB,QAChB,uBAAuB;;AAG9B;;AA6DA;AACA,SAASC,2BAA2B,QAAQ,qBAAqB;AAQjE;AACA,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SACEC,aAAa,EACbC,SAAS,IAAIC,cAAc,EAC3BC,QAAQ,EACRC,iBAAiB,EACjBC,eAAe,EACfC,cAAc,EACdC,cAAc,EACdC,iBAAiB,EACjBC,kBAAkB,EAClBC,gBAAgB,QACX,wBAAwB;;AAE/B;AACA,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASV,SAAS,EAAEW,mBAAmB,QAAQ,sBAAsB;AACrE,SAASC,kBAAkB,EAAEC,qBAAqB,QAAQ,+BAA+B;AACzF,SAASC,qBAAqB,EAAEC,mBAAmB,EAAEC,cAAc,EAAEC,qBAAqB,EAAEC,oBAAoB,QAAQ,iBAAiB;AAGzI;AACA;AACE;AACAC,cAAc,EACdC,eAAe,EACfC,cAAc,EACdC,WAAW,EACXC,iBAAiB,EACjBC,kBAAkB,EAClBC,kBAAkB,EAClBC,eAAe,EACfC,kBAAkB;AAClB;AACAC,WAAW,EACXC,UAAU,EACVC,iBAAiB,EACjBC,cAAc,EACdC,eAAe;AACf;AACAC,mBAAmB,EACnBC,yBAAyB,QACpB,oBAAoB;;AAE3B;AACA;AACE;AACAC,gBAAgB,EAChBC,eAAe,EACfC,wBAAwB,EACxBC,wBAAwB,EACxBC,aAAa,EACbC,cAAc,EACdC,iBAAiB;AACjB;AACAC,gBAAgB,EAChBC,gBAAgB,EAChBC,YAAY,EACZC,mBAAmB,EACnBC,eAAe,QACV,sBAAsB;;AAE7B;AACA,SAASC,eAAe,QAAQ,iCAAiC;AACjE,SAASC,OAAO,EAAEC,YAAY,QAAQ,MAAM;;AAE5C;AACA,cAAc,kBAAkB;AAChC,SACEC,UAAU,EACVC,cAAc,EACdC,eAAe,EACfC,sBAAsB,EACtBC,gBAAgB,QACX,oBAAoB;AAC3B,cAAc,yBAAyB;AACvC,SACEC,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,MAAM,EACNC,UAAU,EACVC,OAAO,EACPC,SAAS,EACTC,UAAU,EACVC,cAAc,QACT,qBAAqB;AAE5B,cAAc,oBAAoB;AAClC,cAAc,mBAAmB","ignoreList":[]}
|
|
@@ -227,8 +227,13 @@ export const useAuthOperations = ({
|
|
|
227
227
|
/**
|
|
228
228
|
* Create a new identity (offline-first)
|
|
229
229
|
* Identity is purely cryptographic - no username or email required
|
|
230
|
+
*
|
|
231
|
+
* This function generates keys locally and does NOT register with the server yet.
|
|
232
|
+
* Registration will happen during syncIdentity() or when username is provided.
|
|
233
|
+
*
|
|
234
|
+
* @param username - Optional username to set during registration (if online)
|
|
230
235
|
*/
|
|
231
|
-
const createIdentity = useCallback(async
|
|
236
|
+
const createIdentity = useCallback(async username => {
|
|
232
237
|
if (!storage) throw new Error('Storage not initialized');
|
|
233
238
|
setAuthState({
|
|
234
239
|
isLoading: true,
|
|
@@ -259,36 +264,50 @@ export const useAuthOperations = ({
|
|
|
259
264
|
// Clear sessions if identity changed (prevents data leakage)
|
|
260
265
|
await clearSessionsIfIdentityChanged(oldPublicKey, publicKey);
|
|
261
266
|
|
|
262
|
-
// Mark as not synced
|
|
267
|
+
// Mark as not synced initially
|
|
263
268
|
await storage.setItem('oxy_identity_synced', 'false');
|
|
264
269
|
setIdentitySynced(false);
|
|
265
270
|
|
|
266
|
-
//
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
271
|
+
// If username provided, try to register immediately (online only)
|
|
272
|
+
if (username) {
|
|
273
|
+
// Validate username format before attempting registration
|
|
274
|
+
const trimmedUsername = username.trim();
|
|
275
|
+
if (trimmedUsername && /^[a-zA-Z0-9]{3,30}$/.test(trimmedUsername)) {
|
|
276
|
+
try {
|
|
277
|
+
const {
|
|
278
|
+
signature,
|
|
279
|
+
timestamp
|
|
280
|
+
} = await SignatureService.createRegistrationSignature();
|
|
281
|
+
await oxyServices.register(publicKey, signature, timestamp, trimmedUsername);
|
|
282
|
+
|
|
283
|
+
// Mark as synced (Zustand store + storage)
|
|
284
|
+
await storage.setItem('oxy_identity_synced', 'true');
|
|
285
|
+
setIdentitySynced(true);
|
|
286
|
+
if (__DEV__ && logger) {
|
|
287
|
+
logger('Identity synced with server successfully with username');
|
|
288
|
+
}
|
|
289
|
+
return {
|
|
290
|
+
synced: true
|
|
291
|
+
};
|
|
292
|
+
} catch (syncError) {
|
|
293
|
+
// Offline or server error - identity created locally but not synced
|
|
294
|
+
if (__DEV__ && logger) {
|
|
295
|
+
logger('Identity created locally with username (offline), will sync when online', syncError);
|
|
296
|
+
}
|
|
297
|
+
return {
|
|
298
|
+
synced: false
|
|
299
|
+
};
|
|
300
|
+
}
|
|
287
301
|
}
|
|
288
|
-
return {
|
|
289
|
-
synced: false
|
|
290
|
-
};
|
|
291
302
|
}
|
|
303
|
+
|
|
304
|
+
// No username provided - defer registration until later
|
|
305
|
+
if (__DEV__ && logger) {
|
|
306
|
+
logger('Identity created locally without username, will register during sync');
|
|
307
|
+
}
|
|
308
|
+
return {
|
|
309
|
+
synced: false
|
|
310
|
+
};
|
|
292
311
|
} catch (error) {
|
|
293
312
|
// CRITICAL: Never delete identity on error - it may have been successfully created
|
|
294
313
|
// Only log the error and let the user recover using their backup file
|
|
@@ -304,7 +323,7 @@ export const useAuthOperations = ({
|
|
|
304
323
|
await storage.setItem('oxy_identity_synced', 'false').catch(() => {});
|
|
305
324
|
setIdentitySynced(false);
|
|
306
325
|
if (__DEV__ && logger) {
|
|
307
|
-
logger('Identity was created but sync failed - user can sync later
|
|
326
|
+
logger('Identity was created but sync failed - user can sync later');
|
|
308
327
|
}
|
|
309
328
|
} else {
|
|
310
329
|
// No identity exists - this was a generation failure, safe to clean up sync flag
|
|
@@ -343,8 +362,10 @@ export const useAuthOperations = ({
|
|
|
343
362
|
/**
|
|
344
363
|
* Sync local identity with server (call when online)
|
|
345
364
|
* TanStack Query handles offline mutations automatically
|
|
365
|
+
*
|
|
366
|
+
* @param username - Optional username to set during sync
|
|
346
367
|
*/
|
|
347
|
-
const syncIdentity = useCallback(async
|
|
368
|
+
const syncIdentity = useCallback(async username => {
|
|
348
369
|
if (!storage) throw new Error('Storage not initialized');
|
|
349
370
|
setAuthState({
|
|
350
371
|
isLoading: true,
|
|
@@ -374,7 +395,7 @@ export const useAuthOperations = ({
|
|
|
374
395
|
signature,
|
|
375
396
|
timestamp
|
|
376
397
|
} = await SignatureService.createRegistrationSignature();
|
|
377
|
-
await oxyServices.register(publicKey, signature, timestamp);
|
|
398
|
+
await oxyServices.register(publicKey, signature, timestamp, username);
|
|
378
399
|
}
|
|
379
400
|
|
|
380
401
|
// Mark as synced (Zustand store + storage)
|
|
@@ -384,13 +405,6 @@ export const useAuthOperations = ({
|
|
|
384
405
|
// Sign in
|
|
385
406
|
const user = await performSignIn(publicKey);
|
|
386
407
|
|
|
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
408
|
// TanStack Query will automatically retry any pending mutations
|
|
395
409
|
|
|
396
410
|
return user;
|
|
@@ -416,8 +430,12 @@ export const useAuthOperations = ({
|
|
|
416
430
|
|
|
417
431
|
/**
|
|
418
432
|
* Import identity from backup file data (offline-first)
|
|
433
|
+
*
|
|
434
|
+
* @param backupData - The backup data to import
|
|
435
|
+
* @param password - Password to decrypt the backup
|
|
436
|
+
* @param username - Optional username to set during registration
|
|
419
437
|
*/
|
|
420
|
-
const importIdentity = useCallback(async (backupData, password) => {
|
|
438
|
+
const importIdentity = useCallback(async (backupData, password, username) => {
|
|
421
439
|
if (!storage) throw new Error('Storage not initialized');
|
|
422
440
|
|
|
423
441
|
// Validate arguments - ensure backupData is an object, not a string (old signature)
|
|
@@ -510,7 +528,7 @@ export const useAuthOperations = ({
|
|
|
510
528
|
signature,
|
|
511
529
|
timestamp
|
|
512
530
|
} = await SignatureService.createRegistrationSignature();
|
|
513
|
-
await oxyServices.register(publicKey, signature, timestamp);
|
|
531
|
+
await oxyServices.register(publicKey, signature, timestamp, username);
|
|
514
532
|
await storage.setItem('oxy_identity_synced', 'true');
|
|
515
533
|
setIdentitySynced(true);
|
|
516
534
|
return {
|
|
@@ -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","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":"AAAA;;;;;;GAMG;AAIH,OAAO,mBAAmB,CAAC;AAG3B,OAAO,EACL,UAAU,EACV,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,WAAW,EAAE,sBAAsB,EAAE,6BAA6B,EAAE,MAAM,QAAQ,CAAC;AAC5F,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAClD,YAAY,EACV,OAAO,EACP,aAAa,EACb,aAAa,EACd,MAAM,UAAU,CAAC;AAGlB,OAAO,EACL,kBAAkB,EAAE,yBAAyB;AAC7C,MAAM,EACP,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,YAAY,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAGjF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,uBAAuB,CAAC;AAC/B,YAAY,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAG9D,YAAY,EACV,SAAS,EACT,IAAI,EACJ,aAAa,EACb,YAAY,EACZ,MAAM,EACN,WAAW,EACX,oBAAoB,EACpB,eAAe,EACf,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,EACT,YAAY,EACZ,qBAAqB,EACrB,iBAAiB,EACjB,QAAQ,EACR,aAAa,EACb,cAAc,EACd,eAAe,EACf,aAAa,EACb,eAAe,EACf,aAAa,EACb,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAClB,aAAa,EACb,sBAAsB,EACtB,2BAA2B,EAC3B,wBAAwB,EAExB,WAAW,EAEX,cAAc,EAEd,cAAc,EACd,SAAS,EACT,YAAY,EACZ,KAAK,EACL,gBAAgB,EAChB,iBAAiB,EACjB,oBAAoB,EACpB,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,4BAA4B,EAC5B,6BAA6B,EAE7B,2BAA2B,EAC3B,2BAA2B,EAE3B,iBAAiB,EACjB,qBAAqB,EACrB,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAElE,YAAY,EACV,oBAAoB,EACpB,aAAa,EACb,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EACL,aAAa,EACb,SAAS,IAAI,cAAc,EAC3B,QAAQ,EACR,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC1F,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,cAAc,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC1I,YAAY,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGhE,OAAO,EAEL,cAAc,EACd,eAAe,EACf,cAAc,EACd,WAAW,EACX,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAElB,WAAW,EACX,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,eAAe,EAEf,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAEL,gBAAgB,EAChB,eAAe,EACf,wBAAwB,EACxB,wBAAwB,EACxB,aAAa,EACb,cAAc,EACd,iBAAiB,EAEjB,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,EACZ,mBAAmB,EACnB,eAAe,GAChB,MAAM,sBAAsB,CAAC;AAG9B,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAG7C,cAAc,kBAAkB,CAAC;AACjC,OAAO,EACL,UAAU,EACV,cAAc,EACd,eAAe,EACf,sBAAsB,EACtB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,OAAO,EACL,MAAM,EACN,QAAQ,EACR,OAAO,EACP,MAAM,EACN,UAAU,EACV,OAAO,EACP,SAAS,EACT,UAAU,EACV,cAAc,EACf,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC"}
|
|
@@ -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":"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,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IACpE,cAAc,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAC9G,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,WAAW,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3C,gBAAgB,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,YAAY,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,6BAA6B,EAAE,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjH,iBAAiB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzH,eAAe,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAA;KAAE,GAAG,IAAI,CAAC;IACjL,iBAAiB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,sBAAsB,EAAE,MAAM,KAAK,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IACpM,mBAAmB,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACzC,mBAAmB,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAGtG,iBAAiB,EAAE;QACjB,QAAQ,EAAE,OAAO,CAAC;QAClB,SAAS,EAAE,OAAO,CAAC;KACpB,CAAC;IAGF,MAAM,EAAE,CAAC,eAAe,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,SAAS,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,eAAe,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,WAAW,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACnD,iBAAiB,EAAE,MAAM,OAAO,CAC9B,KAAK,CAAC;QACJ,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC,CACH,CAAC;IACF,uBAAuB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,gBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,iBAAiB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,aAAa,CAAC;IAC1B,eAAe,CAAC,EAAE,CAAC,cAAc,EAAE,SAAS,GAAG;QAAE,MAAM,EAAE,SAAS,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,KAAK,IAAI,CAAC;IAC/G,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAC9B;AAED,QAAA,MAAM,UAAU,uCAA8C,CAAC;AAE/D,MAAM,WAAW,uBAAuB;IACtC,QAAQ,EAAE,SAAS,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,KAAK,IAAI,CAAC;IAChD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC;CACrC;AAgCD,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,uBAAuB,CA+lCzD,CAAC;AAEF,eAAO,MAAM,kBAAkB,mCAAc,CAAC;AAE9C,eAAO,MAAM,MAAM,QAAO,eAMzB,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -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.39",
|
|
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;
|
|
@@ -34,7 +34,7 @@ export interface UseAuthOperationsOptions {
|
|
|
34
34
|
|
|
35
35
|
export interface UseAuthOperationsResult {
|
|
36
36
|
/** Create a new identity locally (offline-first) and optionally sync with server */
|
|
37
|
-
createIdentity: () => Promise<{ synced: boolean }>;
|
|
37
|
+
createIdentity: (username?: string) => Promise<{ synced: boolean }>;
|
|
38
38
|
/** Import an existing identity from backup file data */
|
|
39
39
|
importIdentity: (backupData: BackupData, password: string) => Promise<{ synced: boolean }>;
|
|
40
40
|
/** Sign in with existing identity on device */
|
|
@@ -50,7 +50,7 @@ export interface UseAuthOperationsResult {
|
|
|
50
50
|
/** Check if identity is synced with server */
|
|
51
51
|
isIdentitySynced: () => Promise<boolean>;
|
|
52
52
|
/** Sync local identity with server (when online) */
|
|
53
|
-
syncIdentity: () => Promise<User>;
|
|
53
|
+
syncIdentity: (username?: string) => Promise<User>;
|
|
54
54
|
}
|
|
55
55
|
|
|
56
56
|
const LOGIN_ERROR_CODE = 'LOGIN_ERROR';
|
|
@@ -315,9 +315,14 @@ export const useAuthOperations = ({
|
|
|
315
315
|
/**
|
|
316
316
|
* Create a new identity (offline-first)
|
|
317
317
|
* Identity is purely cryptographic - no username or email required
|
|
318
|
+
*
|
|
319
|
+
* This function generates keys locally and does NOT register with the server yet.
|
|
320
|
+
* Registration will happen during syncIdentity() or when username is provided.
|
|
321
|
+
*
|
|
322
|
+
* @param username - Optional username to set during registration (if online)
|
|
318
323
|
*/
|
|
319
324
|
const createIdentity = useCallback(
|
|
320
|
-
async (): Promise<{ synced: boolean }> => {
|
|
325
|
+
async (username?: string): Promise<{ synced: boolean }> => {
|
|
321
326
|
if (!storage) throw new Error('Storage not initialized');
|
|
322
327
|
|
|
323
328
|
setAuthState({ isLoading: true, error: null });
|
|
@@ -342,36 +347,45 @@ export const useAuthOperations = ({
|
|
|
342
347
|
// Clear sessions if identity changed (prevents data leakage)
|
|
343
348
|
await clearSessionsIfIdentityChanged(oldPublicKey, publicKey);
|
|
344
349
|
|
|
345
|
-
// Mark as not synced
|
|
350
|
+
// Mark as not synced initially
|
|
346
351
|
await storage.setItem('oxy_identity_synced', 'false');
|
|
347
352
|
setIdentitySynced(false);
|
|
348
353
|
|
|
349
|
-
//
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
354
|
+
// If username provided, try to register immediately (online only)
|
|
355
|
+
if (username) {
|
|
356
|
+
// Validate username format before attempting registration
|
|
357
|
+
const trimmedUsername = username.trim();
|
|
358
|
+
if (trimmedUsername && /^[a-zA-Z0-9]{3,30}$/.test(trimmedUsername)) {
|
|
359
|
+
try {
|
|
360
|
+
const { signature, timestamp } = await SignatureService.createRegistrationSignature();
|
|
361
|
+
await oxyServices.register(publicKey, signature, timestamp, trimmedUsername);
|
|
362
|
+
|
|
363
|
+
// Mark as synced (Zustand store + storage)
|
|
364
|
+
await storage.setItem('oxy_identity_synced', 'true');
|
|
365
|
+
setIdentitySynced(true);
|
|
366
|
+
|
|
367
|
+
if (__DEV__ && logger) {
|
|
368
|
+
logger('Identity synced with server successfully with username');
|
|
369
|
+
}
|
|
370
|
+
|
|
371
|
+
return { synced: true };
|
|
372
|
+
} catch (syncError) {
|
|
373
|
+
// Offline or server error - identity created locally but not synced
|
|
374
|
+
if (__DEV__ && logger) {
|
|
375
|
+
logger('Identity created locally with username (offline), will sync when online', syncError);
|
|
376
|
+
}
|
|
377
|
+
|
|
378
|
+
return { synced: false };
|
|
379
|
+
}
|
|
360
380
|
}
|
|
381
|
+
}
|
|
361
382
|
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
} catch (syncError) {
|
|
366
|
-
// Offline or server error - identity is created locally but not synced
|
|
367
|
-
if (__DEV__ && logger) {
|
|
368
|
-
logger('Identity created locally (offline), will sync when online', syncError);
|
|
369
|
-
}
|
|
370
|
-
|
|
371
|
-
return {
|
|
372
|
-
synced: false,
|
|
373
|
-
};
|
|
383
|
+
// No username provided - defer registration until later
|
|
384
|
+
if (__DEV__ && logger) {
|
|
385
|
+
logger('Identity created locally without username, will register during sync');
|
|
374
386
|
}
|
|
387
|
+
|
|
388
|
+
return { synced: false };
|
|
375
389
|
} catch (error) {
|
|
376
390
|
// CRITICAL: Never delete identity on error - it may have been successfully created
|
|
377
391
|
// Only log the error and let the user recover using their backup file
|
|
@@ -387,7 +401,7 @@ export const useAuthOperations = ({
|
|
|
387
401
|
await storage.setItem('oxy_identity_synced', 'false').catch(() => {});
|
|
388
402
|
setIdentitySynced(false);
|
|
389
403
|
if (__DEV__ && logger) {
|
|
390
|
-
logger('Identity was created but sync failed - user can sync later
|
|
404
|
+
logger('Identity was created but sync failed - user can sync later');
|
|
391
405
|
}
|
|
392
406
|
} else {
|
|
393
407
|
// No identity exists - this was a generation failure, safe to clean up sync flag
|
|
@@ -425,9 +439,11 @@ export const useAuthOperations = ({
|
|
|
425
439
|
/**
|
|
426
440
|
* Sync local identity with server (call when online)
|
|
427
441
|
* TanStack Query handles offline mutations automatically
|
|
442
|
+
*
|
|
443
|
+
* @param username - Optional username to set during sync
|
|
428
444
|
*/
|
|
429
445
|
const syncIdentity = useCallback(
|
|
430
|
-
async (): Promise<User> => {
|
|
446
|
+
async (username?: string): Promise<User> => {
|
|
431
447
|
if (!storage) throw new Error('Storage not initialized');
|
|
432
448
|
|
|
433
449
|
setAuthState({ isLoading: true, error: null });
|
|
@@ -452,7 +468,7 @@ export const useAuthOperations = ({
|
|
|
452
468
|
if (!registered) {
|
|
453
469
|
// Register with server (identity is just the publicKey)
|
|
454
470
|
const { signature, timestamp } = await SignatureService.createRegistrationSignature();
|
|
455
|
-
await oxyServices.register(publicKey, signature, timestamp);
|
|
471
|
+
await oxyServices.register(publicKey, signature, timestamp, username);
|
|
456
472
|
}
|
|
457
473
|
|
|
458
474
|
// Mark as synced (Zustand store + storage)
|
|
@@ -462,13 +478,6 @@ export const useAuthOperations = ({
|
|
|
462
478
|
// Sign in
|
|
463
479
|
const user = await performSignIn(publicKey);
|
|
464
480
|
|
|
465
|
-
// Check if user has username - required for syncing
|
|
466
|
-
if (!user.username) {
|
|
467
|
-
const usernameError = new Error('USERNAME_REQUIRED');
|
|
468
|
-
(usernameError as any).code = 'USERNAME_REQUIRED';
|
|
469
|
-
throw usernameError;
|
|
470
|
-
}
|
|
471
|
-
|
|
472
481
|
// TanStack Query will automatically retry any pending mutations
|
|
473
482
|
|
|
474
483
|
return user;
|
|
@@ -492,9 +501,13 @@ export const useAuthOperations = ({
|
|
|
492
501
|
|
|
493
502
|
/**
|
|
494
503
|
* Import identity from backup file data (offline-first)
|
|
504
|
+
*
|
|
505
|
+
* @param backupData - The backup data to import
|
|
506
|
+
* @param password - Password to decrypt the backup
|
|
507
|
+
* @param username - Optional username to set during registration
|
|
495
508
|
*/
|
|
496
509
|
const importIdentity = useCallback(
|
|
497
|
-
async (backupData: BackupData, password: string): Promise<{ synced: boolean }> => {
|
|
510
|
+
async (backupData: BackupData, password: string, username?: string): Promise<{ synced: boolean }> => {
|
|
498
511
|
if (!storage) throw new Error('Storage not initialized');
|
|
499
512
|
|
|
500
513
|
// Validate arguments - ensure backupData is an object, not a string (old signature)
|
|
@@ -589,7 +602,7 @@ export const useAuthOperations = ({
|
|
|
589
602
|
} else {
|
|
590
603
|
// Need to register this identity (identity is just the publicKey)
|
|
591
604
|
const { signature, timestamp } = await SignatureService.createRegistrationSignature();
|
|
592
|
-
await oxyServices.register(publicKey, signature, timestamp);
|
|
605
|
+
await oxyServices.register(publicKey, signature, timestamp, username);
|
|
593
606
|
|
|
594
607
|
await storage.setItem('oxy_identity_synced', 'true');
|
|
595
608
|
setIdentitySynced(true);
|