Skip to content

Commit

Permalink
Merge pull request #5 from armando1793/add-v4
Browse files Browse the repository at this point in the history
add v4
  • Loading branch information
armando1793 authored May 19, 2024
2 parents 339830d + 2bc537b commit d98b08e
Show file tree
Hide file tree
Showing 58 changed files with 89 additions and 90 deletions.
2 changes: 1 addition & 1 deletion appcheck/appcheck.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"github.com/MicahParks/keyfunc"
"github.com/golang-jwt/jwt/v4"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

// JWKSUrl is the URL of the JWKS used to verify App Check tokens.
Expand Down
2 changes: 1 addition & 1 deletion appcheck/appcheck_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
"github.com/golang-jwt/jwt/v4"
"github.com/google/go-cmp/cmp"
)
Expand Down
2 changes: 1 addition & 1 deletion auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"time"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
"golang.org/x/oauth2"
"google.golang.org/api/option"
"google.golang.org/api/transport"
Expand Down
2 changes: 1 addition & 1 deletion auth/auth_appengine.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package auth
import (
"context"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
"google.golang.org/appengine/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion auth/auth_std.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package auth
import (
"context"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

func newCryptoSigner(ctx context.Context, conf *internal.AuthConfig) (cryptoSigner, error) {
Expand Down
4 changes: 2 additions & 2 deletions auth/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"testing"
"time"

"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
"github.com/armando1793/firebase-admin-go/v4/internal"
"golang.org/x/oauth2/google"
"google.golang.org/api/option"
"google.golang.org/api/transport"
Expand Down
2 changes: 1 addition & 1 deletion auth/email_action_links_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"reflect"
"testing"

"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion auth/export_users.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"net/url"
"strconv"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
"google.golang.org/api/iterator"
)

Expand Down
2 changes: 1 addition & 1 deletion auth/hash/hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"errors"
"fmt"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

// InputOrderType specifies the order in which users' passwords/salts are hashed
Expand Down
4 changes: 2 additions & 2 deletions auth/hash/hash_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"reflect"
"testing"

"github.com/armando1793/firebase-admin-go/auth"
"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/auth"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion auth/import_users.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"errors"
"fmt"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

const maxImportUsers = 1000
Expand Down
2 changes: 1 addition & 1 deletion auth/project_config_mgt.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"net/http"
"strings"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

// ProjectConfig represents the properties to update on the provided project config.
Expand Down
2 changes: 1 addition & 1 deletion auth/provider_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strconv"
"strings"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
"google.golang.org/api/iterator"
)

Expand Down
2 changes: 1 addition & 1 deletion auth/provider_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"
"testing"

"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
"google.golang.org/api/iterator"
)

Expand Down
2 changes: 1 addition & 1 deletion auth/tenant_mgt.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"strconv"
"strings"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
"google.golang.org/api/iterator"
)

Expand Down
2 changes: 1 addition & 1 deletion auth/tenant_mgt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"testing"
"time"

"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
"google.golang.org/api/iterator"
)

Expand Down
2 changes: 1 addition & 1 deletion auth/token_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"strings"
"sync"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions auth/token_generator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"strings"
"testing"

"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

func TestEncodeToken(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion auth/token_verifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"sync"
"time"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
"google.golang.org/api/option"
"google.golang.org/api/transport"
)
Expand Down
2 changes: 1 addition & 1 deletion auth/token_verifier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"testing"
"time"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

func TestNewIDTokenVerifier(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion auth/user_mgt.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"time"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions auth/user_mgt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"testing"
"time"

"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
"github.com/armando1793/firebase-admin-go/v4/internal"
"google.golang.org/api/iterator"
)

Expand Down
2 changes: 1 addition & 1 deletion db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"runtime"
"strings"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
"golang.org/x/oauth2"
"google.golang.org/api/option"
)
Expand Down
2 changes: 1 addition & 1 deletion db/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"runtime"
"testing"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
"google.golang.org/api/option"
)

Expand Down
2 changes: 1 addition & 1 deletion db/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"strconv"
"strings"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

// QueryNode represents a data node retrieved from an ordered query.
Expand Down
2 changes: 1 addition & 1 deletion db/query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"reflect"
"testing"

"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
)

var sortableKeysResp = map[string]interface{}{
Expand Down
2 changes: 1 addition & 1 deletion db/ref.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"net/http"
"strings"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

// txnRetires is the maximum number of times a transaction is retried before giving up. Transaction
Expand Down
2 changes: 1 addition & 1 deletion db/ref_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"reflect"
"testing"

"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
)

type refOp func(r *Ref) error
Expand Down
2 changes: 1 addition & 1 deletion errorutils/errorutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package errorutils
import (
"net/http"

"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

// IsInvalidArgument checks if the given error was due to an invalid client argument.
Expand Down
14 changes: 7 additions & 7 deletions firebase.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
"os"

"cloud.google.com/go/firestore"
"github.com/armando1793/firebase-admin-go/appcheck"
"github.com/armando1793/firebase-admin-go/auth"
"github.com/armando1793/firebase-admin-go/db"
"github.com/armando1793/firebase-admin-go/iid"
"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/messaging"
"github.com/armando1793/firebase-admin-go/storage"
"github.com/armando1793/firebase-admin-go/v4/appcheck"
"github.com/armando1793/firebase-admin-go/v4/auth"
"github.com/armando1793/firebase-admin-go/v4/db"
"github.com/armando1793/firebase-admin-go/v4/iid"
"github.com/armando1793/firebase-admin-go/v4/internal"
"github.com/armando1793/firebase-admin-go/v4/messaging"
"github.com/armando1793/firebase-admin-go/v4/storage"
"google.golang.org/api/option"
"google.golang.org/api/transport"
)
Expand Down
2 changes: 1 addition & 1 deletion firebase_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"testing"
"time"

"github.com/armando1793/firebase-admin-go/messaging"
"github.com/armando1793/firebase-admin-go/v4/messaging"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
"google.golang.org/api/option"
Expand Down
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
module github.com/armando1793/firebase-admin-go

module github.com/armando1793/firebase-admin-go/v4
go 1.20

require (
Expand Down
4 changes: 2 additions & 2 deletions iid/iid.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"net/http"
"strings"

"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
"github.com/armando1793/firebase-admin-go/v4/internal"
)

const iidEndpoint = "https://console.firebase.google.com"
Expand Down
4 changes: 2 additions & 2 deletions iid/iid_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"net/http/httptest"
"testing"

"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/internal"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
"github.com/armando1793/firebase-admin-go/v4/internal"
"google.golang.org/api/option"
)

Expand Down
8 changes: 4 additions & 4 deletions integration/auth/auth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ import (
"testing"
"time"

firebase "github.com/armando1793/firebase-admin-go"
"github.com/armando1793/firebase-admin-go/auth"
"github.com/armando1793/firebase-admin-go/auth/hash"
"github.com/armando1793/firebase-admin-go/integration/internal"
firebase "github.com/armando1793/firebase-admin-go/v4"
"github.com/armando1793/firebase-admin-go/v4/auth"
"github.com/armando1793/firebase-admin-go/v4/auth/hash"
"github.com/armando1793/firebase-admin-go/v4/integration/internal"
"golang.org/x/oauth2/google"
"google.golang.org/api/option"
)
Expand Down
2 changes: 1 addition & 1 deletion integration/auth/project_config_mgt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"reflect"
"testing"

"github.com/armando1793/firebase-admin-go/auth"
"github.com/armando1793/firebase-admin-go/v4/auth"
)

func TestProjectConfig(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion integration/auth/provider_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"reflect"
"testing"

"github.com/armando1793/firebase-admin-go/auth"
"github.com/armando1793/firebase-admin-go/v4/auth"
"google.golang.org/api/iterator"
)

Expand Down
2 changes: 1 addition & 1 deletion integration/auth/tenant_mgt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"
"time"

"github.com/armando1793/firebase-admin-go/auth"
"github.com/armando1793/firebase-admin-go/v4/auth"
"google.golang.org/api/iterator"
)

Expand Down
4 changes: 2 additions & 2 deletions integration/auth/user_mgt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"testing"
"time"

"github.com/armando1793/firebase-admin-go/auth"
"github.com/armando1793/firebase-admin-go/auth/hash"
"github.com/armando1793/firebase-admin-go/v4/auth"
"github.com/armando1793/firebase-admin-go/v4/auth/hash"
"google.golang.org/api/iterator"
)

Expand Down
8 changes: 4 additions & 4 deletions integration/db/db_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import (
"reflect"
"testing"

firebase "github.com/armando1793/firebase-admin-go"
"github.com/armando1793/firebase-admin-go/db"
"github.com/armando1793/firebase-admin-go/errorutils"
"github.com/armando1793/firebase-admin-go/integration/internal"
firebase "github.com/armando1793/firebase-admin-go/v4"
"github.com/armando1793/firebase-admin-go/v4/db"
"github.com/armando1793/firebase-admin-go/v4/errorutils"
"github.com/armando1793/firebase-admin-go/v4/integration/internal"
)

var client *db.Client
Expand Down
Loading

0 comments on commit d98b08e

Please sign in to comment.