Skip to content

Commit d515bb5

Browse files
authored
Merge pull request #6 from CryptoLabInc/feat/disable-redirect-by-env
Feat/disable redirect by env
2 parents 8430123 + c1fc86c commit d515bb5

File tree

5 files changed

+40
-1
lines changed

5 files changed

+40
-1
lines changed

.env.example

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
export CODER_ACCESS_URL="https://coder.access.url"
2+
export CODER_HTTP_ADDRESS="0.0.0.0:3000" #If using nginx -> 127.0.0.1:3000
3+
export CODER_PROVISIONER_DAEMONS=5
4+
export CODER_TLS_ENABLE=false
5+
6+
export CODER_REDIRECT_TO_ACCESS_URL=false
7+
export CODER_TELEMETRY_ENABLE=false
8+
export CODER_OIDC_ENABLED=true
9+
export CODER_OIDC_ISSUER_URL="https://oidc.issuer.url"
10+
export CODER_OIDC_CLIENT_ID="your-oidc-client-id"
11+
export CODER_OIDC_CLIENT_SECRET="your-oidc-client-secret"
12+
export CODER_OIDC_SCOPES="openid email"
13+
export CODER_OIDC_IGNORE_EMAIL_VERIFIED=true
14+
export CODER_OIDC_REDIRECT_URI="$BASE_URL/api/v2/users/oidc/callback"
15+
export CODER_OIDC_LOGOUT_URI="https://oidc.logout.url"
16+
export CODER_OIDC_TOKEN_PATH="/home/ubuntu/.coder/tokens"
17+
18+
# if VITE_DISABLE_EXTERNAL_LOGIN_PAGE variable is true, CODER_DISABLE_PASSWORD_AUTH variable must be false
19+
export VITE_DISABLE_EXTERNAL_LOGIN_PAGE=true
20+
export CODER_DISABLE_PASSWORD_AUTH=false

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ gotests.json
1111
node_modules/
1212
vendor/
1313
yarn-error.log
14+
.env
1415

1516
# VSCode settings.
1617
**/.vscode/*

site/src/@types/vite-env.d.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/// <reference types="vite/client" />
2+
3+
interface ViteTypeOptions {
4+
strictImportEnv: unknown
5+
}
6+
7+
interface ImportMetaEnv {
8+
readonly VITE_DISABLE_EXTERNAL_LOGIN_PAGE: string
9+
}
10+
11+
interface ImportMeta {
12+
readonly env: ImportMetaEnv
13+
}

site/src/pages/LoginPage/LoginPage.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@ export const LoginPage: FC = () => {
6969
/>
7070
);
7171
}
72-
} else {
72+
}
73+
74+
const disableExternalLoginPage = import.meta.env.VITE_DISABLE_EXTERNAL_LOGIN_PAGE === "true";
75+
76+
if (!isSignedIn && !disableExternalLoginPage) {
7377
window.location.replace(`https://heaan.io`);
7478
return null;
7579
}

site/vite.config.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export default defineConfig({
2929
// 'hidden' works like true except that the corresponding sourcemap comments in the bundled files are suppressed
3030
sourcemap: "hidden",
3131
},
32+
envDir: "../",
3233
define: {
3334
"process.env": {
3435
NODE_ENV: process.env.NODE_ENV,

0 commit comments

Comments
 (0)