fix oidc icon display issue (#990)

beszel/internal/agent/data_dir.go

@@ -9,35 +9,30 @@ import (
 )
 
 // getDataDir returns the path to the data directory for the agent and an error
-// if the directory is not valid. Pass an empty string to attempt to find the
-// optimal data directory.
-func getDataDir(dataDir string) (string, error) {
-	if dataDir == "" {
-		dataDir, _ = GetEnv("DATA_DIR")
+// if the directory is not valid. Attempts to find the optimal data directory if
+// no data directories are provided.
+func getDataDir(dataDirs ...string) (string, error) {
+	if len(dataDirs) > 0 {
+		return testDataDirs(dataDirs)
 	}
 
+	dataDir, _ := GetEnv("DATA_DIR")
 	if dataDir != "" {
-		return testDataDirs([]string{dataDir})
+		dataDirs = append(dataDirs, dataDir)
 	}
 
-	var dirsToTry []string
-
 	if runtime.GOOS == "windows" {
-		dirsToTry = []string{
+		dataDirs = append(dataDirs,
 			filepath.Join(os.Getenv("APPDATA"), "beszel-agent"),
 			filepath.Join(os.Getenv("LOCALAPPDATA"), "beszel-agent"),
-		}
+		)
 	} else {
-		homeDir, err := os.UserHomeDir()
-		if err != nil {
-			return "", err
-		}
-		dirsToTry = []string{
-			"/var/lib/beszel-agent",
-			filepath.Join(homeDir, ".config", "beszel"),
+		dataDirs = append(dataDirs, "/var/lib/beszel-agent")
+		if homeDir, err := os.UserHomeDir(); err == nil {
+			dataDirs = append(dataDirs, filepath.Join(homeDir, ".config", "beszel"))
 		}
 	}
-	return testDataDirs(dirsToTry)
+	return testDataDirs(dataDirs)
 }
 
 func testDataDirs(paths []string) (string, error) {

beszel/internal/agent/data_dir_test.go

@@ -44,15 +44,15 @@ func TestGetDataDir(t *testing.T) {
 		oldValue := os.Getenv("DATA_DIR")
 		defer func() {
 			if oldValue == "" {
-				os.Unsetenv("DATA_DIR")
+				os.Unsetenv("BESZEL_AGENT_DATA_DIR")
 			} else {
-				os.Setenv("DATA_DIR", oldValue)
+				os.Setenv("BESZEL_AGENT_DATA_DIR", oldValue)
 			}
 		}()
 
-		os.Setenv("DATA_DIR", tempDir)
+		os.Setenv("BESZEL_AGENT_DATA_DIR", tempDir)
 
-		result, err := getDataDir("")
+		result, err := getDataDir()
 		require.NoError(t, err)
 		assert.Equal(t, tempDir, result)
 	})
@@ -79,7 +79,7 @@ func TestGetDataDir(t *testing.T) {
 
 		// This will try platform-specific defaults, which may or may not work
 		// We're mainly testing that it doesn't panic and returns some result
-		result, err := getDataDir("")
+		result, err := getDataDir()
 		// We don't assert success/failure here since it depends on system permissions
 		// Just verify we get a string result if no error
 		if err == nil {

beszel/site/src/components/login/auth-form.tsx

@@ -1,5 +1,5 @@
-import { t } from "@lingui/core/macro";
-import { Trans } from "@lingui/react/macro";
+import { t } from "@lingui/core/macro"
+import { Trans } from "@lingui/react/macro"
 import { cn } from "@/lib/utils"
 import { buttonVariants } from "@/components/ui/button"
 import { Input } from "@/components/ui/input"
@@ -43,6 +43,14 @@ const showLoginFaliedToast = () => {
 	})
 }
 
+const getAuthProviderIcon = (provider: AuthProviderInfo) => {
+	let { name } = provider
+	if (name.startsWith("oidc")) {
+		name = "oidc"
+	}
+	return prependBasePath(`/_/images/oauth2/${name}.svg`)
+}
+
 export function UserAuthForm({
 	className,
 	isFirstRun,
@@ -242,7 +250,7 @@ export function UserAuthForm({
 					</form>
 					{(isFirstRun || oauthEnabled) && (
 						// only show 'continue with' during onboarding or if we have auth providers
-						(<div className="relative">
+						<div className="relative">
 							<div className="absolute inset-0 flex items-center">
 								<span className="w-full border-t" />
 							</div>
@@ -251,7 +259,7 @@ export function UserAuthForm({
 									<Trans>Or continue with</Trans>
 								</span>
 							</div>
-                        </div>)
+						</div>
 					)}
 				</>
 			)}
@@ -273,7 +281,7 @@ export function UserAuthForm({
 							) : (
 								<img
 									className="me-2 h-4 w-4 dark:brightness-0 dark:invert"
-									src={prependBasePath(`/_/images/oauth2/${provider.name}.svg`)}
+									src={getAuthProviderIcon(provider)}
 									alt=""
 									// onError={(e) => {
 									// 	e.currentTarget.src = "/static/lock.svg"
@@ -287,7 +295,7 @@ export function UserAuthForm({
 			)}
 			{!oauthEnabled && isFirstRun && (
 				// only show GitHub button / dialog during onboarding
-				(<Dialog>
+				<Dialog>
 					<DialogTrigger asChild>
 						<button type="button" className={cn(buttonVariants({ variant: "outline" }))}>
 							<img className="me-2 h-4 w-4 dark:invert" src={prependBasePath("/_/images/oauth2/github.svg")} alt="" />
@@ -318,7 +326,7 @@ export function UserAuthForm({
 							</p>
 						</div>
 					</DialogContent>
-                </Dialog>)
+				</Dialog>
 			)}
 			{passwordEnabled && !isFirstRun && (
 				<Link
@@ -329,5 +337,5 @@ export function UserAuthForm({
 				</Link>
 			)}
 		</div>
-    );
+	)
 }