refactor: merge sign in requests

proto/api/v1/auth_service.proto

@@ -13,14 +13,10 @@ service AuthService {
   rpc GetAuthStatus(GetAuthStatusRequest) returns (User) {
     option (google.api.http) = {post: "/api/v1/auth/status"};
   }
-  // SignIn signs in the user with the given username and password.
+  // SignIn signs in the user.
   rpc SignIn(SignInRequest) returns (User) {
     option (google.api.http) = {post: "/api/v1/auth/signin"};
   }
-  // SignInWithSSO signs in the user with the given SSO code.
-  rpc SignInWithSSO(SignInWithSSORequest) returns (User) {
-    option (google.api.http) = {post: "/api/v1/auth/signin/sso"};
-  }
   // SignUp signs up the user with the given username and password.
   rpc SignUp(SignUpRequest) returns (User) {
     option (google.api.http) = {post: "/api/v1/auth/signup"};
@@ -38,15 +34,26 @@ message GetAuthStatusResponse {
 }
 
 message SignInRequest {
+  // Provide one authentication method (username/password or SSO).
+  oneof method {
+    // Username and password authentication method.
+    PasswordCredentials password_credentials = 1;
+
+    // SSO provider authentication method.
+    SSOCredentials sso_credentials = 2;
+  }
+  // Whether the session should never expire.
+  bool never_expire = 3;
+}
+
+message PasswordCredentials {
   // The username to sign in with.
   string username = 1;
   // The password to sign in with.
   string password = 2;
-  // Whether the session should never expire.
-  bool never_expire = 3;
 }
 
-message SignInWithSSORequest {
+message SSOCredentials {
   // The ID of the SSO provider.
   int32 idp_id = 1;
   // The code to sign in with.

proto/gen/api/v1/auth_service.pb.gw.go

@@ -87,39 +87,6 @@ func local_request_AuthService_SignIn_0(ctx context.Context, marshaler runtime.M
 	return msg, metadata, err
 }
 
-var filter_AuthService_SignInWithSSO_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
-
-func request_AuthService_SignInWithSSO_0(ctx context.Context, marshaler runtime.Marshaler, client AuthServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var (
-		protoReq SignInWithSSORequest
-		metadata runtime.ServerMetadata
-	)
-	io.Copy(io.Discard, req.Body)
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_AuthService_SignInWithSSO_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	msg, err := client.SignInWithSSO(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
-}
-
-func local_request_AuthService_SignInWithSSO_0(ctx context.Context, marshaler runtime.Marshaler, server AuthServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var (
-		protoReq SignInWithSSORequest
-		metadata runtime.ServerMetadata
-	)
-	if err := req.ParseForm(); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_AuthService_SignInWithSSO_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-	msg, err := server.SignInWithSSO(ctx, &protoReq)
-	return msg, metadata, err
-}
-
 var filter_AuthService_SignUp_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)}
 
 func request_AuthService_SignUp_0(ctx context.Context, marshaler runtime.Marshaler, client AuthServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -218,26 +185,6 @@ func RegisterAuthServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux
 		}
 		forward_AuthService_SignIn_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 	})
-	mux.Handle(http.MethodPost, pattern_AuthService_SignInWithSSO_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		var stream runtime.ServerTransportStream
-		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/memos.api.v1.AuthService/SignInWithSSO", runtime.WithHTTPPathPattern("/api/v1/auth/signin/sso"))
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := local_request_AuthService_SignInWithSSO_0(annotatedContext, inboundMarshaler, server, req, pathParams)
-		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
-		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
-		if err != nil {
-			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		forward_AuthService_SignInWithSSO_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-	})
 	mux.Handle(http.MethodPost, pattern_AuthService_SignUp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -352,23 +299,6 @@ func RegisterAuthServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 		}
 		forward_AuthService_SignIn_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
 	})
-	mux.Handle(http.MethodPost, pattern_AuthService_SignInWithSSO_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
-		ctx, cancel := context.WithCancel(req.Context())
-		defer cancel()
-		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/memos.api.v1.AuthService/SignInWithSSO", runtime.WithHTTPPathPattern("/api/v1/auth/signin/sso"))
-		if err != nil {
-			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		resp, md, err := request_AuthService_SignInWithSSO_0(annotatedContext, inboundMarshaler, client, req, pathParams)
-		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
-		if err != nil {
-			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
-			return
-		}
-		forward_AuthService_SignInWithSSO_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-	})
 	mux.Handle(http.MethodPost, pattern_AuthService_SignUp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
@@ -409,7 +339,6 @@ func RegisterAuthServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux
 var (
 	pattern_AuthService_GetAuthStatus_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v1", "auth", "status"}, ""))
 	pattern_AuthService_SignIn_0        = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v1", "auth", "signin"}, ""))
-	pattern_AuthService_SignInWithSSO_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"api", "v1", "auth", "signin", "sso"}, ""))
 	pattern_AuthService_SignUp_0        = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v1", "auth", "signup"}, ""))
 	pattern_AuthService_SignOut_0       = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"api", "v1", "auth", "signout"}, ""))
 )
@@ -417,7 +346,6 @@ var (
 var (
 	forward_AuthService_GetAuthStatus_0 = runtime.ForwardResponseMessage
 	forward_AuthService_SignIn_0        = runtime.ForwardResponseMessage
-	forward_AuthService_SignInWithSSO_0 = runtime.ForwardResponseMessage
 	forward_AuthService_SignUp_0        = runtime.ForwardResponseMessage
 	forward_AuthService_SignOut_0       = runtime.ForwardResponseMessage
 )

proto/gen/api/v1/auth_service_grpc.pb.go

@@ -22,7 +22,6 @@ const _ = grpc.SupportPackageIsVersion9
 const (
 	AuthService_GetAuthStatus_FullMethodName = "/memos.api.v1.AuthService/GetAuthStatus"
 	AuthService_SignIn_FullMethodName        = "/memos.api.v1.AuthService/SignIn"
-	AuthService_SignInWithSSO_FullMethodName = "/memos.api.v1.AuthService/SignInWithSSO"
 	AuthService_SignUp_FullMethodName        = "/memos.api.v1.AuthService/SignUp"
 	AuthService_SignOut_FullMethodName       = "/memos.api.v1.AuthService/SignOut"
 )
@@ -33,10 +32,8 @@ const (
 type AuthServiceClient interface {
 	// GetAuthStatus returns the current auth status of the user.
 	GetAuthStatus(ctx context.Context, in *GetAuthStatusRequest, opts ...grpc.CallOption) (*User, error)
-	// SignIn signs in the user with the given username and password.
+	// SignIn signs in the user.
 	SignIn(ctx context.Context, in *SignInRequest, opts ...grpc.CallOption) (*User, error)
-	// SignInWithSSO signs in the user with the given SSO code.
-	SignInWithSSO(ctx context.Context, in *SignInWithSSORequest, opts ...grpc.CallOption) (*User, error)
 	// SignUp signs up the user with the given username and password.
 	SignUp(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*User, error)
 	// SignOut signs out the user.
@@ -71,16 +68,6 @@ func (c *authServiceClient) SignIn(ctx context.Context, in *SignInRequest, opts
 	return out, nil
 }
 
-func (c *authServiceClient) SignInWithSSO(ctx context.Context, in *SignInWithSSORequest, opts ...grpc.CallOption) (*User, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(User)
-	err := c.cc.Invoke(ctx, AuthService_SignInWithSSO_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *authServiceClient) SignUp(ctx context.Context, in *SignUpRequest, opts ...grpc.CallOption) (*User, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(User)
@@ -107,10 +94,8 @@ func (c *authServiceClient) SignOut(ctx context.Context, in *SignOutRequest, opt
 type AuthServiceServer interface {
 	// GetAuthStatus returns the current auth status of the user.
 	GetAuthStatus(context.Context, *GetAuthStatusRequest) (*User, error)
-	// SignIn signs in the user with the given username and password.
+	// SignIn signs in the user.
 	SignIn(context.Context, *SignInRequest) (*User, error)
-	// SignInWithSSO signs in the user with the given SSO code.
-	SignInWithSSO(context.Context, *SignInWithSSORequest) (*User, error)
 	// SignUp signs up the user with the given username and password.
 	SignUp(context.Context, *SignUpRequest) (*User, error)
 	// SignOut signs out the user.
@@ -131,9 +116,6 @@ func (UnimplementedAuthServiceServer) GetAuthStatus(context.Context, *GetAuthSta
 func (UnimplementedAuthServiceServer) SignIn(context.Context, *SignInRequest) (*User, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SignIn not implemented")
 }
-func (UnimplementedAuthServiceServer) SignInWithSSO(context.Context, *SignInWithSSORequest) (*User, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SignInWithSSO not implemented")
-}
 func (UnimplementedAuthServiceServer) SignUp(context.Context, *SignUpRequest) (*User, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SignUp not implemented")
 }
@@ -197,24 +179,6 @@ func _AuthService_SignIn_Handler(srv interface{}, ctx context.Context, dec func(
 	return interceptor(ctx, in, info, handler)
 }
 
-func _AuthService_SignInWithSSO_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(SignInWithSSORequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(AuthServiceServer).SignInWithSSO(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: AuthService_SignInWithSSO_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(AuthServiceServer).SignInWithSSO(ctx, req.(*SignInWithSSORequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _AuthService_SignUp_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(SignUpRequest)
 	if err := dec(in); err != nil {
@@ -266,10 +230,6 @@ var AuthService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "SignIn",
 			Handler:    _AuthService_SignIn_Handler,
 		},
-		{
-			MethodName: "SignInWithSSO",
-			Handler:    _AuthService_SignInWithSSO_Handler,
-		},
 		{
 			MethodName: "SignUp",
 			Handler:    _AuthService_SignUp_Handler,

server/router/api/v1/auth_service.go

@@ -44,8 +44,10 @@ func (s *APIV1Service) GetAuthStatus(ctx context.Context, _ *v1pb.GetAuthStatusR
 }
 
 func (s *APIV1Service) SignIn(ctx context.Context, request *v1pb.SignInRequest) (*v1pb.User, error) {
+	var existingUser *store.User
+	if passwordCredentials := request.GetPasswordCredentials(); passwordCredentials != nil {
 		user, err := s.Store.GetUser(ctx, &store.FindUser{
-		Username: &request.Username,
+			Username: &passwordCredentials.Username,
 		})
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "failed to get user, error: %v", err)
@@ -54,10 +56,9 @@ func (s *APIV1Service) SignIn(ctx context.Context, request *v1pb.SignInRequest)
 			return nil, status.Errorf(codes.InvalidArgument, unmatchedUsernameAndPasswordError)
 		}
 		// Compare the stored hashed password, with the hashed version of the password that was received.
-	if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(request.Password)); err != nil {
+		if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(passwordCredentials.Password)); err != nil {
 			return nil, status.Errorf(codes.InvalidArgument, unmatchedUsernameAndPasswordError)
 		}
-
 		workspaceGeneralSetting, err := s.Store.GetWorkspaceGeneralSetting(ctx)
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "failed to get workspace general setting, error: %v", err)
@@ -66,24 +67,10 @@ func (s *APIV1Service) SignIn(ctx context.Context, request *v1pb.SignInRequest)
 		if workspaceGeneralSetting.DisallowPasswordAuth && user.Role == store.RoleUser {
 			return nil, status.Errorf(codes.PermissionDenied, "password signin is not allowed")
 		}
-	if user.RowStatus == store.Archived {
-		return nil, status.Errorf(codes.PermissionDenied, "user has been archived with username %s", request.Username)
-	}
-
-	expireTime := time.Now().Add(AccessTokenDuration)
-	if request.NeverExpire {
-		// Set the expire time to 100 years.
-		expireTime = time.Now().Add(100 * 365 * 24 * time.Hour)
-	}
-	if err := s.doSignIn(ctx, user, expireTime); err != nil {
-		return nil, status.Errorf(codes.Internal, "failed to sign in, error: %v", err)
-	}
-	return convertUserFromStore(user), nil
-}
-
-func (s *APIV1Service) SignInWithSSO(ctx context.Context, request *v1pb.SignInWithSSORequest) (*v1pb.User, error) {
+		existingUser = user
+	} else if ssoCredentials := request.GetSsoCredentials(); ssoCredentials != nil {
 		identityProvider, err := s.Store.GetIdentityProvider(ctx, &store.FindIdentityProvider{
-		ID: &request.IdpId,
+			ID: &ssoCredentials.IdpId,
 		})
 		if err != nil {
 			return nil, status.Errorf(codes.Internal, "failed to get identity provider, error: %v", err)
@@ -98,7 +85,7 @@ func (s *APIV1Service) SignInWithSSO(ctx context.Context, request *v1pb.SignInWi
 			if err != nil {
 				return nil, status.Errorf(codes.Internal, "failed to create oauth2 identity provider, error: %v", err)
 			}
-		token, err := oauth2IdentityProvider.ExchangeToken(ctx, request.RedirectUri, request.Code)
+			token, err := oauth2IdentityProvider.ExchangeToken(ctx, ssoCredentials.RedirectUri, ssoCredentials.Code)
 			if err != nil {
 				return nil, status.Errorf(codes.Internal, "failed to exchange token, error: %v", err)
 			}
@@ -158,14 +145,25 @@ func (s *APIV1Service) SignInWithSSO(ctx context.Context, request *v1pb.SignInWi
 				return nil, status.Errorf(codes.Internal, "failed to create user, error: %v", err)
 			}
 		}
-	if user.RowStatus == store.Archived {
-		return nil, status.Errorf(codes.PermissionDenied, "user has been archived with username %s", userInfo.Identifier)
+		existingUser = user
 	}
 
-	if err := s.doSignIn(ctx, user, time.Now().Add(AccessTokenDuration)); err != nil {
+	if existingUser == nil {
+		return nil, status.Errorf(codes.InvalidArgument, "invalid credentials")
+	}
+	if existingUser.RowStatus == store.Archived {
+		return nil, status.Errorf(codes.PermissionDenied, "user has been archived with username %s", existingUser.Username)
+	}
+
+	expireTime := time.Now().Add(AccessTokenDuration)
+	if request.NeverExpire {
+		// Set the expire time to 100 years.
+		expireTime = time.Now().Add(100 * 365 * 24 * time.Hour)
+	}
+	if err := s.doSignIn(ctx, existingUser, expireTime); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to sign in, error: %v", err)
 	}
-	return convertUserFromStore(user), nil
+	return convertUserFromStore(existingUser), nil
 }
 
 func (s *APIV1Service) doSignIn(ctx context.Context, user *store.User, expireTime time.Time) error {

web/src/components/PasswordSignInForm.tsx

@@ -45,7 +45,7 @@ const PasswordSignInForm = observer(() => {
 
     try {
       actionBtnLoadingState.setLoading();
-      await authServiceClient.signIn({ username, password, neverExpire: remember });
+      await authServiceClient.signIn({ passwordCredentials: { username, password }, neverExpire: remember });
       await initialUserStore();
       navigateTo("/");
     } catch (error: any) {

web/src/pages/AuthCallback.tsx

@@ -45,10 +45,12 @@ const AuthCallback = () => {
     const redirectUri = absolutifyLink("/auth/callback");
     (async () => {
       try {
-        await authServiceClient.signInWithSSO({
+        await authServiceClient.signIn({
+          ssoCredentials: {
             idpId: identityProviderId,
             code,
             redirectUri,
+          },
         });
         setState({
           loading: false,

web/src/types/proto/api/v1/auth_service.ts

@@ -19,15 +19,26 @@ export interface GetAuthStatusResponse {
 }
 
 export interface SignInRequest {
+  /** Username and password authentication method. */
+  passwordCredentials?:
+    | PasswordCredentials
+    | undefined;
+  /** SSO provider authentication method. */
+  ssoCredentials?:
+    | SSOCredentials
+    | undefined;
+  /** Whether the session should never expire. */
+  neverExpire: boolean;
+}
+
+export interface PasswordCredentials {
   /** The username to sign in with. */
   username: string;
   /** The password to sign in with. */
   password: string;
-  /** Whether the session should never expire. */
-  neverExpire: boolean;
 }
 
-export interface SignInWithSSORequest {
+export interface SSOCredentials {
   /** The ID of the SSO provider. */
   idpId: number;
   /** The code to sign in with. */
@@ -127,16 +138,16 @@ export const GetAuthStatusResponse: MessageFns<GetAuthStatusResponse> = {
 };
 
 function createBaseSignInRequest(): SignInRequest {
-  return { username: "", password: "", neverExpire: false };
+  return { passwordCredentials: undefined, ssoCredentials: undefined, neverExpire: false };
 }
 
 export const SignInRequest: MessageFns<SignInRequest> = {
   encode(message: SignInRequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
-    if (message.username !== "") {
-      writer.uint32(10).string(message.username);
+    if (message.passwordCredentials !== undefined) {
+      PasswordCredentials.encode(message.passwordCredentials, writer.uint32(10).fork()).join();
     }
-    if (message.password !== "") {
-      writer.uint32(18).string(message.password);
+    if (message.ssoCredentials !== undefined) {
+      SSOCredentials.encode(message.ssoCredentials, writer.uint32(18).fork()).join();
     }
     if (message.neverExpire !== false) {
       writer.uint32(24).bool(message.neverExpire);
@@ -156,7 +167,7 @@ export const SignInRequest: MessageFns<SignInRequest> = {
             break;
           }
 
-          message.username = reader.string();
+          message.passwordCredentials = PasswordCredentials.decode(reader, reader.uint32());
           continue;
         }
         case 2: {
@@ -164,7 +175,7 @@ export const SignInRequest: MessageFns<SignInRequest> = {
             break;
           }
 
-          message.password = reader.string();
+          message.ssoCredentials = SSOCredentials.decode(reader, reader.uint32());
           continue;
         }
         case 3: {
@@ -189,19 +200,81 @@ export const SignInRequest: MessageFns<SignInRequest> = {
   },
   fromPartial(object: DeepPartial<SignInRequest>): SignInRequest {
     const message = createBaseSignInRequest();
+    message.passwordCredentials = (object.passwordCredentials !== undefined && object.passwordCredentials !== null)
+      ? PasswordCredentials.fromPartial(object.passwordCredentials)
+      : undefined;
+    message.ssoCredentials = (object.ssoCredentials !== undefined && object.ssoCredentials !== null)
+      ? SSOCredentials.fromPartial(object.ssoCredentials)
+      : undefined;
+    message.neverExpire = object.neverExpire ?? false;
+    return message;
+  },
+};
+
+function createBasePasswordCredentials(): PasswordCredentials {
+  return { username: "", password: "" };
+}
+
+export const PasswordCredentials: MessageFns<PasswordCredentials> = {
+  encode(message: PasswordCredentials, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+    if (message.username !== "") {
+      writer.uint32(10).string(message.username);
+    }
+    if (message.password !== "") {
+      writer.uint32(18).string(message.password);
+    }
+    return writer;
+  },
+
+  decode(input: BinaryReader | Uint8Array, length?: number): PasswordCredentials {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBasePasswordCredentials();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1: {
+          if (tag !== 10) {
+            break;
+          }
+
+          message.username = reader.string();
+          continue;
+        }
+        case 2: {
+          if (tag !== 18) {
+            break;
+          }
+
+          message.password = reader.string();
+          continue;
+        }
+      }
+      if ((tag & 7) === 4 || tag === 0) {
+        break;
+      }
+      reader.skip(tag & 7);
+    }
+    return message;
+  },
+
+  create(base?: DeepPartial<PasswordCredentials>): PasswordCredentials {
+    return PasswordCredentials.fromPartial(base ?? {});
+  },
+  fromPartial(object: DeepPartial<PasswordCredentials>): PasswordCredentials {
+    const message = createBasePasswordCredentials();
     message.username = object.username ?? "";
     message.password = object.password ?? "";
-    message.neverExpire = object.neverExpire ?? false;
     return message;
   },
 };
 
-function createBaseSignInWithSSORequest(): SignInWithSSORequest {
+function createBaseSSOCredentials(): SSOCredentials {
   return { idpId: 0, code: "", redirectUri: "" };
 }
 
-export const SignInWithSSORequest: MessageFns<SignInWithSSORequest> = {
-  encode(message: SignInWithSSORequest, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
+export const SSOCredentials: MessageFns<SSOCredentials> = {
+  encode(message: SSOCredentials, writer: BinaryWriter = new BinaryWriter()): BinaryWriter {
     if (message.idpId !== 0) {
       writer.uint32(8).int32(message.idpId);
     }
@@ -214,10 +287,10 @@ export const SignInWithSSORequest: MessageFns<SignInWithSSORequest> = {
     return writer;
   },
 
-  decode(input: BinaryReader | Uint8Array, length?: number): SignInWithSSORequest {
+  decode(input: BinaryReader | Uint8Array, length?: number): SSOCredentials {
     const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseSignInWithSSORequest();
+    const message = createBaseSSOCredentials();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
@@ -254,11 +327,11 @@ export const SignInWithSSORequest: MessageFns<SignInWithSSORequest> = {
     return message;
   },
 
-  create(base?: DeepPartial<SignInWithSSORequest>): SignInWithSSORequest {
-    return SignInWithSSORequest.fromPartial(base ?? {});
+  create(base?: DeepPartial<SSOCredentials>): SSOCredentials {
+    return SSOCredentials.fromPartial(base ?? {});
   },
-  fromPartial(object: DeepPartial<SignInWithSSORequest>): SignInWithSSORequest {
-    const message = createBaseSignInWithSSORequest();
+  fromPartial(object: DeepPartial<SSOCredentials>): SSOCredentials {
+    const message = createBaseSSOCredentials();
     message.idpId = object.idpId ?? 0;
     message.code = object.code ?? "";
     message.redirectUri = object.redirectUri ?? "";
@@ -401,7 +474,7 @@ export const AuthServiceDefinition = {
         },
       },
     },
-    /** SignIn signs in the user with the given username and password. */
+    /** SignIn signs in the user. */
     signIn: {
       name: "SignIn",
       requestType: SignInRequest,
@@ -439,48 +512,6 @@ export const AuthServiceDefinition = {
         },
       },
     },
-    /** SignInWithSSO signs in the user with the given SSO code. */
-    signInWithSSO: {
-      name: "SignInWithSSO",
-      requestType: SignInWithSSORequest,
-      requestStream: false,
-      responseType: User,
-      responseStream: false,
-      options: {
-        _unknownFields: {
-          578365826: [
-            new Uint8Array([
-              25,
-              34,
-              23,
-              47,
-              97,
-              112,
-              105,
-              47,
-              118,
-              49,
-              47,
-              97,
-              117,
-              116,
-              104,
-              47,
-              115,
-              105,
-              103,
-              110,
-              105,
-              110,
-              47,
-              115,
-              115,
-              111,
-            ]),
-          ],
-        },
-      },
-    },
     /** SignUp signs up the user with the given username and password. */
     signUp: {
       name: "SignUp",