@barumetric/contracts 1.3.14 → 1.3.16

package/gen/ts/auth.ts

@@ -92,48 +92,18 @@ export interface TelegramConsumeResponse {
   sessionToken: string;
 }
 
-export interface SessionMetadata {
-  location: LocationInfo | undefined;
-  device: DeviceInfo | undefined;
-  ip: string;
-}
-
-export interface LocationInfo {
-  country: string;
-  city: string;
-  latidute: number;
-  longitude: number;
-}
-
-export interface DeviceInfo {
-  browser: string;
-  os: string;
-  type: string;
-}
-
 export interface VkInitResponse {
   url: string;
 }
 
 export interface VkVerifyRequest {
-  idToken: string;
-  accessToken: string;
+  code: string;
+  state: string;
+  deviceId: string;
   metadata: SessionMetadata | undefined;
 }
 
 export interface VkVerifyResponse {
-  sessionId?: string | undefined;
-  accessToken?: string | undefined;
-  refreshToken?: string | undefined;
-  sessionToken?: string | undefined;
-}
-
-export interface VkConsumeRequest {
-  sessionId: string;
-  metadata: SessionMetadata | undefined;
-}
-
-export interface VkConsumeResponse {
   accessToken: string;
   refreshToken: string;
   sessionToken: string;
@@ -154,6 +124,25 @@ export interface GoogleVerifyResponse {
   sessionToken: string;
 }
 
+export interface SessionMetadata {
+  location: LocationInfo | undefined;
+  device: DeviceInfo | undefined;
+  ip: string;
+}
+
+export interface LocationInfo {
+  country: string;
+  city: string;
+  latidute: number;
+  longitude: number;
+}
+
+export interface DeviceInfo {
+  browser: string;
+  os: string;
+  type: string;
+}
+
 export const AUTH_V1_PACKAGE_NAME = "auth.v1";
 
 export interface AuthServiceClient {
@@ -177,8 +166,6 @@ export interface AuthServiceClient {
 
   vkVerify(request: VkVerifyRequest): Observable<VkVerifyResponse>;
 
-  vkConsume(request: VkConsumeRequest): Observable<VkConsumeResponse>;
-
   googleInit(request: Empty): Observable<GoogleInitResponse>;
 
   googleVerify(request: GoogleVerifyRequest): Observable<GoogleVerifyResponse>;
@@ -211,8 +198,6 @@ export interface AuthServiceController {
 
   vkVerify(request: VkVerifyRequest): Promise<VkVerifyResponse> | Observable<VkVerifyResponse> | VkVerifyResponse;
 
-  vkConsume(request: VkConsumeRequest): Promise<VkConsumeResponse> | Observable<VkConsumeResponse> | VkConsumeResponse;
-
   googleInit(request: Empty): Promise<GoogleInitResponse> | Observable<GoogleInitResponse> | GoogleInitResponse;
 
   googleVerify(
@@ -233,7 +218,6 @@ export function AuthServiceControllerMethods() {
       "telegramConsume",
       "vkInit",
       "vkVerify",
-      "vkConsume",
       "googleInit",
       "googleVerify",
     ];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@barumetric/contracts",
-	"version": "1.3.14",
+	"version": "1.3.16",
 	"description": "Protobuf definitions and generated TypeScript types",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",

package/proto/auth.proto

@@ -17,7 +17,6 @@ service AuthService {
 
 	rpc VkInit (google.protobuf.Empty) returns (VkInitResponse);
 	rpc VkVerify (VkVerifyRequest) returns (VkVerifyResponse);
-	rpc VkConsume (VkConsumeRequest) returns (VkConsumeResponse);
 
 	rpc GoogleInit (google.protobuf.Empty) returns (GoogleInitResponse);
 	rpc GoogleVerify (GoogleVerifyRequest) returns (GoogleVerifyResponse);
@@ -102,50 +101,18 @@ message TelegramConsumeResponse {
 	string session_token = 3;
 }
 
-message SessionMetadata {
-	LocationInfo location = 1;
-	DeviceInfo device = 2;
-	string ip = 3;
-}
-
-message LocationInfo {
-	string country = 1;
-	string city = 2;
-	int32 latidute = 3;
-	int32 longitude = 4;
-}
-
-message DeviceInfo {
-	string browser = 1;
-	string os = 2;
-	string type = 3;
-}
-
 message VkInitResponse {
 	string url = 1;
 }
 
 message VkVerifyRequest {
-	string id_token = 1;
-	string access_token = 2;
-	SessionMetadata metadata = 3;
+	string code = 1;
+	string state = 2;
+	string device_id = 3;
+	SessionMetadata metadata = 4;
 }
 
 message VkVerifyResponse {
-	oneof result {
-		string session_id = 1;
-		string access_token = 2;
-		string refresh_token = 3;
-		string session_token = 4;
-	}
-}
-
-message VkConsumeRequest {
-	string session_id = 1;
-	SessionMetadata metadata = 2;
-}
-
-message VkConsumeResponse {
 	string access_token = 1;
 	string refresh_token = 2;
 	string session_token = 3;
@@ -165,3 +132,22 @@ message GoogleVerifyResponse {
 	string refresh_token = 2;
 	string session_token = 3;
 }
+
+message SessionMetadata {
+	LocationInfo location = 1;
+	DeviceInfo device = 2;
+	string ip = 3;
+}
+
+message LocationInfo {
+	string country = 1;
+	string city = 2;
+	int32 latidute = 3;
+	int32 longitude = 4;
+}
+
+message DeviceInfo {
+	string browser = 1;
+	string os = 2;
+	string type = 3;
+}