@mediaryorg/contracts 1.0.4 → 1.0.5

package/dist/proto/paths.d.ts

@@ -1,3 +1,10 @@
 export declare const PROTO_PATH: {
     readonly AUTH: string;
+    readonly USER: string;
 };
+/**
+ * Root directories for protobuf imports.
+ * Pass these to the gRPC loader so that cross-package imports resolve correctly
+ * (e.g. `import "user/v1/user.proto";` from auth.proto).
+ */
+export declare const PROTO_INCLUDE_DIRS: readonly [string];

package/dist/proto/paths.js

@@ -1,7 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PROTO_PATH = void 0;
+exports.PROTO_INCLUDE_DIRS = exports.PROTO_PATH = void 0;
 const path_1 = require("path");
+const PROTO_DIR = (0, path_1.join)(__dirname, "../../proto");
 exports.PROTO_PATH = {
-    AUTH: (0, path_1.join)(__dirname, "../../proto/auth.proto"),
+    AUTH: (0, path_1.join)(PROTO_DIR, "auth/v1/auth.proto"),
+    USER: (0, path_1.join)(PROTO_DIR, "user/v1/user.proto"),
 };
+/**
+ * Root directories for protobuf imports.
+ * Pass these to the gRPC loader so that cross-package imports resolve correctly
+ * (e.g. `import "user/v1/user.proto";` from auth.proto).
+ */
+exports.PROTO_INCLUDE_DIRS = [PROTO_DIR];

package/generated/auth/v1/auth.ts

@@ -0,0 +1,243 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.6
+//   protoc               v3.21.12
+// source: auth/v1/auth.proto
+
+/* eslint-disable */
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
+import { User } from "../../user/v1/user";
+
+export const protobufPackage = "auth.v1";
+
+export interface LoginResponse {
+  user: User | undefined;
+  sessionId: string;
+  maxAgeMs: number;
+}
+
+export interface ConfirmEmailResponse {
+  user: User | undefined;
+  sessionId: string;
+  maxAgeMs: number;
+}
+
+export interface OauthCallbackResponse {
+  user: User | undefined;
+  sessionId: string;
+  maxAgeMs: number;
+}
+
+export interface AdminLoginResponse {
+  user: User | undefined;
+  sessionId: string;
+  maxAgeMs: number;
+}
+
+export interface ValidateSessionResponse {
+  valid: boolean;
+  user: User | undefined;
+}
+
+export interface AdminValidateSessionResponse {
+  valid: boolean;
+  user: User | undefined;
+}
+
+export interface ResendVerificationResponse {
+  message: string;
+}
+
+export interface RequestPasswordResetResponse {
+  message: string;
+}
+
+export interface SetNewPasswordResponse {
+  message: string;
+}
+
+export interface LogoutResponse {
+}
+
+export interface AdminLogoutResponse {
+}
+
+export interface RegisterRequest {
+  name: string;
+  email: string;
+  password: string;
+  passwordRepeat: string;
+}
+
+export interface RegisterResponse {
+  message: string;
+  email: string;
+}
+
+export interface LoginRequest {
+  email: string;
+  password: string;
+}
+
+export interface LogoutRequest {
+  sessionId: string;
+}
+
+export interface ValidateSessionRequest {
+  sessionId: string;
+}
+
+export interface ConfirmEmailRequest {
+  email: string;
+  code: string;
+}
+
+export interface ResendVerificationRequest {
+  email: string;
+}
+
+export interface RequestPasswordResetRequest {
+  email: string;
+}
+
+export interface SetNewPasswordRequest {
+  email: string;
+  code: string;
+  password: string;
+}
+
+export interface OauthConnectRequest {
+  provider: string;
+}
+
+export interface OauthConnectResponse {
+  url: string;
+}
+
+export interface OauthCallbackRequest {
+  provider: string;
+  code: string;
+}
+
+export interface AdminLoginRequest {
+  email: string;
+  password: string;
+}
+
+export interface AdminLogoutRequest {
+  sessionId: string;
+}
+
+export interface AdminValidateSessionRequest {
+  sessionId: string;
+}
+
+export const AUTH_V1_PACKAGE_NAME = "auth.v1";
+
+export interface AuthServiceClient {
+  register(request: RegisterRequest): Observable<RegisterResponse>;
+
+  login(request: LoginRequest): Observable<LoginResponse>;
+
+  logout(request: LogoutRequest): Observable<LogoutResponse>;
+
+  validateSession(request: ValidateSessionRequest): Observable<ValidateSessionResponse>;
+
+  confirmEmail(request: ConfirmEmailRequest): Observable<ConfirmEmailResponse>;
+
+  resendVerification(request: ResendVerificationRequest): Observable<ResendVerificationResponse>;
+
+  requestPasswordReset(request: RequestPasswordResetRequest): Observable<RequestPasswordResetResponse>;
+
+  setNewPassword(request: SetNewPasswordRequest): Observable<SetNewPasswordResponse>;
+
+  oauthConnect(request: OauthConnectRequest): Observable<OauthConnectResponse>;
+
+  oauthCallback(request: OauthCallbackRequest): Observable<OauthCallbackResponse>;
+
+  adminLogin(request: AdminLoginRequest): Observable<AdminLoginResponse>;
+
+  adminLogout(request: AdminLogoutRequest): Observable<AdminLogoutResponse>;
+
+  adminValidateSession(request: AdminValidateSessionRequest): Observable<AdminValidateSessionResponse>;
+}
+
+export interface AuthServiceController {
+  register(request: RegisterRequest): Promise<RegisterResponse> | Observable<RegisterResponse> | RegisterResponse;
+
+  login(request: LoginRequest): Promise<LoginResponse> | Observable<LoginResponse> | LoginResponse;
+
+  logout(request: LogoutRequest): Promise<LogoutResponse> | Observable<LogoutResponse> | LogoutResponse;
+
+  validateSession(
+    request: ValidateSessionRequest,
+  ): Promise<ValidateSessionResponse> | Observable<ValidateSessionResponse> | ValidateSessionResponse;
+
+  confirmEmail(
+    request: ConfirmEmailRequest,
+  ): Promise<ConfirmEmailResponse> | Observable<ConfirmEmailResponse> | ConfirmEmailResponse;
+
+  resendVerification(
+    request: ResendVerificationRequest,
+  ): Promise<ResendVerificationResponse> | Observable<ResendVerificationResponse> | ResendVerificationResponse;
+
+  requestPasswordReset(
+    request: RequestPasswordResetRequest,
+  ): Promise<RequestPasswordResetResponse> | Observable<RequestPasswordResetResponse> | RequestPasswordResetResponse;
+
+  setNewPassword(
+    request: SetNewPasswordRequest,
+  ): Promise<SetNewPasswordResponse> | Observable<SetNewPasswordResponse> | SetNewPasswordResponse;
+
+  oauthConnect(
+    request: OauthConnectRequest,
+  ): Promise<OauthConnectResponse> | Observable<OauthConnectResponse> | OauthConnectResponse;
+
+  oauthCallback(
+    request: OauthCallbackRequest,
+  ): Promise<OauthCallbackResponse> | Observable<OauthCallbackResponse> | OauthCallbackResponse;
+
+  adminLogin(
+    request: AdminLoginRequest,
+  ): Promise<AdminLoginResponse> | Observable<AdminLoginResponse> | AdminLoginResponse;
+
+  adminLogout(
+    request: AdminLogoutRequest,
+  ): Promise<AdminLogoutResponse> | Observable<AdminLogoutResponse> | AdminLogoutResponse;
+
+  adminValidateSession(
+    request: AdminValidateSessionRequest,
+  ): Promise<AdminValidateSessionResponse> | Observable<AdminValidateSessionResponse> | AdminValidateSessionResponse;
+}
+
+export function AuthServiceControllerMethods() {
+  return function (constructor: Function) {
+    const grpcMethods: string[] = [
+      "register",
+      "login",
+      "logout",
+      "validateSession",
+      "confirmEmail",
+      "resendVerification",
+      "requestPasswordReset",
+      "setNewPassword",
+      "oauthConnect",
+      "oauthCallback",
+      "adminLogin",
+      "adminLogout",
+      "adminValidateSession",
+    ];
+    for (const method of grpcMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("AuthService", method)(constructor.prototype[method], method, descriptor);
+    }
+    const grpcStreamMethods: string[] = [];
+    for (const method of grpcStreamMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("AuthService", method)(constructor.prototype[method], method, descriptor);
+    }
+  };
+}
+
+export const AUTH_SERVICE_NAME = "AuthService";

package/generated/google/protobuf/empty.ts

@@ -0,0 +1,11 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.6
+//   protoc               v7.34.1
+// source: google/protobuf/empty.proto
+
+/* eslint-disable */
+
+export const protobufPackage = "google.protobuf";
+
+export interface Empty {}

package/generated/user/v1/user.ts

@@ -0,0 +1,60 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.6
+//   protoc               v3.21.12
+// source: user/v1/user.proto
+
+/* eslint-disable */
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
+
+export const protobufPackage = "user.v1";
+
+export interface User {
+  id: string;
+  email: string;
+  displayName: string;
+  picture: string;
+  role: string;
+  authProvider: string;
+  isVerified: boolean;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface GetUserByIdRequest {
+  userId: string;
+}
+
+export interface GetUserByIdResponse {
+  user: User | undefined;
+}
+
+export const USER_V1_PACKAGE_NAME = "user.v1";
+
+export interface UserServiceClient {
+  getUserById(request: GetUserByIdRequest): Observable<GetUserByIdResponse>;
+}
+
+export interface UserServiceController {
+  getUserById(
+    request: GetUserByIdRequest,
+  ): Promise<GetUserByIdResponse> | Observable<GetUserByIdResponse> | GetUserByIdResponse;
+}
+
+export function UserServiceControllerMethods() {
+  return function (constructor: Function) {
+    const grpcMethods: string[] = ["getUserById"];
+    for (const method of grpcMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("UserService", method)(constructor.prototype[method], method, descriptor);
+    }
+    const grpcStreamMethods: string[] = [];
+    for (const method of grpcStreamMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("UserService", method)(constructor.prototype[method], method, descriptor);
+    }
+  };
+}
+
+export const USER_SERVICE_NAME = "UserService";

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@mediaryorg/contracts",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "description": "Protobuf definitions and generated TypeScript types",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "scripts": {
         "generate": "npm run generate:win",
-        "generate:win": "protoc -I .\\proto .\\proto\\auth.proto --plugin=protoc-gen-ts_proto=.\\node_modules\\.bin\\protoc-gen-ts_proto.cmd --ts_proto_out=.\\generated --ts_proto_opt=nestJs=true,package=omit",
-        "generate:ci": "protoc -I ./proto ./proto/auth.proto --plugin=protoc-gen-ts_proto=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./generated --ts_proto_opt=nestJs=true,package=omit",
+        "generate:win": "protoc -I .\\proto .\\proto\\auth\\v1\\auth.proto .\\proto\\user\\v1\\user.proto --plugin=protoc-gen-ts_proto=.\\node_modules\\.bin\\protoc-gen-ts_proto.cmd --ts_proto_out=.\\generated --ts_proto_opt=nestJs=true,package=omit",
+        "generate:ci": "protoc -I ./proto ./proto/auth/v1/auth.proto ./proto/user/v1/user.proto --plugin=protoc-gen-ts_proto=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./generated --ts_proto_opt=nestJs=true,package=omit",
         "build": "tsc -p tsconfig.build.json"
     },
     "files": [

package/proto/auth/v1/auth.proto

@@ -0,0 +1,148 @@
+syntax = "proto3";
+
+package auth.v1;
+
+import "user/v1/user.proto";
+
+service AuthService {
+  rpc Register(RegisterRequest) returns (RegisterResponse);
+
+  rpc Login(LoginRequest) returns (LoginResponse);
+  rpc Logout(LogoutRequest) returns (LogoutResponse);
+  rpc ValidateSession(ValidateSessionRequest) returns (ValidateSessionResponse);
+
+  rpc ConfirmEmail(ConfirmEmailRequest) returns (ConfirmEmailResponse);
+  rpc ResendVerification(ResendVerificationRequest) returns (ResendVerificationResponse);
+
+  rpc RequestPasswordReset(RequestPasswordResetRequest) returns (RequestPasswordResetResponse);
+  rpc SetNewPassword(SetNewPasswordRequest) returns (SetNewPasswordResponse);
+
+  rpc OauthConnect(OauthConnectRequest) returns (OauthConnectResponse);
+  rpc OauthCallback(OauthCallbackRequest) returns (OauthCallbackResponse);
+
+  rpc AdminLogin(AdminLoginRequest) returns (AdminLoginResponse);
+  rpc AdminLogout(AdminLogoutRequest) returns (AdminLogoutResponse);
+  rpc AdminValidateSession(AdminValidateSessionRequest) returns (AdminValidateSessionResponse);
+}
+
+message LoginResponse {
+  user.v1.User user = 1;
+  string session_id = 2;
+  int64 max_age_ms = 3;
+}
+
+message ConfirmEmailResponse {
+  user.v1.User user = 1;
+  string session_id = 2;
+  int64 max_age_ms = 3;
+}
+
+message OauthCallbackResponse {
+  user.v1.User user = 1;
+  string session_id = 2;
+  int64 max_age_ms = 3;
+}
+
+message AdminLoginResponse {
+  user.v1.User user = 1;
+  string session_id = 2;
+  int64 max_age_ms = 3;
+}
+
+message ValidateSessionResponse {
+  bool valid = 1;
+  user.v1.User user = 2;
+}
+
+message AdminValidateSessionResponse {
+  bool valid = 1;
+  user.v1.User user = 2;
+}
+
+message ResendVerificationResponse {
+  string message = 1;
+}
+
+message RequestPasswordResetResponse {
+  string message = 1;
+}
+
+message SetNewPasswordResponse {
+  string message = 1;
+}
+
+message LogoutResponse {}
+
+message AdminLogoutResponse {}
+
+// --- Requests ---
+
+message RegisterRequest {
+  string name = 1;
+  string email = 2;
+  string password = 3;
+  string password_repeat = 4;
+}
+
+message RegisterResponse {
+  string message = 1;
+  string email = 2;
+}
+
+message LoginRequest {
+  string email = 1;
+  string password = 2;
+}
+
+message LogoutRequest {
+  string session_id = 1;
+}
+
+message ValidateSessionRequest {
+  string session_id = 1;
+}
+
+message ConfirmEmailRequest {
+  string email = 1;
+  string code = 2;
+}
+
+message ResendVerificationRequest {
+  string email = 1;
+}
+
+message RequestPasswordResetRequest {
+  string email = 1;
+}
+
+message SetNewPasswordRequest {
+  string email = 1;
+  string code = 2;
+  string password = 3;
+}
+
+message OauthConnectRequest {
+  string provider = 1;
+}
+
+message OauthConnectResponse {
+  string url = 1;
+}
+
+message OauthCallbackRequest {
+  string provider = 1;
+  string code = 2;
+}
+
+message AdminLoginRequest {
+  string email = 1;
+  string password = 2;
+}
+
+message AdminLogoutRequest {
+  string session_id = 1;
+}
+
+message AdminValidateSessionRequest {
+  string session_id = 1;
+}

package/proto/buf.yaml

@@ -3,8 +3,6 @@ version: v2
 lint:
   use:
     - STANDARD
-  except:
-    - PACKAGE_DIRECTORY_MATCH
 
 breaking:
   use:

package/proto/user/v1/user.proto

@@ -0,0 +1,27 @@
+syntax = "proto3";
+
+package user.v1;
+
+service UserService {
+  rpc GetUserById(GetUserByIdRequest) returns (GetUserByIdResponse);
+}
+
+message User {
+  string id = 1;
+  string email = 2;
+  string display_name = 3;
+  string picture = 4;
+  string role = 5;
+  string auth_provider = 6;
+  bool is_verified = 7;
+  string created_at = 8;
+  string updated_at = 9;
+}
+
+message GetUserByIdRequest {
+  string user_id = 1;
+}
+
+message GetUserByIdResponse {
+  User user = 1;
+}

package/generated/auth.ts

@@ -1,62 +0,0 @@
-// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
-// versions:
-//   protoc-gen-ts_proto  v2.11.6
-//   protoc               v3.21.12
-// source: auth.proto
-
-/* eslint-disable */
-import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
-import { Observable } from "rxjs";
-
-export const protobufPackage = "auth.v1";
-
-export interface SendOtpRequest {
-  identifier: string;
-  type: string;
-}
-
-export interface SendOtpResponse {
-  ok: boolean;
-}
-
-export interface VerifyOtpRequest {
-  identifier: string;
-  type: string;
-  code: string;
-}
-
-export interface VerifyOtpResponse {
-  accessToken: string;
-  refreshToken: string;
-}
-
-export const AUTH_V1_PACKAGE_NAME = "auth.v1";
-
-export interface AuthServiceClient {
-  sendOtp(request: SendOtpRequest): Observable<SendOtpResponse>;
-
-  verifyOtp(request: VerifyOtpRequest): Observable<VerifyOtpResponse>;
-}
-
-export interface AuthServiceController {
-  sendOtp(request: SendOtpRequest): Promise<SendOtpResponse> | Observable<SendOtpResponse> | SendOtpResponse;
-
-  verifyOtp(request: VerifyOtpRequest): Promise<VerifyOtpResponse> | Observable<VerifyOtpResponse> | VerifyOtpResponse;
-}
-
-export function AuthServiceControllerMethods() {
-  return function (constructor: Function) {
-    const grpcMethods: string[] = ["sendOtp", "verifyOtp"];
-    for (const method of grpcMethods) {
-      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
-      GrpcMethod("AuthService", method)(constructor.prototype[method], method, descriptor);
-    }
-    const grpcStreamMethods: string[] = [];
-    for (const method of grpcStreamMethods) {
-      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
-      GrpcStreamMethod("AuthService", method)(constructor.prototype[method], method, descriptor);
-    }
-  };
-}
-
-export const AUTH_SERVICE_NAME = "AuthService";

package/proto/auth.proto

@@ -1,28 +0,0 @@
-syntax = "proto3";
-
-package auth.v1;
-
-service AuthService {
-  rpc SendOtp(SendOtpRequest) returns (SendOtpResponse);
-  rpc VerifyOtp(VerifyOtpRequest) returns (VerifyOtpResponse);
-}
-
-message SendOtpRequest {
-  string identifier = 1;
-  string type = 2;
-}
-
-message SendOtpResponse {
-  bool ok = 1;
-}
-
-message VerifyOtpRequest {
-  string identifier = 1;
-  string type = 2;
-  string code = 3;
-}
-
-message VerifyOtpResponse {
-  string access_token = 1;
-  string refresh_token = 2;
-}