Feat/site member verification for email (#479)

* Feat: add IsomerAdmins database table and migrations * Feat: add access token via interceptor if missing * Feat: add isomerAdminsService * Feat: add hasAccessToSite to usersService * Feat: shift site membership check to authorizationMiddlewareService * Chore: replace authMiddleware.checkHasAccess with authorizationMiddleware.checkIsSiteMember * Chore: migrate authmiddlewareservice to typescript * Fix: rename auth middleware to authentication middleware * Fix: move e2e_isomer_id into constants * Chore: add cookie types * Fix: more concise check for isSiteMember * FIx: rebase errors * Fix: remove unused identityAuthService dependency * Fix: rename AuthService import as identityAuthService * Nit: separate type definition * Feat/email login flow (#480) * build(deps): bump file-type from 16.5.3 to 16.5.4 (#475) Bumps [file-type](https://github.com/sindresorhus/file-type) from 16.5.3 to 16.5.4. - [Release notes](https://github.com/sindresorhus/file-type/releases) - [Commits](sindresorhus/file-type@v16.5.3...v16.5.4) --- updated-dependencies: - dependency-name: file-type dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: package.json & package-lock.json to reduce vulnerabilities (#476) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JS-SEQUELIZE-2959225 * build(deps): bump vm2 from 3.9.5 to 3.9.7 (#350) Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.5 to 3.9.7. - [Release notes](https://github.com/patriksimek/vm2/releases) - [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md) - [Commits](patriksimek/vm2@3.9.5...3.9.7) --- updated-dependencies: - dependency-name: vm2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Chore: remove site links from description (#482) * Fix: update resource room (#481) * 0.10.0 * fix: remove unnecessary update step (#487) * 0.10.1 * Chore: update commit message to include user id * Feat: add login and verify endpoints * Fix: model relations and alias * Feat: add findSitesByUserId * Feat: add site retrieval for email and admin users * Fix: hasAccessToSite * Fix: update email/mobile by isomer id * Chore: update error message * Fix: await check for whitelist * Chore: add mockSessionData for email login * Fix: SiteService behaviour for email users with no whitelisted sites * Test: update sitesservice tests * Test: add new authservice tests and fix existing tests * Fix: update user model to allow null in github field * Fix: update test fixture * Fix: update user test suite * Chore: remove unused endpoint * Fix: rebase errors * Chore: remove unnecessary message in test * Chore: remove unnecessary userId field * Nit: rename variable * Refactor: shift site retrieval for email users into helper method * Chore: spacing and remove unused var * Fix: tests * Tests: add new authorizationMiddlewareService test * fix: remove resources_name and add support for url (#490) * fix: remove resources_name and add support for url * fix: display url parameter as domain but store with https scheme * fix: resolve failing tests * Chore: flip conditional * Refactor: shift order of getSites to make it easier to understand * Test: add new auth router tests * Feat: add integration tests for getSites * Fix: failing requests for getLastUpdated and getStagingUrl * Nit: add comment * Nit: test name and var name * chore(mocks/axios): remove extra stuff * test(sites.spec): refactor specs for clarity * Fix: update settings * Nit: update comment * Fix: tests Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Snyk bot <[email protected]> Co-authored-by: Hsu Zhong Jun <[email protected]> Co-authored-by: seaerchin <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Snyk bot <[email protected]> Co-authored-by: Hsu Zhong Jun <[email protected]> Co-authored-by: seaerchin <[email protected]>
isomerpages · Sep 9, 2022 · dd98e25 · dd98e25
1 parent c6d8043
commit dd98e25
Show file tree

Hide file tree

Showing 49 changed files with 1,315 additions and 287 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.10.1](https://github.com/isomerpages/isomercms-backend/compare/v0.10.0...v0.10.1)
+
+- fix: remove unnecessary update step [`#487`](https://github.com/isomerpages/isomercms-backend/pull/487)
+- 0.10.0 [`#484`](https://github.com/isomerpages/isomercms-backend/pull/484)
+
+#### [v0.10.0](https://github.com/isomerpages/isomercms-backend/compare/v0.9.0...v0.10.0)
+
+> 11 August 2022
+
+- Fix: update resource room [`#481`](https://github.com/isomerpages/isomercms-backend/pull/481)
+- Chore: remove site links from description [`#482`](https://github.com/isomerpages/isomercms-backend/pull/482)
+- build(deps): bump vm2 from 3.9.5 to 3.9.7 [`#350`](https://github.com/isomerpages/isomercms-backend/pull/350)
+- fix: package.json & package-lock.json to reduce vulnerabilities [`#476`](https://github.com/isomerpages/isomercms-backend/pull/476)
+- build(deps): bump file-type from 16.5.3 to 16.5.4 [`#475`](https://github.com/isomerpages/isomercms-backend/pull/475)
+- 0.9.0 [`#473`](https://github.com/isomerpages/isomercms-backend/pull/473)
+
 #### [v0.9.0](https://github.com/isomerpages/isomercms-backend/compare/v0.8.0...v0.9.0)
 
+> 14 July 2022
+
 - Misc Backend Cleanup 1 [`#470`](https://github.com/isomerpages/isomercms-backend/pull/470)
 - 0.8.0 [`#468`](https://github.com/isomerpages/isomercms-backend/pull/468)
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "isomercms",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "private": true,
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
@@ -41,7 +41,7 @@
     "dotenv": "^16.0.1",
     "exponential-backoff": "^3.1.0",
     "express": "~4.16.1",
-    "file-type": "^16.5.3",
+    "file-type": "^16.5.4",
     "helmet": "^4.6.0",
     "http-errors": "~1.8.0",
     "is-svg": "^4.3.1",
@@ -60,7 +60,7 @@
     "pg-connection-string": "^2.5.0",
     "query-string": "^6.14.1",
     "reflect-metadata": "^0.1.13",
-    "sequelize": "^6.17.0",
+    "sequelize": "^6.21.2",
     "sequelize-typescript": "^2.1.3",
     "serialize-error": "^7.0.1",
     "slugify": "^1.6.0",

diff --git a/src/__mocks__/axios.ts b/src/__mocks__/axios.ts
@@ -1,6 +1,3 @@
 import mockAxios from "jest-mock-axios"
 
-mockAxios.interceptors.request.use(jest.fn())
-mockAxios.interceptors.response.use(jest.fn())
-
 export default mockAxios
diff --git a/src/constants/constants.ts b/src/constants/constants.ts
@@ -9,3 +9,5 @@ export enum SiteStatus {
   Initialized = "INITIALIZED",
   Launched = "LAUNCHED",
 }
+
+export const E2E_ISOMER_ID = "e2e-id"
diff --git a/src/database/migrations/20220726094614-create-isomer-admin.js b/src/database/migrations/20220726094614-create-isomer-admin.js
@@ -0,0 +1,36 @@
+module.exports = {
+  up: async (queryInterface, Sequelize) => {
+    await queryInterface.createTable("isomer_admins", {
+      id: {
+        allowNull: false,
+        autoIncrement: true,
+        primaryKey: true,
+        type: Sequelize.BIGINT,
+      },
+      user_id: {
+        allowNull: false,
+        type: Sequelize.BIGINT,
+        references: {
+          model: "users",
+          key: "id",
+        },
+        onUpdate: "CASCADE",
+        onDelete: "CASCADE",
+      },
+      created_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+        defaultValue: Sequelize.fn("NOW"),
+      },
+      updated_at: {
+        type: Sequelize.DATE,
+        allowNull: false,
+        defaultValue: Sequelize.fn("NOW"),
+      },
+    })
+  },
+
+  down: async (queryInterface) => {
+    await queryInterface.dropTable("isomer_admins")
+  },
+}
diff --git a/src/database/migrations/20220803091224-change-users-github-allow-null.js b/src/database/migrations/20220803091224-change-users-github-allow-null.js
@@ -0,0 +1,23 @@
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.changeColumn("users", "github_id", {
+      allowNull: true,
+      unique: true,
+      type: Sequelize.TEXT,
+      validate: {
+        notEmpty: true,
+      },
+    })
+  },
+
+  async down(queryInterface, Sequelize) {
+    await queryInterface.changeColumn("users", "github_id", {
+      allowNull: false,
+      unique: true,
+      type: Sequelize.TEXT,
+      validate: {
+        notEmpty: true,
+      },
+    })
+  },
+}
diff --git a/src/database/models/IsomerAdmin.ts b/src/database/models/IsomerAdmin.ts
@@ -0,0 +1,32 @@
+import {
+  Column,
+  CreatedAt,
+  DataType,
+  ForeignKey,
+  Model,
+  Table,
+  UpdatedAt,
+} from "sequelize-typescript"
+
+import { User } from "@database/models/User"
+
+@Table({ tableName: "isomer_admins" })
+export class IsomerAdmin extends Model {
+  @Column({
+    autoIncrement: true,
+    primaryKey: true,
+    allowNull: false,
+    type: DataType.BIGINT,
+  })
+  id!: number
+
+  @ForeignKey(() => User)
+  @Column
+  userId!: number
+
+  @CreatedAt
+  createdAt!: Date
+
+  @UpdatedAt
+  updatedAt!: Date
+}
diff --git a/src/database/models/Site.ts b/src/database/models/Site.ts
@@ -68,6 +68,7 @@ export class Site extends Model {
     onUpdate: "CASCADE",
     onDelete: "CASCADE",
     through: () => SiteMember,
+    as: "site_members",
   })
   users!: User[]
 
@@ -80,6 +81,8 @@ export class Site extends Model {
   @ForeignKey(() => User)
   creatorId!: number
 
-  @BelongsTo(() => User)
+  @BelongsTo(() => User, {
+    as: "site_creator",
+  })
   creator!: User
 }
diff --git a/src/database/models/User.ts b/src/database/models/User.ts
@@ -31,7 +31,7 @@ export class User extends Model {
   email?: string | null
 
   @Column({
-    allowNull: false,
+    allowNull: true,
     unique: true,
     type: DataType.TEXT,
     validate: {
@@ -61,13 +61,16 @@ export class User extends Model {
   @DeletedAt
   deletedAt?: Date
 
-  @BelongsToMany(() => User, {
+  @BelongsToMany(() => Site, {
     onUpdate: "CASCADE",
     onDelete: "CASCADE",
     through: () => SiteMember,
+    as: "site_members",
   })
   sites!: Site[]
 
-  @HasMany(() => Site)
+  @HasMany(() => Site, {
+    as: "sites_created",
+  })
   sitesCreated?: Site[]
 }
diff --git a/src/database/models/index.ts b/src/database/models/index.ts
@@ -5,3 +5,4 @@ export * from "@database/models/Whitelist"
 export * from "@database/models/AccessToken"
 export * from "@database/models/Repo"
 export * from "@database/models/Deployment"
+export * from "@database/models/IsomerAdmin"
diff --git a/src/fixtures/config.js b/src/fixtures/config.js
@@ -118,7 +118,7 @@ const configContent = {
 const configSha = "configsha"
 
 const configResponse = {
-  url: configContent.url,
+  url: configContent.url.replace("https://", ""),
   title: configContent.title,
   description: configContent.description,
   favicon: configContent.favicon,
@@ -127,7 +127,6 @@ const configResponse = {
   facebook_pixel: configContent["facebook-pixel"],
   google_analytics: configContent.google_analytics,
   linkedin_insights: configContent["linkedin-insights"],
-  resources_name: configContent.resources_name,
   colors: configContent.colors,
 }
 

diff --git a/src/fixtures/sessionData.ts b/src/fixtures/sessionData.ts
@@ -4,7 +4,7 @@ import UserWithSiteSessionData from "@root/classes/UserWithSiteSessionData"
 
 export const mockAccessToken = "mockAccessToken"
 export const mockGithubId = "mockGithubId"
-export const mockIsomerUserId = "mockIsomerUserId"
+export const mockIsomerUserId = "1"
 export const mockEmail = "mockEmail"
 export const mockTreeSha = "mockTreeSha"
 export const mockCurrentCommitSha = "mockCurrentCommitSha"
@@ -34,3 +34,12 @@ export const mockGithubSessionData = new GithubSessionData({
   treeSha: mockTreeSha,
   currentCommitSha: mockCurrentCommitSha,
 })
+export const mockSessionDataEmailUser = new UserSessionData({
+  isomerUserId: mockIsomerUserId,
+  email: mockEmail,
+})
+export const mockSessionDataEmailUserWithSite = new UserWithSiteSessionData({
+  isomerUserId: mockIsomerUserId,
+  email: mockEmail,
+  siteName: mockSiteName,
+})