From 8a023bcab198939cb6cc9d6ca070fad49ed73389 Mon Sep 17 00:00:00 2001
From: Kirill <kirillfando@gmail.com>
Date: Tue, 11 Jan 2022 14:52:12 +0300
Subject: [PATCH 1/6] feat(auth): add "remember me" option to 2-step
 authentication (#156)

---
 public/src/api/httpClient.ts                  | 26 ++++++++++---
 public/src/api/makeApiRequest.ts              |  6 +--
 public/src/interfaces/User.ts                 |  1 +
 public/src/pages/auth/AdminPage.tsx           |  2 +-
 .../src/pages/auth/LoginNew/PasswordCheck.tsx | 37 ++++++++++++++++---
 public/src/pages/main/Header/Sign.tsx         | 10 ++---
 public/src/pages/main/Userprofile.tsx         | 12 +++++-
 .../Testimonials/TestimonialsForm.tsx         |  2 +-
 public/src/router/Routes.tsx                  |  2 +-
 9 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/public/src/api/httpClient.ts b/public/src/api/httpClient.ts
index 455ee3bb..24d093d3 100644
--- a/public/src/api/httpClient.ts
+++ b/public/src/api/httpClient.ts
@@ -30,7 +30,10 @@ export function getProducts(): Promise<Product[]> {
   return makeApiRequest({
     url: ApiUrl.Products,
     method: 'get',
-    headers: { authorization: sessionStorage.getItem('token') }
+    headers: {
+      authorization:
+        sessionStorage.getItem('token') || localStorage.getItem('token')
+    }
   });
 }
 
@@ -42,7 +45,10 @@ export function postTestimonials(data: Testimonial): Promise<any> {
   return makeApiRequest({
     url: ApiUrl.Testimonials,
     method: 'post',
-    headers: { authorization: sessionStorage.getItem('token') },
+    headers: {
+      authorization:
+        sessionStorage.getItem('token') || localStorage.getItem('token')
+    },
     data
   });
 }
@@ -132,7 +138,10 @@ export function getUserPhoto(email: string): Promise<any> {
   return makeApiRequest({
     url: `${ApiUrl.Users}/one/${email}/photo`,
     method: 'get',
-    headers: { authorization: sessionStorage.getItem('token') },
+    headers: {
+      authorization:
+        sessionStorage.getItem('token') || localStorage.getItem('token')
+    },
     responseType: 'arraybuffer'
   });
 }
@@ -141,7 +150,10 @@ export function getAdminStatus(email: string): Promise<any> {
   return makeApiRequest({
     url: `${ApiUrl.Users}/one/${email}/adminpermission`,
     method: 'get',
-    headers: { authorization: sessionStorage.getItem('token') }
+    headers: {
+      authorization:
+        sessionStorage.getItem('token') || localStorage.getItem('token')
+    }
   });
 }
 
@@ -151,7 +163,8 @@ export function putUserData(user: UserData): Promise<UserData> {
     method: 'put',
     headers: {
       'content-type': 'application/json',
-      'authorization': sessionStorage.getItem('token')
+      'authorization':
+        sessionStorage.getItem('token') || localStorage.getItem('token')
     },
     data: user
   });
@@ -166,7 +179,8 @@ export function putPhoto(photo: File, email: string): Promise<any> {
     method: 'put',
     headers: {
       'content-type': 'image/png',
-      'authorization': sessionStorage.getItem('token')
+      'authorization':
+        sessionStorage.getItem('token') || localStorage.getItem('token')
     },
     data
   });
diff --git a/public/src/api/makeApiRequest.ts b/public/src/api/makeApiRequest.ts
index e2362d71..fa1c848e 100644
--- a/public/src/api/makeApiRequest.ts
+++ b/public/src/api/makeApiRequest.ts
@@ -12,14 +12,14 @@ export function makeApiRequest<T>(
     .then((response) => {
       const token = response.headers.authorization;
       token && sessionStorage.setItem('token', token);
+
       return response.data;
     })
     .catch((error) => {
       switch (error.response.status) {
         case 401:
-          sessionStorage.removeItem('email');
-          sessionStorage.removeItem('token');
-          sessionStorage.removeItem('userName');
+          sessionStorage.clear();
+          localStorage.clear();
           return {
             ...error,
             errorText:
diff --git a/public/src/interfaces/User.ts b/public/src/interfaces/User.ts
index 12ee7e68..cca77dc9 100644
--- a/public/src/interfaces/User.ts
+++ b/public/src/interfaces/User.ts
@@ -4,6 +4,7 @@ export interface LoginUser {
   csrf?: string;
   op?: LoginFormMode;
   fingerprint?: string;
+  rememberuser?: string;
 }
 
 export enum LoginFormMode {
diff --git a/public/src/pages/auth/AdminPage.tsx b/public/src/pages/auth/AdminPage.tsx
index 67b43cbd..710dc12c 100644
--- a/public/src/pages/auth/AdminPage.tsx
+++ b/public/src/pages/auth/AdminPage.tsx
@@ -3,7 +3,7 @@ import { getAdminStatus } from '../../api/httpClient';
 import AuthLayout from './AuthLayout';
 
 export const AdminPage: FC = () => {
-  const user = sessionStorage.getItem('email');
+  const user = sessionStorage.getItem('email') || localStorage.getItem('email');
   const [isAdmin, setIsAdmin] = useState<boolean>(false);
 
   useEffect(() => {
diff --git a/public/src/pages/auth/LoginNew/PasswordCheck.tsx b/public/src/pages/auth/LoginNew/PasswordCheck.tsx
index 45fd8751..d49689ef 100644
--- a/public/src/pages/auth/LoginNew/PasswordCheck.tsx
+++ b/public/src/pages/auth/LoginNew/PasswordCheck.tsx
@@ -44,15 +44,32 @@ export const PasswordCheck: FC = () => {
         if (errorText) {
           setErrorText(errorText);
         } else {
-          sessionStorage.setItem('email', email);
+          if (form.rememberuser) {
+            localStorage.setItem(
+              'email',
+              sessionStorage.getItem('email') || ''
+            );
+            localStorage.setItem(
+              'token',
+              sessionStorage.getItem('token') || ''
+            );
+            sessionStorage.clear();
+          }
         }
         return getUserData(email);
       })
       .then((userData: UserData) => {
-        sessionStorage.setItem(
-          'userName',
-          `${userData.firstName} ${userData.lastName}`
-        );
+        if (form.rememberuser) {
+          localStorage.setItem(
+            'userName',
+            `${userData.firstName} ${userData.lastName}`
+          );
+        } else {
+          sessionStorage.setItem(
+            'userName',
+            `${userData.firstName} ${userData.lastName}`
+          );
+        }
         window.location.href = RoutePath.Home;
       });
   };
@@ -79,6 +96,16 @@ export const PasswordCheck: FC = () => {
               value={password}
               onInput={onInput}
             />
+            <label htmlFor="rememberuser">
+              <input
+                type="checkbox"
+                id="rememberuser"
+                name="rememberuser"
+                value="true"
+                onChange={onInput}
+              />
+              &nbsp;Remember me
+            </label>
           </div>
           <button
             className="au-btn au-btn--block au-btn--green m-b-20"
diff --git a/public/src/pages/main/Header/Sign.tsx b/public/src/pages/main/Header/Sign.tsx
index 5aaa81cc..03f9a39f 100644
--- a/public/src/pages/main/Header/Sign.tsx
+++ b/public/src/pages/main/Header/Sign.tsx
@@ -8,8 +8,9 @@ import {
 import { RoutePath } from '../../../router/RoutePath';
 
 export const Sign: FC = () => {
-  const user = sessionStorage.getItem('email');
-  const userName = sessionStorage.getItem('userName');
+  const user = sessionStorage.getItem('email') || localStorage.getItem('email');
+  const userName =
+    sessionStorage.getItem('userName') || localStorage.getItem('username');
   const [isAdminUser, setIsAdminUser] = useState<boolean>(false);
   const [userImage, setUserImage] = useState<string | null>();
 
@@ -43,9 +44,8 @@ export const Sign: FC = () => {
   };
 
   const logout = () => {
-    sessionStorage.removeItem('email');
-    sessionStorage.removeItem('token');
-    sessionStorage.removeItem('userName');
+    sessionStorage.clear();
+    localStorage.clear();
     window.location.reload();
   };
 
diff --git a/public/src/pages/main/Userprofile.tsx b/public/src/pages/main/Userprofile.tsx
index 032bbce4..477fcf38 100644
--- a/public/src/pages/main/Userprofile.tsx
+++ b/public/src/pages/main/Userprofile.tsx
@@ -13,7 +13,8 @@ const defaultUserData: UserData = {
 };
 
 export const Userprofile = () => {
-  const email: string | null = sessionStorage.getItem('email');
+  const email: string | null =
+    sessionStorage.getItem('email') || localStorage.getItem('email');
   const [user, setUser] = useState<UserData>(defaultUserData);
 
   const onInput = ({ target }: { target: EventTarget | null }) => {
@@ -30,7 +31,14 @@ export const Userprofile = () => {
   const sendUserData = (e: FormEvent) => {
     e.preventDefault();
     putUserData(user).then(() => {
-      sessionStorage.setItem('userName', `${user.firstName} ${user.lastName}`);
+      if (localStorage.getItem('email')) {
+        localStorage.setItem('userName', `${user.firstName} ${user.lastName}`);
+      } else {
+        sessionStorage.setItem(
+          'userName',
+          `${user.firstName} ${user.lastName}`
+        );
+      }
       window.location.href = RoutePath.Home;
     });
   };
diff --git a/public/src/pages/marketplace/Testimonials/TestimonialsForm.tsx b/public/src/pages/marketplace/Testimonials/TestimonialsForm.tsx
index 85f76013..92c3df14 100644
--- a/public/src/pages/marketplace/Testimonials/TestimonialsForm.tsx
+++ b/public/src/pages/marketplace/Testimonials/TestimonialsForm.tsx
@@ -19,7 +19,7 @@ interface Props {
 }
 
 export const TestimonialsForm: FC<Props> = (props: Props) => {
-  const user = sessionStorage.getItem('email');
+  const user = sessionStorage.getItem('email') || localStorage.getItem('email');
 
   const [form, setForm] = useState<Testimonial>(defaultTestimonial);
   const { name, title, message } = form;
diff --git a/public/src/router/Routes.tsx b/public/src/router/Routes.tsx
index 315b172b..a8a41265 100644
--- a/public/src/router/Routes.tsx
+++ b/public/src/router/Routes.tsx
@@ -11,7 +11,7 @@ import AdminPage from '../pages/auth/AdminPage';
 import PasswordCheck from '../pages/auth/LoginNew/PasswordCheck';
 
 export const Routes: FC = () => {
-  const user = sessionStorage.getItem('email');
+  const user = sessionStorage.getItem('email') || localStorage.getItem('email');
 
   return (
     <Switch>

From a5b686cea0b396188e72fb74e7b5d4fa7534d28b Mon Sep 17 00:00:00 2001
From: Kirill <kirillfando@gmail.com>
Date: Tue, 11 Jan 2022 20:36:42 +0300
Subject: [PATCH 2/6] fix: typo in getting `userName` while signing in (#157)

---
 public/src/pages/main/Header/Sign.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/pages/main/Header/Sign.tsx b/public/src/pages/main/Header/Sign.tsx
index 03f9a39f..ebab38d4 100644
--- a/public/src/pages/main/Header/Sign.tsx
+++ b/public/src/pages/main/Header/Sign.tsx
@@ -10,7 +10,7 @@ import { RoutePath } from '../../../router/RoutePath';
 export const Sign: FC = () => {
   const user = sessionStorage.getItem('email') || localStorage.getItem('email');
   const userName =
-    sessionStorage.getItem('userName') || localStorage.getItem('username');
+    sessionStorage.getItem('userName') || localStorage.getItem('userName');
   const [isAdminUser, setIsAdminUser] = useState<boolean>(false);
   const [userImage, setUserImage] = useState<string | null>();
 

From 46ce0ba464c92d57f5ebb10c19b3e4db81d4faae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jan 2022 13:27:48 +0300
Subject: [PATCH 3/6] build(deps): bump follow-redirects from 1.14.4 to 1.14.7
 (#159)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0a5ef5bc..5c65ee61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,7 +53,8 @@
       "dependencies": {
         "ansi-regex": {
           "version": "5.0.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "ora": {
@@ -1248,7 +1249,8 @@
         },
         "ansi-regex": {
           "version": "5.0.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "ora": {
@@ -2485,7 +2487,8 @@
       "dependencies": {
         "ansi-regex": {
           "version": "5.0.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "chalk": {
@@ -2829,7 +2832,8 @@
       "dependencies": {
         "ansi-regex": {
           "version": "5.0.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "is-fullwidth-code-point": {
@@ -4459,9 +4463,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.14.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
-      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -9763,7 +9767,8 @@
       "dependencies": {
         "ansi-regex": {
           "version": "5.0.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "is-fullwidth-code-point": {
@@ -9976,7 +9981,8 @@
       "dependencies": {
         "ansi-regex": {
           "version": "5.0.0",
-          "resolved": "",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
         "is-fullwidth-code-point": {

From 2b583edb9a7982fd0d67208c22c10819acf81ab6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jan 2022 13:28:06 +0300
Subject: [PATCH 4/6] build(deps): bump follow-redirects from 1.14.5 to 1.14.7
 in /public (#160)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.5 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.5...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 public/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/package-lock.json b/public/package-lock.json
index 9c8ee972..0c1e2a2a 100644
--- a/public/package-lock.json
+++ b/public/package-lock.json
@@ -8007,9 +8007,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz",
-      "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
     },
     "for-in": {
       "version": "1.0.2",

From b2624af905fd43772e001c6a3dc73db33e4391f5 Mon Sep 17 00:00:00 2001
From: Kirill <kirillfando@gmail.com>
Date: Mon, 17 Jan 2022 13:32:12 +0300
Subject: [PATCH 5/6] fix(file): remote file inclusion (#158)

---
 src/file/cloud.providers.metadata.ts | 13 +++++++++----
 src/file/file.service.ts             |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/file/cloud.providers.metadata.ts b/src/file/cloud.providers.metadata.ts
index 723c58b3..6fd594fd 100644
--- a/src/file/cloud.providers.metadata.ts
+++ b/src/file/cloud.providers.metadata.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@nestjs/common';
+import axios from 'axios';
 
 @Injectable()
 export class CloudProvidersMetaData {
@@ -29,7 +30,7 @@ export class CloudProvidersMetaData {
         tags
         guest-attributes
         maintenance-event
-        network-interfaces/   
+        network-interfaces/
     `.trim(),
     );
     this.providers.set(
@@ -207,7 +208,7 @@ export class CloudProvidersMetaData {
                   "macAddress": "0011AAFFBB22"
               }]
           }
-      }    
+      }
     `.trim(),
     );
     this.providers.set(
@@ -257,7 +258,7 @@ export class CloudProvidersMetaData {
     );
   }
 
-  get(providerUrl: string): string {
+  async get(providerUrl: string): Promise<string> {
     if (providerUrl.startsWith(CloudProvidersMetaData.GOOGLE)) {
       return this.providers.get(CloudProvidersMetaData.GOOGLE);
     } else if (providerUrl.startsWith(CloudProvidersMetaData.DIGITAL_OCEAN)) {
@@ -267,7 +268,11 @@ export class CloudProvidersMetaData {
     } else if (providerUrl.startsWith(CloudProvidersMetaData.AZURE)) {
       return this.providers.get(CloudProvidersMetaData.AZURE);
     } else {
-      return null;
+      const { data } = await axios(providerUrl, {
+        timeout: 5000,
+        responseType: 'text',
+      });
+      return data;
     }
   }
 }
diff --git a/src/file/file.service.ts b/src/file/file.service.ts
index 1bce6b3f..f88b3275 100644
--- a/src/file/file.service.ts
+++ b/src/file/file.service.ts
@@ -18,7 +18,7 @@ export class FileService {
 
       return fs.createReadStream(file);
     } else if (file.startsWith('http')) {
-      const content = this.cloudProviders.get(file);
+      const content = await this.cloudProviders.get(file);
 
       if (content) {
         return Readable.from(content);

From 0424660dd1d65b211a975fc80ef80d0ee526c741 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 22 Jan 2022 13:25:29 +0300
Subject: [PATCH 6/6] build(deps): bump nanoid from 3.1.30 to 3.2.0 in /public
 (#161)

Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.30 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.30...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 public/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/package-lock.json b/public/package-lock.json
index 0c1e2a2a..15469540 100644
--- a/public/package-lock.json
+++ b/public/package-lock.json
@@ -12451,9 +12451,9 @@
       "optional": true
     },
     "nanoid": {
-      "version": "3.1.30",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz",
-      "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
+      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==",
       "dev": true
     },
     "nanomatch": {