feat: custom redirect urls for app connections

tookey-io · Jan 12, 2024 · da872dc · da872dc
1 parent 9dce366
commit da872dc
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/apps/api/src/secrets/secrets.controller.ts b/apps/api/src/secrets/secrets.controller.ts
@@ -45,9 +45,16 @@ export class SecretsController {
       .type('html')
       .type('text/html')
       .send(
-        `<script>if(window.opener){window.opener.postMessage({ 'code': '${encodeURIComponent(
-          code,
-        )}' },'*')}</script> <html>Redirect succuesfully, this window should close now</html>`,
+        `
+<script>
+  if (window.opener) {
+    window.opener.postMessage({ 'code': '${encodeURIComponent(code)}' },'*')
+  } else {
+    window.localStorage.setItem('__oauth_code', params['code']);
+    window.close();
+  }
+</script>
+<html>Redirect succuesfully, this window should close now</html>`,
       );
   }
 

diff --git a/apps/api/src/secrets/secrets.service.ts b/apps/api/src/secrets/secrets.service.ts
@@ -73,10 +73,11 @@ export class SecretsService {
   }
 
   async claim(dto: ClaimConnectionDto) {
-    const { clientSecret } = await this.getSecretById(dto.clientId);
+    const { clientSecret, redirectUrl } = await this.getSecretById(dto.clientId);
+    const redirect_uri = redirectUrl ?? this.config.getOrThrow('publicUrl') + '/api/secrets/redirect'
     const body: Record<string, string> = {
-      redirect_uri: this.config.getOrThrow('publicUrl') + '/api/secrets/redirect',
       grant_type: 'authorization_code',
+      redirect_uri,
       code: dto.code,
     };
 

diff --git a/libs/database/src/entities/secrets.entity.ts b/libs/database/src/entities/secrets.entity.ts
@@ -19,6 +19,8 @@ export class SecretEntity extends MetaEntity {
     @Column({ nullable: false })
     clientId: string;
 
+    @Column({ nullable: true })
+    redirectUrl: string;
 }
 
 @CustomRepository(SecretEntity)

diff --git a/libs/database/src/migrations/1705086423012-secrets-redirects.ts b/libs/database/src/migrations/1705086423012-secrets-redirects.ts
@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class SecretsRedirects1705086423012 implements MigrationInterface {
+    name = 'SecretsRedirects1705086423012'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "secret_entity" ADD "redirectUrl" character varying`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "secret_entity" DROP COLUMN "redirectUrl"`);
+    }
+
+}
diff --git a/libs/database/src/migrations/index.ts b/libs/database/src/migrations/index.ts
@@ -18,4 +18,5 @@ export * from './1697435937767-user-google';
 export * from './1697737348969-email';
 export * from './1697743613593-roles';
 export * from './1699113772938-secrets';
-export * from './1701893634169-pieces';
+export * from './1701893634169-pieces';
+export * from './1705086423012-secrets-redirects';