refactor updateTimeDrift to preSendIntent

Author: VGabriel45

packages/waas/src/auth.ts

@@ -339,9 +339,21 @@ export class SequenceWaaS {
     }
   }
 
-  private async updateTimeDrift() {
+  /**
+   * Checks the server status and sets the time drift before sending any intent.
+   * @throws {Error} If server status check fails or Date header is missing
+   */
+  private async preSendIntent() {
+    const res = await fetch(`${this.config.rpcServer}/status`)
+
+    if (res.status !== 200) {
+      if (res.status === 451) {
+        throw new Error('Unavailable For Legal Reasons')
+      }
+      throw new Error(`Error with status ${res.status}`)
+    }
+
     if (getTimeDrift() === undefined) {
-      const res = await fetch(`${this.config.rpcServer}/status`)
       const date = res.headers.get('Date')
       if (!date) {
         throw new Error('failed to get Date header value from /status')
@@ -446,7 +458,7 @@ export class SequenceWaaS {
   }
 
   async initAuth(identity: Identity): Promise<Challenge> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     if ('guest' in identity && identity.guest) {
       return this.initGuestAuth()
@@ -511,7 +523,7 @@ export class SequenceWaaS {
     challenge: Challenge,
     opts?: { sessionName?: string; forceCreateAccount?: boolean }
   ): Promise<SignInResponse> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     // initAuth can start while user is already signed in and continue with linkAccount method,
     // but it can't be used to completeAuth while user is already signed in. In this
@@ -579,7 +591,7 @@ export class SequenceWaaS {
   }
 
   async dropSession({ sessionId, strict }: { sessionId?: string; strict?: boolean } = {}) {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const thisSessionId = await this.waas.getSessionId()
     if (!thisSessionId) {
@@ -627,7 +639,7 @@ export class SequenceWaaS {
   }
 
   async listSessions(): Promise<Sessions> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const sessionId = await this.waas.getSessionId()
     if (!sessionId) {
@@ -649,7 +661,7 @@ export class SequenceWaaS {
   }
 
   async validateSession(args?: ValidationArgs) {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     if (await this.isSessionValid()) {
       return true
@@ -659,7 +671,7 @@ export class SequenceWaaS {
   }
 
   async finishValidateSession(challenge: string): Promise<boolean> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.finishValidateSession(this.validationRequiredSalt, challenge)
     const result = await this.sendIntent(intent)
@@ -673,7 +685,7 @@ export class SequenceWaaS {
   }
 
   async isSessionValid(): Promise<boolean> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.getSession()
     const result = await this.sendIntent(intent)
@@ -700,14 +712,14 @@ export class SequenceWaaS {
   }
 
   async sessionAuthProof({ nonce, network, validation }: { nonce?: string; network?: string; validation?: ValidationArgs }) {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.sessionAuthProof({ nonce, network })
     return await this.trySendIntent({ validation }, intent, isSessionAuthProofResponse)
   }
 
   async listAccounts() {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.listAccounts()
     const res = await this.sendIntent(intent)
@@ -720,7 +732,7 @@ export class SequenceWaaS {
   }
 
   async linkAccount(challenge: Challenge) {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.linkAccount(challenge.getIntentParams())
     const res = await this.sendIntent(intent)
@@ -733,14 +745,14 @@ export class SequenceWaaS {
   }
 
   async removeAccount(accountId: string) {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.removeAccount({ accountId })
     await this.sendIntent(intent)
   }
 
   async getIdToken(args?: { nonce?: string }): Promise<IntentResponseIdToken> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.getIdToken({ nonce: args?.nonce })
     const res = await this.sendIntent(intent)
@@ -788,14 +800,14 @@ export class SequenceWaaS {
   }
 
   async signMessage(args: WithSimpleNetwork<SignMessageArgs> & CommonAuthArgs): Promise<SignedMessageResponse> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.signMessage(await this.useIdentifier(args))
     return this.trySendIntent(args, intent, isSignedMessageResponse)
   }
 
   async signTypedData(args: WithSimpleNetwork<SignTypedDataArgs> & CommonAuthArgs): Promise<SignedTypedDataResponse> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.signTypedData(await this.useIdentifier(args))
     return this.trySendIntent(args, intent, isSignedTypedDataResponse)
@@ -824,42 +836,42 @@ export class SequenceWaaS {
   }
 
   async sendTransaction(args: WithSimpleNetwork<SendTransactionsArgs> & CommonAuthArgs): Promise<MaySentTransactionResponse> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.sendTransaction(await this.useIdentifier(args))
     return this.trySendTransactionIntent(intent, args)
   }
 
   async sendERC20(args: WithSimpleNetwork<SendERC20Args> & CommonAuthArgs): Promise<MaySentTransactionResponse> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.sendERC20(await this.useIdentifier(args))
     return this.trySendTransactionIntent(intent, args)
   }
 
   async sendERC721(args: WithSimpleNetwork<SendERC721Args> & CommonAuthArgs): Promise<MaySentTransactionResponse> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.sendERC721(await this.useIdentifier(args))
     return this.trySendTransactionIntent(intent, args)
   }
 
   async sendERC1155(args: WithSimpleNetwork<SendERC1155Args> & CommonAuthArgs): Promise<MaySentTransactionResponse> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.sendERC1155(await this.useIdentifier(args))
     return this.trySendTransactionIntent(intent, args)
   }
 
   async callContract(args: WithSimpleNetwork<SendContractCallArgs> & CommonAuthArgs): Promise<MaySentTransactionResponse> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.callContract(await this.useIdentifier(args))
     return this.trySendTransactionIntent(intent, args)
   }
 
   async feeOptions(args: WithSimpleNetwork<SendTransactionsArgs> & CommonAuthArgs): Promise<FeeOptionsResponse> {
-    await this.updateTimeDrift()
+    await this.preSendIntent()
 
     const intent = await this.waas.feeOptions(await this.useIdentifier(args))
     return this.trySendIntent(args, intent, isFeeOptionsResponse)