simply http response define

Author: endink

package.json

@@ -1,6 +1,6 @@
 {
   "name": "infra-sdk-core",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A type script sdk for infra java spring server.",
   "main": "lib/index.js",
   "scripts": {

src/request/index.ts

@@ -7,7 +7,7 @@ import {
     RequestResponse
 } from "umi-request";
 import { RefreshTokenParam, OAuth2AccessToken, GrantTypes, LoginParam, CheckTokenResult } from "../oauth2";
-import { ErrorContext, CustomErrorHandler, RequestOptions, RequestContext } from "./types";
+import { ErrorContext, CustomErrorHandler, RequestOptions, RequestContext, HttpResponse } from "./types";
 import { OAuth2Session, ApplicationError } from "../core";
 import { clientSession } from "../oauth2/session";
 import { isNotNullOrBlankString } from "../utils";
@@ -83,15 +83,15 @@ const handleError = (error: ResponseError, options: RequestOptions, skipNotify?:
 
 export interface ExtendedRequestMethod<R = true> extends RequestMethod<R> {
     <T = any>(url: string, options?: ExtendedRequestOptionsInit): R extends true
-        ? Promise<RequestResponse<T & ApplicationError>>
+        ? Promise<HttpResponse<T>>
         : Promise<T | ApplicationError>;
     login: (
         param: LoginParam,
         options?: OAuth2RequestOptions
-    ) => Promise<RequestResponse<OAuth2AccessToken & ApplicationError>>;
+    ) => Promise<HttpResponse<OAuth2AccessToken>>;
     checkToken: (
         options?: OAuth2RequestOptions & { tokenValue?: string }
-    ) => Promise<RequestResponse<CheckTokenResult & ApplicationError>>;
+    ) => Promise<HttpResponse<CheckTokenResult>>;
 }
 
 export interface ExtendedRequestOptionsInit extends RequestOptionsInit {
@@ -195,7 +195,7 @@ export function initRequest(options: RequestOptions, session?: OAuth2Session): E
 
         return request<OAuth2AccessToken & ApplicationError>(accessTokenUrl, s);
     };
-
+    
     req.checkToken = async (ropt?: OAuth2RequestOptions & { tokenValue?: string }) => {
         const { checkTokenUrl, session: current } = requestContext;
 
@@ -227,3 +227,25 @@ export function initRequest(options: RequestOptions, session?: OAuth2Session): E
 }
 
 
+export function makeFailedResponseWithError(err: ApplicationError): HttpResponse<any> {
+    const r: HttpResponse<any> = {
+        data: err,
+        response: {
+            ok: false,
+            status: 200
+        } as any
+    };
+    return r;
+}
+
+export function makeSucceedResponseWithData<T = any>(data: T): HttpResponse<T> {
+    const r: HttpResponse<T> = {
+        data,
+        response: {
+            ok: true,
+            status: 200
+        } as any
+    };
+    return r;
+}
+

src/request/types.ts

@@ -1,5 +1,5 @@
-import { ResponseError } from "umi-request";
-import { OAuth2Session, ToastAdapter } from "../core";
+import { RequestResponse, ResponseError } from "umi-request";
+import { ApplicationError, OAuth2Session, ToastAdapter } from "../core";
 
 export interface ErrorContext {
     error: ResponseError;
@@ -23,4 +23,6 @@ export interface RequestOptions {
     noneOAuth2?: boolean;
 }
 
-export type RequestContext = Pick<RequestOptions, "accessTokenUrl" | "checkTokenUrl"> & { session?: OAuth2Session };
+export type RequestContext = Pick<RequestOptions, "accessTokenUrl" | "checkTokenUrl"> & { session?: OAuth2Session };
+
+export type HttpResponse<T> = RequestResponse<T & ApplicationError>;