Make use of logging lib, move errors to utils/errors, remove yalc fro…

…m packages

packages/react-sdk/package.json

@@ -31,8 +31,7 @@
     "react": ">=16.8"
   },
   "dependencies": {
-    "@corbado/web-core": "file:.yalc/@corbado/web-core",
-    "ts-results": "^3.3.0"
+    "@corbado/web-core": "^0.1.6"
   },
   "devDependencies": {
     "@types/react": "^18.2.0"

packages/react/package.json

@@ -30,8 +30,8 @@
     "url": "https://github.com/corbado/javascript/issues"
   },
   "dependencies": {
-    "@corbado/react-sdk": "file:.yalc/@corbado/react-sdk",
-    "@corbado/web-core": "file:.yalc/@corbado/web-core",
+    "@corbado/react-sdk": "^0.1.6",
+    "@corbado/web-core": "^0.1.6",
     "i18next": "23.5.1",
     "i18next-browser-languagedetector": "7.1.0",
     "react-i18next": "13.2.2"

packages/web-core/package.json

@@ -31,7 +31,10 @@
   "dependencies": {
     "@github/webauthn-json": "^2.1.1",
     "axios": "^1.6.0",
-    "rxjs": "^7.8.1",
+    "loglevel": "^1.8.1",
+    "rxjs": "^7.8.1"
+  },
+  "devDependencies": {
     "ts-results": "^3.3.0"
   }
 }

packages/web-core/src/index.ts

@@ -1,4 +1,5 @@
 export * from './utils/constants';
 export * from './utils/helpers/webAuthUtils';
+export * from './utils/errors';
 export * from './types';
 export * from './services';

packages/web-core/src/services/ApiService.ts

@@ -14,8 +14,8 @@ import type {
   InitSignUpWithEmailOTPError,
   LoginWithPasskeyError,
   SignUpWithPasskeyError,
-} from '../types';
-import { CorbadoError, NonRecoverableError } from '../types';
+} from '../utils';
+import { CorbadoError, NonRecoverableError } from '../utils';
 
 // TODO: does this work also without npm start? (e.g. vite js)
 const packageVersion = '0';

packages/web-core/src/services/AuthService.ts

@@ -1,25 +1,24 @@
+import log from 'loglevel';
 import { Subject } from 'rxjs';
 import type { Result } from 'ts-results';
 import { Ok } from 'ts-results';
 
 import type { AuthenticationResponse } from '../internaltypes/auth';
+import type { IUser, ShortSession, UserAuthMethodsInterface } from '../types';
+import { AuthState, LoginHandler } from '../types';
 import type {
   AppendPasskeyError,
   CompleteLoginWithEmailOTPError,
   CompleteSignupWithEmailOTPError,
   InitAutocompletedLoginWithPasskeyError,
   InitLoginWithEmailOTPError,
   InitSignUpWithEmailOTPError,
-  IUser,
   LoginWithPasskeyError,
-  ShortSession,
   SignUpWithPasskeyError,
-  UserAuthMethodsInterface,
-} from '../types';
-import { AuthState, LoginHandler } from '../types';
+} from '../utils';
 import type { ApiService } from './ApiService';
-import type { AuthenticatorService } from './AuthenticatorService';
 import type { SessionService } from './SessionService';
+import type { WebAuthnService } from './WebAuthnService';
 
 /**
  * AuthService is a class that handles authentication related operations.
@@ -29,7 +28,7 @@ import type { SessionService } from './SessionService';
  */
 export class AuthService {
   #apiService: ApiService;
-  #authenticatorService: AuthenticatorService;
+  #authenticatorService: WebAuthnService;
 
   // sessionService is used to store and manage (e.g. refresh) the user's session
   #sessionService: SessionService;
@@ -45,13 +44,19 @@ export class AuthService {
   /**
    * The constructor initializes the AuthService with an instance of ApiService.
    */
-  constructor(apiService: ApiService, sessionService: SessionService, authenticatorService: AuthenticatorService) {
+  constructor(apiService: ApiService, sessionService: SessionService, authenticatorService: WebAuthnService) {
     this.#apiService = apiService;
     this.#authenticatorService = authenticatorService;
     this.#sessionService = sessionService;
   }
 
-  init() {
+  init(isDebug = false) {
+    if (isDebug) {
+      log.setLevel('debug');
+    } else {
+      log.setLevel('error');
+    }
+
     this.#sessionService.init((shortSession: ShortSession | undefined) => {
       const user = this.#sessionService.getUser();
 

packages/web-core/src/services/SessionService.ts

@@ -3,6 +3,7 @@ import type { AxiosRequestConfig } from 'axios';
 import type { IFullUser, IUser } from '../types';
 import { ShortSession } from '../types';
 import type { ApiService } from './ApiService';
+import log from "loglevel";
 
 const shortSessionKey = 'cbo_short_session';
 const longSessionKey = 'cbo_long_session';
@@ -68,7 +69,6 @@ export class SessionService {
    * @returns The username or null if it's not set.
    */
   public getUser(): IUser | undefined {
-    console.log(this.#shortSession);
     if (!this.#shortSession) {
       return;
     }
@@ -127,7 +127,7 @@ export class SessionService {
 
   logout() {
     // TODO: should we call backend to destroy the session here?
-    console.log('logging out user');
+    log.debug('logging out user');
     this.clear();
 
     if (this.#onShortSessionChange) {
@@ -204,7 +204,7 @@ export class SessionService {
     }
 
     // nothing to do for now
-    console.log('no refresh, token still valid');
+    log.debug('no refresh, token still valid');
     return;
   }
 
@@ -217,12 +217,12 @@ export class SessionService {
       };
       const response = await this.#apiService.sessionsApi.sessionRefresh({}, options);
       if (response.status !== 200) {
-        console.error(`refresh error, status code: ${response.status}`);
+        log.warn(`refresh error, status code: ${response.status}`);
         return;
       }
 
       if (!response.data.shortSession?.value) {
-        console.error('refresh error, missing short session');
+        log.warn('refresh error, missing short session');
         return;
       }
 
@@ -231,7 +231,7 @@ export class SessionService {
     } catch (e) {
       // if it's a network error, we should do a retry
       // for all other errors, we should log out the user
-      console.log(e);
+      log.warn(e);
       this.logout();
     }
   }

packages/web-core/src/services/AuthenticatorService.ts → packages/web-core/src/services/WebAuthnService.ts

@@ -2,14 +2,14 @@ import { create, get } from '@github/webauthn-json';
 import type { Subject } from 'rxjs';
 import type { Result } from 'ts-results';
 import { Err, Ok } from 'ts-results';
+import {CorbadoError, NonRecoverableError} from "../utils";
 
-import { CorbadoError, NonRecoverableError } from '../types';
 
 /**
  * AuthenticatorService handles all interactions with webAuthn platform authenticators.
  * Currently, this includes the creation of passkeys and the login with existing passkeys.
  */
-export class AuthenticatorService {
+export class WebAuthnService {
   #globalErrors: Subject<NonRecoverableError | undefined>;
 
   constructor(globalErrors: Subject<NonRecoverableError | undefined>) {

packages/web-core/src/services/index.ts

@@ -1,14 +1,13 @@
 import { Subject } from 'rxjs';
 
 import type { IFlowHandlerConfig } from '../types';
-import { NonRecoverableError } from '../types';
-import { defaultTimeout } from '../utils';
+import {defaultTimeout, NonRecoverableError} from '../utils';
 import { ApiService } from './ApiService';
-import { AuthenticatorService } from './AuthenticatorService';
 import { AuthService } from './AuthService';
 import type { FlowHandlerService } from './FlowHandlerService';
 import { ProjectService } from './ProjectService';
 import { SessionService } from './SessionService';
+import { WebAuthnService } from './WebAuthnService';
 
 export type { ProjectService } from './ProjectService';
 export type { AuthService } from './AuthService';
@@ -41,7 +40,7 @@ export class CorbadoApp {
     this.#projectId = projectId;
     this.#apiService = new ApiService(this.#projectId, apiTimeout);
     const sessionService = new SessionService(this.#apiService);
-    const authenticatorService = new AuthenticatorService(this.#globalErrors);
+    const authenticatorService = new WebAuthnService(this.#globalErrors);
     this.#authService = new AuthService(this.#apiService, sessionService, authenticatorService);
     this.#projectService = new ProjectService(this.#apiService);
   }
@@ -72,7 +71,6 @@ export class CorbadoApp {
    */
   public init() {
     if (!this.#validateProjectId(this.#projectId)) {
-      console.log('invalid project id');
       this.#globalErrors.next(NonRecoverableError.invalidConfig('Invalid project ID'));
     }
 

packages/web-core/src/types/index.ts

@@ -3,4 +3,3 @@ export * from './auth';
 export * from './flowHandler';
 export * from './session';
 export * from './loginHandler';
-export * from './errors';

packages/web-core/src/types/loginHandler.ts

@@ -1,6 +1,6 @@
 import type { Result } from 'ts-results';
 
-import type { CompleteAutocompletedLoginWithPasskeyError } from './errors';
+import type { CompleteAutocompletedLoginWithPasskeyError } from '../utils/errors/errors';
 
 export class LoginHandler {
   readonly #completionCallback: () => Promise<Result<void, CompleteAutocompletedLoginWithPasskeyError>>;

packages/web-core/src/types/errors.ts → packages/web-core/src/utils/errors/errors.ts

@@ -1,4 +1,6 @@
-import type { ErrorRspAllOfError } from '../api';
+import log from "loglevel";
+
+import type { ErrorRspAllOfError } from '../../api';
 
 export type SignUpWithPasskeyError =
   | UserAlreadyExistsError
@@ -28,7 +30,7 @@ export class CorbadoError extends Error {
   }
 
   static fromApiResponse(errorResp: ErrorRspAllOfError): CorbadoError {
-    console.log('errorResp', errorResp);
+    log.debug('errorResp', errorResp);
     switch (errorResp.type) {
       case 'validation_error': {
         if (!errorResp.validation?.length) {
@@ -77,7 +79,7 @@ export class CorbadoError extends Error {
   }
 
   static fromUnknownException(e: unknown): CorbadoError {
-    console.log('unknown exception', e);
+    log.debug('unknown exception', e);
     return CorbadoError.unknown();
   }
 

packages/web-core/src/utils/errors/index.ts

@@ -0,0 +1 @@
+export * from './errors';

packages/web-core/src/utils/index.ts

@@ -1,3 +1,4 @@
 export * from './helpers';
 export * from './constants';
 export * from './flows';
+export * from './errors';