mirror of
https://github.com/coder/coder.git
synced 2026-10-29 17:44:33 +08:00
chore: move /gitauth to /externalauth on the frontend (#9954)
* chore: move `/gitauth` to `/externalauth` on the frontend This actually took a lot more jank than anticipated, so I wanted to split this up before adding the ability to embed new providers. * Rename FE * Fix em' up * Fix linting error * Fix e2e tests * chore: update helm golden files
This commit is contained in:
+3
-3
@@ -426,7 +426,7 @@ const createTemplateVersionTar = async (
|
||||
error: response.apply?.error ?? "",
|
||||
resources: response.apply?.resources ?? [],
|
||||
parameters: response.apply?.parameters ?? [],
|
||||
gitAuthProviders: response.apply?.gitAuthProviders ?? [],
|
||||
externalAuthProviders: response.apply?.externalAuthProviders ?? [],
|
||||
},
|
||||
};
|
||||
});
|
||||
@@ -508,7 +508,7 @@ const createTemplateVersionTar = async (
|
||||
state: new Uint8Array(),
|
||||
resources: [],
|
||||
parameters: [],
|
||||
gitAuthProviders: [],
|
||||
externalAuthProviders: [],
|
||||
...response.apply,
|
||||
} as ApplyComplete;
|
||||
response.apply.resources = response.apply.resources?.map(fillResource);
|
||||
@@ -523,7 +523,7 @@ const createTemplateVersionTar = async (
|
||||
error: "",
|
||||
resources: [],
|
||||
parameters: [],
|
||||
gitAuthProviders: [],
|
||||
externalAuthProviders: [],
|
||||
...response.plan,
|
||||
} as PlanComplete;
|
||||
response.plan.resources = response.plan.resources?.map(fillResource);
|
||||
|
||||
@@ -249,7 +249,7 @@ export interface PlanComplete {
|
||||
error: string;
|
||||
resources: Resource[];
|
||||
parameters: RichParameter[];
|
||||
gitAuthProviders: string[];
|
||||
externalAuthProviders: string[];
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -266,7 +266,7 @@ export interface ApplyComplete {
|
||||
error: string;
|
||||
resources: Resource[];
|
||||
parameters: RichParameter[];
|
||||
gitAuthProviders: string[];
|
||||
externalAuthProviders: string[];
|
||||
}
|
||||
|
||||
/** CancelRequest requests that the previous request be canceled gracefully. */
|
||||
@@ -859,7 +859,7 @@ export const PlanComplete = {
|
||||
for (const v of message.parameters) {
|
||||
RichParameter.encode(v!, writer.uint32(26).fork()).ldelim();
|
||||
}
|
||||
for (const v of message.gitAuthProviders) {
|
||||
for (const v of message.externalAuthProviders) {
|
||||
writer.uint32(34).string(v!);
|
||||
}
|
||||
return writer;
|
||||
@@ -895,7 +895,7 @@ export const ApplyComplete = {
|
||||
for (const v of message.parameters) {
|
||||
RichParameter.encode(v!, writer.uint32(34).fork()).ldelim();
|
||||
}
|
||||
for (const v of message.gitAuthProviders) {
|
||||
for (const v of message.externalAuthProviders) {
|
||||
writer.uint32(42).string(v!);
|
||||
}
|
||||
return writer;
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
import { test } from "@playwright/test";
|
||||
import { gitAuth } from "../constants";
|
||||
import { Endpoints } from "@octokit/types";
|
||||
import { GitAuthDevice } from "api/typesGenerated";
|
||||
import { ExternalAuthDevice } from "api/typesGenerated";
|
||||
import { Awaiter, createServer } from "../helpers";
|
||||
import { beforeCoderTest } from "../hooks";
|
||||
|
||||
test.beforeEach(async ({ page }) => await beforeCoderTest(page));
|
||||
|
||||
// Ensures that a Git auth provider with the device flow functions and completes!
|
||||
test("git auth device", async ({ page }) => {
|
||||
const device: GitAuthDevice = {
|
||||
test("external auth device", async ({ page }) => {
|
||||
const device: ExternalAuthDevice = {
|
||||
device_code: "1234",
|
||||
user_code: "1234-5678",
|
||||
expires_in: 900,
|
||||
@@ -46,7 +46,7 @@ test("git auth device", async ({ page }) => {
|
||||
sentPending.done();
|
||||
});
|
||||
|
||||
await page.goto(`/gitauth/${gitAuth.deviceProvider}`, {
|
||||
await page.goto(`/externalauth/${gitAuth.deviceProvider}`, {
|
||||
waitUntil: "domcontentloaded",
|
||||
});
|
||||
await page.getByText(device.user_code).isVisible();
|
||||
@@ -57,7 +57,7 @@ test("git auth device", async ({ page }) => {
|
||||
await page.waitForSelector("text=1 organization authorized");
|
||||
});
|
||||
|
||||
test("git auth web", async ({ baseURL, page }) => {
|
||||
test("external auth web", async ({ baseURL, page }) => {
|
||||
const srv = await createServer(gitAuth.webPort);
|
||||
// The GitHub validate endpoint returns the currently authenticated user!
|
||||
srv.use(gitAuth.validatePath, (req, res) => {
|
||||
@@ -70,11 +70,11 @@ test("git auth web", async ({ baseURL, page }) => {
|
||||
});
|
||||
srv.use(gitAuth.authPath, (req, res) => {
|
||||
res.redirect(
|
||||
`${baseURL}/gitauth/${gitAuth.webProvider}/callback?code=1234&state=` +
|
||||
`${baseURL}/externalauth/${gitAuth.webProvider}/callback?code=1234&state=` +
|
||||
req.query.state,
|
||||
);
|
||||
});
|
||||
await page.goto(`/gitauth/${gitAuth.webProvider}`, {
|
||||
await page.goto(`/externalauth/${gitAuth.webProvider}`, {
|
||||
waitUntil: "domcontentloaded",
|
||||
});
|
||||
// This endpoint doesn't have the installations URL set intentionally!
|
||||
Reference in New Issue
Block a user