@citec-spbu/contracts 1.0.2 → 1.0.4

package/dist/proto/paths.d.ts

@@ -1,3 +1,4 @@
 export declare const PROTO_PATHS: {
     readonly AUTH: string;
+    readonly ACCOUNT: string;
 };

package/dist/proto/paths.js

@@ -4,4 +4,5 @@ exports.PROTO_PATHS = void 0;
 const node_path_1 = require("node:path");
 exports.PROTO_PATHS = {
     AUTH: (0, node_path_1.join)(__dirname, "../../proto/auth.proto"),
+    ACCOUNT: (0, node_path_1.join)(__dirname, "../../proto/account.proto"),
 };

package/gen/ts/account.ts

@@ -0,0 +1,57 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.10.1
+//   protoc               v3.21.12
+// source: account.proto
+
+/* eslint-disable */
+import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { Observable } from "rxjs";
+
+export const protobufPackage = "account.v1";
+
+export enum Role {
+  ROLE_UNSPECIFIED = 0,
+  ROLE_USER = 1,
+  ROLE_SUPERVISOR = 2,
+  ROLE_ADMIN = 3,
+  UNRECOGNIZED = -1,
+}
+
+export interface GetAccountRequest {
+  id: string;
+}
+
+export interface GetAccountResponse {
+  id: string;
+  role: Role;
+}
+
+export const ACCOUNT_V1_PACKAGE_NAME = "account.v1";
+
+export interface AccountServiceClient {
+  getAccount(request: GetAccountRequest): Observable<GetAccountResponse>;
+}
+
+export interface AccountServiceController {
+  getAccount(
+    request: GetAccountRequest,
+  ): Promise<GetAccountResponse> | Observable<GetAccountResponse> | GetAccountResponse;
+}
+
+export function AccountServiceControllerMethods() {
+  return function (constructor: Function) {
+    const grpcMethods: string[] = ["getAccount"];
+    for (const method of grpcMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcMethod("AccountService", method)(constructor.prototype[method], method, descriptor);
+    }
+    const grpcStreamMethods: string[] = [];
+    for (const method of grpcStreamMethods) {
+      const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+      GrpcStreamMethod("AccountService", method)(constructor.prototype[method], method, descriptor);
+    }
+  };
+}
+
+export const ACCOUNT_SERVICE_NAME = "AccountService";

package/gen/ts/auth.ts

@@ -10,64 +10,62 @@ import { Observable } from "rxjs";
 
 export const protobufPackage = "auth.v1";
 
-export interface GithubInitRequest {
-  state: string;
+export interface GenerateJwtRequest {
+  provider: string;
+  providerId: string;
 }
 
-export interface GithubInitResponse {
-  redirectUrl: string;
+export interface GenerateJwtResponse {
+  tokens: TokenPair | undefined;
 }
 
-export interface GithubCallbackRequest {
-  code: string;
-  state: string;
+export interface ValidateJwtRequest {
+  accessToken: string;
 }
 
-export interface GithubCallbackResponse {
-  tokens: TokenPair | undefined;
+export interface ValidateJwtResponse {
+  valid: boolean;
+  accountId: string;
 }
 
-export interface RefreshTokenRequest {
+export interface RefreshRequest {
   refreshToken: string;
 }
 
-export interface RefreshTokenResponse {
+export interface RefreshResponse {
   tokens: TokenPair | undefined;
 }
 
 export interface TokenPair {
   accessToken: string;
   refreshToken: string;
-  expiresIn: number;
 }
 
 export const AUTH_V1_PACKAGE_NAME = "auth.v1";
 
 export interface AuthServiceClient {
-  githubInit(request: GithubInitRequest): Observable<GithubInitResponse>;
+  generateJwt(request: GenerateJwtRequest): Observable<GenerateJwtResponse>;
 
-  githubCallback(request: GithubCallbackRequest): Observable<GithubCallbackResponse>;
+  validateJwt(request: ValidateJwtRequest): Observable<ValidateJwtResponse>;
 
-  refresh(request: RefreshTokenRequest): Observable<RefreshTokenResponse>;
+  refresh(request: RefreshRequest): Observable<RefreshResponse>;
 }
 
 export interface AuthServiceController {
-  githubInit(
-    request: GithubInitRequest,
-  ): Promise<GithubInitResponse> | Observable<GithubInitResponse> | GithubInitResponse;
+  generateJwt(
+    request: GenerateJwtRequest,
+  ): Promise<GenerateJwtResponse> | Observable<GenerateJwtResponse> | GenerateJwtResponse;
 
-  githubCallback(
-    request: GithubCallbackRequest,
-  ): Promise<GithubCallbackResponse> | Observable<GithubCallbackResponse> | GithubCallbackResponse;
+  validateJwt(
+    request: ValidateJwtRequest,
+  ): Promise<ValidateJwtResponse> | Observable<ValidateJwtResponse> | ValidateJwtResponse;
 
-  refresh(
-    request: RefreshTokenRequest,
-  ): Promise<RefreshTokenResponse> | Observable<RefreshTokenResponse> | RefreshTokenResponse;
+  refresh(request: RefreshRequest): Promise<RefreshResponse> | Observable<RefreshResponse> | RefreshResponse;
 }
 
 export function AuthServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = ["githubInit", "githubCallback", "refresh"];
+    const grpcMethods: string[] = ["generateJwt", "validateJwt", "refresh"];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("AuthService", method)(constructor.prototype[method], method, descriptor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@citec-spbu/contracts",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Protobuf definitions and generated TypeScript types",
   "main": "./dist/index.js",
   "types": "./dist/index.d.js",

package/proto/account.proto

@@ -0,0 +1,23 @@
+syntax = "proto3";
+
+package account.v1;
+
+service AccountService {
+  rpc GetAccount(GetAccountRequest) returns (GetAccountResponse);
+}
+
+message GetAccountRequest {
+  string id = 1;
+}
+
+message GetAccountResponse {
+  string id = 1;
+  Role role = 2;
+}
+
+enum Role {
+  ROLE_UNSPECIFIED = 0;
+  ROLE_USER = 1;
+  ROLE_SUPERVISOR = 2;
+  ROLE_ADMIN = 3;
+}

package/proto/auth.proto

@@ -3,40 +3,40 @@ syntax = "proto3";
 package auth.v1;
 
 service AuthService {
-  rpc GithubInit(GithubInitRequest) returns (GithubInitResponse) {}
+  rpc GenerateJwt(GenerateJwtRequest) returns (GenerateJwtResponse);
 
-  rpc GithubCallback(GithubCallbackRequest) returns (GithubCallbackResponse) {}
+  rpc ValidateJwt(ValidateJwtRequest) returns (ValidateJwtResponse);
 
-  rpc Refresh(RefreshTokenRequest) returns (RefreshTokenResponse) {}
+  rpc Refresh(RefreshRequest) returns (RefreshResponse);
 }
 
-message GithubInitRequest {
-  string state = 1;
+message GenerateJwtRequest {
+  string provider = 1;
+  string provider_id = 2;
 }
 
-message GithubInitResponse {
-  string redirect_url = 1;
+message GenerateJwtResponse {
+  TokenPair tokens = 1;
 }
 
-message GithubCallbackRequest {
-  string code = 1;
-  string state = 2;
+message ValidateJwtRequest {
+  string access_token = 1;
 }
 
-message GithubCallbackResponse {
-  TokenPair tokens = 1;
+message ValidateJwtResponse {
+  bool valid = 1;
+  string account_id = 2;
 }
 
-message RefreshTokenRequest {
+message RefreshRequest {
   string refresh_token = 1;
 }
 
-message RefreshTokenResponse {
+message RefreshResponse {
   TokenPair tokens = 1;
 }
 
 message TokenPair {
   string access_token = 1;
   string refresh_token = 2;
-  int64 expires_in = 3;
 }