...

4 files changed, 21 insertions, 19 deletions

diff --git a/Timeline/ClientApp/src/app/http/mock/common.ts b/Timeline/ClientApp/src/app/http/mock/common.ts
index a3ad08ee..3dce8117 100644
--- a/Timeline/ClientApp/src/app/http/mock/common.ts
+++ b/Timeline/ClientApp/src/app/http/mock/common.ts
@@ -58,7 +58,9 @@ Object.defineProperty(window, 'networkLatency', {
   },

 });

 

-export async function mockPrepare(): Promise<void> {

+export async function mockPrepare(key: string): Promise<void> {

+  console.log(`Recieve request: ${key}`);

+

   if (disableNetwork) {

     console.warn('Network is disabled for mock server.');

     throw new HttpNetworkError();

diff --git a/Timeline/ClientApp/src/app/http/mock/timeline.ts b/Timeline/ClientApp/src/app/http/mock/timeline.ts
index 911da2f2..9434f666 100644
--- a/Timeline/ClientApp/src/app/http/mock/timeline.ts
+++ b/Timeline/ClientApp/src/app/http/mock/timeline.ts
@@ -286,7 +286,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
   async listTimeline(

     query: HttpTimelineListQuery

   ): Promise<HttpTimelineInfo[]> {

-    await mockPrepare();

+    await mockPrepare('timeline.list');

     return (

       await Promise.all(

         (await getTimelineNameList()).map((name) => getTimelineInfo(name))

@@ -339,7 +339,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
       ifModifiedSince?: Date;

     }

   ): Promise<HttpTimelineInfo | NotModified> {

-    await mockPrepare();

+    await mockPrepare('timeline.get');

     try {

       const timeline = await getTimelineInfo(timelineName);

       if (query != null && query.ifModifiedSince != null) {

@@ -373,7 +373,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
     req: HttpTimelinePostRequest,

     token: string

   ): Promise<HttpTimelineInfo> {

-    await mockPrepare();

+    await mockPrepare('timeline.post');

     const user = checkToken(token);

     try {

       await createTimeline(req.name, user);

@@ -391,7 +391,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
     req: HttpTimelinePatchRequest,

     _token: string

   ): Promise<HttpTimelineInfo> {

-    await mockPrepare();

+    await mockPrepare('timeline.patch');

     let modified = false;

     if (req.description != null) {

       modified = true;

@@ -416,7 +416,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
   }

 

   async deleteTimeline(timelineName: string, _token: string): Promise<void> {

-    await mockPrepare();

+    await mockPrepare('timeline.delete');

     await setTimelineNameList(

       without(await getTimelineNameList(), timelineName)

     );

@@ -432,7 +432,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
     username: string,

     _token: string

   ): Promise<void> {

-    await mockPrepare();

+    await mockPrepare('timeline.member.put');

     const oldMembers =

       (await getTimelinePropertyValue<string[] | null>(

         timelineName,

@@ -452,7 +452,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
     username: string,

     _token: string

   ): Promise<void> {

-    await mockPrepare();

+    await mockPrepare('timeline.member.delete');

     const oldMembers =

       (await getTimelinePropertyValue<string[] | null>(

         timelineName,

@@ -496,7 +496,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
       includeDeleted?: boolean;

     }

   ): Promise<HttpTimelineGenericPostInfo[]> {

-    await mockPrepare();

+    await mockPrepare('timeline.post.list');

     // TODO: Permission check.

 

     const currentPostId = await getTimelinePropertyValue<number | null>(

@@ -538,7 +538,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
     _token?: string,

     etag?: string

   ): Promise<BlobWithEtag | NotModified> {

-    await mockPrepare();

+    await mockPrepare('timeline.post.data.get');

     // TODO: Permission check.

 

     const optionalSavedEtag = await getTimelinePostPropertyValue<string>(

@@ -580,7 +580,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
     req: HttpTimelinePostPostRequest,

     token: string

   ): Promise<HttpTimelinePostInfo> {

-    await mockPrepare();

+    await mockPrepare('timeline.post.post');

     const user = checkToken(token);

 

     const savedId = await getTimelinePropertyValue<number | null>(

@@ -643,7 +643,7 @@ export class MockHttpTimelineClient implements IHttpTimelineClient {
     postId: number,

     _token: string

   ): Promise<void> {

-    await mockPrepare();

+    await mockPrepare('timeline.post.delete');

     // TODO: permission check

     await removeTimelinePostProperty(timelineName, postId, 'type');

     await removeTimelinePostProperty(timelineName, postId, 'data');

diff --git a/Timeline/ClientApp/src/app/http/mock/token.ts b/Timeline/ClientApp/src/app/http/mock/token.ts
index 6924e7d7..6929be2a 100644
--- a/Timeline/ClientApp/src/app/http/mock/token.ts
+++ b/Timeline/ClientApp/src/app/http/mock/token.ts
@@ -14,7 +14,7 @@ import { getUser, MockUserNotExistError, checkToken } from './user';
 export class MockHttpTokenClient implements IHttpTokenClient {

   // TODO: Mock bad credentials error.

   async create(req: HttpCreateTokenRequest): Promise<HttpCreateTokenResponse> {

-    await mockPrepare();

+    await mockPrepare('token.create');

     try {

       const user = await getUser(req.username);

       return {

@@ -35,7 +35,7 @@ export class MockHttpTokenClient implements IHttpTokenClient {
   }

 

   async verify(req: HttpVerifyTokenRequest): Promise<HttpVerifyTokenResponse> {

-    await mockPrepare();

+    await mockPrepare('token.verify');

     try {

       const user = await getUser(checkToken(req.token));

       return {

diff --git a/Timeline/ClientApp/src/app/http/mock/user.ts b/Timeline/ClientApp/src/app/http/mock/user.ts
index 53f68b5a..76a35f17 100644
--- a/Timeline/ClientApp/src/app/http/mock/user.ts
+++ b/Timeline/ClientApp/src/app/http/mock/user.ts
@@ -79,7 +79,7 @@ export async function getUser(
 

 export class MockHttpUserClient implements IHttpUserClient {

   async get(username: string): Promise<HttpUser> {

-    await mockPrepare();

+    await mockPrepare('user.get');

     return await getUser(username).catch((e) => {

       if (e instanceof MockUserNotExistError) {

         throw new HttpUserNotExistError();

@@ -94,7 +94,7 @@ export class MockHttpUserClient implements IHttpUserClient {
     req: HttpUserPatchRequest,

     _token: string

   ): Promise<HttpUser> {

-    await mockPrepare();

+    await mockPrepare('user.patch');

     if (req.nickname != null) {

       await mockStorage.setItem(`user.${username}.nickname`, req.nickname);

     }

@@ -106,7 +106,7 @@ export class MockHttpUserClient implements IHttpUserClient {
     username: string,

     etag?: string

   ): Promise<BlobWithEtag | NotModified> {

-    await mockPrepare();

+    await mockPrepare('user.avatar.get');

 

     const savedEtag = await mockStorage.getItem(`user.${username}.avatar.etag`);

     if (savedEtag == null) {

@@ -124,7 +124,7 @@ export class MockHttpUserClient implements IHttpUserClient {
   }

 

   async putAvatar(username: string, data: Blob, _token: string): Promise<void> {

-    await mockPrepare();

+    await mockPrepare('user.avatar.put');

     const etag = await sha1(data);

     await mockStorage.setItem<Blob>(`user.${username}.avatar.data`, data);

     await mockStorage.setItem<string>(`user.${username}.avatar.etag`, etag);

@@ -134,7 +134,7 @@ export class MockHttpUserClient implements IHttpUserClient {
     _req: HttpChangePasswordRequest,

     _token: string

   ): Promise<void> {

-    await mockPrepare();

+    await mockPrepare('userop.changepassowrd');

     throw new Error('Not Implemented.');

   }

 }