lowcoder-org · FalkWolsky · Nov 7, 2023 · Nov 6, 2023 · Nov 6, 2023 · Nov 6, 2023
diff --git a/client/packages/lowcoder-cli/client.d.ts b/client/packages/lowcoder-cli/client.d.ts
@@ -31,10 +31,10 @@ declare var REACT_APP_LANGUAGES: string;
 declare var REACT_APP_COMMIT_ID: string;
 declare var REACT_APP_API_HOST: string;
 declare var LOWCODER_NODE_SERVICE_URL: string;
-declare var LOWCODER_SHOW_BRAND: string;
-declare var LOWCODER_CUSTOM_LOGO: string;
-declare var LOWCODER_CUSTOM_LOGO_SQUARE: string;
-declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
+declare var REACT_APP_LOWCODER_SHOW_BRAND: string;
+declare var REACT_APP_LOWCODER_CUSTOM_LOGO: string;
+declare var REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE: string;
+declare var REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
 declare var REACT_APP_ENV: string;
 declare var REACT_APP_BUILD_ID: string;
 declare var REACT_APP_LOG_LEVEL: string;

diff --git a/client/packages/lowcoder-dev-utils/buildVars.js b/client/packages/lowcoder-dev-utils/buildVars.js
@@ -20,23 +20,23 @@ export const buildVars = [
     defaultValue: "",
   },
   {
-    name: "LOWCODER_SHOW_BRAND",
+    name: "REACT_APP_LOWCODER_SHOW_BRAND",
     defaultValue: 'false',
   },
   {
-    name: "LOWCODER_CUSTOM_LOGO",
+    name: "REACT_APP_LOWCODER_CUSTOM_LOGO",
     defaultValue: '',
   },
   {
-    name: "LOWCODER_CUSTOM_LOGO_SQUARE",
+    name: "REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE",
     defaultValue: '',
   },
   {
-    name: "LOWCODER_NODE_SERVICE_URL",
-    defaultValue: "",
+    name: "REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT",
+    defaultValue: '',
   },
   {
-    name: "LOWCODER_CUSTOM_AUTH_WELCOME_TEXT",
+    name: "LOWCODER_NODE_SERVICE_URL",
     defaultValue: "",
   },
   {

diff --git a/client/packages/lowcoder/index.html b/client/packages/lowcoder/index.html
@@ -96,5 +96,11 @@
     <div id="root"></div>
     <script type="module" src="/src/index.ts"></script>
     <!-- <%- browserCheckScript %> -->
+    <script>
+      window.lowcoder_show_brand = "<%= process.env.REACT_APP_LOWCODER_SHOW_BRAND %>";
+      window.lowcoder_custom_auth_welcome_text = "<%= process.env.REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT %>";
+      window.lowcoder_custom_logo = "<%= process.env.REACT_APP_LOWCODER_CUSTOM_LOGO %>";
+      window.lowcoder_custom_logo_square = "<%= process.env.REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE %>";
+    </script>
   </body>
 </html>
diff --git a/client/packages/lowcoder/src/api/configApi.ts b/client/packages/lowcoder/src/api/configApi.ts
@@ -13,7 +13,7 @@ class ConfigApi extends Api {
   static fetchConfig(orgId?: string): AxiosPromise<ConfigResponse> {
     let authConfigURL = ConfigApi.configURL;
     if(orgId?.length) {
-      authConfigURL += `?orgId?=${orgId}`;
+      authConfigURL += `?orgId=${orgId}`;
     }
     return Api.get(authConfigURL);
   }

diff --git a/client/packages/lowcoder/src/app-env.d.ts b/client/packages/lowcoder/src/app-env.d.ts
@@ -34,10 +34,10 @@ declare var REACT_APP_LANGUAGES: string;
 declare var REACT_APP_COMMIT_ID: string;
 declare var REACT_APP_API_HOST: string;
 declare var LOWCODER_NODE_SERVICE_URL: string;
-declare var LOWCODER_SHOW_BRAND: string;
-declare var LOWCODER_CUSTOM_LOGO: string;
-declare var LOWCODER_CUSTOM_LOGO_SQUARE: string;
-declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
+declare var REACT_APP_LOWCODER_SHOW_BRAND: string;
+declare var REACT_APP_LOWCODER_CUSTOM_LOGO: string;
+declare var REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE: string;
+declare var REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
 declare var REACT_APP_ENV: string;
 declare var REACT_APP_BUILD_ID: string;
 declare var REACT_APP_LOG_LEVEL: string;

diff --git a/client/packages/lowcoder/src/components/PageSkeleton.tsx b/client/packages/lowcoder/src/components/PageSkeleton.tsx
@@ -83,8 +83,8 @@ export default function PageSkeleton(props: IProps) {
       {!hideHeader && isHeaderReady && (
         <Header
           headerStart={
-            LOWCODER_SHOW_BRAND === 'true' ? 
-            LOWCODER_CUSTOM_LOGO !== "" ? <img src={LOWCODER_CUSTOM_LOGO} alt="logo" /> :<StyledLogoWithName branding={true} /> : 
+            REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? 
+            REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? <img src={REACT_APP_LOWCODER_CUSTOM_LOGO} alt="logo" /> :<StyledLogoWithName branding={true} /> : 
             <StyledLogoHome branding={true} />
           }
           style={{ backgroundColor: brandingConfig?.headerColor, ...props.headStyle }}

diff --git a/client/packages/lowcoder/src/index.ts b/client/packages/lowcoder/src/index.ts
@@ -34,7 +34,11 @@ debug(`REACT_APP_LANGUAGES:, ${REACT_APP_LANGUAGES}`);
 debug(`REACT_APP_API_HOST:, ${REACT_APP_API_HOST}`);
 debug(`REACT_APP_ENV:, ${REACT_APP_ENV}`);
 debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`);
-
+debug(`REACT_APP_LOWCODER_SHOW_BRAND:, ${REACT_APP_LOWCODER_SHOW_BRAND}`);
+debug(`REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT:, ${REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT}`);
+debug(`LOWCODER_CUSTOM_LOGO:, ${REACT_APP_LOWCODER_CUSTOM_LOGO}`);
+debug(`LOWCODER_CUSTOM_LOGO_SQUARE:, ${REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE}`);
+
 try {
   bootstrap();
   hideLoading();

diff --git a/client/packages/lowcoder/src/pages/common/header.tsx b/client/packages/lowcoder/src/pages/common/header.tsx
@@ -290,8 +290,8 @@ export default function Header(props: HeaderProps) {
   const headerStart = (
     <>
       <StyledLink onClick={() => history.push(ALL_APPLICATIONS_URL)}>
-      {LOWCODER_SHOW_BRAND === 'true' ? 
-      LOWCODER_CUSTOM_LOGO_SQUARE !== "" ? <img src={LOWCODER_CUSTOM_LOGO_SQUARE } height={24} width={24} alt="logo" /> :<LogoIcon /> : 
+      {REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? 
+      REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE !== "" ? <img src={REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE } height={24} width={24} alt="logo" /> :<LogoIcon /> : 
       <LogoHome />}
       </StyledLink>
       {editName ? (
@@ -434,8 +434,8 @@ export function AppHeader() {
   const brandingConfig = useSelector(getBrandingConfig);
   const headerStart = (
     <StyledLink onClick={() => history.push(ALL_APPLICATIONS_URL)}>
-      {LOWCODER_SHOW_BRAND === 'true' ? 
-      LOWCODER_CUSTOM_LOGO !== "" ? <img src={LOWCODER_CUSTOM_LOGO}  height={28} alt="logo" /> :<LogoWithName branding={!user.orgDev} /> : 
+      {REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? 
+      REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? <img src={REACT_APP_LOWCODER_CUSTOM_LOGO}  height={28} alt="logo" /> :<LogoWithName branding={!user.orgDev} /> : 
       <LogoHome />}
     </StyledLink>
   );

diff --git a/client/packages/lowcoder/src/pages/setting/idSource/list.tsx b/client/packages/lowcoder/src/pages/setting/idSource/list.tsx
@@ -45,13 +45,13 @@ export const IdSourceList = (props: any) => {
   const enableEnterpriseLogin = useSelector(selectSystemConfig)?.featureFlag?.enableEnterpriseLogin;
 
   useEffect(() => {
-    if (!currentOrgId || (!isSelfDomain(config) && !isEnterpriseMode(config))) {
+    if (!currentOrgId) {
       return;
     }
     getConfigs();
   }, [currentOrgId]);
 
-  if (!currentOrgId || (!isSelfDomain(config) && !isEnterpriseMode(config))) {
+  if (!currentOrgId) {
     return null;
   }
 

diff --git a/client/packages/lowcoder/src/pages/setting/settingHome.tsx b/client/packages/lowcoder/src/pages/setting/settingHome.tsx
@@ -52,14 +52,9 @@ export function SettingHome() {
     {
       key: SettingPageEnum.OAuthProvider,
       label: (
-        <span>
-          <span className="text">{trans("settings.oauthProviders")}</span>
-          {(!currentOrgAdmin(user) || (!isSelfDomain(config) && !isEnterpriseMode(config))) && (
-            <FreeLimitTag text={trans("settings.premium")} />
-          )}
-        </span>
+         <span className="text">{trans("settings.oauthProviders")}</span>
       ),
-      disabled: !currentOrgAdmin(user) || (!isSelfDomain(config) && !isEnterpriseMode(config)),
+      disabled: !currentOrgAdmin(user),
     },
     {
       key: SettingPageEnum.Environments,

diff --git a/client/packages/lowcoder/src/pages/userAuth/login.tsx b/client/packages/lowcoder/src/pages/userAuth/login.tsx
@@ -131,11 +131,11 @@ function Login() {
     loginCardView = thirdPartyLoginView;
   }
 
-  const loginHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
-    ? LOWCODER_CUSTOM_AUTH_WELCOME_TEXT
+  const loginHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
+    ? REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT
     : getLoginTitle(inviteInfo?.createUserName, systemConfig?.branding?.brandName)
 
-  const loginSubHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
+  const loginSubHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
     ? trans("userAuth.poweredByLowcoder")
     : ''
 

diff --git a/client/packages/lowcoder/src/pages/userAuth/register.tsx b/client/packages/lowcoder/src/pages/userAuth/register.tsx
@@ -71,11 +71,11 @@ function UserRegister() {
     return null;
   }
 
-  const registerHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
-    ? LOWCODER_CUSTOM_AUTH_WELCOME_TEXT
+  const registerHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
+    ? REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT
     : trans("userAuth.register")
 
-  const registerSubHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
+  const registerSubHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== ""
     ? trans("userAuth.poweredByLowcoder")
     : ''
 

diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java
@@ -33,6 +33,7 @@ public class CommonConfig {
     private boolean cloud;
     private Security security = new Security();
     private String version;
+    private String apiVersion;
     private boolean blockHoundEnable;
     private String cookieName;
     private int maxQueryTimeout = 300;

diff --git a/.../api-service/lowcoder-server/src/main/java/org/lowcoder/api/OpenAPIDocsConfiguration.java b/.../api-service/lowcoder-server/src/main/java/org/lowcoder/api/OpenAPIDocsConfiguration.java
@@ -17,12 +17,12 @@ public class OpenAPIDocsConfiguration {
     private CommonConfig commonConfig;
 
     @Bean
-    public OpenAPI customizeOpenAPI() {
+    OpenAPI customizeOpenAPI() {
         final String securitySchemeName = commonConfig.getCookieName();
         return new OpenAPI()
                 .info(new Info()
                         .title("Lowcoder API")
-                        .version("1.0"))
+                        .version(commonConfig.getApiVersion()))
                 .addServersItem(new Server()
                         .url("/"))
                 .addSecurityItem(new SecurityRequirement()

diff --git a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml
@@ -3,9 +3,9 @@ spring:
     mongodb:
       authentication-database: admin
       auto-index-creation: false
-      uri: mongodb://192.168.1.111:27017/lowcoder?authSource=admin
+      uri: mongodb://lowcoder:secret123@localhost:27017/lowcoder?authSource=admin
     redis:
-      url: redis://192.168.1.111:6379
+      url: redis://localhost:6379
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true
@@ -39,7 +39,8 @@ common:
   security:
     cors-allowed-domains:
       - '*'
-  version: 1.1.8
+  version: 2.1.4
+  apiVersion: 1.1
   block-hound-enable: false
   js-executor:
     host: http://127.0.0.1:6060

diff --git a/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml
@@ -40,6 +40,7 @@ common:
     default-value: lowcoder.org
   cloud: false
   version: 2.1.4
+  apiVersion: 1.1
   block-hound-enable: false
   js-executor:
     host: ${LOWCODER_NODE_SERVICE_URL:http://127.0.0.1:6060}