Release v0.9.1

chore(web): Remove API url env variable

docker/Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /automatisch
 
 RUN \
   apk --no-cache add --virtual build-dependencies python3 build-base && \
-  yarn global add @automatisch/cli@0.9.0 --network-timeout 1000000 && \
+  yarn global add @automatisch/cli@0.9.1 --network-timeout 1000000 && \
   rm -rf /usr/local/share/.cache/ && \
   apk del build-dependencies
 

docker/Dockerfile.compose

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM automatischio/automatisch:0.9.0
+FROM automatischio/automatisch:0.9.1
 WORKDIR /automatisch
 
 RUN apk add --no-cache openssl dos2unix

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.9.0",
+  "version": "0.9.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "command": {

packages/backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automatisch/backend",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "license": "See LICENSE file",
   "description": "The open source Zapier alternative. Build workflow automation without spending time and money.",
   "scripts": {
@@ -22,7 +22,7 @@
     "prebuild": "rm -rf ./dist"
   },
   "dependencies": {
-    "@automatisch/web": "^0.9.0",
+    "@automatisch/web": "^0.9.1",
     "@bull-board/express": "^3.10.1",
     "@casl/ability": "^6.5.0",
     "@graphql-tools/graphql-file-loader": "^7.3.4",
@@ -110,7 +110,7 @@
     "url": "https://github.com/automatisch/automatisch/issues"
   },
   "devDependencies": {
-    "@automatisch/types": "^0.9.0",
+    "@automatisch/types": "^0.9.1",
     "@types/bcrypt": "^5.0.0",
     "@types/bull": "^3.15.8",
     "@types/cors": "^2.8.12",

packages/backend/src/graphql/schema.graphql

@@ -720,6 +720,7 @@ type ListSamlAuthProvider {
   id: String
   name: String
   issuer: String
+  loginUrl: String
 }
 
 type Permission {

packages/backend/src/models/saml-auth-provider.ee.ts

@@ -75,6 +75,14 @@ class SamlAuthProvider extends Base {
     },
   });
 
+  static get virtualAttributes() {
+    return ['loginUrl'];
+  }
+
+  get loginUrl() {
+    return new URL(`/login/saml/${this.issuer}`, appConfig.baseUrl).toString();
+  }
+
   get config(): SamlConfig {
     const callbackUrl = new URL(
       `/login/saml/${this.issuer}/callback`,

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automatisch/cli",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "license": "See LICENSE file",
   "description": "The open source Zapier alternative. Build workflow automation without spending time and money.",
   "contributors": [
@@ -33,7 +33,7 @@
     "version": "oclif readme && git add README.md"
   },
   "dependencies": {
-    "@automatisch/backend": "^0.9.0",
+    "@automatisch/backend": "^0.9.1",
     "@oclif/core": "^1",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-plugins": "^2.0.1",

packages/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automatisch/docs",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "license": "See LICENSE file",
   "description": "The open source Zapier alternative. Build workflow automation without spending time and money.",
   "private": true,

packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automatisch/e2e-tests",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "license": "See LICENSE file",
   "private": true,
   "description": "The open source Zapier alternative. Build workflow automation without spending time and money.",

packages/types/index.d.ts

@@ -427,6 +427,7 @@ type TSamlAuthProvider = {
   roleAttributeName: string;
   defaultRoleId: string;
   active: boolean;
+  loginUrl: string;
 };
 
 type AppConfig = {
@@ -437,7 +438,7 @@ type AppConfig = {
   canCustomConnect: boolean;
   shared: boolean;
   disabled: boolean;
-}
+};
 
 type AppAuthClient = {
   id: string;
@@ -445,7 +446,7 @@ type AppAuthClient = {
   appConfigId: string;
   authDefaults: string;
   formattedAuthDefaults: IJSONObject;
-}
+};
 
 declare module 'axios' {
   interface AxiosResponse {

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automatisch/types",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "license": "See LICENSE file",
   "description": "Type definitions for automatisch",
   "homepage": "https://github.com/automatisch/automatisch",

packages/web/.env-example

@@ -1,5 +1,4 @@
 PORT=3001
-REACT_APP_API_URL=http://localhost:3000
 REACT_APP_GRAPHQL_URL=http://localhost:3000/graphql
 # HTTPS=true
 REACT_APP_BASE_URL=http://localhost:3001

packages/web/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@automatisch/web",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "license": "See LICENSE file",
   "description": "The open source Zapier alternative. Build workflow automation without spending time and money.",
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@automatisch/types": "^0.9.0",
+    "@automatisch/types": "^0.9.1",
     "@casl/ability": "^6.5.0",
     "@casl/react": "^3.1.0",
     "@emotion/react": "^11.4.1",

packages/web/src/components/SsoProviders/index.ee.tsx

@@ -24,7 +24,7 @@ function SsoProviders() {
             <Button
               key={provider.id}
               component="a"
-              href={URLS.SSO_LOGIN(provider.issuer)}
+              href={provider.loginUrl}
               variant="outlined"
             >
               {formatMessage('ssoProviders.loginWithProvider', {

packages/web/src/config/app.ts

@@ -1,7 +1,6 @@
 type Config = {
   [key: string]: string;
   baseUrl: string;
-  apiUrl: string;
   graphqlUrl: string;
   notificationsUrl: string;
   chatwootBaseUrl: string;
@@ -10,17 +9,10 @@ type Config = {
 
 const config: Config = {
   baseUrl: process.env.REACT_APP_BASE_URL as string,
-  apiUrl: process.env.REACT_APP_API_URL as string,
   graphqlUrl: process.env.REACT_APP_GRAPHQL_URL as string,
   notificationsUrl: process.env.REACT_APP_NOTIFICATIONS_URL as string,
   chatwootBaseUrl: 'https://app.chatwoot.com',
-  supportEmailAddress: 'support@automatisch.io'
+  supportEmailAddress: 'support@automatisch.io',
 };
 
-if (!config.apiUrl && !config.graphqlUrl) {
-  config.apiUrl = '/';
-} else if (!config.apiUrl) {
-  config.apiUrl = (new URL(config.graphqlUrl)).origin;
-}
-
 export default config;

packages/web/src/config/urls.ts

@@ -1,5 +1,3 @@
-import appConfig from './app';
-
 export const CONNECTIONS = '/connections';
 export const EXECUTIONS = '/executions';
 export const EXECUTION_PATTERN = '/executions/:executionId';
@@ -7,8 +5,6 @@ export const EXECUTION = (executionId: string) => `/executions/${executionId}`;
 
 export const LOGIN = '/login';
 export const LOGIN_CALLBACK = `${LOGIN}/callback`;
-export const SSO_LOGIN = (issuer: string) =>
-  `${appConfig.apiUrl}/login/saml/${issuer}`;
 export const SIGNUP = '/sign-up';
 export const FORGOT_PASSWORD = '/forgot-password';
 export const RESET_PASSWORD = '/reset-password';

packages/web/src/graphql/queries/list-saml-auth-providers.ee.ts

@@ -5,6 +5,7 @@ export const LIST_SAML_AUTH_PROVIDERS = gql`
     listSamlAuthProviders {
       id
       name
+      loginUrl
       issuer
     }
   }