chore: add instance url to profile

usememos · Aug 13, 2024 · c3f381c · c3f381c
1 parent 9a27fdf
commit c3f381c
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 42 deletions.
diff --git a/bin/memos/main.go b/bin/memos/main.go
@@ -44,6 +44,7 @@ var (
 				DSN:          viper.GetString("dsn"),
 				Public:       viper.GetBool("public"),
 				PasswordAuth: viper.GetBool("password-auth"),
+				InstanceURL:  viper.GetString("instance-url"),
 				Version:      version.GetCurrentVersion(viper.GetString("mode")),
 			}
 			if err := instanceProfile.Validate(); err != nil {
@@ -107,9 +108,7 @@ var (
 func init() {
 	viper.SetDefault("mode", "demo")
 	viper.SetDefault("driver", "sqlite")
-	viper.SetDefault("addr", "")
 	viper.SetDefault("port", 8081)
-	viper.SetDefault("public", false)
 	viper.SetDefault("password-auth", true)
 
 	rootCmd.PersistentFlags().String("mode", "demo", `mode of server, can be "prod" or "dev" or "demo"`)
@@ -120,37 +119,33 @@ func init() {
 	rootCmd.PersistentFlags().String("dsn", "", "database source name(aka. DSN)")
 	rootCmd.PersistentFlags().Bool("public", false, "")
 	rootCmd.PersistentFlags().Bool("password-auth", true, "")
+	rootCmd.PersistentFlags().String("instance-url", "", "the url of your memos instance")
 
-	err := viper.BindPFlag("mode", rootCmd.PersistentFlags().Lookup("mode"))
-	if err != nil {
+	if err := viper.BindPFlag("mode", rootCmd.PersistentFlags().Lookup("mode")); err != nil {
 		panic(err)
 	}
-	err = viper.BindPFlag("addr", rootCmd.PersistentFlags().Lookup("addr"))
-	if err != nil {
+	if err := viper.BindPFlag("addr", rootCmd.PersistentFlags().Lookup("addr")); err != nil {
 		panic(err)
 	}
-	err = viper.BindPFlag("port", rootCmd.PersistentFlags().Lookup("port"))
-	if err != nil {
+	if err := viper.BindPFlag("port", rootCmd.PersistentFlags().Lookup("port")); err != nil {
 		panic(err)
 	}
-	err = viper.BindPFlag("data", rootCmd.PersistentFlags().Lookup("data"))
-	if err != nil {
+	if err := viper.BindPFlag("data", rootCmd.PersistentFlags().Lookup("data")); err != nil {
 		panic(err)
 	}
-	err = viper.BindPFlag("driver", rootCmd.PersistentFlags().Lookup("driver"))
-	if err != nil {
+	if err := viper.BindPFlag("driver", rootCmd.PersistentFlags().Lookup("driver")); err != nil {
 		panic(err)
 	}
-	err = viper.BindPFlag("dsn", rootCmd.PersistentFlags().Lookup("dsn"))
-	if err != nil {
+	if err := viper.BindPFlag("dsn", rootCmd.PersistentFlags().Lookup("dsn")); err != nil {
 		panic(err)
 	}
-	err = viper.BindPFlag("public", rootCmd.PersistentFlags().Lookup("public"))
-	if err != nil {
+	if err := viper.BindPFlag("public", rootCmd.PersistentFlags().Lookup("public")); err != nil {
 		panic(err)
 	}
-	err = viper.BindPFlag("password-auth", rootCmd.PersistentFlags().Lookup("password-auth"))
-	if err != nil {
+	if err := viper.BindPFlag("password-auth", rootCmd.PersistentFlags().Lookup("password-auth")); err != nil {
+		panic(err)
+	}
+	if err := viper.BindPFlag("instance-url", rootCmd.PersistentFlags().Lookup("instance-url")); err != nil {
 		panic(err)
 	}
 
@@ -159,6 +154,9 @@ func init() {
 	if err := viper.BindEnv("password-auth", "MEMOS_PASSWORD_AUTH"); err != nil {
 		panic(err)
 	}
+	if err := viper.BindEnv("instance-url", "MEMOS_INSTANCE_URL"); err != nil {
+		panic(err)
+	}
 }
 
 func printGreetings(profile *profile.Profile) {

diff --git a/docs/apidocs.swagger.yaml b/docs/apidocs.swagger.yaml
@@ -3154,3 +3154,6 @@ definitions:
       passwordAuth:
         type: boolean
         description: password_auth is a flag whether the instance allows password authentication.
+      instanceUrl:
+        type: string
+        description: instance_url is the URL of the instance.
diff --git a/proto/api/v1/workspace_service.proto b/proto/api/v1/workspace_service.proto
@@ -25,6 +25,8 @@ message WorkspaceProfile {
   bool public = 4;
   // password_auth is a flag whether the instance allows password authentication.
   bool password_auth = 5;
+  // instance_url is the URL of the instance.
+  string instance_url = 6;
 }
 
 message GetWorkspaceProfileRequest {}
diff --git a/proto/gen/api/v1/workspace_service.pb.go b/proto/gen/api/v1/workspace_service.pb.go
diff --git a/server/profile/profile.go b/server/profile/profile.go
@@ -31,6 +31,8 @@ type Profile struct {
 	Public bool
 	// PasswordAuth is the flag whether the instance uses password authentication.
 	PasswordAuth bool
+	// InstanceURL is the url of your memos instance.
+	InstanceURL string
 }
 
 func (p *Profile) IsDev() bool {

diff --git a/server/router/api/v1/workspace_service.go b/server/router/api/v1/workspace_service.go
@@ -17,6 +17,7 @@ func (s *APIV1Service) GetWorkspaceProfile(ctx context.Context, _ *v1pb.GetWorks
 		Mode:         s.Profile.Mode,
 		Public:       s.Profile.Public,
 		PasswordAuth: s.Profile.PasswordAuth,
+		InstanceUrl:  s.Profile.InstanceURL,
 	}
 	owner, err := s.GetInstanceOwner(ctx)
 	if err != nil {