@mediaryorg/contracts 1.0.7 → 1.0.10

package/dist/proto/paths.d.ts

@@ -1,6 +1,7 @@
 export declare const PROTO_PATH: {
     readonly AUTH: string;
     readonly USER: string;
+    readonly PROFILE: string;
 };
 /**
  * Root directories for protobuf imports.

package/dist/proto/paths.js

@@ -6,6 +6,7 @@ const PROTO_DIR = (0, path_1.join)(__dirname, "../../proto");
 exports.PROTO_PATH = {
     AUTH: (0, path_1.join)(PROTO_DIR, "auth/v1/auth.proto"),
     USER: (0, path_1.join)(PROTO_DIR, "user/v1/user.proto"),
+    PROFILE: (0, path_1.join)(PROTO_DIR, "profile/v1/profile.proto"),
 };
 /**
  * Root directories for protobuf imports.

package/generated/auth/v1/auth.ts

@@ -7,60 +7,15 @@
 /* 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 {
+/** Identity-only view of a user emitted by auth-service. */
+export interface AuthUser {
+  id: string;
+  email: string;
+  role: string;
+  isVerified: boolean;
 }
 
 export interface RegisterRequest {
@@ -80,33 +35,65 @@ export interface LoginRequest {
   password: string;
 }
 
+export interface LoginResponse {
+  user: AuthUser | undefined;
+  sessionId: string;
+  maxAgeMs: number;
+}
+
 export interface LogoutRequest {
   sessionId: string;
 }
 
+export interface LogoutResponse {
+}
+
 export interface ValidateSessionRequest {
   sessionId: string;
 }
 
+export interface ValidateSessionResponse {
+  valid: boolean;
+  user: AuthUser | undefined;
+}
+
 export interface ConfirmEmailRequest {
   email: string;
   code: string;
 }
 
+export interface ConfirmEmailResponse {
+  user: AuthUser | undefined;
+  sessionId: string;
+  maxAgeMs: number;
+}
+
 export interface ResendVerificationRequest {
   email: string;
 }
 
+export interface ResendVerificationResponse {
+  message: string;
+}
+
 export interface RequestPasswordResetRequest {
   email: string;
 }
 
+export interface RequestPasswordResetResponse {
+  message: string;
+}
+
 export interface SetNewPasswordRequest {
   email: string;
   code: string;
   password: string;
 }
 
+export interface SetNewPasswordResponse {
+  message: string;
+}
+
 export interface OauthConnectRequest {
   provider: string;
 }
@@ -118,6 +105,13 @@ export interface OauthConnectResponse {
 export interface OauthCallbackRequest {
   provider: string;
   code: string;
+  state: string;
+}
+
+export interface OauthCallbackResponse {
+  user: AuthUser | undefined;
+  sessionId: string;
+  maxAgeMs: number;
 }
 
 export interface AdminLoginRequest {
@@ -125,14 +119,28 @@ export interface AdminLoginRequest {
   password: string;
 }
 
+export interface AdminLoginResponse {
+  user: AuthUser | undefined;
+  sessionId: string;
+  maxAgeMs: number;
+}
+
 export interface AdminLogoutRequest {
   sessionId: string;
 }
 
+export interface AdminLogoutResponse {
+}
+
 export interface AdminValidateSessionRequest {
   sessionId: string;
 }
 
+export interface AdminValidateSessionResponse {
+  valid: boolean;
+  user: AuthUser | undefined;
+}
+
 export const AUTH_V1_PACKAGE_NAME = "auth.v1";
 
 export interface AuthServiceClient {

package/generated/profile/v1/profile.ts

@@ -0,0 +1,73 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.6
+//   protoc               v3.21.12
+// source: profile/v1/profile.proto
+
+/* eslint-disable */
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
+
+export const protobufPackage = "profile.v1";
+
+export interface Profile {
+  id: string;
+  userId: string;
+  displayName: string;
+  picture: string;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface GetProfileByUserIdRequest {
+  userId: string;
+}
+
+export interface GetProfileByUserIdResponse {
+  profile: Profile | undefined;
+}
+
+export interface UpdateProfileRequest {
+  userId: string;
+  displayName?: string | undefined;
+  picture?: string | undefined;
+}
+
+export interface UpdateProfileResponse {
+  profile: Profile | undefined;
+}
+
+export const PROFILE_V1_PACKAGE_NAME = "profile.v1";
+
+export interface ProfileServiceClient {
+  getProfileByUserId(request: GetProfileByUserIdRequest): Observable<GetProfileByUserIdResponse>;
+
+  updateProfile(request: UpdateProfileRequest): Observable<UpdateProfileResponse>;
+}
+
+export interface ProfileServiceController {
+  getProfileByUserId(
+    request: GetProfileByUserIdRequest,
+  ): Promise<GetProfileByUserIdResponse> | Observable<GetProfileByUserIdResponse> | GetProfileByUserIdResponse;
+
+  updateProfile(
+    request: UpdateProfileRequest,
+  ): Promise<UpdateProfileResponse> | Observable<UpdateProfileResponse> | UpdateProfileResponse;
+}
+
+export function ProfileServiceControllerMethods() {
+  return function (constructor: Function) {
+    const grpcMethods: string[] = ["getProfileByUserId", "updateProfile"];
+    for (const method of grpcMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("ProfileService", method)(constructor.prototype[method], method, descriptor);
+    }
+    const grpcStreamMethods: string[] = [];
+    for (const method of grpcStreamMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("ProfileService", method)(constructor.prototype[method], method, descriptor);
+    }
+  };
+}
+
+export const PROFILE_SERVICE_NAME = "ProfileService";

package/generated/user/v1/user.ts

@@ -16,12 +16,22 @@ export interface User {
   displayName: string;
   picture: string;
   role: string;
-  authProvider: string;
   isVerified: boolean;
   createdAt: string;
   updatedAt: string;
 }
 
+export interface CreateUserRequest {
+  email: string;
+  displayName: string;
+  picture: string;
+  isVerified: boolean;
+}
+
+export interface CreateUserResponse {
+  user: User | undefined;
+}
+
 export interface GetUserByIdRequest {
   userId: string;
 }
@@ -30,21 +40,112 @@ export interface GetUserByIdResponse {
   user: User | undefined;
 }
 
+export interface GetUserByEmailRequest {
+  email: string;
+}
+
+export interface GetUserByEmailResponse {
+  user: User | undefined;
+}
+
+export interface UpdateUserRequest {
+  userId: string;
+  email?: string | undefined;
+  displayName?: string | undefined;
+  picture?: string | undefined;
+  role?: string | undefined;
+}
+
+export interface UpdateUserResponse {
+  user: User | undefined;
+}
+
+export interface MarkUserVerifiedRequest {
+  userId: string;
+}
+
+export interface MarkUserVerifiedResponse {
+  user: User | undefined;
+}
+
+export interface DeleteUserRequest {
+  userId: string;
+}
+
+export interface DeleteUserResponse {
+}
+
+export interface UpsertUserFromOAuthRequest {
+  email: string;
+  displayName: string;
+  picture: string;
+  isVerified: boolean;
+}
+
+export interface UpsertUserFromOAuthResponse {
+  user: User | undefined;
+  created: boolean;
+}
+
 export const USER_V1_PACKAGE_NAME = "user.v1";
 
 export interface UserServiceClient {
+  createUser(request: CreateUserRequest): Observable<CreateUserResponse>;
+
   getUserById(request: GetUserByIdRequest): Observable<GetUserByIdResponse>;
+
+  getUserByEmail(request: GetUserByEmailRequest): Observable<GetUserByEmailResponse>;
+
+  updateUser(request: UpdateUserRequest): Observable<UpdateUserResponse>;
+
+  markUserVerified(request: MarkUserVerifiedRequest): Observable<MarkUserVerifiedResponse>;
+
+  deleteUser(request: DeleteUserRequest): Observable<DeleteUserResponse>;
+
+  upsertUserFromOAuth(request: UpsertUserFromOAuthRequest): Observable<UpsertUserFromOAuthResponse>;
 }
 
 export interface UserServiceController {
+  createUser(
+    request: CreateUserRequest,
+  ): Promise<CreateUserResponse> | Observable<CreateUserResponse> | CreateUserResponse;
+
   getUserById(
     request: GetUserByIdRequest,
   ): Promise<GetUserByIdResponse> | Observable<GetUserByIdResponse> | GetUserByIdResponse;
+
+  getUserByEmail(
+    request: GetUserByEmailRequest,
+  ): Promise<GetUserByEmailResponse> | Observable<GetUserByEmailResponse> | GetUserByEmailResponse;
+
+  updateUser(
+    request: UpdateUserRequest,
+  ): Promise<UpdateUserResponse> | Observable<UpdateUserResponse> | UpdateUserResponse;
+
+  markUserVerified(
+    request: MarkUserVerifiedRequest,
+  ): Promise<MarkUserVerifiedResponse> | Observable<MarkUserVerifiedResponse> | MarkUserVerifiedResponse;
+
+  deleteUser(
+    request: DeleteUserRequest,
+  ): Promise<DeleteUserResponse> | Observable<DeleteUserResponse> | DeleteUserResponse;
+
+  upsertUserFromOAuth(
+    request: UpsertUserFromOAuthRequest,
+  ): Promise<UpsertUserFromOAuthResponse> | Observable<UpsertUserFromOAuthResponse> | UpsertUserFromOAuthResponse;
 }
 
 export function UserServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = ["getUserById"];
+    const grpcMethods: string[] = [
+      "createUser",
+      "getUserById",
+      "getUserByEmail",
+      "updateUser",
+      "markUserVerified",
+      "deleteUser",
+      "upsertUserFromOAuth",
+    ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("UserService", method)(constructor.prototype[method], method, descriptor);

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@mediaryorg/contracts",
-    "version": "1.0.7",
+    "version": "1.0.10",
     "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\\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",
+        "generate:win": "protoc -I .\\proto .\\proto\\auth\\v1\\auth.proto .\\proto\\user\\v1\\user.proto .\\proto\\profile\\v1\\profile.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 ./proto/profile/v1/profile.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

@@ -2,8 +2,6 @@ syntax = "proto3";
 
 package auth.v1;
 
-import "user/v1/user.proto";
-
 service AuthService {
   rpc Register(RegisterRequest) returns (RegisterResponse);
 
@@ -25,58 +23,14 @@ service AuthService {
   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;
+// Identity-only view of a user emitted by auth-service.
+message AuthUser {
+  string id = 1;
+  string email = 2;
+  string role = 3;
+  bool is_verified = 4;
 }
 
-message LogoutResponse {}
-
-message AdminLogoutResponse {}
-
-// --- Requests ---
-
 message RegisterRequest {
   string name = 1;
   string email = 2;
@@ -94,33 +48,64 @@ message LoginRequest {
   string password = 2;
 }
 
+message LoginResponse {
+  AuthUser user = 1;
+  string session_id = 2;
+  int64 max_age_ms = 3;
+}
+
 message LogoutRequest {
   string session_id = 1;
 }
 
+message LogoutResponse {}
+
 message ValidateSessionRequest {
   string session_id = 1;
 }
 
+message ValidateSessionResponse {
+  bool valid = 1;
+  AuthUser user = 2;
+}
+
 message ConfirmEmailRequest {
   string email = 1;
   string code = 2;
 }
 
+message ConfirmEmailResponse {
+  AuthUser user = 1;
+  string session_id = 2;
+  int64 max_age_ms = 3;
+}
+
 message ResendVerificationRequest {
   string email = 1;
 }
 
+message ResendVerificationResponse {
+  string message = 1;
+}
+
 message RequestPasswordResetRequest {
   string email = 1;
 }
 
+message RequestPasswordResetResponse {
+  string message = 1;
+}
+
 message SetNewPasswordRequest {
   string email = 1;
   string code = 2;
   string password = 3;
 }
 
+message SetNewPasswordResponse {
+  string message = 1;
+}
+
 message OauthConnectRequest {
   string provider = 1;
 }
@@ -132,6 +117,13 @@ message OauthConnectResponse {
 message OauthCallbackRequest {
   string provider = 1;
   string code = 2;
+  string state = 3;
+}
+
+message OauthCallbackResponse {
+  AuthUser user = 1;
+  string session_id = 2;
+  int64 max_age_ms = 3;
 }
 
 message AdminLoginRequest {
@@ -139,10 +131,23 @@ message AdminLoginRequest {
   string password = 2;
 }
 
+message AdminLoginResponse {
+  AuthUser user = 1;
+  string session_id = 2;
+  int64 max_age_ms = 3;
+}
+
 message AdminLogoutRequest {
   string session_id = 1;
 }
 
+message AdminLogoutResponse {}
+
 message AdminValidateSessionRequest {
   string session_id = 1;
 }
+
+message AdminValidateSessionResponse {
+  bool valid = 1;
+  AuthUser user = 2;
+}

package/proto/profile/v1/profile.proto

@@ -0,0 +1,35 @@
+syntax = "proto3";
+
+package profile.v1;
+
+service ProfileService {
+  rpc GetProfileByUserId(GetProfileByUserIdRequest) returns (GetProfileByUserIdResponse);
+  rpc UpdateProfile(UpdateProfileRequest) returns (UpdateProfileResponse);
+}
+
+message Profile {
+  string id = 1;
+  string user_id = 2;
+  string display_name = 3;
+  string picture = 4;
+  string created_at = 5;
+  string updated_at = 6;
+}
+
+message GetProfileByUserIdRequest {
+  string user_id = 1;
+}
+
+message GetProfileByUserIdResponse {
+  Profile profile = 1;
+}
+
+message UpdateProfileRequest {
+  string user_id = 1;
+  optional string display_name = 2;
+  optional string picture = 3;
+}
+
+message UpdateProfileResponse {
+  Profile profile = 1;
+}

package/proto/user/v1/user.proto

@@ -3,7 +3,13 @@ syntax = "proto3";
 package user.v1;
 
 service UserService {
+  rpc CreateUser(CreateUserRequest) returns (CreateUserResponse);
   rpc GetUserById(GetUserByIdRequest) returns (GetUserByIdResponse);
+  rpc GetUserByEmail(GetUserByEmailRequest) returns (GetUserByEmailResponse);
+  rpc UpdateUser(UpdateUserRequest) returns (UpdateUserResponse);
+  rpc MarkUserVerified(MarkUserVerifiedRequest) returns (MarkUserVerifiedResponse);
+  rpc DeleteUser(DeleteUserRequest) returns (DeleteUserResponse);
+  rpc UpsertUserFromOAuth(UpsertUserFromOAuthRequest) returns (UpsertUserFromOAuthResponse);
 }
 
 message User {
@@ -12,10 +18,20 @@ message User {
   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;
+  bool is_verified = 6;
+  string created_at = 7;
+  string updated_at = 8;
+}
+
+message CreateUserRequest {
+  string email = 1;
+  string display_name = 2;
+  string picture = 3;
+  bool is_verified = 4;
+}
+
+message CreateUserResponse {
+  User user = 1;
 }
 
 message GetUserByIdRequest {
@@ -25,3 +41,49 @@ message GetUserByIdRequest {
 message GetUserByIdResponse {
   User user = 1;
 }
+
+message GetUserByEmailRequest {
+  string email = 1;
+}
+
+message GetUserByEmailResponse {
+  User user = 1;
+}
+
+message UpdateUserRequest {
+  string user_id = 1;
+  optional string email = 2;
+  optional string display_name = 3;
+  optional string picture = 4;
+  optional string role = 5;
+}
+
+message UpdateUserResponse {
+  User user = 1;
+}
+
+message MarkUserVerifiedRequest {
+  string user_id = 1;
+}
+
+message MarkUserVerifiedResponse {
+  User user = 1;
+}
+
+message DeleteUserRequest {
+  string user_id = 1;
+}
+
+message DeleteUserResponse {}
+
+message UpsertUserFromOAuthRequest {
+  string email = 1;
+  string display_name = 2;
+  string picture = 3;
+  bool is_verified = 4;
+}
+
+message UpsertUserFromOAuthResponse {
+  User user = 1;
+  bool created = 2;
+}