Unverified Commit c4ad4ace authored by Simon Esposito's avatar Simon Esposito Committed by GitHub
Browse files

Update get purchase/subscription signature (#990) 

Set deleted user purchases/subs as belonging to system user.
Return empty user id when retrieving purchases/subscriptions belonging to the system user.
Do not return error when purchases validation contain mismatching userIDs.
parent 5b4416e1

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ The format is based on [keep a changelog](http://keepachangelog.com) and this pr 


### Changed

- Improve graceful shutdown of Google IAP receipt processor.

- If In-App Purchases validation contain mismatching userIDs, do not return an error.



### Fixed

- Consistent validation of override operator in runtime leaderboard record writes.

go.mod

+1 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ require ( 
	github.com/gorilla/mux v1.8.0

	github.com/gorilla/websocket v1.5.0

	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3

	github.com/heroiclabs/nakama-common v1.26.0

	github.com/heroiclabs/nakama-common v1.26.1-0.20230227112928-be92be890386

	github.com/jackc/pgconn v1.13.0

	github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa

	github.com/jackc/pgtype v1.12.0
@@ -75,5 +75,3 @@ require ( 
	golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect

	golang.org/x/text v0.3.7 // indirect

)
 


replace github.com/heroiclabs/nakama-common => ../nakama-common

go.sum

+2 −2
Original line number Diff line number Diff line
@@ -285,8 +285,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO 
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=

github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=

github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=

github.com/heroiclabs/nakama-common v1.26.0 h1:YcZwKjmxT6YvEhKuZ/bPnt0BV6PbrfapFis1ZiFzOOk=

github.com/heroiclabs/nakama-common v1.26.0/go.mod h1:zdYggBBPmykSfz4zYFJmBDX5wyURSPAGANtJPEDdbx8=

github.com/heroiclabs/nakama-common v1.26.1-0.20230227112928-be92be890386 h1:fCHcRLOFZDHy3KM+aZQUb/h/8uCfJJSzDKSCkwIRFvs=

github.com/heroiclabs/nakama-common v1.26.1-0.20230227112928-be92be890386/go.mod h1:zdYggBBPmykSfz4zYFJmBDX5wyURSPAGANtJPEDdbx8=

github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=

github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=

github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

migrate/sql/20230222172540-purchases-not-null-uid.sql

0 → 100644
+67 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2021 The Nakama Authors

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 * http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



-- +migrate Up

ALTER TABLE purchase

    DROP CONSTRAINT purchase_user_id_fkey;

ALTER TABLE subscription

    DROP CONSTRAINT subscription_user_id_fkey;



UPDATE purchase

    SET user_id = '00000000-0000-0000-0000-000000000000' WHERE user_id IS NULL;

UPDATE subscription

    SET user_id = '00000000-0000-0000-0000-000000000000' WHERE user_id IS NULL;



ALTER TABLE purchase

    ALTER COLUMN user_id SET NOT NULL;

ALTER TABLE purchase

    ALTER COLUMN user_id SET DEFAULT '00000000-0000-0000-0000-000000000000';



ALTER TABLE subscription

    ALTER COLUMN user_id SET NOT NULL;

ALTER TABLE subscription

    ALTER COLUMN user_id SET DEFAULT '00000000-0000-0000-0000-000000000000';



ALTER TABLE purchase

    ADD CONSTRAINT purchase_user_id_fkey FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE SET DEFAULT;

ALTER TABLE subscription

    ADD CONSTRAINT subscription_user_id_fkey FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE SET DEFAULT;



-- +migrate Down

ALTER TABLE purchase

    DROP CONSTRAINT purchase_user_id_fkey;

ALTER TABLE subscription

    DROP CONSTRAINT subscription_user_id_fkey;



ALTER TABLE purchase

    ALTER COLUMN user_id DROP DEFAULT;

ALTER TABLE purchase

    ALTER COLUMN user_id DROP NOT NULL;



ALTER TABLE subscription

    ALTER COLUMN user_id DROP DEFAULT;

ALTER TABLE subscription

    ALTER COLUMN user_id DROP NOT NULL;



UPDATE purchase

    SET user_id = NULL WHERE user_id = '00000000-0000-0000-0000-000000000000';

UPDATE subscription

    SET user_id = NULL WHERE user_id = '00000000-0000-0000-0000-000000000000';



ALTER TABLE purchase

    ADD CONSTRAINT purchase_user_id_fkey FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE SET NULL;

ALTER TABLE subscription

    ADD CONSTRAINT subscription_user_id_fkey FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE SET NULL;

server/api_subscription.go

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ func (s *ApiServer) GetSubscription(ctx context.Context, in *api.GetSubscription 
		}

	}



	_, sub, err := GetSubscriptionByProductId(ctx, s.logger, s.db, userID.String(), in.ProductId)

	sub, err := GetSubscriptionByProductId(ctx, s.logger, s.db, userID.String(), in.ProductId)

	if err != nil {

		if err == ErrSubscriptionNotFound {

			return nil, status.Error(codes.NotFound, err.Error())