Add v6 version suffix

Author: Rajat Goel

generator/generate-sdk.sh

@@ -1,26 +1,29 @@
 #! /usr/bin/env bash
 set -euo pipefail
 
-if [[ $# -gt 1 ]]; then
+if [[ $# -ne 1 ]]; then
     echo "$0: Not expecting more than one command-line argument, got $#." 1>&2
     exit 1
 fi
 
+version=$(echo $1 | cut -f1 -d'.')
 loc=$(realpath -e $0)
 base_dir=$(dirname "$loc")
 spec_dir="$base_dir/dropbox-api-spec"
-gen_dir=$(dirname ${base_dir})/dropbox
+gen_dir=$(dirname ${base_dir})/v$version/dropbox
 
 stone -v -a :all go_types.stoneg.py "$gen_dir" "$spec_dir"/*.stone
 stone -v -a :all go_client.stoneg.py "$gen_dir" "$spec_dir"/*.stone
 
 # Update SDK and API spec versions
-sdk_version=${1:-"5.0.0"}
+sdk_version=${1}
 pushd ${spec_dir}
 spec_version=$(git rev-parse --short HEAD)
 popd
 
 sed -i.bak -e "s/UNKNOWN SDK VERSION/${sdk_version}/" \
     -e "s/UNKNOWN SPEC VERSION/${spec_version}/" ${gen_dir}/sdk.go
 rm ${gen_dir}/sdk.go.bak
+pushd ${gen_dir}
 goimports -l -w ${gen_dir}
+popd

v6/dropbox/account/client.go

@@ -0,0 +1,111 @@
+// Copyright (c) Dropbox, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+package account
+
+import (
+	"bytes"
+	"encoding/json"
+	"io/ioutil"
+	"net/http"
+
+	"github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox"
+	"github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox/auth"
+)
+
+// Client interface describes all routes in this namespace
+type Client interface {
+	// SetProfilePhoto : Sets a user's profile photo.
+	SetProfilePhoto(arg *SetProfilePhotoArg) (res *SetProfilePhotoResult, err error)
+}
+
+type apiImpl dropbox.Context
+
+//SetProfilePhotoAPIError is an error-wrapper for the set_profile_photo route
+type SetProfilePhotoAPIError struct {
+	dropbox.APIError
+	EndpointError *SetProfilePhotoError `json:"error"`
+}
+
+func (dbx *apiImpl) SetProfilePhoto(arg *SetProfilePhotoArg) (res *SetProfilePhotoResult, err error) {
+	cli := dbx.Client
+
+	dbx.Config.LogDebug("arg: %v", arg)
+	b, err := json.Marshal(arg)
+	if err != nil {
+		return
+	}
+
+	headers := map[string]string{
+		"Content-Type": "application/json",
+	}
+	if dbx.Config.AsMemberID != "" {
+		headers["Dropbox-API-Select-User"] = dbx.Config.AsMemberID
+	}
+
+	req, err := (*dropbox.Context)(dbx).NewRequest("api", "rpc", true, "account", "set_profile_photo", headers, bytes.NewReader(b))
+	if err != nil {
+		return
+	}
+	dbx.Config.LogInfo("req: %v", req)
+
+	resp, err := cli.Do(req)
+	if err != nil {
+		return
+	}
+
+	dbx.Config.LogInfo("resp: %v", resp)
+	defer resp.Body.Close()
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return
+	}
+
+	dbx.Config.LogDebug("body: %s", body)
+	if resp.StatusCode == http.StatusOK {
+		err = json.Unmarshal(body, &res)
+		if err != nil {
+			return
+		}
+
+		return
+	}
+	if resp.StatusCode == http.StatusConflict {
+		var apiError SetProfilePhotoAPIError
+		err = json.Unmarshal(body, &apiError)
+		if err != nil {
+			return
+		}
+		err = apiError
+		return
+	}
+	err = auth.HandleCommonAuthErrors(dbx.Config, resp, body)
+	if err != nil {
+		return
+	}
+	err = dropbox.HandleCommonAPIErrors(dbx.Config, resp, body)
+	return
+}
+
+// New returns a Client implementation for this namespace
+func New(c dropbox.Config) Client {
+	ctx := apiImpl(dropbox.NewContext(c))
+	return &ctx
+}

dropbox/account/client.go v6/dropbox/account/client.go-edropbox/account/client.go renamed to v6/dropbox/account/client.go-e

@@ -26,8 +26,8 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/dropbox/dropbox-sdk-go-unofficial/dropbox"
-	"github.com/dropbox/dropbox-sdk-go-unofficial/dropbox/auth"
+	"github.com/dropbox/dropbox-sdk-go-unofficial/v6dropbox"
+	"github.com/dropbox/dropbox-sdk-go-unofficial/v6dropbox/auth"
 )
 
 // Client interface describes all routes in this namespace

v6/dropbox/account/types.go

@@ -0,0 +1,106 @@
+// Copyright (c) Dropbox, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+// Package account : has no documentation (yet)
+package account
+
+import (
+	"encoding/json"
+
+	"github.com/dropbox/dropbox-sdk-go-unofficial/v6/dropbox"
+)
+
+// PhotoSourceArg : has no documentation (yet)
+type PhotoSourceArg struct {
+	dropbox.Tagged
+	// Base64Data : Image data in base64-encoded bytes.
+	Base64Data string `json:"base64_data,omitempty"`
+}
+
+// Valid tag values for PhotoSourceArg
+const (
+	PhotoSourceArgBase64Data = "base64_data"
+	PhotoSourceArgOther      = "other"
+)
+
+// UnmarshalJSON deserializes into a PhotoSourceArg instance
+func (u *PhotoSourceArg) UnmarshalJSON(body []byte) error {
+	type wrap struct {
+		dropbox.Tagged
+		// Base64Data : Image data in base64-encoded bytes.
+		Base64Data string `json:"base64_data,omitempty"`
+	}
+	var w wrap
+	var err error
+	if err = json.Unmarshal(body, &w); err != nil {
+		return err
+	}
+	u.Tag = w.Tag
+	switch u.Tag {
+	case "base64_data":
+		u.Base64Data = w.Base64Data
+
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// SetProfilePhotoArg : has no documentation (yet)
+type SetProfilePhotoArg struct {
+	// Photo : Image to set as the user's new profile photo.
+	Photo *PhotoSourceArg `json:"photo"`
+}
+
+// NewSetProfilePhotoArg returns a new SetProfilePhotoArg instance
+func NewSetProfilePhotoArg(Photo *PhotoSourceArg) *SetProfilePhotoArg {
+	s := new(SetProfilePhotoArg)
+	s.Photo = Photo
+	return s
+}
+
+// SetProfilePhotoError : has no documentation (yet)
+type SetProfilePhotoError struct {
+	dropbox.Tagged
+}
+
+// Valid tag values for SetProfilePhotoError
+const (
+	SetProfilePhotoErrorFileTypeError  = "file_type_error"
+	SetProfilePhotoErrorFileSizeError  = "file_size_error"
+	SetProfilePhotoErrorDimensionError = "dimension_error"
+	SetProfilePhotoErrorThumbnailError = "thumbnail_error"
+	SetProfilePhotoErrorTransientError = "transient_error"
+	SetProfilePhotoErrorOther          = "other"
+)
+
+// SetProfilePhotoResult : has no documentation (yet)
+type SetProfilePhotoResult struct {
+	// ProfilePhotoUrl : URL for the photo representing the user, if one is set.
+	ProfilePhotoUrl string `json:"profile_photo_url"`
+}
+
+// NewSetProfilePhotoResult returns a new SetProfilePhotoResult instance
+func NewSetProfilePhotoResult(ProfilePhotoUrl string) *SetProfilePhotoResult {
+	s := new(SetProfilePhotoResult)
+	s.ProfilePhotoUrl = ProfilePhotoUrl
+	return s
+}

dropbox/account/types.go v6/dropbox/account/types.go-edropbox/account/types.go renamed to v6/dropbox/account/types.go-e

@@ -24,7 +24,7 @@ package account
 import (
 	"encoding/json"
 
-	"github.com/dropbox/dropbox-sdk-go-unofficial/dropbox"
+	"github.com/dropbox/dropbox-sdk-go-unofficial/v6dropbox"
 )
 
 // PhotoSourceArg : has no documentation (yet)