Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove jwt secret env variable (#3291)

Browse Source
This commit is contained in:
Nathan.fooo 2023-08-30 11:51:33 +08:00 committed by GitHub
parent b88aed887a
commit 897d7980f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/appflowy_flutter/lib/env/env.dart vendored
View File

@ -29,21 +29,12 @@ abstract class Env {
defaultValue: '', defaultValue: '',
) )
static final String supabaseAnonKey = _Env.supabaseAnonKey; static final String supabaseAnonKey = _Env.supabaseAnonKey;
@EnviedField(
obfuscate: true,
varName: 'SUPABASE_JWT_SECRET',
defaultValue: '',
)
static final String supabaseJwtSecret = _Env.supabaseJwtSecret;
} }
bool get isSupabaseEnabled { bool get isSupabaseEnabled {
// Only enable supabase in release and develop mode. // Only enable supabase in release and develop mode.
if (integrationMode().isRelease || integrationMode().isDevelop) { if (integrationMode().isRelease || integrationMode().isDevelop) {
return Env.supabaseUrl.isNotEmpty && return Env.supabaseUrl.isNotEmpty && Env.supabaseAnonKey.isNotEmpty;
Env.supabaseAnonKey.isNotEmpty &&
Env.supabaseJwtSecret.isNotEmpty;
} else { } else {
return false; return false;
} }

1
frontend/appflowy_flutter/lib/startup/tasks/rust_sdk.dart
View File

@ -34,7 +34,6 @@ AppFlowyEnv getAppFlowyEnv() {
enable_sync: true, enable_sync: true,
url: Env.supabaseUrl, url: Env.supabaseUrl,
anon_key: Env.supabaseAnonKey, anon_key: Env.supabaseAnonKey,
jwt_secret: Env.supabaseJwtSecret,
); );
return AppFlowyEnv( return AppFlowyEnv(

2
frontend/appflowy_flutter/packages/appflowy_backend/lib/env_serde.dart
View File

@ -27,13 +27,11 @@ class SupabaseConfiguration {
final bool enable_sync; final bool enable_sync;
final String url; final String url;
final String anon_key; final String anon_key;
final String jwt_secret;
SupabaseConfiguration({ SupabaseConfiguration({
this.enable_sync = true, this.enable_sync = true,
required this.url, required this.url,
required this.anon_key, required this.anon_key,
required this.jwt_secret,
}); });
factory SupabaseConfiguration.fromJson(Map<String, dynamic> json) => factory SupabaseConfiguration.fromJson(Map<String, dynamic> json) =>

2
frontend/appflowy_flutter/packages/appflowy_backend/lib/env_serde.i.dart
View File

@ -22,7 +22,6 @@ SupabaseConfiguration _$SupabaseConfigurationFromJson(
enable_sync: json['enable_sync'] as bool? ?? true, enable_sync: json['enable_sync'] as bool? ?? true,
url: json['url'] as String, url: json['url'] as String,
anon_key: json['anon_key'] as String, anon_key: json['anon_key'] as String,
jwt_secret: json['jwt_secret'] as String,
); );
Map<String, dynamic> _$SupabaseConfigurationToJson( Map<String, dynamic> _$SupabaseConfigurationToJson(
@ -31,5 +30,4 @@ Map<String, dynamic> _$SupabaseConfigurationToJson(
'enable_sync': instance.enable_sync, 'enable_sync': instance.enable_sync,
'url': instance.url, 'url': instance.url,
'anon_key': instance.anon_key, 'anon_key': instance.anon_key,
'jwt_secret': instance.jwt_secret,
}; };

7
frontend/rust-lib/flowy-server-config/src/supabase_config.rs
View File

@ -5,7 +5,6 @@ use flowy_error::{ErrorCode, FlowyError};
pub const ENABLE_SUPABASE_SYNC: &str = "ENABLE_SUPABASE_SYNC"; pub const ENABLE_SUPABASE_SYNC: &str = "ENABLE_SUPABASE_SYNC";
pub const SUPABASE_URL: &str = "SUPABASE_URL"; pub const SUPABASE_URL: &str = "SUPABASE_URL";
pub const SUPABASE_ANON_KEY: &str = "SUPABASE_ANON_KEY"; pub const SUPABASE_ANON_KEY: &str = "SUPABASE_ANON_KEY";
pub const SUPABASE_JWT_SECRET: &str = "SUPABASE_JWT_SECRET";
pub const SUPABASE_DB: &str = "SUPABASE_DB"; pub const SUPABASE_DB: &str = "SUPABASE_DB";
pub const SUPABASE_DB_USER: &str = "SUPABASE_DB_USER"; pub const SUPABASE_DB_USER: &str = "SUPABASE_DB_USER";
@ -20,8 +19,6 @@ pub struct SupabaseConfiguration {
pub url: String, pub url: String,
/// The key of the supabase server. /// The key of the supabase server.
pub anon_key: String, pub anon_key: String,
/// The secret used to sign the JWT tokens.
pub jwt_secret: String,
} }
impl SupabaseConfiguration { impl SupabaseConfiguration {
@ -31,9 +28,6 @@ impl SupabaseConfiguration {
.map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_URL"))?, .map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_URL"))?,
anon_key: std::env::var(SUPABASE_ANON_KEY) anon_key: std::env::var(SUPABASE_ANON_KEY)
.map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_ANON_KEY"))?, .map_err(|_| FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_ANON_KEY"))?,
jwt_secret: std::env::var(SUPABASE_JWT_SECRET).map_err(|_| {
FlowyError::new(ErrorCode::InvalidAuthConfig, "Missing SUPABASE_JWT_SECRET")
})?,
}) })
} }
@ -41,6 +35,5 @@ impl SupabaseConfiguration {
pub fn write_env(&self) { pub fn write_env(&self) {
std::env::set_var(SUPABASE_URL, &self.url); std::env::set_var(SUPABASE_URL, &self.url);
std::env::set_var(SUPABASE_ANON_KEY, &self.anon_key); std::env::set_var(SUPABASE_ANON_KEY, &self.anon_key);
std::env::set_var(SUPABASE_JWT_SECRET, &self.jwt_secret);
} }
} }