Subscription-Check Saga

lowcoder-org · FalkWolsky · Sep 15, 2024 · Aug 10, 2024 · Aug 12, 2024 · Aug 17, 2024
commit b415d1e06da115bcc5da8cd576a27ab111aa059b
diff --git a/client/packages/lowcoder/src/api/applicationApi.ts b/client/packages/lowcoder/src/api/applicationApi.ts
@@ -77,25 +77,25 @@ interface GrantAppPermissionReq {
 
 class ApplicationApi extends Api {
   static newURLPrefix = "/applications";
-  static fetchHomeDataURL = "/v1/applications/home";
-  static createApplicationURL = "/v1/applications";
-  static fetchAllMarketplaceAppsURL = "/v1/applications/marketplace-apps";
-  static deleteApplicationURL = (applicationId: string) => `/v1/applications/${applicationId}`;
-  static getAppPublishInfoURL = (applicationId: string) => `/v1/applications/${applicationId}/view`;
-  static getAppEditingInfoURL = (applicationId: string) => `/v1/applications/${applicationId}`;
-  static updateApplicationURL = (applicationId: string) => `/v1/applications/${applicationId}`;
+  static fetchHomeDataURL = "/applications/home";
+  static createApplicationURL = "/applications";
+  static fetchAllMarketplaceAppsURL = "/applications/marketplace-apps";
+  static deleteApplicationURL = (applicationId: string) => `/applications/${applicationId}`;
+  static getAppPublishInfoURL = (applicationId: string) => `/applications/${applicationId}/view`;
+  static getAppEditingInfoURL = (applicationId: string) => `/applications/${applicationId}`;
+  static updateApplicationURL = (applicationId: string) => `/applications/${applicationId}`;
   static getApplicationPermissionURL = (applicationId: string) =>
-    `/v1/applications/${applicationId}/permissions`;
+    `/applications/${applicationId}/permissions`;
   static grantAppPermissionURL = (applicationId: string) =>
-    `/v1/applications/${applicationId}/permissions`;
+    `/applications/${applicationId}/permissions`;
   static publishApplicationURL = (applicationId: string) =>
-    `/v1/applications/${applicationId}/publish`;
+    `/applications/${applicationId}/publish`;
   static updateAppPermissionURL = (applicationId: string, permissionId: string) =>
-    `/v1/applications/${applicationId}/permissions/${permissionId}`;
-  static createFromTemplateURL = `/v1/applications/createFromTemplate`;
+    `/applications/${applicationId}/permissions/${permissionId}`;
+  static createFromTemplateURL = `/applications/createFromTemplate`;
   static publicToAllURL = (applicationId: string) => `/applications/${applicationId}/public-to-all`;
-  static publicToMarketplaceURL = (applicationId: string) => `/v1/applications/${applicationId}/public-to-marketplace`;
-  static getMarketplaceAppURL = (applicationId: string) => `/v1/applications/${applicationId}/view_marketplace`;
+  static publicToMarketplaceURL = (applicationId: string) => `/applications/${applicationId}/public-to-marketplace`;
+  static getMarketplaceAppURL = (applicationId: string) => `/applications/${applicationId}/view_marketplace`;
 
 
   static fetchHomeData(request: HomeDataPayload): AxiosPromise<HomeDataResponse> {

diff --git a/client/packages/lowcoder/src/api/datasourceApi.ts b/client/packages/lowcoder/src/api/datasourceApi.ts
@@ -155,7 +155,7 @@ export interface DataSourceTypeInfo {
 }
 
 export class DatasourceApi extends Api {
-  static url = "v1/datasources";
+  static url = "datasources";
 
   // this api can be accessed by anonymous users when app is public.
   static fetchJsDatasourceByApp(
@@ -207,7 +207,7 @@ export class DatasourceApi extends Api {
   static fetchDatasourceType(
     orgId: string
   ): AxiosPromise<GenericApiResponse<DataSourceTypeInfo[]>> {
-    return Api.get(`/v1/organizations/${orgId}/datasourceTypes`);
+    return Api.get(`/organizations/${orgId}/datasourceTypes`);
   }
 
   static fetchDynamicPluginConfig<T = any>(

diff --git a/client/packages/lowcoder/src/api/inviteApi.ts b/client/packages/lowcoder/src/api/inviteApi.ts
@@ -19,7 +19,7 @@ export type InviteInfo = {
 
 class InviteApi extends Api {
   static getInviteURL = "/invitation";
-  static acceptInviteURL = (invitationId: string) => `/v1/invitation/${invitationId}/invite`;
+  static acceptInviteURL = (invitationId: string) => `/invitation/${invitationId}/invite`;
 
   // generate invitation
   static getInvite(request: GetInviteRequest): AxiosPromise<GenericApiResponse<InviteInfo>> {

diff --git a/client/packages/lowcoder/src/api/orgApi.ts b/client/packages/lowcoder/src/api/orgApi.ts
@@ -34,24 +34,24 @@ export interface OrgAPIUsageResponse extends ApiResponse {
 }
 
 export class OrgApi extends Api {
-  static createGroupURL = "/v1/groups";
-  static updateGroupURL = (groupId: string) => `/v1/groups/${groupId}/update`;
-  static fetchGroupURL = "/v1/groups/list";
-  static fetchGroupUsersURL = (groupId: string) => `/v1/groups/${groupId}/members`;
-  static deleteGroupURL = (groupId: string) => `/v1/groups/${groupId}`;
-  static fetchOrgUsersURL = (orgId: string) => `/v1/organizations/${orgId}/members`;
-  static deleteOrgUsersURL = (orgId: string) => `/v1/organizations/${orgId}/remove`;
-  static deleteGroupUserURL = (groupId: string) => `/v1/groups/${groupId}/remove`;
-  static addGroupUserURL = (groupId: string) => `/v1/groups/${groupId}/addMember`;
-  static updateUserOrgRoleURL = (orgId: string) => `/v1/organizations/${orgId}/role`;
-  static updateUserGroupRoleURL = (groupId: string) => `/v1/groups/${groupId}/role`;
-  static quitOrgURL = (orgId: string) => `/v1/organizations/${orgId}/leave`;
-  static quitGroupURL = (groupId: string) => `/v1/groups/${groupId}/leave`;
-  static switchOrgURL = (orgId: string) => `/v1/organizations/switchOrganization/${orgId}`;
-  static createOrgURL = "/v1/organizations";
-  static deleteOrgURL = (orgId: string) => `/v1/organizations/${orgId}`;
-  static updateOrgURL = (orgId: string) => `/v1/organizations/${orgId}/update`;
-  static fetchUsage = (orgId: string) => `/v1/organizations/${orgId}/api-usage`;
+  static createGroupURL = "/groups";
+  static updateGroupURL = (groupId: string) => `/groups/${groupId}/update`;
+  static fetchGroupURL = "/groups/list";
+  static fetchGroupUsersURL = (groupId: string) => `/groups/${groupId}/members`;
+  static deleteGroupURL = (groupId: string) => `/groups/${groupId}`;
+  static fetchOrgUsersURL = (orgId: string) => `/organizations/${orgId}/members`;
+  static deleteOrgUsersURL = (orgId: string) => `/organizations/${orgId}/remove`;
+  static deleteGroupUserURL = (groupId: string) => `/groups/${groupId}/remove`;
+  static addGroupUserURL = (groupId: string) => `/groups/${groupId}/addMember`;
+  static updateUserOrgRoleURL = (orgId: string) => `/organizations/${orgId}/role`;
+  static updateUserGroupRoleURL = (groupId: string) => `/groups/${groupId}/role`;
+  static quitOrgURL = (orgId: string) => `/organizations/${orgId}/leave`;
+  static quitGroupURL = (groupId: string) => `/groups/${groupId}/leave`;
+  static switchOrgURL = (orgId: string) => `/organizations/switchOrganization/${orgId}`;
+  static createOrgURL = "/organizations";
+  static deleteOrgURL = (orgId: string) => `/organizations/${orgId}`;
+  static updateOrgURL = (orgId: string) => `/organizations/${orgId}/update`;
+  static fetchUsage = (orgId: string) => `/organizations/${orgId}/api-usage`;
 
   static createGroup(request: { name: string }): AxiosPromise<GenericApiResponse<OrgGroup>> {
     return Api.post(OrgApi.createGroupURL, request);

diff --git a/client/packages/lowcoder/src/api/platformApi.ts b/client/packages/lowcoder/src/api/platformApi.ts
@@ -2,7 +2,7 @@ import { AxiosPromise } from "axios";
 import Api from "./api";
 
 export class PlatformApi extends Api {
-  static url = "v1/query";
+  static url = "query";
 
   static version(): AxiosPromise<string> {
     return Api.get("/VERSION", { _t: Date.now() }, { baseURL: "/" });

diff --git a/client/packages/lowcoder/src/api/queryApi.ts b/client/packages/lowcoder/src/api/queryApi.ts
@@ -46,7 +46,7 @@ export type QueryExecuteResponse = {
 };
 
 export class QueryApi extends Api {
-  static url = "v1/query";
+  static url = "query";
 
   static queryExecuteCancelTokenSource: Record<string, CancelTokenSource> = {};
 

diff --git a/client/packages/lowcoder/src/api/userApi.ts b/client/packages/lowcoder/src/api/userApi.ts
@@ -63,14 +63,14 @@ export type GetCurrentUserResponse = GenericApiResponse<CurrentUser>;
 class UserApi extends Api {
   static thirdPartyLoginURL = "/auth/tp/login";
   static thirdPartyBindURL = "/auth/tp/bind";
-  static usersURL = "/v1/users";
+  static usersURL = "/users";
   static sendVerifyCodeURL = "/auth/otp/send";
   static logoutURL = "/auth/logout";
-  static userURL = "/v1/users/me";
+  static userURL = "/users/me";
   static currentUserURL = "/users/currentUser";
   static rawCurrentUserURL = "/users/rawCurrentUser";
   static emailBindURL = "/auth/email/bind";
-  static passwordURL = "/v1/users/password";
+  static passwordURL = "/users/password";
   static formLoginURL = "/auth/form/login";
   static markUserStatusURL = "/users/mark-status";
   static userDetailURL = (id: string) => `/users/userDetail/${id}`;

diff --git a/client/packages/lowcoder/src/app.tsx b/client/packages/lowcoder/src/app.tsx
@@ -36,6 +36,7 @@ import { Redirect, Router, Switch } from "react-router-dom";
 import type { AppState } from "redux/reducers";
 import { fetchConfigAction } from "redux/reduxActions/configActions";
 import { fetchUserAction } from "redux/reduxActions/userActions";
+import { fetchSubscriptionsAction } from "redux/reduxActions/subscriptionActions";
 import { reduxStore } from "redux/store/store";
 import { developEnv } from "util/envUtils";
 import history from "util/history";
@@ -89,6 +90,7 @@ type AppIndexProps = {
   fetchHomeDataFinished: boolean;
   fetchConfig: (orgId?: string) => void;
   fetchHomeData: (currentUserAnonymous?: boolean | undefined) => void;
+  fetchSubscriptions: () => void;
   getCurrentUser: () => void;
   favicon: string;
   brandName: string;
@@ -111,6 +113,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
       this.props.fetchConfig(this.props.currentOrgId);
       if (!this.props.currentUserAnonymous) {
         this.props.fetchHomeData(this.props.currentUserAnonymous);
+        this.props.fetchSubscriptions();
       }
     }
   }
@@ -416,14 +419,20 @@ const mapDispatchToProps = (dispatch: any) => ({
     dispatch(fetchUserAction());
   },
   fetchConfig: (orgId?: string) => dispatch(fetchConfigAction(orgId)),
+
+  fetchSubscriptions: () => {
+    // dispatch(fetchSubscriptionsAction());
+  },
+
   fetchHomeData: (currentUserAnonymous: boolean | undefined) => {
+    dispatch(fetchHomeData({}));
     // the rule should be that if the user is not logged in and if he want to view an App, we should not fetch the home data
-    if (window.location.pathname == APP_EDITOR_URL && !currentUserAnonymous && !currentUserAnonymous === undefined) {
+    /* if (window.location.pathname == APP_EDITOR_URL && !currentUserAnonymous && !currentUserAnonymous === undefined) {
       dispatch(fetchHomeData({}));
     }
     else {
       dispatch(fetchHomeData({}));
-    }
+    } */
   }
 });
 

diff --git a/client/packages/lowcoder/src/appView/AppViewInstance.tsx b/client/packages/lowcoder/src/appView/AppViewInstance.tsx
@@ -84,7 +84,7 @@ export class AppViewInstance<I = any, O = any> {
     if (!appDsl) {
       const http = axios.create({ baseURL: baseUrl, withCredentials: true });
       const data: ApplicationResp = await http
-        .get(`/api/v1/applications/${this.appId}/view`)
+        .get(`/api/applications/${this.appId}/view`)
         .then((i) => i.data)
         .catch((e) => {
           if (e.response?.status === API_STATUS_CODES.REQUEST_NOT_AUTHORISED) {

diff --git a/client/packages/lowcoder/src/constants/apiConstants.ts b/client/packages/lowcoder/src/constants/apiConstants.ts
@@ -52,9 +52,9 @@ export const API_REQUEST_HEADERS: RawAxiosRequestHeaders = {
   "Content-Type": "application/json",
 };
 export const SERVER_HOST = `${REACT_APP_API_HOST ?? ""}`;
-export const ASSETS_URI = (id: string) => `${SERVER_HOST}/api/v1/assets/${id}`;
-export const USER_HEAD_UPLOAD_URL = `${SERVER_HOST}/api/v1/users/photo`;
+export const ASSETS_URI = (id: string) => `${SERVER_HOST}/api/assets/${id}`;
+export const USER_HEAD_UPLOAD_URL = `${SERVER_HOST}/api/users/photo`;
 export const ORG_ICON_UPLOAD_URL = (orgId: string) =>
-  `${SERVER_HOST}/api/v1/organizations/${orgId}/logo`;
+  `${SERVER_HOST}/api/organizations/${orgId}/logo`;
 
 export type ApiRequestStatus = "init" | "requesting" | "success" | "error";
diff --git a/client/packages/lowcoder/src/constants/reduxActionConstants.ts b/client/packages/lowcoder/src/constants/reduxActionConstants.ts
@@ -159,6 +159,11 @@ export const ReduxActionTypes = {
   FETCH_AUDIT_LOG: "FETCH_AUDIT_LOG",
   FETCH_AUDIT_LOG_SUCCESS: "FETCH_AUDIT_LOG_SUCCESS",
 
+  /* subscription */
+  FETCH_SUBSCRIPTIONS_INIT: "FETCH_SUBSCRIPTIONS_INIT",
+  FETCH_SUBSCRIPTIONS_SUCCESS: "FETCH_SUBSCRIPTIONS_SUCCESS",
+  FETCH_SUBSCRIPTIONS_FAILURE: "FETCH_SUBSCRIPTIONS_FAILURE",
+
   /* application snapshot */
   FETCH_APP_SNAPSHOTS: "FETCH_APP_SNAPSHOTS",
   FETCH_APP_SNAPSHOTS_SUCCESS: "FETCH_APP_SNAPSHOTS_SUCCESS",
@@ -211,6 +216,9 @@ export const ReduxActionErrorTypes = {
   /* sytem config */
   FETCH_SYS_CONFIG_ERROR: "FETCH_SYS_CONFIG_ERROR",
 
+  /* subscription */
+  FETCH_SUBSCRIPTIONS_ERROR: "FETCH_SUBSCRIPTIONS_ERROR",
+
   /* application snapshot */
   CREATE_APP_SNAPSHOT_ERROR: "CREATE_APP_SNAPSHOT_ERROR",
   FETCH_APP_SNAPSHOTS_ERROR: "FETCH_APP_SNAPSHOTS_ERROR",