mirror of
				https://github.com/steveiliop56/tinyauth.git
				synced 2025-11-04 08:05:42 +00:00 
			
		
		
		
	Compare commits
	
		
			4 Commits
		
	
	
		
			v4.0.0-bet
			...
			v4.0.0-bet
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					287c6f975f | ||
| 
						 | 
					0255e954f7 | ||
| 
						 | 
					c5d70d7c93 | ||
| 
						 | 
					adffb4ac0a | 
@@ -8,7 +8,7 @@
 | 
			
		||||
    <link rel="shortcut icon" href="/favicon.ico" />
 | 
			
		||||
    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
 | 
			
		||||
    <meta name="apple-mobile-web-app-title" content="Tinyauth" />
 | 
			
		||||
    <meta name="robots" content="none" />
 | 
			
		||||
    <meta name="robots" content="nofollow, noindex" />
 | 
			
		||||
    <link rel="manifest" href="/site.webmanifest" />
 | 
			
		||||
    <title>Tinyauth</title>
 | 
			
		||||
  </head>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,11 +1,17 @@
 | 
			
		||||
import { useAppContext } from "@/context/app-context";
 | 
			
		||||
import { LanguageSelector } from "../language/language";
 | 
			
		||||
import { Outlet } from "react-router";
 | 
			
		||||
import { useCallback, useState } from "react";
 | 
			
		||||
import { useCallback, useEffect, useState } from "react";
 | 
			
		||||
import { DomainWarning } from "../domain-warning/domain-warning";
 | 
			
		||||
 | 
			
		||||
const BaseLayout = ({ children }: { children: React.ReactNode }) => {
 | 
			
		||||
  const { backgroundImage } = useAppContext();
 | 
			
		||||
  const { backgroundImage, title } = useAppContext();
 | 
			
		||||
 | 
			
		||||
  useEffect(() => {
 | 
			
		||||
    if (title !== "Tinyauth") {
 | 
			
		||||
      document.title = title + " - Tinyauth";
 | 
			
		||||
    }
 | 
			
		||||
  }, [title]);
 | 
			
		||||
 | 
			
		||||
  return (
 | 
			
		||||
    <div
 | 
			
		||||
 
 | 
			
		||||
@@ -150,18 +150,6 @@ func (app *BootstrapApp) Setup() error {
 | 
			
		||||
	configuredProviders := make([]controller.Provider, 0)
 | 
			
		||||
 | 
			
		||||
	for id, provider := range oauthProviders {
 | 
			
		||||
		if id == "" {
 | 
			
		||||
			continue
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		if provider.Name == "" {
 | 
			
		||||
			if name, ok := config.OverrideProviders[id]; ok {
 | 
			
		||||
				provider.Name = name
 | 
			
		||||
			} else {
 | 
			
		||||
				provider.Name = utils.Capitalize(id)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		configuredProviders = append(configuredProviders, controller.Provider{
 | 
			
		||||
			Name:  provider.Name,
 | 
			
		||||
			ID:    id,
 | 
			
		||||
 
 | 
			
		||||
@@ -71,14 +71,12 @@ func (docker *DockerService) GetLabels(appDomain string) (config.App, error) {
 | 
			
		||||
	for _, ctr := range containers {
 | 
			
		||||
		inspect, err := docker.InspectContainer(ctr.ID)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			log.Warn().Str("id", ctr.ID).Err(err).Msg("Error inspecting container, skipping")
 | 
			
		||||
			continue
 | 
			
		||||
			return config.App{}, err
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		labels, err := decoders.DecodeLabels(inspect.Config.Labels)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			log.Warn().Str("id", ctr.ID).Err(err).Msg("Error getting container labels, skipping")
 | 
			
		||||
			continue
 | 
			
		||||
			return config.App{}, err
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		for appName, appLabels := range labels.Apps {
 | 
			
		||||
 
 | 
			
		||||
@@ -50,7 +50,7 @@ func (broker *OAuthBrokerService) Init() error {
 | 
			
		||||
			log.Error().Err(err).Msgf("Failed to initialize OAuth service: %T", name)
 | 
			
		||||
			return err
 | 
			
		||||
		}
 | 
			
		||||
		log.Info().Str("service", service.GetName()).Msg("Initialized OAuth service")
 | 
			
		||||
		log.Info().Str("service", name).Msg("Initialized OAuth service")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return nil
 | 
			
		||||
 
 | 
			
		||||
@@ -184,7 +184,6 @@ func GetOAuthProvidersConfig(env []string, args []string, appUrl string) (map[st
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// If we have google/github providers and no redirect URL then set a default
 | 
			
		||||
 | 
			
		||||
	for id := range config.OverrideProviders {
 | 
			
		||||
		if provider, exists := providers[id]; exists {
 | 
			
		||||
			if provider.RedirectURL == "" {
 | 
			
		||||
@@ -194,6 +193,18 @@ func GetOAuthProvidersConfig(env []string, args []string, appUrl string) (map[st
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Set names
 | 
			
		||||
	for id, provider := range providers {
 | 
			
		||||
		if provider.Name == "" {
 | 
			
		||||
			if name, ok := config.OverrideProviders[id]; ok {
 | 
			
		||||
				provider.Name = name
 | 
			
		||||
			} else {
 | 
			
		||||
				provider.Name = Capitalize(id)
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		providers[id] = provider
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Return combined providers
 | 
			
		||||
	return providers, nil
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -210,10 +210,12 @@ func TestGetOAuthProvidersConfig(t *testing.T) {
 | 
			
		||||
		"client1": {
 | 
			
		||||
			ClientID:     "client1-id",
 | 
			
		||||
			ClientSecret: "client1-secret",
 | 
			
		||||
			Name:         "Client1",
 | 
			
		||||
		},
 | 
			
		||||
		"client2": {
 | 
			
		||||
			ClientID:     "client2-id",
 | 
			
		||||
			ClientSecret: "client2-secret",
 | 
			
		||||
			Name:         "Client2",
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -247,6 +249,7 @@ func TestGetOAuthProvidersConfig(t *testing.T) {
 | 
			
		||||
		"client1": {
 | 
			
		||||
			ClientID:     "client1-id",
 | 
			
		||||
			ClientSecret: "file content",
 | 
			
		||||
			Name:         "Client1",
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
@@ -262,6 +265,7 @@ func TestGetOAuthProvidersConfig(t *testing.T) {
 | 
			
		||||
			ClientID:     "google-id",
 | 
			
		||||
			ClientSecret: "google-secret",
 | 
			
		||||
			RedirectURL:  "http://app.url/api/oauth/callback/google",
 | 
			
		||||
			Name:         "Google",
 | 
			
		||||
		},
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user