Merge pull request #127 from finkinfridom/feature/test-merges

feat: updated strategy

.github/workflows/linter.yml

@@ -50,5 +50,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TYPESCRIPT_ES_CONFIG_FILE: .eslintrc.json
           TYPESCRIPT_DEFAULT_STYLE: prettier
+          VALIDATE_GITLEAKS: false
           USE_FIND_ALGORITHM: true
           LINTER_RULES_PATH: /

__tests__/Auth0Strategy.test.ts

@@ -31,13 +31,13 @@ describe("Auth0Strategy", () => {
     expect(strategy.name).toBe("auth0");
   });
   describe("authenticate", () => {
-    it("should fallback to standard user-pwd login", () => {
+    it("should fallback to standard user-pwd login", async () => {
       const req = {
         user: {
           id: "test",
         },
       } as unknown as Request;
-      strategy.authenticate(req);
+      await strategy.authenticate(req);
       expect(strategy.success).toBeCalledWith(req.user);
     });
     it("invalid 'oidc' should return error", async () => {
@@ -70,7 +70,7 @@ describe("Auth0Strategy", () => {
         .spyOn(strategy.ctx, "find")
         .mockResolvedValue({ docs: [] } as unknown as PaginatedDocs<any>);
       await strategy.authenticate(req);
-      expect(spyFind).toBeCalledTimes(1);
+      expect(spyFind).toBeCalledTimes(2);
       expect(spyCreate).toBeCalledTimes(1);
       expect(protoSuccessMock).toBeCalledWith({
         id: "non-existing-oidc",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-auth0-plugin",
-  "version": "0.0.10",
+  "version": "0.1.0",
   "main": "dist/strategies/index.js",
   "types": "dist/strategies/index.d.ts",
   "repository": "https://github.com/finkinfridom/payload-auth0-plugin.git",

src/strategies/Auth0Strategy.ts

@@ -40,15 +40,26 @@ export class Auth0Strategy extends Strategy {
       },
     });
   }
-  findUser(oidcUser): Promise<PaginatedDocs<any>> {
-    return this.ctx.find({
+  async findUser(oidcUser): Promise<PaginatedDocs<any>> {
+    const result = await this.ctx.find({
       collection: this.slug,
       where: {
         sub: {
           equals: oidcUser.sub,
         },
       },
     });
+    if (result.docs && result.docs.length) {
+      return Promise.resolve(result);
+    }
+    return this.ctx.find({
+      collection: this.slug,
+      where: {
+        email: {
+          equals: oidcUser.email,
+        },
+      },
+    });
   }
 
   async mergeUsers(foundUser, oidcUser): Promise<void> {