feat: refactor variable + resource linkage + OAuth visibility

windmill-labs · Nov 27, 2022 · 37967a7 · 37967a7
1 parent 55020e6
commit 37967a7
Show file tree

Hide file tree

Showing 14 changed files with 544 additions and 298 deletions.
diff --git a/backend/migrations/20221127143814_remove_oauth_from_res.down.sql b/backend/migrations/20221127143814_remove_oauth_from_res.down.sql
@@ -0,0 +1 @@
+-- Add down migration script here
diff --git a/backend/migrations/20221127143814_remove_oauth_from_res.up.sql b/backend/migrations/20221127143814_remove_oauth_from_res.up.sql
@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TABLE resource DROP COLUMN is_oauth;
diff --git a/backend/oauth_connect.json b/backend/oauth_connect.json
@@ -1,96 +1,75 @@
 {
-    "github": {
-        "auth_url": "https://github.com/login/oauth/authorize",
-        "token_url": "https://github.com/login/oauth/access_token",
-        "scopes": [
-            "workflow",
-            "repo"
-        ]
-    },
-    "gitlab": {
-        "auth_url": "https://gitlab.com/oauth/authorize",
-        "token_url": "https://gitlab.com/oauth/token",
-        "scopes": [
-            "api"
-        ]
-    },
-    "bitbucket": {
-        "auth_url": "https://bitbucket.org/site/oauth2/authorize",
-        "token_url": "https://bitbucket.org/site/oauth2/access_token",
-        "scopes": [
-            "repository"
-        ]
-    },
-    "slack": {
-        "auth_url": "https://slack.com/oauth/authorize",
-        "token_url": "https://slack.com/api/oauth.access",
-        "scopes": [
-            "chat:write:user",
-            "users:read",
-            "users:read.email"
-        ]
-    },
-    "gsheets": {
-        "auth_url": "https://accounts.google.com/o/oauth2/v2/auth",
-        "token_url": "https://oauth2.googleapis.com/token",
-        "scopes": [
-            "https://www.googleapis.com/auth/spreadsheets"
-        ],
-        "extra_params": {
-            "access_type": "offline",
-            "consent": "prompt"
-        }
-    },
-    "gdrive": {
-        "auth_url": "https://accounts.google.com/o/oauth2/v2/auth",
-        "token_url": "https://oauth2.googleapis.com/token",
-        "scopes": [
-            "https://www.googleapis.com/auth/drive"
-        ],
-        "extra_params": {
-            "access_type": "offline",
-            "consent": "prompt"
-        }
-    },
-    "gmail": {
-        "auth_url": "https://accounts.google.com/o/oauth2/v2/auth",
-        "token_url": "https://oauth2.googleapis.com/token",
-        "scopes": [
-            "https://www.googleapis.com/auth/gmail.send"
-        ],
-        "extra_params": {
-            "access_type": "offline",
-            "consent": "prompt"
-        }
-    },
-    "gcal": {
-        "auth_url": "https://accounts.google.com/o/oauth2/v2/auth",
-        "token_url": "https://oauth2.googleapis.com/token",
-        "scopes": [
-            "https://www.googleapis.com/auth/calendar.events"
-        ],
-        "extra_params": {
-            "access_type": "offline",
-            "consent": "prompt"
-        }
-    },
-    "gcloud": {
-        "auth_url": "https://accounts.google.com/o/oauth2/v2/auth",
-        "token_url": "https://oauth2.googleapis.com/token",
-        "scopes": [
-            "https://www.googleapis.com/auth/cloud-platform"
-        ],
-        "extra_params": {
-            "access_type": "offline",
-            "consent": "prompt"
-        }
-    },
-    "basecamp": {
-        "auth_url": "https://launchpad.37signals.com/authorization/new",
-        "token_url": "https://launchpad.37signals.com/authorization/token",
-        "scopes": [],
-        "extra_params": {
-            "type": "web_server"
-        }
+  "github": {
+    "auth_url": "https://github.com/login/oauth/authorize",
+    "token_url": "https://github.com/login/oauth/access_token",
+    "scopes": ["workflow", "repo"]
+  },
+  "gitlab": {
+    "auth_url": "https://gitlab.com/oauth/authorize",
+    "token_url": "https://gitlab.com/oauth/token",
+    "scopes": ["api"]
+  },
+  "bitbucket": {
+    "auth_url": "https://bitbucket.org/site/oauth2/authorize",
+    "token_url": "https://bitbucket.org/site/oauth2/access_token",
+    "scopes": ["repository"]
+  },
+  "slack": {
+    "auth_url": "https://slack.com/oauth/authorize",
+    "token_url": "https://slack.com/api/oauth.access",
+    "scopes": ["chat:write:user", "users:read", "users:read.email"]
+  },
+  "gsheets": {
+    "auth_url": "https://accounts.google.com/o/oauth2/v2/auth",
+    "token_url": "https://oauth2.googleapis.com/token",
+    "scopes": ["https://www.googleapis.com/auth/spreadsheets"],
+    "extra_params": {
+      "access_type": "offline",
+      "prompt": "consent"
     }
+  },
+  "gdrive": {
+    "auth_url": "https://accounts.google.com/o/oauth2/v2/auth",
+    "token_url": "https://oauth2.googleapis.com/token",
+    "scopes": ["https://www.googleapis.com/auth/drive"],
+    "extra_params": {
+      "access_type": "offline",
+      "prompt": "consent"
+    }
+  },
+  "gmail": {
+    "auth_url": "https://accounts.google.com/o/oauth2/v2/auth",
+    "token_url": "https://oauth2.googleapis.com/token",
+    "scopes": ["https://www.googleapis.com/auth/gmail.send"],
+    "extra_params": {
+      "access_type": "offline",
+      "prompt": "consent"
+    }
+  },
+  "gcal": {
+    "auth_url": "https://accounts.google.com/o/oauth2/v2/auth",
+    "token_url": "https://oauth2.googleapis.com/token",
+    "scopes": ["https://www.googleapis.com/auth/calendar.events"],
+    "extra_params": {
+      "access_type": "offline",
+      "prompt": "consent"
+    }
+  },
+  "gcloud": {
+    "auth_url": "https://accounts.google.com/o/oauth2/v2/auth",
+    "token_url": "https://oauth2.googleapis.com/token",
+    "scopes": ["https://www.googleapis.com/auth/cloud-platform"],
+    "extra_params": {
+      "access_type": "offline",
+      "prompt": "consent"
+    }
+  },
+  "basecamp": {
+    "auth_url": "https://launchpad.37signals.com/authorization/new",
+    "token_url": "https://launchpad.37signals.com/authorization/token",
+    "scopes": [],
+    "extra_params": {
+      "type": "web_server"
+    }
+  }
 }