moc-oauth-client 1.0.2 → 1.0.4

package/dist/index.d.ts

@@ -1,17 +1,12 @@
-interface OAuthSuccess<T> {
-    statusCode: number;
-    success: true;
-    message: string;
-    data: T;
+interface OAuthResult<T> {
+    data: T | null;
+    error: OAuthError["error"] | null;
 }
 interface OAuthError {
     success: false;
     error: {
         code: string;
         message: string;
-        timestamp: string;
-        path: string;
-        requestId: string;
     };
 }
 interface AuthorizeResponse {
@@ -29,44 +24,43 @@ interface CurrentUser {
 }
 
 /**
- * MocOAuthClient is a client library for interacting with the Moc OAuth API.
+ * MOCOAuthClient is a client library for interacting with the MOC OAuth API.
  * It provides methods for authorizing clients, validating tokens, refreshing tokens,
  * and retrieving the current user's information.
  */
-declare class MocOAuthClient {
+declare class MOCOAuthClient {
     /**
-     * Authorize a client using the OAuth API.
+     * Authorizes a client using the MOC OAuth API.
      * @returns A promise resolving to an object containing the response data.
-     * The response data will contain a redirectUri which can be used to redirect the user to the Moc OAuth API's authorization page.
-     * @throws An error if the authorization request fails.
+     * The response data will contain the authorization URL for the client.
+     * @throws An error if the request to authorize the client fails.
      */
-    authorizeClient(): Promise<OAuthSuccess<AuthorizeResponse>>;
+    authorizeClient(): Promise<OAuthResult<AuthorizeResponse>>;
     /**
-     * Validates a JWT token using the Moc OAuth API.
+     * Validates a JWT token using the MOC OAuth API.
      * @param accessToken The JWT token to validate.
      * @returns A promise resolving to an object containing the response data.
      * The response data will contain a boolean indicating whether the token is valid or not,
      * an access token, and a refresh token.
-     * @throws An error if the validation request fails.
+     * @throws An error if the request to validate the token fails.
      */
-    validateToken(accessToken: string): Promise<OAuthSuccess<ValidateTokenResponse>>;
+    validateToken(accessToken: string): Promise<OAuthResult<ValidateTokenResponse>>;
     /**
-     * Retrieves the current user's information using the Moc OAuth API.
+     * Retrieves the current user's information using the MOC OAuth API.
      * @param accessToken The JWT token to use for authentication.
      * @returns A promise resolving to an object containing the response data.
      * The response data will contain the current user's email, first name, and last name.
-     * @throws An error if the request to retrieve the current user's information fails.
+     * @throws An error if the request to retrieve the user's information fails.
      */
-    getCurrentUser(accessToken: string): Promise<OAuthSuccess<CurrentUser>>;
+    getCurrentUser(accessToken: string): Promise<OAuthResult<CurrentUser>>;
     /**
-     * Refreshes a JWT token using the Moc OAuth API.
-     * @param refreshToken The refresh token to use for authentication.
+     * Refreshes an access token using the MOC OAuth API.
+     * @param refreshToken The JWT token to use for authentication.
      * @returns A promise resolving to an object containing the response data.
-     * The response data will contain a boolean indicating whether the token is valid or not,
-     * an access token, and a refresh token.
-     * @throws An error if the request to refresh the token fails.
+     * The response data will contain the new access token and refresh token.
+     * @throws An error if the request to refresh the access token fails.
      */
-    refreshToken(refreshToken: string): Promise<OAuthSuccess<ValidateTokenResponse>>;
+    refreshToken(refreshToken: string): Promise<OAuthResult<ValidateTokenResponse>>;
 }
 
-export { type AuthorizeResponse, type CurrentUser, MocOAuthClient, type OAuthError, type OAuthSuccess, type ValidateTokenResponse };
+export { type AuthorizeResponse, type CurrentUser, MOCOAuthClient, type OAuthError, type OAuthResult, type ValidateTokenResponse };

package/dist/index.js

@@ -30,7 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  MocOAuthClient: () => MocOAuthClient
+  MOCOAuthClient: () => MOCOAuthClient
 });
 module.exports = __toCommonJS(index_exports);
 
@@ -60,20 +60,14 @@ var http = import_axios.default.create({
 });
 
 // src/errors.ts
-function handleError(error) {
+function parseError(error) {
   const err = error;
-  if (err.response?.data) {
-    throw err.response.data;
+  if (err.response?.data?.error) {
+    return err.response.data.error;
   }
-  throw {
-    success: false,
-    error: {
-      code: "UNKNOWN_ERROR",
-      message: err.message,
-      timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-      path: "",
-      requestId: ""
-    }
+  return {
+    code: "UNKNOWN_ERROR",
+    message: err.message ?? "Unknown error"
   };
 }
 
@@ -86,12 +80,12 @@ var API_ENDPOINTS = {
 };
 
 // src/client.ts
-var MocOAuthClient = class {
+var MOCOAuthClient = class {
   /**
-   * Authorize a client using the OAuth API.
+   * Authorizes a client using the MOC OAuth API.
    * @returns A promise resolving to an object containing the response data.
-   * The response data will contain a redirectUri which can be used to redirect the user to the Moc OAuth API's authorization page.
-   * @throws An error if the authorization request fails.
+   * The response data will contain the authorization URL for the client.
+   * @throws An error if the request to authorize the client fails.
    */
   async authorizeClient() {
     try {
@@ -100,35 +94,47 @@ var MocOAuthClient = class {
         clientSecret: config.clientSecret,
         redirectUri: config.redirectUri
       });
-      return res.data;
+      return {
+        data: res.data.data,
+        error: null
+      };
     } catch (e) {
-      handleError(e);
+      return {
+        data: null,
+        error: parseError(e)
+      };
     }
   }
   /**
-   * Validates a JWT token using the Moc OAuth API.
+   * Validates a JWT token using the MOC OAuth API.
    * @param accessToken The JWT token to validate.
    * @returns A promise resolving to an object containing the response data.
    * The response data will contain a boolean indicating whether the token is valid or not,
    * an access token, and a refresh token.
-   * @throws An error if the validation request fails.
+   * @throws An error if the request to validate the token fails.
    */
   async validateToken(accessToken) {
     try {
       const res = await http.post(API_ENDPOINTS.VALIDATE_TOKEN, {
         accessToken
       });
-      return res.data;
+      return {
+        data: res.data.data,
+        error: null
+      };
     } catch (e) {
-      handleError(e);
+      return {
+        data: null,
+        error: parseError(e)
+      };
     }
   }
   /**
-   * Retrieves the current user's information using the Moc OAuth API.
+   * Retrieves the current user's information using the MOC OAuth API.
    * @param accessToken The JWT token to use for authentication.
    * @returns A promise resolving to an object containing the response data.
    * The response data will contain the current user's email, first name, and last name.
-   * @throws An error if the request to retrieve the current user's information fails.
+   * @throws An error if the request to retrieve the user's information fails.
    */
   async getCurrentUser(accessToken) {
     try {
@@ -137,31 +143,42 @@ var MocOAuthClient = class {
           Authorization: `Bearer ${accessToken}`
         }
       });
-      return res.data;
+      return {
+        data: res.data.data,
+        error: null
+      };
     } catch (e) {
-      handleError(e);
+      return {
+        data: null,
+        error: parseError(e)
+      };
     }
   }
   /**
-   * Refreshes a JWT token using the Moc OAuth API.
-   * @param refreshToken The refresh token to use for authentication.
+   * Refreshes an access token using the MOC OAuth API.
+   * @param refreshToken The JWT token to use for authentication.
    * @returns A promise resolving to an object containing the response data.
-   * The response data will contain a boolean indicating whether the token is valid or not,
-   * an access token, and a refresh token.
-   * @throws An error if the request to refresh the token fails.
+   * The response data will contain the new access token and refresh token.
+   * @throws An error if the request to refresh the access token fails.
    */
   async refreshToken(refreshToken) {
     try {
       const res = await http.post(API_ENDPOINTS.REFRESH_TOKEN, {
         refreshToken
       });
-      return res.data;
+      return {
+        data: res.data.data,
+        error: null
+      };
     } catch (e) {
-      handleError(e);
+      return {
+        data: null,
+        error: parseError(e)
+      };
     }
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  MocOAuthClient
+  MOCOAuthClient
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moc-oauth-client",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "OAuth client for Ministry of Commerce, Cambodia",
   "author": "Ministry of Commerce, Cambodia",
   "license": "MIT",