WIP - Changing the Theme Detail View 3

Author: MenamAfzal

client/packages/lowcoder/src/comps/comps/buttonComp/buttonComp.tsx

@@ -25,7 +25,8 @@ import {
 import { RefControl } from "comps/controls/refControl";
 
 import React, { useContext } from "react";
-import { AnimationStyle, styleControl } from "@lowcoder-ee/index.sdk";
+import { AnimationStyle } from "@lowcoder-ee/comps/controls/styleControlConstants";
+import { styleControl } from "@lowcoder-ee/comps/controls/styleControl";
 
 const FormLabel = styled(CommonBlueLabel)`
   font-size: 13px;

client/packages/lowcoder/src/comps/comps/buttonComp/dropdownComp.tsx

@@ -21,7 +21,7 @@ import {
   ButtonStyleControl,
   getButtonStyle,
 } from "./buttonCompConstants";
-import { styleControl } from "@lowcoder-ee/index.sdk";
+import { styleControl } from "@lowcoder-ee/comps/controls/styleControl";
 
 
 const StyledDropdownButton = styled(DropdownButton)`

client/packages/lowcoder/src/comps/comps/containerComp/containerComp.tsx

@@ -16,7 +16,8 @@ import { BoolCodeControl } from "comps/controls/codeControl";
 import { DisabledContext } from "comps/generators/uiCompBuilder";
 import React, { useContext } from "react";
 import { EditorContext } from "comps/editorState";
-import { AnimationStyle, styleControl } from "@lowcoder-ee/index.sdk";
+import { styleControl } from "@lowcoder-ee/comps/controls/styleControl";
+import { AnimationStyle } from "@lowcoder-ee/comps/controls/styleControlConstants";
 
 export const ContainerBaseComp = (function () {
   const childrenMap = {

client/packages/lowcoder/src/comps/comps/containerComp/pageLayoutComp.tsx

@@ -18,7 +18,8 @@ import {
   ContainerCompBuilder,
 } from "../pageLayoutComp/pageLayoutCompBuilder";
 import { PageLayout } from "../pageLayoutComp/pageLayout";
-import { AnimationStyle, styleControl } from "@lowcoder-ee/index.sdk";
+import { styleControl } from "@lowcoder-ee/comps/controls/styleControl";
+import { AnimationStyle } from "@lowcoder-ee/comps/controls/styleControlConstants";
 
 export const ContainerBaseComp = (function () {
   const childrenMap = {

client/packages/lowcoder/src/comps/comps/customComp/customComp.tsx

@@ -12,7 +12,8 @@ import { EventData, EventTypeEnum } from "./types";
 import { hiddenPropertyView } from "comps/utils/propertyUtils";
 import { trans } from "i18n";
 import { EditorContext } from "comps/editorState";
-import { AnimationStyle, AnimationStyleType, CustomStyle, CustomStyleType, styleControl } from "@lowcoder-ee/index.sdk";
+import { AnimationStyle, AnimationStyleType, CustomStyle, CustomStyleType } from "@lowcoder-ee/comps/controls/styleControlConstants";
+import { styleControl } from "@lowcoder-ee/comps/controls/styleControl";
 
 // TODO: eventually to embedd in container so we have styling?
 // TODO: support different starter templates for different frameworks (react, ANT, Flutter, Angular, etc)

client/packages/lowcoder/src/comps/comps/formComp/formComp.tsx

@@ -58,7 +58,8 @@ import { DisabledContext } from "comps/generators/uiCompBuilder";
 import { default as LoadingOutlined } from "@ant-design/icons/LoadingOutlined";
 import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
 import { styled } from "styled-components";
-import { AnimationStyle, styleControl } from "@lowcoder-ee/index.sdk";
+import { styleControl } from "@lowcoder-ee/comps/controls/styleControl";
+import { AnimationStyle } from "@lowcoder-ee/comps/controls/styleControlConstants";
 
 const FormWrapper = styled.div`
   height: 100%;

client/packages/lowcoder/src/comps/comps/jsonComp/jsonExplorerComp.tsx

@@ -11,7 +11,8 @@ import { hiddenPropertyView } from "comps/utils/propertyUtils";
 import { trans } from "i18n";
 import { EditorContext } from "comps/editorState";
 import { useContext } from "react";
-import { AnimationStyle, AnimationStyleType, styleControl } from "@lowcoder-ee/index.sdk";
+import { styleControl } from "@lowcoder-ee/comps/controls/styleControl";
+import { AnimationStyle, AnimationStyleType } from "@lowcoder-ee/comps/controls/styleControlConstants";
 
 /**
  * JsonExplorer Comp

client/packages/lowcoder/src/comps/comps/listViewComp/listView.tsx

@@ -18,7 +18,7 @@ import {
 import { ContextContainerComp } from "./contextContainerComp";
 import { ListViewImplComp } from "./listViewComp";
 import { getCurrentItemParams, getData } from "./listViewUtils";
-import { AnimationStyleType } from "@lowcoder-ee/index.sdk";
+import { AnimationStyleType } from "@lowcoder-ee/comps/controls/styleControlConstants";
 
 const ListViewWrapper = styled.div<{ $style: any; $paddingWidth: string,$animationStyle:AnimationStyleType }>`
   height: 100%;

client/packages/lowcoder/src/comps/comps/meetingComp/controlButton.tsx

@@ -39,7 +39,6 @@ import { useEffect, useRef, useState } from "react";
 import ReactResizeDetector from "react-resize-detector";
 
 import { useContext } from "react";
-import { BoolControl } from "@lowcoder-ee/index.sdk";
 
 const Container = styled.div<{ $style: any }>`
   height: 100%;

client/packages/lowcoder/src/comps/comps/selectInputComp/radioCompConstants.tsx

@@ -22,7 +22,7 @@ import { RefControl } from "comps/controls/refControl";
 
 import { useContext } from "react";
 import { EditorContext } from "comps/editorState";
-import { withDefault } from "@lowcoder-ee/index.sdk";
+import { withDefault } from "@lowcoder-ee/comps/generators/simpleGenerators";
 
 export const RadioLayoutOptions = [
   { label: trans("radio.horizontal"), value: "horizontal" },

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/Oauth2GenericAuthConfig.java

@@ -26,13 +26,15 @@ public class Oauth2GenericAuthConfig extends Oauth2SimpleAuthConfig {
     private String scope;
     private HashMap<String, String> sourceMappings;
     private Boolean userInfoIntrospection;
+    private Boolean userCanSelectAccounts;
 
     @Override
     public String replaceAuthUrlClientIdPlaceholder(String url)
     {
         return super.replaceAuthUrlClientIdPlaceholder(url)
                 .replace(BASE_URL_PLACEHOLDER, authorizationEndpoint)
-                .replace(SCOPE_PLACEHOLDER, scope);
+                .replace(SCOPE_PLACEHOLDER, scope)
+                .concat(Boolean.FALSE.equals(userCanSelectAccounts)?"":"&prompt=select_account");
     }
 
 

server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/auth/constants/Oauth2Constants.java

@@ -48,6 +48,5 @@ public class Oauth2Constants {
             + "&redirect_uri=" + REDIRECT_URL_PLACEHOLDER
             + "&state=" + STATE_PLACEHOLDER
             + "&scope=" + SCOPE_PLACEHOLDER
-            + "&access_type=offline"
-            + "&prompt=select_account";
+            + "&access_type=offline";
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java

@@ -246,7 +246,12 @@ private Mono<Boolean> updateApplicationStatus(String applicationId, ApplicationS
 
     @Override
     public Mono<ApplicationView> getEditingApplication(String applicationId) {
-        return checkPermissionWithReadableErrorMsg(applicationId, EDIT_APPLICATIONS)
+        return applicationService.findById(applicationId).filter(application -> application.isPublicToAll() && application.isPublicToMarketplace())
+                .map(application -> {
+                    ResourcePermission permission = ResourcePermission.builder().resourceRole(ResourceRole.VIEWER).build();
+                    return permission;
+                })
+                .switchIfEmpty(checkPermissionWithReadableErrorMsg(applicationId, EDIT_APPLICATIONS))
                 .zipWhen(permission -> applicationService.findById(applicationId)
                         .delayUntil(application -> checkApplicationStatus(application, NORMAL)))
                 .zipWhen(tuple -> applicationService.getAllDependentModulesFromApplication(tuple.getT2(), false), TupleUtils::merge)

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/request/oauth2/request/GenericAuthRequest.java

@@ -1,5 +1,6 @@
 package org.lowcoder.api.authentication.request.oauth2.request;
 
+import lombok.Setter;
 import org.lowcoder.api.authentication.request.AuthException;
 import org.lowcoder.api.authentication.request.oauth2.GenericOAuthProviderSource;
 import org.lowcoder.api.authentication.request.oauth2.OAuth2RequestContext;

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/factory/AuthConfigFactoryImpl.java

@@ -117,7 +117,8 @@ private Oauth2SimpleAuthConfig buildOauth2GenericAuthConfig(AuthConfigRequest au
                 .userInfoEndpoint(authConfigRequest.getUserInfoEndpoint())
                 .scope(authConfigRequest.getScope())
                 .authType(AuthTypeConstants.GENERIC)
-                .userInfoIntrospection(MapUtils.getBoolean(authConfigRequest,"userInfoIntrospection", false))
+                .userInfoIntrospection(MapUtils.getBoolean(authConfigRequest,"userInfoIntrospection"))
+                .userCanSelectAccounts(MapUtils.getBoolean(authConfigRequest,"userCanSelectAccounts"))
                 .build();
     }
 }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/util/AuthenticationUtils.java

@@ -74,7 +74,7 @@ public static AuthToken mapToAuthToken(Map<String, Object> map, HashMap<String,
                 .accessToken(MapUtils.getString(map, "access_token"))
                 .expireIn(MapUtils.getIntValue(map, "expires_in"))
                 .refreshToken(MapUtils.getString(map, "refresh_token"))
-                .jwt(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "jwt")))
+                .jwt(AdvancedMapUtils.getString(map, MapUtils.getString(sourceMappings, "jwt", "access_token")))
                 .build();
     }
 

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/framework/security/SecurityConfig.java

@@ -91,6 +91,7 @@ SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, CONFIG_URL), // system config
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, SERVER_SETTING_URL), // system env
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, CONFIG_URL + "/deploymentId"), // system config
+                        ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, APPLICATION_URL + "/*"), // application view
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, APPLICATION_URL + "/*/view"), // application view
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, APPLICATION_URL + "/*/view_marketplace"), // application view
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, APPLICATION_URL + "/marketplace-apps"), // marketplace apps
@@ -121,6 +122,7 @@ SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, NewUrl.CONFIG_URL + "/deploymentId"),
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.HEAD, NewUrl.STATE_URL + "/healthCheck"),
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, NewUrl.PREFIX + "/status/**"),
+                        ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, NewUrl.APPLICATION_URL + "/*"),
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, NewUrl.APPLICATION_URL + "/*/view"),
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, NewUrl.APPLICATION_URL + "/*/view_marketplace"),
                         ServerWebExchangeMatchers.pathMatchers(HttpMethod.GET, NewUrl.APPLICATION_URL + "/marketplace-apps"), // marketplace apps
@@ -172,6 +174,7 @@ private CorsConfigurationSource buildCorsConfigurationSource() {
         source.registerCorsConfiguration(CONFIG_URL, skipCheckCorsForAll);
         source.registerCorsConfiguration(GROUP_URL + "/list", skipCheckCorsForAll);
         source.registerCorsConfiguration(QUERY_URL + "/execute", skipCheckCorsForAll);
+        source.registerCorsConfiguration(APPLICATION_URL + "/*", skipCheckCorsForAll);
         source.registerCorsConfiguration(APPLICATION_URL + "/*/view", skipCheckCorsForAll);
         source.registerCorsConfiguration(APPLICATION_URL + "/*/view_marketplace", skipCheckCorsForAll);
         source.registerCorsConfiguration(APPLICATION_URL + "/marketplace-apps", skipCheckCorsForAll);
@@ -183,6 +186,7 @@ private CorsConfigurationSource buildCorsConfigurationSource() {
         source.registerCorsConfiguration(NewUrl.CONFIG_URL, skipCheckCorsForAll);
         source.registerCorsConfiguration(NewUrl.GROUP_URL + "/list", skipCheckCorsForAll);
         source.registerCorsConfiguration(NewUrl.QUERY_URL + "/execute", skipCheckCorsForAll);
+        source.registerCorsConfiguration(NewUrl.APPLICATION_URL + "/*", skipCheckCorsForAll);
         source.registerCorsConfiguration(NewUrl.APPLICATION_URL + "/*/view", skipCheckCorsForAll);
         source.registerCorsConfiguration(NewUrl.APPLICATION_URL + "/*/view_marketplace", skipCheckCorsForAll);
         source.registerCorsConfiguration(NewUrl.APPLICATION_URL + "/marketplace-apps", skipCheckCorsForAll);

server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GenericAuthenticateTest.java

@@ -88,6 +88,7 @@ public void testGoogleLoginSuccess(WireMockRuntimeInfo wmRuntimeInfo) {
                 .scope("scope")
                 .sourceMappings(sourceMappings)
                 .userInfoIntrospection(true)
+                .userCanSelectAccounts(true)
                 .build();
 
         var organization = Organization.builder().build();

server/node-service/src/controllers/plugins.ts

@@ -17,6 +17,10 @@ export async function listPlugins(req: Request, res: Response) {
 export async function runPluginQuery(req: Request, res: Response) {
   const { pluginName, dsl, context, dataSourceConfig } = req.body;
   const ctx = pluginServices.getPluginContext(req);
+
+
+  console.log("pluginName: ", pluginName, "dsl: ", dsl, "context: ", context, "dataSourceConfig: ", dataSourceConfig, "ctx: ", ctx);
+
   const result = await pluginServices.runPluginQuery(
     pluginName,
     dsl,

server/node-service/src/plugins/index.ts

@@ -34,6 +34,7 @@ import didPlugin from "./did";
 import bigQueryPlugin from "./bigQuery";
 import appConfigPlugin from "./appconfig";
 import tursoPlugin from "./turso";
+import postmanEchoPlugin from "./postmanEcho";
 
 let plugins: (DataSourcePlugin | DataSourcePluginFactory)[] = [
   s3Plugin,
@@ -71,6 +72,7 @@ let plugins: (DataSourcePlugin | DataSourcePluginFactory)[] = [
   bigQueryPlugin,
   appConfigPlugin,
   tursoPlugin,
+  postmanEchoPlugin,
 ];
 
 try {

server/node-service/src/plugins/openApi/index.ts

@@ -82,6 +82,8 @@ export async function runOpenApi(
   const { actionName, ...otherActionData } = actionData;
   const { serverURL } = dataSourceConfig;
 
+
+
   let operation, realOperationId, definition: OpenAPI.Document | undefined;
 
   for (const {id, def} of await getDefinitions(spec, openApiSpecDereferenced)) {
@@ -114,6 +116,7 @@ export async function runOpenApi(
   try {
     const { parameters, requestBody } = normalizeParams(otherActionData, operation, isOas3Spec);
     let securities = extractSecurityParams(dataSourceConfig, definition);
+
     const response = await SwaggerClient.execute({
       spec: definition,
       operationId: realOperationId,
@@ -122,6 +125,7 @@ export async function runOpenApi(
       securities,
       responseContentType: "application/json",
       userFetch: async (url: string, req: RequestInit) => {
+        console.log("req", req);
         return fetch(url, req);
       },
       requestInterceptor: (req: any) => {

server/node-service/src/plugins/postmanEcho/index.ts

@@ -0,0 +1,53 @@
+import { readYaml } from "../../common/util";
+import _ from "lodash";
+import path from "path";
+import { OpenAPIV3, OpenAPI } from "openapi-types";
+import { ConfigToType, DataSourcePlugin } from "lowcoder-sdk/dataSource";
+import { runOpenApi } from "../openApi";
+import { parseOpenApi, ParseOpenApiOptions } from "../openApi/parse";
+
+import spec from './postmanEcho.spec.json';
+
+
+const dataSourceConfig = {
+  type: "dataSource",
+  params: []
+} as const;
+
+const parseOptions: ParseOpenApiOptions = {
+  actionLabel: (method: string, path: string, operation: OpenAPI.Operation) => {
+    return _.upperFirst(operation.summary ? operation.summary : operation.operationId || "");
+  },
+};
+
+type DataSourceConfigType = ConfigToType<typeof dataSourceConfig>;
+
+const postmanEchoPlugin: DataSourcePlugin<any, DataSourceConfigType> = {
+  id: "postmanEcho",
+  name: "Postman Echo",
+  icon: "postmanEcho.svg",
+  category: "api",
+  dataSourceConfig,
+  queryConfig: async () => {
+    const { actions, categories } = await parseOpenApi(spec as unknown as OpenAPI.Document, parseOptions);
+    return {
+      type: "query",
+      label: "Action",
+      categories: {
+        label: "Resources",
+        items: categories,
+      },
+      actions,
+    };
+  },
+  run: function (actionData, dataSourceConfig): Promise<any> {
+    const runApiDsConfig = {
+      url: "",
+      serverURL: "",
+      dynamicParamsConfig: dataSourceConfig,
+    };
+    return runOpenApi(actionData, runApiDsConfig, spec as OpenAPIV3.Document);
+  },
+};
+
+export default postmanEchoPlugin;