jr-common-micro 1.1.10 → 1.1.12

package/dist/proto/micro/v1/education/services_connect.d.ts

@@ -394,14 +394,8 @@ export declare const PUserVipService: {
             readonly O: typeof UserVipFormResponse;
             readonly kind: MethodKind.Unary;
         };
-        readonly setUserVipForm: {
-            readonly name: "setUserVipForm";
-            readonly I: typeof UserVipFormRequest;
-            readonly O: typeof UserVipFormResponse;
-            readonly kind: MethodKind.Unary;
-        };
-        readonly updateUserVipForm: {
-            readonly name: "updateUserVipForm";
+        readonly upsertUserVipForm: {
+            readonly name: "upsertUserVipForm";
             readonly I: typeof UserVipFormRequest;
             readonly O: typeof UserVipFormResponse;
             readonly kind: MethodKind.Unary;

package/dist/proto/micro/v1/education/services_connect.js

@@ -397,14 +397,8 @@ exports.PUserVipService = {
             O: education_messages_pb_js_1.UserVipFormResponse,
             kind: protobuf_1.MethodKind.Unary,
         },
-        setUserVipForm: {
-            name: "setUserVipForm",
-            I: education_messages_pb_js_1.UserVipFormRequest,
-            O: education_messages_pb_js_1.UserVipFormResponse,
-            kind: protobuf_1.MethodKind.Unary,
-        },
-        updateUserVipForm: {
-            name: "updateUserVipForm",
+        upsertUserVipForm: {
+            name: "upsertUserVipForm",
             I: education_messages_pb_js_1.UserVipFormRequest,
             O: education_messages_pb_js_1.UserVipFormResponse,
             kind: protobuf_1.MethodKind.Unary,

package/dist/proto/micro/v1/education/services_nest.d.ts

@@ -186,14 +186,12 @@ export declare function PMediaEducationServiceControllerMethods(): (constructor:
 export declare const P_MEDIA_EDUCATION_SERVICE_NAME = "PMediaEducationService";
 export interface PUserVipServiceClient {
     getUserVipForm(request: EmptyRequest, metadata?: Metadata): Observable<UserVipFormResponse>;
-    setUserVipForm(request: UserVipFormRequest, metadata?: Metadata): Observable<UserVipFormResponse>;
-    updateUserVipForm(request: UserVipFormRequest, metadata?: Metadata): Observable<UserVipFormResponse>;
+    upsertUserVipForm(request: UserVipFormRequest, metadata?: Metadata): Observable<UserVipFormResponse>;
     getPageStatus(request: EmptyRequest, metadata?: Metadata): Observable<VipPageStatusResponse>;
 }
 export interface PUserVipServiceController {
     getUserVipForm(request: EmptyRequest, metadata?: Metadata): Promise<UserVipFormResponse> | Observable<UserVipFormResponse> | UserVipFormResponse;
-    setUserVipForm(request: UserVipFormRequest, metadata?: Metadata): Promise<UserVipFormResponse> | Observable<UserVipFormResponse> | UserVipFormResponse;
-    updateUserVipForm(request: UserVipFormRequest, metadata?: Metadata): Promise<UserVipFormResponse> | Observable<UserVipFormResponse> | UserVipFormResponse;
+    upsertUserVipForm(request: UserVipFormRequest, metadata?: Metadata): Promise<UserVipFormResponse> | Observable<UserVipFormResponse> | UserVipFormResponse;
     getPageStatus(request: EmptyRequest, metadata?: Metadata): Promise<VipPageStatusResponse> | Observable<VipPageStatusResponse> | VipPageStatusResponse;
 }
 export declare function PUserVipServiceControllerMethods(): (constructor: Function) => void;

package/dist/proto/micro/v1/education/services_nest.js

@@ -199,7 +199,7 @@ function PMediaEducationServiceControllerMethods() {
 exports.P_MEDIA_EDUCATION_SERVICE_NAME = "PMediaEducationService";
 function PUserVipServiceControllerMethods() {
     return function (constructor) {
-        const grpcMethods = ["getUserVipForm", "setUserVipForm", "updateUserVipForm", "getPageStatus"];
+        const grpcMethods = ["getUserVipForm", "upsertUserVipForm", "getPageStatus"];
         for (const method of grpcMethods) {
             const descriptor = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
             (0, microservices_1.GrpcMethod)("PUserVipService", method)(constructor.prototype[method], method, descriptor);

package/dist/proto/micro/v1/user/auth_messages_nest.d.ts

@@ -12,6 +12,10 @@ export interface LoginRequest {
 export interface GoogleRequest {
     email: string;
 }
+export interface AppleRequest {
+    identity_token: string;
+    email?: string | undefined;
+}
 export interface LoginResponse {
     status: ResponseStatus | undefined;
     data: AccessTokenDto | undefined;

package/dist/proto/micro/v1/user/auth_messages_pb.d.ts

@@ -37,6 +37,18 @@ export declare class GoogleRequest extends Message<GoogleRequest> {
     static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): GoogleRequest;
     static equals(a: GoogleRequest | PlainMessage<GoogleRequest> | undefined, b: GoogleRequest | PlainMessage<GoogleRequest> | undefined): boolean;
 }
+export declare class AppleRequest extends Message<AppleRequest> {
+    identityToken: string;
+    email?: string;
+    constructor(data?: PartialMessage<AppleRequest>);
+    static readonly runtime: typeof proto3;
+    static readonly typeName = "micro.v1.user.AppleRequest";
+    static readonly fields: FieldList;
+    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): AppleRequest;
+    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): AppleRequest;
+    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): AppleRequest;
+    static equals(a: AppleRequest | PlainMessage<AppleRequest> | undefined, b: AppleRequest | PlainMessage<AppleRequest> | undefined): boolean;
+}
 export declare class LoginResponse extends Message<LoginResponse> {
     status?: ResponseStatus;
     data?: AccessTokenDto;

package/dist/proto/micro/v1/user/auth_messages_pb.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResendVerificationEmailResponse = exports.ResendVerificationEmailRequest = exports.RemoveUserDataRequest = exports.ValidationDto = exports.VerifyTokenResponse = exports.VerifyTokenRequest = exports.UserVerificationResponse = exports.UserVerificationRequest = exports.LostPasswordChangePasswordResponse = exports.LostPasswordChangePasswordRequest = exports.LostPasswordHashCheckResponse = exports.LostPasswordHashCheckRequest = exports.LostPasswordStartResponse = exports.LostPasswordStartRequest = exports.TfaResponse = exports.TfaRequest = exports.RegisterResponse = exports.RegisterRequest = exports.LoginResponse = exports.GoogleRequest = exports.LoginRequest = exports.AccessTokenDto = void 0;
+exports.ResendVerificationEmailResponse = exports.ResendVerificationEmailRequest = exports.RemoveUserDataRequest = exports.ValidationDto = exports.VerifyTokenResponse = exports.VerifyTokenRequest = exports.UserVerificationResponse = exports.UserVerificationRequest = exports.LostPasswordChangePasswordResponse = exports.LostPasswordChangePasswordRequest = exports.LostPasswordHashCheckResponse = exports.LostPasswordHashCheckRequest = exports.LostPasswordStartResponse = exports.LostPasswordStartRequest = exports.TfaResponse = exports.TfaRequest = exports.RegisterResponse = exports.RegisterRequest = exports.LoginResponse = exports.AppleRequest = exports.GoogleRequest = exports.LoginRequest = exports.AccessTokenDto = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
 const user_messages_pb_js_1 = require("./user_messages_pb.js");
 const general_pb_js_1 = require("../general_pb.js");
@@ -83,6 +83,33 @@ class GoogleRequest extends protobuf_1.Message {
     }
 }
 exports.GoogleRequest = GoogleRequest;
+class AppleRequest extends protobuf_1.Message {
+    identityToken = "";
+    email;
+    constructor(data) {
+        super();
+        protobuf_1.proto3.util.initPartial(data, this);
+    }
+    static runtime = protobuf_1.proto3;
+    static typeName = "micro.v1.user.AppleRequest";
+    static fields = protobuf_1.proto3.util.newFieldList(() => [
+        { no: 1, name: "identity_token", kind: "scalar", T: 9 },
+        { no: 2, name: "email", kind: "scalar", T: 9, opt: true },
+    ]);
+    static fromBinary(bytes, options) {
+        return new AppleRequest().fromBinary(bytes, options);
+    }
+    static fromJson(jsonValue, options) {
+        return new AppleRequest().fromJson(jsonValue, options);
+    }
+    static fromJsonString(jsonString, options) {
+        return new AppleRequest().fromJsonString(jsonString, options);
+    }
+    static equals(a, b) {
+        return protobuf_1.proto3.util.equals(AppleRequest, a, b);
+    }
+}
+exports.AppleRequest = AppleRequest;
 class LoginResponse extends protobuf_1.Message {
     status;
     data;

package/dist/proto/micro/v1/user/services_connect.d.ts

@@ -1,4 +1,4 @@
-import { GoogleRequest, LoginRequest, LoginResponse, LostPasswordChangePasswordRequest, LostPasswordChangePasswordResponse, LostPasswordHashCheckRequest, LostPasswordHashCheckResponse, LostPasswordStartRequest, LostPasswordStartResponse, RegisterRequest, RegisterResponse, RemoveUserDataRequest, ResendVerificationEmailRequest, ResendVerificationEmailResponse, TfaRequest, TfaResponse, UserVerificationRequest, UserVerificationResponse, VerifyTokenRequest, VerifyTokenResponse } from "./auth_messages_pb.js";
+import { AppleRequest, GoogleRequest, LoginRequest, LoginResponse, LostPasswordChangePasswordRequest, LostPasswordChangePasswordResponse, LostPasswordHashCheckRequest, LostPasswordHashCheckResponse, LostPasswordStartRequest, LostPasswordStartResponse, RegisterRequest, RegisterResponse, RemoveUserDataRequest, ResendVerificationEmailRequest, ResendVerificationEmailResponse, TfaRequest, TfaResponse, UserVerificationRequest, UserVerificationResponse, VerifyTokenRequest, VerifyTokenResponse } from "./auth_messages_pb.js";
 import { MethodKind } from "@bufbuild/protobuf";
 import { ByIdRequest, EmptyRequest, EmptyResponse, PaginateFromRequest, PaginateRequest } from "../general_pb.js";
 import { BetaCodePaginateResponse, BetaCodeSingleResponse, BetaCodeStoreRequest, BetaCodeUpdateRequest, ContactPaginationResponse, ContactRequest, ContactResponse, PreviewResponse, PublicUserPreviewResponse, UpdatePasswordRequest, UserAdminStoreRequest, UserPaginationResponse, UserSingleResponse, UserUpdateRequest } from "./user_messages_pb.js";
@@ -167,6 +167,17 @@ export declare const PUserGoogleService: {
         };
     };
 };
+export declare const PUserAppleService: {
+    readonly typeName: "micro.v1.user.PUserAppleService";
+    readonly methods: {
+        readonly apple: {
+            readonly name: "Apple";
+            readonly I: typeof AppleRequest;
+            readonly O: typeof LoginResponse;
+            readonly kind: MethodKind.ServerStreaming;
+        };
+    };
+};
 export declare const PUserExistService: {
     readonly typeName: "micro.v1.user.PUserExistService";
     readonly methods: {

package/dist/proto/micro/v1/user/services_connect.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PBetaCodeAdminService = exports.PRoleAdminService = exports.PUserAdminService = exports.PUserExistService = exports.PUserGoogleService = exports.PSiteSettingsService = exports.PRoleService = exports.PUserService = exports.PAuthService = void 0;
+exports.PBetaCodeAdminService = exports.PRoleAdminService = exports.PUserAdminService = exports.PUserExistService = exports.PUserAppleService = exports.PUserGoogleService = exports.PSiteSettingsService = exports.PRoleService = exports.PUserService = exports.PAuthService = void 0;
 const auth_messages_pb_js_1 = require("./auth_messages_pb.js");
 const protobuf_1 = require("@bufbuild/protobuf");
 const general_pb_js_1 = require("../general_pb.js");
@@ -170,6 +170,17 @@ exports.PUserGoogleService = {
         },
     }
 };
+exports.PUserAppleService = {
+    typeName: "micro.v1.user.PUserAppleService",
+    methods: {
+        apple: {
+            name: "Apple",
+            I: auth_messages_pb_js_1.AppleRequest,
+            O: auth_messages_pb_js_1.LoginResponse,
+            kind: protobuf_1.MethodKind.ServerStreaming,
+        },
+    }
+};
 exports.PUserExistService = {
     typeName: "micro.v1.user.PUserExistService",
     methods: {

package/dist/proto/micro/v1/user/services_nest.d.ts

@@ -1,7 +1,7 @@
 import type { Metadata } from "@grpc/grpc-js";
 import { Observable } from "rxjs";
 import { ByIdRequest, EmptyRequest, EmptyResponse, PaginateFromRequest, PaginateRequest } from "../general_nest";
-import { GoogleRequest, LoginRequest, LoginResponse, LostPasswordChangePasswordRequest, LostPasswordChangePasswordResponse, LostPasswordHashCheckRequest, LostPasswordHashCheckResponse, LostPasswordStartRequest, LostPasswordStartResponse, RegisterRequest, RegisterResponse, RemoveUserDataRequest, ResendVerificationEmailRequest, ResendVerificationEmailResponse, TfaRequest, TfaResponse, UserVerificationRequest, UserVerificationResponse, VerifyTokenRequest, VerifyTokenResponse } from "./auth_messages_nest";
+import { AppleRequest, GoogleRequest, LoginRequest, LoginResponse, LostPasswordChangePasswordRequest, LostPasswordChangePasswordResponse, LostPasswordHashCheckRequest, LostPasswordHashCheckResponse, LostPasswordStartRequest, LostPasswordStartResponse, RegisterRequest, RegisterResponse, RemoveUserDataRequest, ResendVerificationEmailRequest, ResendVerificationEmailResponse, TfaRequest, TfaResponse, UserVerificationRequest, UserVerificationResponse, VerifyTokenRequest, VerifyTokenResponse } from "./auth_messages_nest";
 import { RoleAdminStoreRequest, RoleAdminUpdateRequest, RolePaginationResponse, RoleSingleResponse } from "./authorization_messages_nest";
 import { SiteSettingsRequest, SiteSettingsResponse } from "./site_settings_messages_nest";
 import { BetaCodePaginateResponse, BetaCodeSingleResponse, BetaCodeStoreRequest, BetaCodeUpdateRequest, ContactPaginationResponse, ContactRequest, ContactResponse, PreviewResponse, PublicUserPreviewResponse, UpdatePasswordRequest, UserAdminStoreRequest, UserPaginationResponse, UserSingleResponse, UserUpdateRequest } from "./user_messages_nest";
@@ -83,6 +83,14 @@ export interface PUserGoogleServiceController {
 }
 export declare function PUserGoogleServiceControllerMethods(): (constructor: Function) => void;
 export declare const P_USER_GOOGLE_SERVICE_NAME = "PUserGoogleService";
+export interface PUserAppleServiceClient {
+    apple(request: AppleRequest, metadata?: Metadata): Observable<LoginResponse>;
+}
+export interface PUserAppleServiceController {
+    apple(request: AppleRequest, metadata?: Metadata): Observable<LoginResponse>;
+}
+export declare function PUserAppleServiceControllerMethods(): (constructor: Function) => void;
+export declare const P_USER_APPLE_SERVICE_NAME = "PUserAppleService";
 export interface PUserExistServiceClient {
     checkUserExist(request: ByIdRequest, metadata?: Metadata): Observable<EmptyResponse>;
 }

package/dist/proto/micro/v1/user/services_nest.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.P_BETA_CODE_ADMIN_SERVICE_NAME = exports.P_ROLE_ADMIN_SERVICE_NAME = exports.P_USER_ADMIN_SERVICE_NAME = exports.P_USER_EXIST_SERVICE_NAME = exports.P_USER_GOOGLE_SERVICE_NAME = exports.P_SITE_SETTINGS_SERVICE_NAME = exports.P_ROLE_SERVICE_NAME = exports.P_USER_SERVICE_NAME = exports.P_AUTH_SERVICE_NAME = exports.MICRO_V1_USER_PACKAGE_NAME = exports.protobufPackage = void 0;
+exports.P_BETA_CODE_ADMIN_SERVICE_NAME = exports.P_ROLE_ADMIN_SERVICE_NAME = exports.P_USER_ADMIN_SERVICE_NAME = exports.P_USER_EXIST_SERVICE_NAME = exports.P_USER_APPLE_SERVICE_NAME = exports.P_USER_GOOGLE_SERVICE_NAME = exports.P_SITE_SETTINGS_SERVICE_NAME = exports.P_ROLE_SERVICE_NAME = exports.P_USER_SERVICE_NAME = exports.P_AUTH_SERVICE_NAME = exports.MICRO_V1_USER_PACKAGE_NAME = exports.protobufPackage = void 0;
 exports.PAuthServiceControllerMethods = PAuthServiceControllerMethods;
 exports.PUserServiceControllerMethods = PUserServiceControllerMethods;
 exports.PRoleServiceControllerMethods = PRoleServiceControllerMethods;
 exports.PSiteSettingsServiceControllerMethods = PSiteSettingsServiceControllerMethods;
 exports.PUserGoogleServiceControllerMethods = PUserGoogleServiceControllerMethods;
+exports.PUserAppleServiceControllerMethods = PUserAppleServiceControllerMethods;
 exports.PUserExistServiceControllerMethods = PUserExistServiceControllerMethods;
 exports.PUserAdminServiceControllerMethods = PUserAdminServiceControllerMethods;
 exports.PRoleAdminServiceControllerMethods = PRoleAdminServiceControllerMethods;
@@ -100,6 +101,21 @@ function PUserGoogleServiceControllerMethods() {
     };
 }
 exports.P_USER_GOOGLE_SERVICE_NAME = "PUserGoogleService";
+function PUserAppleServiceControllerMethods() {
+    return function (constructor) {
+        const grpcMethods = ["apple"];
+        for (const method of grpcMethods) {
+            const descriptor = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+            (0, microservices_1.GrpcMethod)("PUserAppleService", method)(constructor.prototype[method], method, descriptor);
+        }
+        const grpcStreamMethods = [];
+        for (const method of grpcStreamMethods) {
+            const descriptor = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
+            (0, microservices_1.GrpcStreamMethod)("PUserAppleService", method)(constructor.prototype[method], method, descriptor);
+        }
+    };
+}
+exports.P_USER_APPLE_SERVICE_NAME = "PUserAppleService";
 function PUserExistServiceControllerMethods() {
     return function (constructor) {
         const grpcMethods = ["checkUserExist"];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jr-common-micro",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "",
   "author": "",
   "private": false,

package/proto/micro/v1/education/services.proto

@@ -97,7 +97,6 @@ service PMediaEducationService {
 
 service PUserVipService{
   rpc getUserVipForm(EmptyRequest) returns (UserVipFormResponse); 
-  rpc setUserVipForm(UserVipFormRequest) returns (UserVipFormResponse);
-  rpc updateUserVipForm(UserVipFormRequest) returns (UserVipFormResponse);
+  rpc upsertUserVipForm(UserVipFormRequest) returns (UserVipFormResponse);
   rpc getPageStatus(EmptyRequest) returns (VipPageStatusResponse);
 }

package/proto/micro/v1/user/auth_messages.proto

@@ -20,6 +20,11 @@ message GoogleRequest {
   string email = 1;
 }
 
+message AppleRequest {
+  string identity_token = 1;
+  optional string email = 2;
+}
+
 message LoginResponse {
   ResponseStatus status = 1;
   AccessTokenDto data = 2;

package/proto/micro/v1/user/services.proto

@@ -50,6 +50,10 @@ service PUserGoogleService {
   rpc Google(GoogleRequest) returns(stream LoginResponse) {}
 }
 
+service PUserAppleService {
+  rpc Apple(AppleRequest) returns(stream LoginResponse) {}
+}
+
 service PUserExistService {
   rpc CheckUserExist(ByIdRequest) returns(stream EmptyResponse) {}
 }